highmark-markdown 1.2.37 → 1.2.38

package/src/node/html/topmost.js

@@ -9,6 +9,37 @@ import { HTML_MARKDOWN_RULE_NAME } from "../../ruleNames/markdown";
 import { divisionHTMLNodesFromNode, indexDirectiveHTMLNodeFromNode, contentsDirectiveHTMLNodeFromNode } from "../../utilities/html";
 
 export default class TopmostHTMLNode extends HTMLNode {
+  getRuleName() {
+    const ruleName = HTML_MARKDOWN_RULE_NAME;
+
+    return ruleName;
+  }
+
+  getDivisionHTMLNode() {
+    const index = 0,
+          divisionHTMLNode = this.getDivisionHTMLNodeAt(index);
+
+    return divisionHTMLNode;
+  }
+
+  getDivisionHTMLNodes() {
+    const node = this,  ///
+          divisionHTMLNodes = divisionHTMLNodesFromNode(node);
+
+    return divisionHTMLNodes;
+  }
+
+  getDivisionHTMLNodeAt(index) {
+    const divisionHTMLNodes = this.getDivisionHTMLNodes(),
+          divisionHTMLNode = divisionHTMLNodes[index] || null;
+
+    return divisionHTMLNode;
+  }
+
+  adjustIndent(indent) {
+    return indent;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     this.childNodes.forEach((childNode) => {
       siblingDOMElement = childNode.mount(parentDOMElement, siblingDOMElement, context);
@@ -32,15 +63,6 @@ export default class TopmostHTMLNode extends HTMLNode {
   }
 
   paginate(context) {
-    let divisionHTMLNodes,
-        divisionHTMLTransforms;
-
-    divisionHTMLNodes = this.getDivisionHTMLNodes();
-
-    divisionHTMLTransforms = divisionHTMLTransformsFromDivisionHTMLNodes(divisionHTMLNodes);
-
-    divisionHTMLNodes = [];
-
     let pageNumber;
 
     pageNumber = 1;
@@ -49,20 +71,23 @@ export default class TopmostHTMLNode extends HTMLNode {
       pageNumber
     });
 
-    divisionHTMLTransforms.forEach((divisionHTMLTransform) => {
-      divisionHTMLTransform.remove();
+    const htmlTransforms = [],
+          topmostHTMLNode = this,  //
+          divisionHTMLNodes = this.getDivisionHTMLNodes(),
+          divisionHTMLTransforms = divisionHTMLTransformsFromDivisionHTMLNodes(divisionHTMLNodes);
 
-      divisionHTMLTransform.paginate(divisionHTMLNodes, context);
+    divisionHTMLTransforms.forEach((divisionHTMLTransform) => {
+      divisionHTMLTransform.paginate(htmlTransforms, context);
     });
 
     delete context.pageNumber;
 
-    divisionHTMLTransforms = divisionHTMLTransformsFromDivisionHTMLNodes(divisionHTMLNodes);
-
-    const topmostHTMLNode = this; ///
-
     divisionHTMLTransforms.forEach((divisionHTMLTransform) => {
-      divisionHTMLTransform.appendToTopmostHTMLNode(topmostHTMLNode);
+      divisionHTMLTransform.remove();
+    });
+
+    htmlTransforms.forEach((htmlTransform) => {
+      htmlTransform.appendToTopmostHTMLNode(topmostHTMLNode);
     });
   }
 
@@ -98,37 +123,6 @@ export default class TopmostHTMLNode extends HTMLNode {
     }
   }
 
-  adjustIndent(indent) {
-    return indent;
-  }
-
-  getRuleName() {
-    const ruleName = HTML_MARKDOWN_RULE_NAME;
-
-    return ruleName;
-  }
-
-  getDivisionHTMLNode() {
-    const index = 0,
-          divisionHTMLNode = this.getDivisionHTMLNodeAt(index);
-
-    return divisionHTMLNode;
-  }
-
-  getDivisionHTMLNodes() {
-    const node = this,  ///
-          divisionHTMLNodes = divisionHTMLNodesFromNode(node);
-
-    return divisionHTMLNodes;
-  }
-
-  getDivisionHTMLNodeAt(index) {
-    const divisionHTMLNodes = this.getDivisionHTMLNodes(),
-          divisionHTMLNode = divisionHTMLNodes[index] || null;
-
-    return divisionHTMLNode;
-  }
-
   static tagName = "html";
 
   static className = null;

package/src/node/html.js

@@ -222,16 +222,7 @@ class HTMLNode extends Node {
 
   selfClosingTag(context) {
     const tagName = this.tagName(context),
-          className = this.className(context),
-          attributeName = this.attributeName(context),
-          attributeValue = this.attributeValue(context),
-          classHTML = (className !== null) ?
-                       ` class="${className}"` :
-                          EMPTY_STRING,
-          attributeHTML = ((attributeName !== null) && (attributeValue !== null)) ?
-                           ` ${attributeName}="${attributeValue}"` :
-                              EMPTY_STRING,
-          selfClosingTag = `<${tagName}${classHTML}${attributeHTML}/>`;
+          selfClosingTag = `<${tagName}/>`;
 
     return selfClosingTag;
   }
@@ -317,9 +308,11 @@ class HTMLNode extends Node {
 
     indent = this.adjustIndent(indent);
 
-    const childNodesHTML = this.childNodesAsHTML(indent, context);
+    const className = this.className(context),
+          attributeName = this.attributeName(context),
+          childNodesHTML = this.childNodesAsHTML(indent, context);
 
-    if (childNodesHTML !== EMPTY_STRING) {
+    if ((childNodesHTML !== EMPTY_STRING) || (className !== null) || (attributeName !== null)) {
       const startingTag = this.startingTag(context),
             closingTag = this.closingTag(context);
 

package/src/transform/html/anchor/index.js

@@ -0,0 +1,23 @@
+"use strict";
+
+import HTMLTransform from "../../../transform/html"
+import IndexAnchorHTMLNode from "../../../node/html/anchor/index";
+
+export default class IndexAnchorTMLTransform extends HTMLTransform {
+  appendToTopmostHTMLNode(topmostHTMLNode) {
+    const htmlNode = this.getHTMLNode(),
+          childNode = htmlNode, ///
+          parentNode = topmostHTMLNode; ///
+
+    parentNode.appendChildNode(childNode);
+  }
+
+  static fromPageNumber(pageNumber) {
+    const identifier = pageNumber,  ///
+          indexAnchorHTMLNode = IndexAnchorHTMLNode.fromIdentifier(identifier),
+          htmlNode = indexAnchorHTMLNode, ///
+          indexAnchorHTMLTransform = HTMLTransform.fromHTMLNode(IndexAnchorTMLTransform, htmlNode);
+
+    return indexAnchorHTMLTransform;
+  }
+}

package/src/utilities/grammar.js

@@ -101,13 +101,7 @@ export function htmlFromMarkdownOptionsAndImporter(markdown, options, importer)
     if (topmostHTMLNode !== null) {
       topmostHTMLNode.resolve(context);
 
-      const divisionHTMLNOdes = topmostHTMLNode.getDivisionHTMLNodes();
-
-      divisionHTMLNOdes.forEach((divisionHTMLNOde) => {
-        const divisionHTMLNOdeHTML = divisionHTMLNOde.asHTML(context);
-
-        html = `${html}${divisionHTMLNOdeHTML}`;
-      });
+      html = topmostHTMLNode.asHTML(context);
     }
   }
 

package/src/transform/html/indexAnchor.js

@@ -1,24 +0,0 @@
-"use strict";
-
-import HTMLTransform from "../../transform/html"
-import AnchorHTMLNode from "../../node/html/anchor";
-
-import { INDEX_PREPEND } from "../../prepends";
-
-export default class IndexAnchorTMLTransform extends HTMLTransform {
-  appendToHTMLNode(htmlNode) {
-    const parentHTMLNode = htmlNode;  ///
-
-    this.prependTo(parentHTMLNode);
-  }
-
-  static fromPageNumber(pageNumber) {
-    const prepend = INDEX_PREPEND,
-          identifier = pageNumber,  ///
-          anchorHTMLNode = AnchorHTMLNode.fromPrependAndIdentifier(prepend, identifier),
-          htmlNode = anchorHTMLNode, ///
-          paragraphHTMLTransform = HTMLTransform.fromHTMLNode(IndexAnchorTMLTransform, htmlNode);
-
-    return paragraphHTMLTransform;
-  }
-}