highmark-markdown 0.0.56 → 0.0.60

package/src/node/markdown/mailToLink.js

@@ -9,6 +9,34 @@ import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
 const { first, second, secondLast } = arrayUtilities;
 
 export default class MailToLinkMarkdownNode extends MarkdownNode {
+  attributeName(context) {
+    const attributeName = HREF_ATTRIBUTE_NAME;
+
+    return attributeName;
+  }
+
+  attributeValue(context) {
+    const childNodes = this.getChildNodes(),
+          childNodesLength = childNodes.length;
+
+    let addressMarkdownNode;
+
+    if (childNodesLength === 1) {
+      const firstChildNode = first(childNodes);
+
+      addressMarkdownNode = firstChildNode;  ///
+    } else {
+      const secondLastChildNode = secondLast(childNodes);
+
+      addressMarkdownNode = secondLastChildNode;  ///
+    }
+
+    const addressMarkdownNodeContent = addressMarkdownNode.content(context),
+          attributeValue = `mailto:${addressMarkdownNodeContent}`;
+
+    return attributeValue;
+  }
+
   childNodesAsHTML(indent, context) {
     let childNodesHTML;
 
@@ -51,33 +79,5 @@ export default class MailToLinkMarkdownNode extends MarkdownNode {
     }
   }
 
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    let addressMarkdownNode;
-
-    if (childNodesLength === 1) {
-      const firstChildNode = first(childNodes);
-
-      addressMarkdownNode = firstChildNode;  ///
-    } else {
-      const secondLastChildNode = secondLast(childNodes);
-
-      addressMarkdownNode = secondLastChildNode;  ///
-    }
-
-    const addressMarkdownNodeContent = addressMarkdownNode.content(context),
-          attributeValue = `mailto:${addressMarkdownNodeContent}`;
-
-    return attributeValue;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(MailToLinkMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/strongText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 
 class StrongTextMarkdownNode extends MarkdownNode {
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(StrongTextMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/stronglyEmphasisedText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 import ruleNameToHTMLMap from "../../ruleNameToHTMLMap";
 
 import { STRONG_TEXT_RULE_NAME } from "../../ruleNames";

package/src/node/markdown/tableCell.js

@@ -1,69 +1,24 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
-import TextMarkdownNode from "./text";
 
-import { PERIOD } from "../../constants";
 import { htmlFromChildNodes, domElementsFromChildNodes } from "../../utilities/childNodes";
 
-const { first } = arrayUtilities;
-
 export default class TableCellMarkdownNode extends MarkdownNode {
-  isEmpty(context) {
-    let empty = false;
-
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    if (childNodesLength === 2) {
-      const firstChildNode = first(childNodes),
-            firstChildNodeTextMarkdownNode = (firstChildNode instanceof TextMarkdownNode);
-
-      if (firstChildNodeTextMarkdownNode) {
-        const textMarkdownNode = firstChildNode,  ///
-              content = textMarkdownNode.content(context);
-
-        if (content === PERIOD) {
-          empty = true;
-        }
-      }
-    }
-
-    return empty;
-  }
-
   childNodesAsHTML(indent, context) {
-    let childNodesHTML = null;
-
-    const empty = this.isEmpty(context);
-
-    if (!empty) {
-      const childNodes = this.getChildNodes(),
-            html = htmlFromChildNodes(childNodes, context);
-
-      childNodesHTML = html;  ///
-    }
+    const childNodes = this.getChildNodes(),
+          childNodesHTML = htmlFromChildNodes(childNodes, context);
 
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(domElement, context) {
-    const empty = this.isEmpty(context);
-
-    if (empty) {
-      return;
-    }
-
+  createChildNodeDOMElements(context) {
     const childNodes = this.getChildNodes(),
           domElements = domElementsFromChildNodes(childNodes, context),
-          parentDOMElement = domElement,  ///
-          childDOMElements = domElements,  ///
-          siblingDOMElement = null;
+          childNodeDOMElements = domElements; ///
 
-    childDOMElements.forEach((childDOMElement) => {
-      parentDOMElement.insertBefore(childDOMElement, siblingDOMElement);
+    childNodeDOMElements.forEach((childNodeDOMElement) => {
+      this.insertDOMElement(childNodeDOMElement);
     });
   }
 

package/src/node/markdown/text.js

@@ -1,20 +1,7 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
 
-const { first } = arrayUtilities;
-
 export default class TextMarkdownNode extends MarkdownNode {
-  content(context) {
-    const childNodes = this.getChildNodes(),
-          firstChildNode = first(childNodes),
-          terminalNode = firstChildNode,  ///
-          content = terminalNode.getContent();
-
-    return content;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(TextMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/url.js

@@ -3,7 +3,7 @@
 import MarkdownNode from "../../node/markdown";
 import contentMixins from "../../mixins/content";
 
-export default class URLMarkdownNode extends MarkdownNode {
+class URLMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {
     const content = this.content(context),
           html = content; ///
@@ -24,3 +24,5 @@ export default class URLMarkdownNode extends MarkdownNode {
 }
 
 Object.assign(URLMarkdownNode.prototype, contentMixins);
+
+export default URLMarkdownNode;

package/src/node/markdown/verticalSpace.js

@@ -1,28 +1,31 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import MarkdownNode from "../../node/markdown";
-import contentMixins from "../../mixins/content";
 
-class VerticalSpaceMarkdownNode extends MarkdownNode {
-  asHTML(indent, context) {
-    const content = this.content(context),
-          html = content; ///
+const { first } = arrayUtilities;
 
-    return html;
-  }
+export default class VerticalSpaceMarkdownNode extends MarkdownNode {
+  childNodesAsHTML(indent, context) {
+    const childNodes = this.getChildNodes(),
+          firstChildNode = first(childNodes),
+          endOfLineMarkdownNode = firstChildNode,
+          content = endOfLineMarkdownNode.content(context),
+          childNodesHTML = content; ///
 
-  createDOMElement(context) {
-    const content = this.content(context),
-          domElement = document.createTextNode(content);
+    return childNodesHTML;
+  }
 
-    this.setDOMElement(domElement);
+  createChildNodeDOMElements(context) {
+    const childNodes = this.getChildNodes(),
+          firstChildNode = first(childNodes),
+          inlineTextMarkdownNode = firstChildNode,  ///
+          content = inlineTextMarkdownNode.content(context),
+          childNodeDOMElement = document.createTextNode(content);
 
-    return domElement;
+    this.insertDOMElement(childNodeDOMElement);
   }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(VerticalSpaceMarkdownNode, ruleName, childNodes, opacity); }
 }
-
-Object.assign(VerticalSpaceMarkdownNode.prototype, contentMixins);
-
-export default VerticalSpaceMarkdownNode;

package/src/node/markdown.js

@@ -36,18 +36,6 @@ class MarkdownNode extends NonTerminalNode {
     return className;
   }
 
-  attributeName(context) {
-    const attributeName = null;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const attributeValue = null;
-
-    return attributeValue;
-  }
-
   asHTML(indent, context) {
     if (context === undefined) {
       context = indent; ///
@@ -148,6 +136,18 @@ ${indent}${closingTag}
     return indent;
   }
 
+  attributeName(context) {
+    const attributeName = null;
+
+    return attributeName;
+  }
+
+  attributeValue(context) {
+    const attributeValue = null;
+
+    return attributeValue;
+  }
+
   childNodesAsHTML(indent, context) {
     const childNodes = this.getChildNodes(),
           childNodesHTML = childNodes.reduce((childNodesHTML, childNode) => {

package/src/utilities/content.js

@@ -7,7 +7,7 @@ import { ESCAPED_TOKEN_TYPE } from "../tokenTypes";
 
 const { first, last } = arrayUtilities;
 
-export function contentFromMarkdownNodes(markdownNodes, context) {
+export function contentFromMarkdownNodes(markdownNodes, context, trimmed = false) {
   let content = EMPTY_STRING;
 
   let { tokens } = context;
@@ -25,26 +25,28 @@ export function contentFromMarkdownNodes(markdownNodes, context) {
   let firstTokenIndex = firstSignificantTokenIndex,  ///
       lastTokenIndex = lastSignificantTokenIndex; ///
 
-  const previousTokenIndex = firstTokenIndex - 1,
-        nextTokenIndex = lastTokenIndex + 1;
+  if (!trimmed) {
+    const previousTokenIndex = firstTokenIndex - 1,
+          nextTokenIndex = lastTokenIndex + 1;
 
-  if (previousTokenIndex > -1) {
-    const previousToken = tokens[previousTokenIndex],
-          previousTokenSignificant = previousToken.isSignificant();
+    if (previousTokenIndex > -1) {
+      const previousToken = tokens[previousTokenIndex],
+            previousTokenSignificant = previousToken.isSignificant();
 
-    if (!previousTokenSignificant) {
-      firstTokenIndex--;
+      if (!previousTokenSignificant) {
+        firstTokenIndex--;
+      }
     }
-  }
 
-  const tokensLength = tokens.length;
+    const tokensLength = tokens.length;
 
-  if (nextTokenIndex < tokensLength) {
-    const nextToken = tokens[nextTokenIndex],
-          nextTokenSignificant = nextToken.isSignificant();
+    if (nextTokenIndex < tokensLength) {
+      const nextToken = tokens[nextTokenIndex],
+            nextTokenSignificant = nextToken.isSignificant();
 
-    if (!nextTokenSignificant) {
-      lastTokenIndex++;
+      if (!nextTokenSignificant) {
+        lastTokenIndex++;
+      }
     }
   }