From 5edcc2f14e1f106167d0820a68260c7d300f50ed Mon Sep 17 00:00:00 2001
From: Jovyn Tan <61113575+jovyntls@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:46:16 +0800
Subject: [PATCH] Refactor core package to use Node types (#2221)

Refactor core package to use Node types

In #2201, we introduced a unifying type for nodes. Most of the core
package is not yet using the new types.

Let's refactor the core package to utilise these new types, and add a
utility parseHTML method that avoids further `as unknown as` typecasts
throughout the codebase. Doing so allows us to make full use of
TypeScript's type-checking abilities while avoiding code duplication.

For more information on the rationale of the unifying types, refer to
#2201.
---
 packages/core/src/html/FootnoteProcessor.ts   | 16 +++---
 packages/core/src/html/MdAttributeRenderer.ts | 37 ++++++-------
 packages/core/src/html/NodeProcessor.ts       | 22 ++++----
 packages/core/src/html/SiteLinkManager.ts     | 14 ++---
 packages/core/src/html/codeblockProcessor.ts  | 12 ++--
 packages/core/src/html/headerProcessor.ts     | 14 ++---
 packages/core/src/html/linkProcessor.ts       | 55 +++++++++----------
 .../core/src/html/siteAndPageNavProcessor.ts  | 39 +++++--------
 .../core/src/html/vueSlotSyntaxProcessor.ts   | 20 +++----
 packages/core/src/html/warnings.ts            | 14 ++---
 packages/core/src/plugins/Plugin.ts           | 10 ++--
 packages/core/src/plugins/PluginManager.ts    |  6 +-
 packages/core/src/utils/node.ts               |  9 +++
 .../core/src/variables/VariableProcessor.ts   | 10 ++--
 .../core/test/unit/html/NodeProcessor.test.ts | 13 +++--
 .../test/unit/html/SiteLinkManager.test.ts    | 15 +++--
 .../core/test/unit/html/linkProcessor.test.ts | 42 +++++++-------
 17 files changed, 163 insertions(+), 185 deletions(-)

diff --git a/packages/core/src/html/FootnoteProcessor.ts b/packages/core/src/html/FootnoteProcessor.ts
index 09dc6b9663..8fded4a3d6 100644
--- a/packages/core/src/html/FootnoteProcessor.ts
+++ b/packages/core/src/html/FootnoteProcessor.ts
@@ -1,5 +1,5 @@
 import cheerio from 'cheerio';
-import { DomElement } from 'htmlparser2';
+import { MbNode, parseHTML } from '../utils/node';
 import { MARKBIND_FOOTNOTE_POPOVER_ID_PREFIX } from './constants';
 
 /*
@@ -13,7 +13,7 @@ export class FootnoteProcessor {
     this.renderedFootnotes = [];
   }
 
-  processMbTempFootnotes(node: DomElement) {
+  processMbTempFootnotes(node: MbNode) {
     const $ = cheerio(node);
     const content = $.html();
     if (content) {
@@ -22,7 +22,7 @@ export class FootnoteProcessor {
     $.remove();
   }
 
-  combineFootnotes(processNode: (nd: DomElement) => any): string {
+  combineFootnotes(processNode: (nd: MbNode) => any): string {
     let hasFootnote = false;
     const prefix = '<hr class="footnotes-sep">\n<section class="footnotes">\n<ol class="footnotes-list">\n';
 
@@ -30,17 +30,17 @@ export class FootnoteProcessor {
       const $ = cheerio.load(footNoteBlock);
       let popoversHtml = '';
 
-      $('li.footnote-item').each((index, li) => {
+      $('li.footnote-item').each((_index, li) => {
         hasFootnote = true;
         const popoverId = `${MARKBIND_FOOTNOTE_POPOVER_ID_PREFIX}${(li as any).attribs.id}`;
-        const popoverNode = cheerio.parseHTML(`<popover id="${popoverId}">
+        const popoverNode = parseHTML(`<popover id="${popoverId}">
             <div #content>
               ${$(li).html()}
             </div>
-          </popover>`)[0];
-        processNode(popoverNode as unknown as DomElement);
+          </popover>`)[0] as MbNode;
+        processNode(popoverNode);
 
-        popoversHtml += cheerio.html(popoverNode as any);
+        popoversHtml += cheerio.html(popoverNode);
       });
 
       return `${popoversHtml}\n${footNoteBlock}\n`;
diff --git a/packages/core/src/html/MdAttributeRenderer.ts b/packages/core/src/html/MdAttributeRenderer.ts
index 0a0da8ef1e..656902db2f 100644
--- a/packages/core/src/html/MdAttributeRenderer.ts
+++ b/packages/core/src/html/MdAttributeRenderer.ts
@@ -1,11 +1,9 @@
-import cheerio from 'cheerio';
 import has from 'lodash/has';
-import { DomElement } from 'htmlparser2';
 import { getVslotShorthandName } from './vueSlotSyntaxProcessor';
 import type { MarkdownProcessor } from './MarkdownProcessor';
 import * as logger from '../utils/logger';
 import { createSlotTemplateNode } from './elements';
-import { NodeOrText } from '../utils/node';
+import { MbNode, NodeOrText, parseHTML } from '../utils/node';
 
 const _ = {
   has,
@@ -29,11 +27,8 @@ export class MdAttributeRenderer {
    * @param isInline Whether to process the attribute with only inline markdown-it rules
    * @param slotName Name attribute of the <slot> element to insert, which defaults to the attribute name
    */
-  processAttributeWithoutOverride(node: DomElement, attribute: string,
+  processAttributeWithoutOverride(node: MbNode, attribute: string,
                                   isInline: boolean, slotName = attribute): void {
-    if (!node.attribs) {
-      return;
-    }
     const hasAttributeSlot = node.children
         && node.children.some(child => getVslotShorthandName(child) === slotName);
 
@@ -63,7 +58,7 @@ export class MdAttributeRenderer {
    * @returns {boolean} whether the node has both the slot and attribute
    */
   // eslint-disable-next-line class-methods-use-this
-  hasSlotOverridingAttribute(node: DomElement, attribute: string, slotName = attribute): boolean {
+  hasSlotOverridingAttribute(node: MbNode, attribute: string, slotName = attribute): boolean {
     const hasNamedSlot = node.children
       && node.children.some(child => getVslotShorthandName(child) === slotName);
     if (!hasNamedSlot || !node.attribs) {
@@ -80,7 +75,7 @@ export class MdAttributeRenderer {
     return hasAttribute;
   }
 
-  processPopoverAttributes(node: DomElement) {
+  processPopoverAttributes(node: MbNode) {
     if (!this.hasSlotOverridingAttribute(node, 'header')) {
       this.processAttributeWithoutOverride(node, 'header', true);
     }
@@ -103,11 +98,11 @@ export class MdAttributeRenderer {
     this.processAttributeWithoutOverride(node, 'content', true);
   }
 
-  processTooltip(node: DomElement) {
+  processTooltip(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'content', true);
   }
 
-  processModalAttributes(node: DomElement) {
+  processModalAttributes(node: MbNode) {
     if (!this.hasSlotOverridingAttribute(node, 'header')) {
       this.processAttributeWithoutOverride(node, 'header', true);
     }
@@ -117,7 +112,7 @@ export class MdAttributeRenderer {
    * Panels
    */
 
-  processPanelAttributes(node: DomElement) {
+  processPanelAttributes(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'alt', false, '_alt');
     if (!this.hasSlotOverridingAttribute(node, 'header')) {
       this.processAttributeWithoutOverride(node, 'header', false);
@@ -128,17 +123,17 @@ export class MdAttributeRenderer {
    * Questions, QOption, and Quizzes
    */
 
-  processQuestion(node: DomElement) {
+  processQuestion(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'header', false);
     this.processAttributeWithoutOverride(node, 'hint', false);
     this.processAttributeWithoutOverride(node, 'answer', false);
   }
 
-  processQOption(node: DomElement) {
+  processQOption(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'reason', false);
   }
 
-  processQuiz(node: DomElement) {
+  processQuiz(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'intro', false);
   }
 
@@ -146,7 +141,7 @@ export class MdAttributeRenderer {
    * Tabs
    */
 
-  processTabAttributes(node: DomElement) {
+  processTabAttributes(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'header', true);
   }
 
@@ -154,7 +149,7 @@ export class MdAttributeRenderer {
    * Boxes
    */
 
-  processBoxAttributes(node: DomElement) {
+  processBoxAttributes(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'icon', true);
     this.processAttributeWithoutOverride(node, 'header', false);
   }
@@ -163,7 +158,7 @@ export class MdAttributeRenderer {
    * Dropdowns
    */
 
-  processDropdownAttributes(node: DomElement) {
+  processDropdownAttributes(node: MbNode) {
     if (!this.hasSlotOverridingAttribute(node, 'header')) {
       this.processAttributeWithoutOverride(node, 'header', true);
     }
@@ -173,7 +168,7 @@ export class MdAttributeRenderer {
    * Thumbnails
    */
 
-  processThumbnailAttributes(node: DomElement) {
+  processThumbnailAttributes(node: MbNode) {
     if (!node.attribs) {
       return;
     }
@@ -189,11 +184,11 @@ export class MdAttributeRenderer {
     }
 
     const renderedText = this.markdownProcessor.renderMdInline(text);
-    node.children = cheerio.parseHTML(renderedText) as unknown as DomElement[];
+    node.children = parseHTML(renderedText);
     delete node.attribs.text;
   }
 
-  processScrollTopButtonAttributes(node: DomElement) {
+  processScrollTopButtonAttributes(node: MbNode) {
     this.processAttributeWithoutOverride(node, 'icon', true);
   }
 }
diff --git a/packages/core/src/html/NodeProcessor.ts b/packages/core/src/html/NodeProcessor.ts
index 885294a731..bd842f0800 100644
--- a/packages/core/src/html/NodeProcessor.ts
+++ b/packages/core/src/html/NodeProcessor.ts
@@ -115,7 +115,7 @@ export class NodeProcessor {
   /*
    * Frontmatter collection
    */
-  _processFrontmatter(node: MbNode, context: Context) {
+  private _processFrontmatter(node: MbNode, context: Context) {
     let currentFrontmatter = {};
     const frontmatter = cheerio(node);
     if (!context.processingOptions.omitFrontmatter && frontmatter.text().trim()) {
@@ -153,18 +153,16 @@ export class NodeProcessor {
    * Removes the node if modal id already exists, processes node otherwise
    */
   private processModal(node: MbNode) {
-    if (node.attribs) {
-      if (this.processedModals[node.attribs.id]) {
-        cheerio(node).remove();
-      } else {
-        this.processedModals[node.attribs.id] = true;
+    if (this.processedModals[node.attribs.id]) {
+      cheerio(node).remove();
+    } else {
+      this.processedModals[node.attribs.id] = true;
 
-        // Transform deprecated slot names; remove when deprecating
-        renameSlot(node, 'modal-header', 'header');
-        renameSlot(node, 'modal-footer', 'footer');
+      // Transform deprecated slot names; remove when deprecating
+      renameSlot(node, 'modal-header', 'header');
+      renameSlot(node, 'modal-footer', 'footer');
 
-        this.mdAttributeRenderer.processModalAttributes(node);
-      }
+      this.mdAttributeRenderer.processModalAttributes(node);
     }
   }
 
@@ -397,7 +395,7 @@ export class NodeProcessor {
           return;
         }
         const mainHtmlNodes = dom.map((d) => {
-          let processed;
+          let processed: NodeOrText;
           try {
             processed = this.traverse(d, context);
           } catch (err: any) {
diff --git a/packages/core/src/html/SiteLinkManager.ts b/packages/core/src/html/SiteLinkManager.ts
index ee041d720c..eb835b25dd 100644
--- a/packages/core/src/html/SiteLinkManager.ts
+++ b/packages/core/src/html/SiteLinkManager.ts
@@ -1,7 +1,7 @@
 import has from 'lodash/has';
-import { DomElement } from 'htmlparser2';
 import * as linkProcessor from './linkProcessor';
 import type { NodeProcessorConfig } from './NodeProcessor';
+import { MbNode } from '../utils/node';
 
 const _ = { has };
 
@@ -51,16 +51,14 @@ export class SiteLinkManager {
    * Add a link to the intralinkCollection to be validated later,
    * if the node should be validated and intralink validation is not disabled.
    */
-  collectIntraLinkToValidate(node: DomElement, cwf: string) {
-    if (node.name && !tagsToValidate.has(node.name)) {
+  collectIntraLinkToValidate(node: MbNode, cwf: string) {
+    if (!tagsToValidate.has(node.name)) {
       return 'Should not validate';
     }
 
-    if (node.attribs) {
-      const hasIntralinkValidationDisabled = _.has(node.attribs, 'no-validation');
-      if (hasIntralinkValidationDisabled) {
-        return 'Intralink validation disabled';
-      }
+    const hasIntralinkValidationDisabled = _.has(node.attribs, 'no-validation');
+    if (hasIntralinkValidationDisabled) {
+      return 'Intralink validation disabled';
     }
 
     const resourcePath = linkProcessor.getDefaultTagsResourcePath(node);
diff --git a/packages/core/src/html/codeblockProcessor.ts b/packages/core/src/html/codeblockProcessor.ts
index 27a88037a5..8c1fffb6e2 100644
--- a/packages/core/src/html/codeblockProcessor.ts
+++ b/packages/core/src/html/codeblockProcessor.ts
@@ -1,6 +1,6 @@
 import cheerio from 'cheerio';
-import { DomElement } from 'htmlparser2';
 import has from 'lodash/has';
+import { NodeOrText, MbNode } from '../utils/node';
 
 const md = require('../lib/markdown-it');
 const util = require('../lib/markdown-it/utils');
@@ -20,9 +20,9 @@ interface TraverseLinePartData {
  * @param node The node of the line part to be traversed
  * @param hlStart The highlight start position, relative to the start of the line part
  * @param hlEnd The highlight end position, relative to the start of the line part
- * @returns {object} An object that contains data to be used by the node's parent.
+ * @returns  An object that contains data to be used by the node's parent.
  */
-function traverseLinePart(node: DomElement, hlStart: number, hlEnd: number): TraverseLinePartData {
+function traverseLinePart(node: NodeOrText, hlStart: number, hlEnd: number): TraverseLinePartData {
   const resData: TraverseLinePartData = {
     numCharsTraversed: 0,
     shouldParentHighlight: false,
@@ -128,7 +128,7 @@ function traverseLinePart(node: DomElement, hlStart: number, hlEnd: number): Tra
  * traverses over the line and applies the highlight.
  * @param node Root of the code block element, which is the 'pre' node
  */
-export function highlightCodeBlock(node: DomElement) {
+export function highlightCodeBlock(node: MbNode) {
   if (!node.children) {
     return;
   }
@@ -155,8 +155,8 @@ export function highlightCodeBlock(node: DomElement) {
  * @param node the code block element, which is the 'code' node
  * @param showCodeLineNumbers true if line numbers should be shown, false otherwise
  */
-export function setCodeLineNumbers(node: DomElement, showCodeLineNumbers: boolean) {
-  const existingClass = node.attribs?.class || '';
+export function setCodeLineNumbers(node: MbNode, showCodeLineNumbers: boolean) {
+  const existingClass = node.attribs.class || '';
   const styleClassRegex = /(^|\s)(no-)?line-numbers($|\s)/;
   const hasStyleClass = styleClassRegex.test(existingClass);
   if (hasStyleClass) {
diff --git a/packages/core/src/html/headerProcessor.ts b/packages/core/src/html/headerProcessor.ts
index 751beda441..d8370a9d01 100644
--- a/packages/core/src/html/headerProcessor.ts
+++ b/packages/core/src/html/headerProcessor.ts
@@ -1,9 +1,9 @@
 import cheerio from 'cheerio';
 import slugify from '@sindresorhus/slugify';
 import has from 'lodash/has';
-import { DomElement } from 'htmlparser2';
 import { getVslotShorthandName } from './vueSlotSyntaxProcessor';
 import type { NodeProcessorConfig } from './NodeProcessor';
+import { MbNode, NodeOrText } from '../utils/node';
 
 const _ = {
   has,
@@ -12,7 +12,7 @@ const _ = {
 /*
  * h1 - h6
  */
-export function setHeadingId(node: DomElement, config: NodeProcessorConfig) {
+export function setHeadingId(node: MbNode, config: NodeProcessorConfig) {
   const textContent = cheerio(node).text();
   // remove the '&lt;' and '&gt;' symbols that markdown-it uses to escape '<' and '>'
   const cleanedContent = textContent.replace(/&lt;|&gt;/g, '');
@@ -27,16 +27,15 @@ export function setHeadingId(node: DomElement, config: NodeProcessorConfig) {
     headerIdMap[slugifiedHeading] = 2;
   }
 
-  node.attribs = node.attribs ?? {};
   node.attribs.id = headerId;
 }
 
 /**
  * Traverses the dom breadth-first from the specified element to find a html heading child.
  * @param node Root element to search from
- * @returns {undefined|*} The header element, or undefined if none is found.
+ * @returns  The header element, or undefined if none is found.
  */
-function _findHeaderElement(node: DomElement) {
+function _findHeaderElement(node: MbNode): undefined | NodeOrText {
   const elements = node.children;
   if (!elements || !elements.length) {
     return undefined;
@@ -64,7 +63,7 @@ function _findHeaderElement(node: DomElement) {
  * This is to ensure anchors still work when panels are in their minimized form.
  * @param node The root panel element
  */
-export function assignPanelId(node: DomElement) {
+export function assignPanelId(node: MbNode) {
   const slotChildren = node.children
     ? node.children.filter(child => getVslotShorthandName(child) !== '')
     : [];
@@ -72,7 +71,7 @@ export function assignPanelId(node: DomElement) {
   const headerSlot = slotChildren.find(child => getVslotShorthandName(child) === 'header');
 
   if (headerSlot) {
-    const header = _findHeaderElement(headerSlot);
+    const header = _findHeaderElement(headerSlot as MbNode);
     if (!header) {
       return;
     }
@@ -82,7 +81,6 @@ export function assignPanelId(node: DomElement) {
           + 'Please report this to the MarkBind developers. Thank you!');
     }
 
-    node.attribs = node.attribs ?? {};
     node.attribs.panelId = header.attribs.id;
   }
 }
diff --git a/packages/core/src/html/linkProcessor.ts b/packages/core/src/html/linkProcessor.ts
index aa5df522eb..bbb011897f 100644
--- a/packages/core/src/html/linkProcessor.ts
+++ b/packages/core/src/html/linkProcessor.ts
@@ -3,7 +3,6 @@ import has from 'lodash/has';
 import parse from 'url-parse';
 import ignore from 'ignore';
 
-import { DomElement } from 'htmlparser2';
 import * as fsUtil from '../utils/fsUtil';
 import * as logger from '../utils/logger';
 import * as urlUtil from '../utils/urlUtil';
@@ -11,6 +10,7 @@ import * as urlUtil from '../utils/urlUtil';
 import { PluginManager } from '../plugins/PluginManager';
 import type { NodeProcessorConfig } from './NodeProcessor';
 import type { PageSources } from '../Page/PageSources';
+import { MbNode } from '../utils/node';
 
 const _ = { has };
 
@@ -28,12 +28,11 @@ const defaultTagLinkMap: { [key: string]: string } = {
   script: 'src',
 };
 
-export function hasTagLink(node: DomElement) {
-  return node.name && (node.name in defaultTagLinkMap || node.name in pluginTagConfig);
+export function hasTagLink(node: MbNode) {
+  return node.name in defaultTagLinkMap || node.name in pluginTagConfig;
 }
 
-export function getDefaultTagsResourcePath(node: DomElement): string {
-  if (!node.name || !node.attribs) return '';
+export function getDefaultTagsResourcePath(node: MbNode) {
   const linkAttribName = defaultTagLinkMap[node.name];
   const resourcePath = node.attribs[linkAttribName];
   return resourcePath;
@@ -55,7 +54,7 @@ export function isIntraLink(resourcePath: string | undefined): boolean {
     && !MAILTO_OR_TEL_REGEX.test(resourcePath);
 }
 
-function _convertRelativeLink(node: DomElement, cwf: string, rootPath: string,
+function _convertRelativeLink(node: MbNode, cwf: string, rootPath: string,
                               baseUrl: string, resourcePath: string | undefined, linkAttribName: string) {
   if (!resourcePath || !isIntraLink(resourcePath)) {
     return;
@@ -70,9 +69,7 @@ function _convertRelativeLink(node: DomElement, cwf: string, rootPath: string,
   const fullResourcePath = path.join(cwd, resourcePath);
   const resourcePathFromRoot = _getResourcePathFromRoot(rootPath, fullResourcePath);
 
-  if (node.attribs) {
-    node.attribs[linkAttribName] = path.posix.join(baseUrl || '/', resourcePathFromRoot);
-  }
+  node.attribs[linkAttribName] = path.posix.join(baseUrl || '/', resourcePathFromRoot);
 }
 
 /**
@@ -82,20 +79,19 @@ function _convertRelativeLink(node: DomElement, cwf: string, rootPath: string,
  *
  * TODO allow plugins to tap into this process / extend {@link defaultTagLinkMap}
  *
- * @param {DomElement} node from the dom traversal
- * @param {string} cwf as flagged from {@link NodeProcessor}
- * @param {string} rootPath of the root site
- * @param {string} baseUrl
+ * @param  node from the dom traversal
+ * @param  cwf as flagged from {@link NodeProcessor}
+ * @param  rootPath of the root site
+ * @param  baseUrl
  */
-export function convertRelativeLinks(node: DomElement, cwf: string, rootPath: string, baseUrl: string) {
-  if (!node.name) return;
+export function convertRelativeLinks(node: MbNode, cwf: string, rootPath: string, baseUrl: string) {
   if (node.name in defaultTagLinkMap) {
     const resourcePath = getDefaultTagsResourcePath(node);
     const linkAttribName = defaultTagLinkMap[node.name];
     _convertRelativeLink(node, cwf, rootPath, baseUrl, resourcePath, linkAttribName);
   }
 
-  if (node.name in pluginTagConfig && pluginTagConfig[node.name].attributes && node.attribs) {
+  if (node.name in pluginTagConfig && pluginTagConfig[node.name].attributes) {
     pluginTagConfig[node.name].attributes.forEach((attrConfig) => {
       if (attrConfig.isRelative && node.attribs) {
         const resourcePath = node.attribs[attrConfig.name];
@@ -105,8 +101,8 @@ export function convertRelativeLinks(node: DomElement, cwf: string, rootPath: st
   }
 }
 
-export function convertMdExtToHtmlExt(node: DomElement) {
-  if (node.name === 'a' && node.attribs && node.attribs.href) {
+export function convertMdExtToHtmlExt(node: MbNode) {
+  if (node.name === 'a' && node.attribs.href) {
     const hasNoConvert = _.has(node.attribs, 'no-convert');
     if (hasNoConvert) {
       return;
@@ -164,10 +160,10 @@ function isValidFileAsset(resourcePath: string, config: NodeProcessorConfig) {
  * Serves as an internal intra-link validator. Checks if the intra-links are valid.
  * If the intra-links are suspected to be invalid, a warning message will be logged.
  *
- * @param {string} resourcePath parsed from the node's relevant attribute
- * @param {string} cwf as flagged from {@link NodePreprocessor}
- * @param {NodeProcessorConfig} config passed for page metadata access
- * @returns {string} these string return values are for unit testing purposes only
+ * @param  resourcePath parsed from the node's relevant attribute
+ * @param  cwf as flagged from {@link NodePreprocessor}
+ * @param  config passed for page metadata access
+ * @returns  these string return values are for unit testing purposes only
  */
 export function validateIntraLink(resourcePath: string, cwf: string, config: NodeProcessorConfig): string {
   if (!isIntraLink(resourcePath)) {
@@ -230,22 +226,21 @@ export function validateIntraLink(resourcePath: string, cwf: string, config: Nod
  * Resolves and collects source file paths pointed to by attributes in nodes for live reload.
  * Only necessary for plugins for now.
  *
- * @param {DomElement} node from the dom traversal
- * @param {string} rootPath site root path to resolve the link from
- * @param {string} baseUrl base url to strip off the link (if any)
- * @param {PageSources} pageSources {@link PageSources} object to add the resolved file path to
- * @returns {string | void} these string return values are for unit testing purposes only
+ * @param  node from the dom traversal
+ * @param  rootPath site root path to resolve the link from
+ * @param  baseUrl base url to strip off the link (if any)
+ * @param  pageSources {@link PageSources} object to add the resolved file path to
+ * @returns  these string return values are for unit testing purposes only
  */
-export function collectSource(node: DomElement, rootPath: string,
+export function collectSource(node: MbNode, rootPath: string,
                               baseUrl: string, pageSources: PageSources): string | void {
-  if (!node.name) return;
   const tagConfig = pluginTagConfig[node.name];
   if (!tagConfig || !tagConfig.attributes) {
     return;
   }
 
   tagConfig.attributes.forEach((attrConfig) => {
-    if (!attrConfig.isSourceFile || !node.attribs) {
+    if (!attrConfig.isSourceFile) {
       return;
     }
 
diff --git a/packages/core/src/html/siteAndPageNavProcessor.ts b/packages/core/src/html/siteAndPageNavProcessor.ts
index feee6ea526..12aa51b6f8 100644
--- a/packages/core/src/html/siteAndPageNavProcessor.ts
+++ b/packages/core/src/html/siteAndPageNavProcessor.ts
@@ -1,6 +1,8 @@
 import { v4 as uuidv4 } from 'uuid';
-import { DomElement } from 'htmlparser2';
 import cheerio from 'cheerio';
+import {
+  MbNode, NodeOrText, parseHTML, TextElement,
+} from '../utils/node';
 
 require('../patches/htmlparser2');
 const md = require('../lib/markdown-it');
@@ -38,21 +40,18 @@ const SITE_NAV_DROPDOWN_ICON_ROTATED_HTML = '<div class="site-nav-dropdown-btn-c
  * otherwise it is replaced with one until it is unique.
  */
 export class PageNavProcessor {
-  uuidTextNode: DomElement | undefined;
-  constructor() {
-    this.uuidTextNode = undefined;
-  }
+  uuidTextNode?: TextElement;
 
   getUuid() {
     return (this.uuidTextNode && this.uuidTextNode.data) || '';
   }
 
-  renderPageNav(node: DomElement) {
-    [this.uuidTextNode] = cheerio.parseHTML(uuidv4()) as unknown as [DomElement];
-    cheerio(node).replaceWith(this.uuidTextNode as unknown as cheerio.Element);
+  renderPageNav(node: MbNode) {
+    [this.uuidTextNode] = parseHTML(uuidv4());
+    cheerio(node).replaceWith(this.uuidTextNode as cheerio.Element);
   }
 
-  finalizePageNavUuid(mainHtml: string | null, mainHtmlNodes: DomElement[], footnotesHtml: string) {
+  finalizePageNavUuid(mainHtml: string | null, mainHtmlNodes: NodeOrText[], footnotesHtml: string) {
     if (!this.uuidTextNode) {
       return mainHtml;
     }
@@ -74,15 +73,14 @@ export class PageNavProcessor {
     return mainHtmlString;
   }
 
-  static transformPrintContainer(node: DomElement) {
-    node.attribs = node.attribs ?? {};
+  static transformPrintContainer(node: MbNode) {
     node.attribs.class = 'page-nav-print d-none d-print-block';
     node.attribs['v-pre'] = '';
     node.name = 'div';
   }
 }
 
-export function renderSiteNav(node: DomElement) {
+export function renderSiteNav(node: MbNode) {
   const $original = cheerio(node);
   const siteNavText = $original.text().trim();
   if (siteNavText === '') {
@@ -93,7 +91,7 @@ export function renderSiteNav(node: DomElement) {
   const siteNavHtml = md.render(siteNavText.replace(SITE_NAV_EMPTY_LINE_REGEX, '\n'));
   const $ = cheerio.load(siteNavHtml);
 
-  $('ul').each((i1, ulElem) => {
+  $('ul').each((_i1, ulElem) => {
     const nestingLevel = $(ulElem).parents('ul').length;
     $(ulElem).addClass(SITE_NAV_LIST_CLASS);
     if (nestingLevel === 0) {
@@ -104,7 +102,7 @@ export function renderSiteNav(node: DomElement) {
     const defaultListItemClass = `${SITE_NAV_DEFAULT_LIST_ITEM_CLASS} ${listItemLevelClass}`;
     const customListItemClasses = `${SITE_NAV_CUSTOM_LIST_ITEM_CLASS} ${listItemLevelClass}`;
 
-    $(ulElem).children('li').each((i2, liElem) => {
+    $(ulElem).children('li').each((_i2, liElem) => {
       const nestedLists = $(liElem).children('ul');
       const nestedAnchors = $(liElem).children('a');
       if (nestedLists.length === 0 && nestedAnchors.length === 0) {
@@ -140,11 +138,8 @@ export function renderSiteNav(node: DomElement) {
   $original.append($.root());
 }
 
-function addOverlayPortalSource(node: DomElement, to: string) {
-  node.attribs = node.attribs ?? {};
-  if (node.name) {
-    node.attribs['tag-name'] = node.name;
-  }
+function addOverlayPortalSource(node: MbNode, to: string) {
+  node.attribs['tag-name'] = node.name;
   node.attribs.to = to;
   node.name = 'overlay-source';
 }
@@ -153,11 +148,7 @@ function addOverlayPortalSource(node: DomElement, to: string) {
  * Wrap id="site/page-nav", and the <site-nav> component with a <nav-portal> vue component.
  * This component portals said element into the mobile navbar menus as needed.
  */
-export function addSitePageNavPortal(node: DomElement) {
-  if (!node.attribs) {
-    return;
-  }
-
+export function addSitePageNavPortal(node: MbNode) {
   if (node.attribs.id === SITE_NAV_ID || node.attribs.id === 'page-nav') {
     addOverlayPortalSource(node, node.attribs.id);
   } else if (node.attribs['mb-site-nav']) {
diff --git a/packages/core/src/html/vueSlotSyntaxProcessor.ts b/packages/core/src/html/vueSlotSyntaxProcessor.ts
index 88e8fc2d02..8e23d429c3 100644
--- a/packages/core/src/html/vueSlotSyntaxProcessor.ts
+++ b/packages/core/src/html/vueSlotSyntaxProcessor.ts
@@ -1,14 +1,13 @@
-import cheerio from 'cheerio';
 import has from 'lodash/has';
 import find from 'lodash/find';
-import { DomElement } from 'htmlparser2';
+import { MbNode, NodeOrText, parseHTML } from '../utils/node';
 
 const _ = {
   has,
   find,
 };
 
-export function getVslotShorthandName(node: DomElement) {
+export function getVslotShorthandName(node: NodeOrText) {
   if (!node.attribs) {
     return '';
   }
@@ -25,17 +24,16 @@ export function getVslotShorthandName(node: DomElement) {
 /*
  * Shifts the slot node deeper by one level by creating a new intermediary node with template tag name.
  */
-export function shiftSlotNodeDeeper(node: DomElement) {
+export function shiftSlotNodeDeeper(node: MbNode) {
   const nodeChildren = node.children ?? [];
 
   nodeChildren.forEach((child) => {
     const vslotShorthandName = getVslotShorthandName(child);
     if (vslotShorthandName && child.name !== 'template') {
-      const newSlotNode = cheerio.parseHTML('<template></template>')[0] as unknown as DomElement;
+      const newSlotNode = parseHTML('<template></template>')[0] as MbNode;
 
       const vslotShorthand = `#${vslotShorthandName}`;
 
-      newSlotNode.attribs = newSlotNode?.attribs ?? {};
       newSlotNode.attribs[vslotShorthand] = '';
       if (child.attribs) {
         delete child.attribs[vslotShorthand];
@@ -44,7 +42,7 @@ export function shiftSlotNodeDeeper(node: DomElement) {
       newSlotNode.parent = node;
       child.parent = newSlotNode;
 
-      newSlotNode.children = newSlotNode?.children ?? [];
+      newSlotNode.children = newSlotNode.children ?? [];
       newSlotNode.children.push(child);
 
       // replace the shifted old child node with the new slot node
@@ -62,11 +60,7 @@ export function shiftSlotNodeDeeper(node: DomElement) {
 /*
  * Transforms deprecated vue slot syntax (slot="test") into the updated Vue slot shorthand syntax (#test).
  */
-export function transformOldSlotSyntax(node: DomElement) {
-  if (!node.children) {
-    return;
-  }
-
+export function transformOldSlotSyntax(node: MbNode) {
   node.children.forEach((child) => {
     if (child.attribs && _.has(child.attribs, 'slot')) {
       const vslotShorthandName = `#${child.attribs.slot}`;
@@ -76,7 +70,7 @@ export function transformOldSlotSyntax(node: DomElement) {
   });
 }
 
-export function renameSlot(node: DomElement, originalName: string, newName: string) {
+export function renameSlot(node: MbNode, originalName: string, newName: string) {
   if (!node.children) {
     return;
   }
diff --git a/packages/core/src/html/warnings.ts b/packages/core/src/html/warnings.ts
index c3b3e6d141..065411fb15 100644
--- a/packages/core/src/html/warnings.ts
+++ b/packages/core/src/html/warnings.ts
@@ -1,5 +1,5 @@
-import { DomElement } from 'htmlparser2';
 import * as logger from '../utils/logger';
+import { MbNode } from '../utils/node';
 import { getVslotShorthandName } from './vueSlotSyntaxProcessor';
 
 /**
@@ -10,7 +10,7 @@ import { getVslotShorthandName } from './vueSlotSyntaxProcessor';
  * @param attribute An attribute that is conflicting with other attributes
  * @param attrsConflictingWith The attributes conflicting with `attribute`
  */
-function _warnConflictingAttributes(node: DomElement, attribute: string, attrsConflictingWith: string[]) {
+function _warnConflictingAttributes(node: MbNode, attribute: string, attrsConflictingWith: string[]) {
   if (!node.attribs || !(attribute in node.attribs)) {
     return;
   }
@@ -29,7 +29,7 @@ function _warnConflictingAttributes(node: DomElement, attribute: string, attrsCo
  * @param element Root element to check
  * @param namePairs Object of slot name pairs with each pair in the form deprecated : correct
  */
-function _warnDeprecatedSlotNames(element: DomElement, namePairs: { [name: string]: string }) {
+function _warnDeprecatedSlotNames(element: MbNode, namePairs: { [name: string]: string }) {
   if (!(element.children)) {
     return;
   }
@@ -48,8 +48,8 @@ function _warnDeprecatedSlotNames(element: DomElement, namePairs: { [name: strin
   });
 }
 
-export const warnConflictingAtributesMap: { [attr: string]: (nd: DomElement) => void } = {
-  box: (node: DomElement) => {
+export const warnConflictingAtributesMap: { [attr: string]: (nd: MbNode) => void } = {
+  box: (node) => {
     _warnConflictingAttributes(node, 'light', ['seamless']);
     _warnConflictingAttributes(node, 'no-background', ['background-color', 'seamless']);
     _warnConflictingAttributes(node, 'no-border',
@@ -58,8 +58,8 @@ export const warnConflictingAtributesMap: { [attr: string]: (nd: DomElement) =>
   },
 };
 
-export const warnDeprecatedAtributesMap: { [attr: string]: (nd: DomElement) => void } = {
-  modal: (node: DomElement) => {
+export const warnDeprecatedAtributesMap: { [attr: string]: (nd: MbNode) => void } = {
+  modal: (node) => {
     _warnDeprecatedSlotNames(node, {
       'modal-header': 'header',
       'modal-footer': 'footer',
diff --git a/packages/core/src/plugins/Plugin.ts b/packages/core/src/plugins/Plugin.ts
index d4c8b7546c..6d862a0786 100644
--- a/packages/core/src/plugins/Plugin.ts
+++ b/packages/core/src/plugins/Plugin.ts
@@ -2,11 +2,11 @@ import path from 'path';
 import fs from 'fs-extra';
 import cheerio from 'cheerio';
 
-import { DomElement } from 'htmlparser2';
 import isString from 'lodash/isString';
 import * as logger from '../utils/logger';
 import * as urlUtil from '../utils/urlUtil';
 import type { NodeProcessorConfig } from '../html/NodeProcessor';
+import { NodeOrText } from '../utils/node';
 
 require('../patches/htmlparser2');
 
@@ -43,8 +43,8 @@ export class Plugin {
     getLinks: (...args: any[]) => any;
     getScripts: (...args: any[]) => any;
     postRender: (pluginContext: PluginContext, frontmatter: FrontMatter, content: string) => string;
-    processNode: (pluginContext: PluginContext, node: DomElement, config?: NodeProcessorConfig) => string;
-    postProcessNode: (pluginContext: PluginContext, node: DomElement, config?: NodeProcessorConfig) => string;
+    processNode: (pluginContext: PluginContext, node: NodeOrText, config?: NodeProcessorConfig) => string;
+    postProcessNode: (pluginContext: PluginContext, node: NodeOrText, config?: NodeProcessorConfig) => string;
     tagConfig: { [key: string]: TagConfigs };
   };
 
@@ -145,7 +145,7 @@ export class Plugin {
     return content;
   }
 
-  processNode(node: DomElement, config: NodeProcessorConfig) {
+  processNode(node: NodeOrText, config: NodeProcessorConfig) {
     if (!this.plugin.processNode) {
       return;
     }
@@ -153,7 +153,7 @@ export class Plugin {
     this.plugin.processNode(this.pluginOptions, node, config);
   }
 
-  postProcessNode(node: DomElement, config: NodeProcessorConfig) {
+  postProcessNode(node: NodeOrText, config: NodeProcessorConfig) {
     if (!this.plugin.postProcessNode) {
       return;
     }
diff --git a/packages/core/src/plugins/PluginManager.ts b/packages/core/src/plugins/PluginManager.ts
index 2083260385..0aed9157fe 100644
--- a/packages/core/src/plugins/PluginManager.ts
+++ b/packages/core/src/plugins/PluginManager.ts
@@ -1,6 +1,5 @@
 import merge from 'lodash/merge';
 
-import { DomElement } from 'htmlparser2';
 import path from 'path';
 import fs from 'fs-extra';
 import walkSync from 'walk-sync';
@@ -14,6 +13,7 @@ import {
 } from './Plugin';
 import type { NodeProcessorConfig } from '../html/NodeProcessor';
 import type { PageAssets } from '../Page/PageConfig';
+import { NodeOrText } from '../utils/node';
 
 const { ignoreTags } = require('../patches');
 
@@ -205,13 +205,13 @@ export class PluginManager {
       .reduce((renderedContent, plugin) => plugin.postRender(frontmatter, renderedContent), content);
   }
 
-  processNode(node: DomElement) {
+  processNode(node: NodeOrText) {
     Object.values(this.plugins).forEach((plugin) => {
       plugin.processNode(node, this.config);
     });
   }
 
-  postProcessNode(node: DomElement) {
+  postProcessNode(node: NodeOrText) {
     Object.values(this.plugins).forEach((plugin) => {
       plugin.postProcessNode(node, this.config);
     });
diff --git a/packages/core/src/utils/node.ts b/packages/core/src/utils/node.ts
index b0eb872476..4a5970b991 100644
--- a/packages/core/src/utils/node.ts
+++ b/packages/core/src/utils/node.ts
@@ -1,3 +1,4 @@
+import cheerio from 'cheerio';
 import { DomElement } from 'htmlparser2';
 
 /*
@@ -20,3 +21,11 @@ export type MbNode = DomElement & cheerio.Element & {
  * NodeOrText is used before a node can be casted to either TextElement or MbNode.
  */
 export type NodeOrText = TextElement | MbNode;
+
+/**
+ * Utility function for converting HTML string to a node or text element.
+ */
+export function parseHTML(html: string) {
+  const node = cheerio.parseHTML(html);
+  return node as unknown as NodeOrText[];
+}
diff --git a/packages/core/src/variables/VariableProcessor.ts b/packages/core/src/variables/VariableProcessor.ts
index 342612bda9..5469042acd 100644
--- a/packages/core/src/variables/VariableProcessor.ts
+++ b/packages/core/src/variables/VariableProcessor.ts
@@ -1,5 +1,4 @@
 import cheerio from 'cheerio';
-import { DomElement } from 'htmlparser2';
 
 import { ATTRIB_CWF } from '../constants';
 import { PageSources } from '../Page/PageSources';
@@ -7,6 +6,7 @@ import VariableRenderer from './VariableRenderer';
 import * as logger from '../utils/logger';
 import * as urlUtil from '../utils/urlUtil';
 import type { Context } from '../html/Context';
+import { MbNode } from '../utils/node';
 
 /**
  * All variable extraction and rendering is done here.
@@ -160,7 +160,7 @@ class VariableProcessor {
    * Extracts variables specified as <include var-xx="..."> in include elements.
    * @param includeElement to extract inline variables from
    */
-  private static extractIncludeInlineVariables(includeElement: DomElement) {
+  private static extractIncludeInlineVariables(includeElement: MbNode) {
     const includeInlineVariables: { [key: string]: any } = {};
 
     Object.entries(includeElement.attribs || {}).forEach(([attribute, val]) => {
@@ -178,7 +178,7 @@ class VariableProcessor {
    * Extracts variables specified as <variable> in include elements.
    * @param includeElement to search child nodes for
    */
-  private static extractIncludeChildElementVariables(includeElement: DomElement) {
+  private static extractIncludeChildElementVariables(includeElement: MbNode) {
     if (!(includeElement.children && includeElement.children.length)) {
       return {};
     }
@@ -210,7 +210,7 @@ class VariableProcessor {
    * It is a subroutine for {@link renderIncludeFile}
    * @param includeElement include element to extract variables from
    */
-  private static extractIncludeVariables(includeElement: DomElement) {
+  private static extractIncludeVariables(includeElement: MbNode) {
     const includeInlineVariables = VariableProcessor.extractIncludeInlineVariables(includeElement);
     const includeChildVariables = VariableProcessor.extractIncludeChildElementVariables(includeElement);
 
@@ -239,7 +239,7 @@ class VariableProcessor {
   renderIncludeFile(
     filePath: string,
     pageSources: PageSources,
-    node: DomElement,
+    node: MbNode,
     context: Context,
     asIfAt: string,
   ) {
diff --git a/packages/core/test/unit/html/NodeProcessor.test.ts b/packages/core/test/unit/html/NodeProcessor.test.ts
index ef242f0055..277556c594 100644
--- a/packages/core/test/unit/html/NodeProcessor.test.ts
+++ b/packages/core/test/unit/html/NodeProcessor.test.ts
@@ -1,10 +1,11 @@
 import path from 'path';
 import cheerio from 'cheerio';
-import htmlparser, { DomElement } from 'htmlparser2';
+import htmlparser from 'htmlparser2';
 import * as testData from './NodeProcessor.data';
 import { Context } from '../../../src/html/Context';
 import { shiftSlotNodeDeeper, transformOldSlotSyntax } from '../../../src/html/vueSlotSyntaxProcessor';
 import { getNewDefaultNodeProcessor } from '../utils/utils';
+import { MbNode, parseHTML } from '../../../src/utils/node';
 
 /**
  * Runs the processNode or postProcessNode method of NodeProcessor on the provided
@@ -217,9 +218,9 @@ test('deprecated vue slot syntax should be converted to updated Vue slot shortha
   // slot="test" converted to #test
   const test = '<panel><div slot="header">test</div><p slot="test">test2</p></panel>';
 
-  const testNode = cheerio.parseHTML(test)[0];
+  const testNode = parseHTML(test)[0] as MbNode;
 
-  transformOldSlotSyntax(testNode as unknown as DomElement);
+  transformOldSlotSyntax(testNode);
 
   const expected = '<panel><div #header>test</div><p #test>test2</p></panel>';
 
@@ -229,11 +230,11 @@ test('deprecated vue slot syntax should be converted to updated Vue slot shortha
 test('slot nodes which have tag names other than "template" are shifted one level deeper ', async () => {
   const test = '<panel><div #header>test</div></panel>';
 
-  const testNode = cheerio.parseHTML(test)[0];
+  const testNode = parseHTML(test)[0] as MbNode;
 
-  shiftSlotNodeDeeper(testNode as unknown as DomElement);
+  shiftSlotNodeDeeper(testNode);
 
   const expected = '<panel><template #header><div>test</div></template></panel>';
 
-  expect(cheerio.html(testNode as unknown as cheerio.Element)).toEqual(expected);
+  expect(cheerio.html(testNode)).toEqual(expected);
 });
diff --git a/packages/core/test/unit/html/SiteLinkManager.test.ts b/packages/core/test/unit/html/SiteLinkManager.test.ts
index c0c6b2fdb7..f5ef9206c5 100644
--- a/packages/core/test/unit/html/SiteLinkManager.test.ts
+++ b/packages/core/test/unit/html/SiteLinkManager.test.ts
@@ -1,5 +1,4 @@
-import cheerio from 'cheerio';
-import { DomElement } from 'htmlparser2';
+import { MbNode, parseHTML } from '../../../src/utils/node';
 import { getNewSiteLinkManager } from '../utils/utils';
 
 const fs = require('fs');
@@ -22,7 +21,7 @@ const mockCwf = 'Test';
 test('Test invalid URL link ', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<div>Test</div>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Should not validate';
 
@@ -32,7 +31,7 @@ test('Test invalid URL link ', () => {
 test('Test mailto URL link', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<a href="mailto:test@example.com">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Should not validate';
 
@@ -42,7 +41,7 @@ test('Test mailto URL link', () => {
 test('Test tel URL link', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<a href="tel:999">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Should not validate';
 
@@ -52,7 +51,7 @@ test('Test tel URL link', () => {
 test('Test link for disabled intralink validation', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<a href="https://markbind.org" no-validation>Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Intralink validation disabled';
 
@@ -62,7 +61,7 @@ test('Test link for disabled intralink validation', () => {
 test('Test invalid, non-existent link ending with no extension to be collected', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<a href="/missingRawFile">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Intralink collected to be validated later';
 
@@ -72,7 +71,7 @@ test('Test invalid, non-existent link ending with no extension to be collected',
 test('Test valid ".html" extension link ', () => {
   const siteLinkManager = getNewSiteLinkManager();
   const mockLink = '<a href="/index.html">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
 
   const EXPECTED_RESULT = 'Intralink collected to be validated later';
 
diff --git a/packages/core/test/unit/html/linkProcessor.test.ts b/packages/core/test/unit/html/linkProcessor.test.ts
index d0af1b2408..e764807559 100644
--- a/packages/core/test/unit/html/linkProcessor.test.ts
+++ b/packages/core/test/unit/html/linkProcessor.test.ts
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio';
-import { DomElement } from 'htmlparser2';
 import * as linkProcessor from '../../../src/html/linkProcessor';
 import { NodeProcessorConfig } from '../../../src/html/NodeProcessor';
+import { MbNode, parseHTML } from '../../../src/utils/node';
 
 const fs = require('fs-extra');
 
@@ -54,16 +54,16 @@ test.each([
   // Test no conversion when no-convert attribute is present
   ['<a href="/index.md#test-1" no-convert>Test</a>', '<a href="/index.md#test-1" no-convert>Test</a>'],
 ])('Test link auto-conversion for %s', (input, expected) => {
-  const mockNode = cheerio.parseHTML(input)[0];
+  const mockNode = parseHTML(input)[0] as MbNode;
 
-  linkProcessor.convertMdExtToHtmlExt(mockNode as unknown as DomElement);
+  linkProcessor.convertMdExtToHtmlExt(mockNode);
 
   expect(cheerio.html(mockNode as unknown as cheerio.Element)).toBe(expected);
 });
 
 test('Test invalid URL link ', () => {
   const mockLink = '<a href="https://markbind.org">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Not Intralink';
@@ -74,7 +74,7 @@ test('Test invalid URL link ', () => {
 test('Test valid ".html" extension link ', () => {
   // should be checked as page
   const mockLink = '<a href="/index.html">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink with ".html" extension is a valid Page Source or File Asset';
@@ -85,7 +85,7 @@ test('Test valid ".html" extension link ', () => {
 test('Test valid raw (not page source) ".html" extension link ', () => {
   // should be checked as file asset
   const mockLink = '<a href="/userGuide/raw.html">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_ERR_RESULT = 'Intralink with ".html" extension is a valid Page Source or File Asset';
@@ -96,7 +96,7 @@ test('Test valid raw (not page source) ".html" extension link ', () => {
 test('Test invalid, non-existent ".html" extension link ', () => {
   // should be checked as page and file asset
   const mockLink = '<a href="/missing.html">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_ERR_RESULT = 'Intralink with ".html" extension is neither a Page Source nor File Asset';
@@ -107,7 +107,7 @@ test('Test invalid, non-existent ".html" extension link ', () => {
 test('Test valid link ending with /', () => {
   // should be checked as page
   const mockLink = '<a href="/userGuide/">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink ending with "/" is a valid Page Source or File Asset';
@@ -118,7 +118,7 @@ test('Test valid link ending with /', () => {
 test('Test valid link ending with /', () => {
   // should be checked as page and file asset
   const mockLink = '<a href="/devGuide/">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink ending with "/" is a valid Page Source or File Asset';
@@ -129,7 +129,7 @@ test('Test valid link ending with /', () => {
 test('Test invalid, non-existent link ending with /', () => {
   // should be checked as page and file asset
   const mockLink = '<a href="/missingGuide/">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink ending with "/" is neither a Page Source nor File Asset';
@@ -140,7 +140,7 @@ test('Test invalid, non-existent link ending with /', () => {
 test('Test valid link ending with no extension', () => {
   // should be checked as page
   const mockLink = '<a href="/userGuide">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink with no extension is a valid Page Source or File Asset';
@@ -151,7 +151,7 @@ test('Test valid link ending with no extension', () => {
 test('Test valid link ending with no extension', () => {
   // should be checked as page and file asset (implicit index resource path will be true)
   const mockLink = '<a href="/devGuide">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink with no extension is a valid Page Source or File Asset';
@@ -162,7 +162,7 @@ test('Test valid link ending with no extension', () => {
 test('Test valid link ending with no extension', () => {
   // should be checked as file asset (raw file)
   const mockLink = '<a href="/rawFile">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink with no extension is a valid Page Source or File Asset';
@@ -173,7 +173,7 @@ test('Test valid link ending with no extension', () => {
 test('Test invalid, non-existent link ending with no extension', () => {
   // should be checked as page, file asset, and raw file asset
   const mockLink = '<a href="/missingRawFile">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink with no extension is neither a Page Source nor File Asset';
@@ -184,7 +184,7 @@ test('Test invalid, non-existent link ending with no extension', () => {
 test('Test valid file asset links (png)', () => {
   // should be checked as file asset
   const mockLink = '<img src="/images/logo.png">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink is a valid File Asset';
@@ -194,7 +194,7 @@ test('Test valid file asset links (png)', () => {
 
 test('Test valid file asset links (with %20 in the file path)', () => {
   const mockLink = '<a href="/spaced%20folder/img.png">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
   const EXPECTED_RESULT = 'Intralink is a valid File Asset';
 
@@ -203,7 +203,7 @@ test('Test valid file asset links (with %20 in the file path)', () => {
 
 test('Test valid file asset links (with space in the file path)', () => {
   const mockLink = '<a href="/spaced folder/img.png">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
   const EXPECTED_RESULT = 'Intralink is a valid File Asset';
 
@@ -213,7 +213,7 @@ test('Test valid file asset links (with space in the file path)', () => {
 test('Test valid file asset links (css)', () => {
   // should be checked as file asset
   const mockLink = '<link rel="stylesheet" href="/css/main.css">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink is a valid File Asset';
@@ -224,7 +224,7 @@ test('Test valid file asset links (css)', () => {
 test('Test invalid link for non-existent file asset (css)', () => {
   // should be checked as file asset
   const mockLink = '<link rel="stylesheet" href="/css/missing.css">Test</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
 
   const EXPECTED_RESULT = 'Intralink is not a File Asset';
@@ -234,7 +234,7 @@ test('Test invalid link for non-existent file asset (css)', () => {
 
 test('Test non intralinks (mailto)', () => {
   const mockLink = '<a href="mailto:foo@bar.com">Test Email</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
   const EXPECTED_RESULT = 'Not Intralink';
 
@@ -243,7 +243,7 @@ test('Test non intralinks (mailto)', () => {
 
 test('Test non intralinks (tel)', () => {
   const mockLink = '<a href="tel:999">Test Phone</a>';
-  const mockNode = cheerio.parseHTML(mockLink)[0] as unknown as DomElement;
+  const mockNode = parseHTML(mockLink)[0] as MbNode;
   const mockResourcePath = linkProcessor.getDefaultTagsResourcePath(mockNode);
   const EXPECTED_RESULT = 'Not Intralink';