highmark-markdown 0.0.287 → 0.0.289

package/src/node/markdown/directives.js

@@ -1,19 +1,55 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import MarkdownNode from "../../node/markdown";
 
+const { push } = arrayUtilities;
+
 export default class DirectivesMarkdownNode extends MarkdownNode {
+  constructor(ruleName, childNodes, opacity, precedence, domElement, domElements) {
+    super(ruleName, childNodes, opacity, precedence, domElement);
+
+    this.domElements = domElements;
+  }
+
+  getDOMElements() {
+    return this.domElements;
+  }
+
   asHTML(indent, context) {
-    const html = null;
+    const childNodesHTML = this.childNodesAsHTML(indent, context),
+          html = childNodesHTML;  ///
 
     return html;
   }
 
   createDOMElement(context) {
-    const domElement = null;
+    const domElement = null,
+          childNodes = this.getChildNodes();
+
+    childNodes.forEach((childNode) => {
+      const childNodeNonTerminalNode = childNode.isNonTerminalNode();
+
+      if (childNodeNonTerminalNode) {
+        const nonTerminalNode = childNode,  ///
+              markdownNode = nonTerminalNode; ///
+
+        markdownNode.createDOMElement(context);
+
+        const markdownNodeDOMElements = markdownNode.getDOMElements();
+
+        push(this.domElements, markdownNodeDOMElements);
+      }
+    });
 
     return domElement;
   }
 
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(DirectivesMarkdownNode, ruleName, childNodes, opacity); }
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) {
+    const domElements = [],
+          directivesMarkdownNode = MarkdownNode.fromRuleNameChildNodesAndOpacity(DirectivesMarkdownNode, ruleName, childNodes, opacity, domElements);
+
+    return directivesMarkdownNode;
+  }
 }

package/src/node/markdown/subDivision.js

@@ -7,13 +7,14 @@ import MarkdownNode from "../../node/markdown";
 const { second } = arrayUtilities;
 
 export default class SubDivisionMarkdownNode extends MarkdownNode {
-  getDOMElement() {
-    const childNodes = this.getChildNodes(),
-          secondChildNode = second(childNodes),
-          secondChildNodeDOMElement = secondChildNode.getDOMElement(),
-          domElement = secondChildNodeDOMElement;  ///
+  constructor(ruleName, childNodes, opacity, precedence, domElement, domElements) {
+    super(ruleName, childNodes, opacity, precedence, domElement);
 
-    return domElement;
+    this.domElements = domElements;
+  }
+
+  getDOMElements() {
+    return this.domElements;
   }
 
   asHTML(indent, context) {
@@ -26,13 +27,21 @@ export default class SubDivisionMarkdownNode extends MarkdownNode {
   }
 
   createDOMElement(context) {
-    const childNodes = this.getChildNodes(),
-          secondChildNode = second(childNodes),
-          secondChildNodeDOMElement = secondChildNode.createDOMElement(context),
-          domElement = secondChildNodeDOMElement;  ///
+    const domElement = null,
+          childNodes = this.getChildNodes(),
+          secondChildNode = second(childNodes);
+
+    secondChildNode.createDOMElement(context);
+
+    this.domElements = secondChildNode.getDOMElements();
 
     return domElement;
   }
 
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(SubDivisionMarkdownNode, ruleName, childNodes, opacity); }
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) {
+    const domElements = [],
+          subDivisionMarkdownNode = MarkdownNode.fromRuleNameChildNodesAndOpacity(SubDivisionMarkdownNode, ruleName, childNodes, opacity, domElements);
+
+    return subDivisionMarkdownNode;
+  }
 }

package/src/node/markdown.js

@@ -23,6 +23,14 @@ class MarkdownNode extends NonTerminalNode {
     this.domElement = domElement;
   }
 
+  getDOMElements() {
+    const domElements = (this.domElement === null) ?
+                          [] :
+                            [this.domElement];
+
+    return domElements;
+  }
+
   tagName(context) {
     const { tagName } = elementMap[this.ruleName];
 
@@ -217,12 +225,15 @@ ${childNodesHTML}${indent}${closingTag}
 
       if (childNodeNonTerminalNode) {
         const nonTerminalNode = childNode,  ///
-              markdownNode = nonTerminalNode, ///
-              domElement = markdownNode.createDOMElement(context);
+              markdownNode = nonTerminalNode; ///
 
-        if (domElement !== null) {
+        markdownNode.createDOMElement(context);
+
+        const domElements = markdownNode.getDOMElements();
+
+        domElements.forEach((domElement) => {
           this.addDOMElement(domElement);
-        }
+        });
       }
     });
   }

package/src/utilities/childNodes.js

@@ -7,7 +7,7 @@ import PlainTextMarkdownNode from "../node/markdown/plainText";
 import { EMPTY_STRING } from "../constants";
 import { contentFromMarkdownNodes } from "./content";
 
-const { clear } = arrayUtilities;
+const { push, clear } = arrayUtilities;
 
 export function htmlFromChildNodes(childNodes, context, leftTrimmed) {
   let html;
@@ -141,11 +141,11 @@ export function domElementsFromChildNodes(childNodes, context, leftTrimmed) {
           domElements.push(domElement);
         }
 
-        const domElement = markdownNode.createDOMElement(context);
+        markdownNode.createDOMElement(context);
 
-        if (domElement !== null) {
-          domElements.push(domElement);
-        }
+        const markdownNodeDOMElements = markdownNode.getDOMElements();
+
+        push(domElements, markdownNodeDOMElements);
       }
     }