highmark-markdown 1.0.173 → 1.0.174

package/src/node/markdown/emailLink.js

@@ -1,114 +1,68 @@
 "use strict";
 
 import MarkdownNode from "../../node/markdown";
-import contentMixins from "../../mixins/content";
 
-import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
+import { EMAIL_ADDRESS_TOKEN_TYPE } from "../../tokenTypes";
 
-class EmailLinkMarkdownNode extends MarkdownNode {
-  inlineText(context) {
-    let inlineText = null;
+export default class EmailLinkMarkdownNode extends MarkdownNode {
+  emailAddressFromSecondLastChildNode(context) {
+    const emailAddress = this.fromSecondLastChildNode((secondLastChildNode) => {
+      const terminalNode = secondLastChildNode,  ///
+            emailAddress = emailAddressFromTerminalNode(terminalNode);
 
-    const multiplicity = this.getMultiplicity();
+      return emailAddress;
+    });
 
-    if (multiplicity > 1) {
-      inlineText = this.fromSecondChildNode((secondChildNode) => {
-        const indent = null,
-              inlineTextMarkdownNode = secondChildNode, ///
-              inlineTextMarkdownNodeHTML = inlineTextMarkdownNode.asHTML(indent, context);
-
-        inlineText = inlineTextMarkdownNodeHTML;  ///
-      });
-    }
-
-    return inlineText;
+    return emailAddress;
   }
 
-  emailAddress(context) {
-    const multiplicity = this.getMultiplicity();
-
-    let emailAddressTerminalNode;
-
-    if (multiplicity === 1) {
-      emailAddressTerminalNode = this.fromFirstChildNode((firstChildNode) => {
-        const emailAddressTerminalNode = firstChildNode;  ///
-
-        return emailAddressTerminalNode;
-      });
-    } else {
-      emailAddressTerminalNode = this.fromSecondLastChildNode((secondLastChildNode) => {
-        const emailAddressTerminalNode = secondLastChildNode;  ///
+  emailAddressFromFirstLastChildNode(context) {
+    const emailAddress = this.fromFirstLastChildNode((firstLastChildNode) => {
+      const terminalNode = firstLastChildNode,  ///
+            emailAddress = emailAddressFromTerminalNode(terminalNode);
 
-        return emailAddressTerminalNode;
-      });
-    }
-
-    const emailAddressTerminalNodeContent = emailAddressTerminalNode.getContent(),
-          emailAddress = emailAddressTerminalNodeContent; ///
+      return emailAddress;
+    });
 
     return emailAddress;
   }
 
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const emailAddress = this.emailAddress(context),
-          attributeValue = `mailto:${emailAddress}`;
+  emailAddress(context) {
+    const simple = this.isSimple(),
+          emailAddress = simple ?
+                            this.emailAddressFromFirstLastChildNode(context) :
+                              this.emailAddressFromSecondLastChildNode(context);
 
-    return attributeValue;
+    return emailAddress;
   }
 
-  createDOMElement(context) {
-    let content;
-
-    const inlineText = this.inlineText(context);
+  isSimple() {
+    const simple = this.fromFirstLastChildNode((firstLastChildNode) => {
+      const terminalNode = firstLastChildNode,  ///
+            type = terminalNode.getType(),
+            typeEmailAddressTokenType = (type === EMAIL_ADDRESS_TOKEN_TYPE),
+            simple = typeEmailAddressTokenType; ///
 
-    if (inlineText !== null) {
-      content = inlineText; ///
-    } else {
-      content = this.content(context);
-    }
+      return simple;
+    });
 
-    let domElement;
-
-    const textNode = document.createTextNode(content);
-
-    domElement = super.createDOMElement(context);
-
-    const parentDOMElement = domElement;  ///
-
-    domElement = textNode; ///
-
-    parentDOMElement.appendChild(domElement);
-
-    domElement = parentDOMElement;  ///
-
-    return domElement;
+    return simple;
   }
 
-  childNodesAsHTML(indent, context) {
-    let content;
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmailLinkMarkdownNode, ruleName, childNodes, opacity); }
+}
 
-    const inlineText = this.inlineText(context);
+function emailAddressFromTerminalNode(terminalNode) {
+  let emailAddress = null;
 
-    if (inlineText !== null) {
-      content = inlineText;  ///
-    } else {
-      content = this.content(context);
-    }
+  const type = terminalNode.getType(),
+        typeEmailAddressTokenType = (type === EMAIL_ADDRESS_TOKEN_TYPE);
 
-    const childNodesHTML = content;
+  if (typeEmailAddressTokenType) {
+    const content = terminalNode.getContent();
 
-    return childNodesHTML;
+    emailAddress = content; ///
   }
 
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmailLinkMarkdownNode, ruleName, childNodes, opacity); }
-}
-
-Object.assign(EmailLinkMarkdownNode.prototype, contentMixins);
-
-export default EmailLinkMarkdownNode;
+  return emailAddress;
+}

package/src/node/markdown/emphasisedText.js

@@ -1,46 +1,7 @@
 "use strict";
 
 import MarkdownNode from "../../node/markdown";
-import contentMixins from "../../mixins/content";
-
-class EmphasisedTextMarkdownNode extends MarkdownNode {
-  inlineText(context) {
-    const inlineText = this.fromSecondChildNode((secondChildNode) => {
-      const indent = null,
-            inlineTextMarkdownNode = secondChildNode, ///
-            inlineTextMarkdownNodeHTML = inlineTextMarkdownNode.asHTML(indent, context),
-            inlineText = inlineTextMarkdownNodeHTML;  ///
-
-      return inlineText;
-    });
-
-    return inlineText;
-  }
-
-  createDOMElement(context) {
-    const inlineText = this.inlineText(context),
-          content = inlineText; ///
-
-    let domElement;
-
-    const textNode = document.createTextNode(content);
-
-    domElement = super.createDOMElement(context);
-
-    const parentDOMElement = domElement;  ///
-
-    domElement = textNode; ///
-
-    parentDOMElement.appendChild(domElement);
-
-    domElement = parentDOMElement;  ///
-
-    return domElement;
-  }
 
+export default class EmphasisedTextMarkdownNode extends MarkdownNode {
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmphasisedTextMarkdownNode, ruleName, childNodes, opacity); }
 }
-
-Object.assign(EmphasisedTextMarkdownNode.prototype, contentMixins);
-
-export default EmphasisedTextMarkdownNode;

package/src/node/markdown/error.js

@@ -1,50 +1,19 @@
 "use strict";
 
 import MarkdownNode from "../../node/markdown";
-import contentMixins from "../../mixins/content";
 
-class ErrorMarkdownNode extends MarkdownNode {
-  asHTML(indent, context) {
-    indent = this.adjustIndent(indent);
+export default class ErrorMarkdownNode extends MarkdownNode {
+  error(context) {
+    const error = this.fromFirstChildNode((firstChildNode) => {
+      const terminalNode = firstChildNode,  ///
+            content = terminalNode.getContent(),
+            error = content;  ///
 
-    const childNodesHTML = this.childNodesAsHTML(indent, context),
-          startingTag = this.startingTag(context),
-          closingTag = this.closingTag(context),
-          html = `${indent}${startingTag}${childNodesHTML}${closingTag}
-`;
+      return error;
+    });
 
-    return html;
-  }
-
-  createDOMElement(context) {
-    let domElement;
-
-    const content = this.content(context),
-          textNode  = document.createTextNode(content);
-
-    domElement = super.createDOMElement(context);
-
-    const parentDOMElement = domElement;
-
-    domElement = textNode; ///
-
-    parentDOMElement.appendChild(domElement);
-
-    domElement = parentDOMElement;  ///
-
-    return domElement;
-  }
-
-  childNodesAsHTML(indent, context) {
-    const content = this.content(context),
-          childNodesHTML = content; ///
-
-    return childNodesHTML;
+    return error;
   }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ErrorMarkdownNode, ruleName, childNodes, opacity); }
 }
-
-Object.assign(ErrorMarkdownNode.prototype, contentMixins);
-
-export default ErrorMarkdownNode;

package/src/node/markdown/footnote.js

@@ -1,20 +1,8 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
 
-const { first } = arrayUtilities;
-
 export default class FootnoteMarkdownNode extends MarkdownNode {
-  mount(parentDOMElement, siblingDOMElement, context) {
-    ///
-  }
-
-  unmount(parentDOMElement, context) {
-    ///
-  }
-
   identifier(context) {
     const identifier = this.fromFirstChildNode((firstChildNode) => {
       const referenceMarkdownNode = firstChildNode,  ///

package/src/node/markdown/footnoteLink.js

@@ -5,10 +5,8 @@ import { arrayUtilities } from "necessary";
 import MarkdownNode from "../../node/markdown";
 
 import { EMPTY_STRING } from "../../constants";
-import { FOOTNOTE_PREPEND } from "../../prepends";
-import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
 
-const { first, second } = arrayUtilities;
+const { second } = arrayUtilities;
 
 export default class FootnoteLinkMarkdownNode extends MarkdownNode {
   constructor(ruleName, childNodes, opacity, precedence, domElement, number) {
@@ -25,13 +23,13 @@ export default class FootnoteLinkMarkdownNode extends MarkdownNode {
     this.number = number;
   }
 
-  content(context) {
-    const content = (this.number !== null) ?
-                      this.number :
-                        EMPTY_STRING;
-
-    return content;
-  }
+  // content(context) {
+  //   const content = (this.number !== null) ?
+  //                     this.number :
+  //                       EMPTY_STRING;
+  //
+  //   return content;
+  // }
 
   identifier(context) {
     const identifier = this.fromFirstChildNode((firstChildNode) => {
@@ -44,20 +42,6 @@ export default class FootnoteLinkMarkdownNode extends MarkdownNode {
     return identifier;
   }
 
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const prepend = FOOTNOTE_PREPEND,
-          identifier = this.identifier(context),
-          attributeValue = `#${prepend}-${identifier}`; ///
-
-    return attributeValue;
-  }
-
   clear() {
     if (this.domElement === null) {
       return;
@@ -97,13 +81,6 @@ export default class FootnoteLinkMarkdownNode extends MarkdownNode {
     this.update(context);
   }
 
-  childNodesAsHTML(indent, context) {
-    const content = this.content(context),
-          childNodesHTML = content; ///
-
-    return childNodesHTML;
-  }
-
   clone() { return super.clone(this.number); }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) {

package/src/node/markdown/footnotesList.js

@@ -2,7 +2,6 @@
 
 import MarkdownNode from "../../node/markdown";
 
-import { START_ATTRIBUTE_NAME } from "../../attributeNames";
 import { FOOTNOTES_LIST_RULE_NAME } from "../../ruleNames";
 
 export default class FootnotesListMarkdownNode extends MarkdownNode {
@@ -16,18 +15,6 @@ export default class FootnotesListMarkdownNode extends MarkdownNode {
     return this.start;
   }
 
-  attributeName(context) {
-    const attributeName = START_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const attributeValue = this.start;  ///
-
-    return attributeValue;
-  }
-
   clone() { return super.clone(this.start); }
 
   static fromDOMElement(domElement) {

package/src/node/markdown/heading/primary.js

@@ -3,8 +3,6 @@
 import HeadingMarkdownNode from "../../../node/markdown/heading";
 
 export default class PrimaryHeadingMarkdownNode extends HeadingMarkdownNode {
-  static lines = 3;
-
   static depth = 1;
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return HeadingMarkdownNode.fromRuleNameChildNodesAndOpacity(PrimaryHeadingMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/heading/quaternary.js

@@ -3,8 +3,6 @@
 import HeadingMarkdownNode from "../../../node/markdown/heading";
 
 export default class QuaternaryHeadingMarkdownNode extends HeadingMarkdownNode {
-  static lines = 2;
-
   static depth = 4;
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return HeadingMarkdownNode.fromRuleNameChildNodesAndOpacity(QuaternaryHeadingMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/heading/secondary.js

@@ -3,8 +3,6 @@
 import HeadingMarkdownNode from "../../../node/markdown/heading";
 
 export default class SecondaryHeadingMarkdownNode extends HeadingMarkdownNode {
-  static lines = 2.5;
-
   static depth = 2;
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return HeadingMarkdownNode.fromRuleNameChildNodesAndOpacity(SecondaryHeadingMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/heading/tertiary.js

@@ -3,8 +3,6 @@
 import HeadingMarkdownNode from "../../../node/markdown/heading";
 
 export default class TertiaryHeadingMarkdownNode extends HeadingMarkdownNode {
-  static lines = 2.25;
-
   static depth = 3;
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return HeadingMarkdownNode.fromRuleNameChildNodesAndOpacity(TertiaryHeadingMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/heading.js

@@ -1,15 +1,11 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
 import AnchorMarkdownNode from "../../node/markdown/anchor";
 
 import { CONTENTS_PREPEND } from "../../prepends";
 import { replaceSpacesWithHyphens, removedLeadingWhitespace, removeNonAlphabeticAndSpaceCharacters } from "../../utilities/string";
 
-const { last } = arrayUtilities;
-
 export default class HeadingMarkdownNode extends MarkdownNode {
   getDepth() {
     const { depth } = this.constructor;
@@ -33,16 +29,6 @@ export default class HeadingMarkdownNode extends MarkdownNode {
     return identifier;
   }
 
-  getLineMarkdownNode() {
-    const lineMarkdownNode = this.fromFirstLastChildNode((firstLastChildNode) => {
-      const lineMarkdownNode = firstLastChildNode;  ///
-
-      return lineMarkdownNode;
-    });
-
-    return lineMarkdownNode;
-  }
-
   static fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity); }
 }
 

package/src/node/markdown/hyperlink.js

@@ -1,118 +1,68 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
-import contentMixins from "../../mixins/content";
-
-import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
-
-const { second } = arrayUtilities;
-
-class HyperlinkLinkMarkdownNode extends MarkdownNode {
-  url(context) {
-    const multiplicity = this.getMultiplicity();
-
-    let urlTerminalNode;
-
-    if (multiplicity === 1) {
-      urlTerminalNode = this.fromFirstChildNode((firstChildNode) => {
-        const urlTerminalNode = firstChildNode; ///
 
-        return urlTerminalNode;
-      });
-    } else {
-      urlTerminalNode = this.fromSecondLastChildNode((secondLastChildNode) => {
-        const urlTerminalNode = secondLastChildNode; ///
+import { URL_TOKEN_TYPE } from "../../tokenTypes";
 
-        return urlTerminalNode;
-      });
-    }
+export default class HyperlinkMarkdownNode extends MarkdownNode {
+  urlFromSecondLastChildNode(context) {
+    const url = this.fromSecondLastChildNode((secondLastChildNode) => {
+      const terminalNode = secondLastChildNode,  ///
+            url = urlFromTerminalNode(terminalNode);
 
-    const urlTerminalNodeContent = urlTerminalNode.getContent(),
-          url = urlTerminalNodeContent; ///
+      return url;
+    });
 
     return url;
   }
 
-  inlineText(context) {
-    let inlineText = null;
+  urlFromFirstLastChildNode(context) {
+    const url = this.fromFirstLastChildNode((firstLastChildNode) => {
+      const terminalNode = firstLastChildNode,  ///
+            url = urlFromTerminalNode(terminalNode);
 
-    const multiplicity = this.getMultiplicity();
+      return url;
+    });
 
-    if (multiplicity > 1) {
-      inlineText = this.fromSecondChildNode((secondChildNode) => {
-        const indent = null,
-              inlineTextMarkdownNode = secondChildNode, ///
-              inlineTextMarkdownNodeHTML = inlineTextMarkdownNode.asHTML(indent, context);
-
-        inlineText = inlineTextMarkdownNodeHTML;  ///
-      });
-    }
-
-    return inlineText;
-  }
-
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
+    return url;
   }
 
-  attributeValue(context) {
-    const url = this.url(context),
-          attributeValue = url; ///
+  url(context) {
+    const simple = this.isSimple(),
+          url = simple ?
+                  this.urlFromFirstLastChildNode(context) :
+                    this.urlFromSecondLastChildNode(context);
 
-    return attributeValue;
+    return url;
   }
 
-  createDOMElement(context) {
-    let content;
-
-    const inlineText = this.inlineText(context);
-
-    if (inlineText !== null) {
-      content = inlineText; ///
-    } else {
-      content = this.content(context);
-    }
-
-    let domElement;
-
-    const textNode = document.createTextNode(content);
-
-    domElement = super.createDOMElement(context);
-
-    const parentDOMElement = domElement;  ///
+  isSimple() {
+    const simple = this.fromFirstLastChildNode((firstLastChildNode) => {
+      const terminalNode = firstLastChildNode,  ///
+            type = terminalNode.getType(),
+            typeURLTokenType = (type === URL_TOKEN_TYPE),
+            simple = typeURLTokenType; ///
 
-    domElement = textNode; ///
+      return simple;
+    });
 
-    parentDOMElement.appendChild(domElement);
-
-    domElement = parentDOMElement;  ///
-
-    return domElement;
+    return simple;
   }
 
-  childNodesAsHTML(indent, context) {
-    let content;
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(HyperlinkMarkdownNode, ruleName, childNodes, opacity); }
+}
 
-    const inlineText = this.inlineText(context);
+function urlFromTerminalNode(terminalNode) {
+  let url = null;
 
-    if (inlineText !== null) {
-      content = inlineText;  ///
-    } else {
-      content = this.content(context);
-    }
+  const type = terminalNode.getType(),
+        typeURLTokenType = (type === URL_TOKEN_TYPE);
 
-    const childNodesHTML = content; ///
+  if (typeURLTokenType) {
+    const content = terminalNode.getContent();
 
-    return childNodesHTML;
+    url = content; ///
   }
 
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(HyperlinkLinkMarkdownNode, ruleName, childNodes, opacity); }
-}
-
-Object.assign(HyperlinkLinkMarkdownNode.prototype, contentMixins);
-
-export default HyperlinkLinkMarkdownNode;
+  return url;
+}