highmark-markdown 1.0.183 → 1.0.185

package/src/markdown/bnf.js

@@ -2,314 +2,277 @@
 
 const bnf = `
 
-    markdown                ::=  ( division | error )+ ;
+    markdown                 ::=  ( division | error )+ ;
     
     
-    division                ::=  ( subDivision | verticalSpace )+ ;
+    division                 ::=  ( subDivision | verticalSpace )+ ;
     
     
-    subDivision             ::=  directives 
+    subDivision..            ::=  directives 
     
-                              |  primaryHeading 
+                               |  primaryHeading 
 
-                              |  secondaryHeading 
+                               |  secondaryHeading 
                                    
-                              |  tertiaryHeading 
+                               |  tertiaryHeading 
                                    
-                              |  quaternaryHeading 
+                               |  quaternaryHeading 
                                    
-                              |  table 
+                               |  table 
                                    
-                              |  footnote
+                               |  footnote
                                    
-                              |  orderedList 
+                               |  orderedList 
                                    
-                              |  unorderedList 
+                               |  unorderedList 
                                    
-                              |  blockListing 
+                               |  blockListing 
       
-                              |  paragraph 
+                               |  paragraph 
                                
-                              ;
+                               ;
 
     
-    verticalSpace.          ::=  <END_OF_LINE>+ ;
+    verticalSpace            ::=  <END_OF_LINE>+ ;
 
 
-    error.                  ::=  . ;
+    error.                   ::=  . ;
 
 
-    directives              ::=  indexDirective 
+    directives               ::=  indexDirective 
   
-                               | ignoreDirective 
+                               |  ignoreDirective 
   
-                               | contentsDirective 
+                               |  contentsDirective 
   
-                               | footnotesDirective
+                               |  footnotesDirective
                                
-                               | pageNumberDirective 
+                               |  pageNumberDirective 
     
-                               | embedDirective ( endOfLine embedDirective )* 
+                               |  embedDirective ( endOfLine embedDirective )* 
                                
-                               | includeDirective ( endOfLine includeDirective )* 
+                               |  includeDirective ( endOfLine includeDirective )* 
 
                                ; 
   
 
-    primaryHeading.         ::=  "#" line ;
+    primaryHeading           ::=  "#" line ;
 
 
-    secondaryHeading.       ::=  "##" line ;
+    secondaryHeading         ::=  "##" line ;
 
 
-    tertiaryHeading.        ::=  "###" line ;
+    tertiaryHeading          ::=  "###" line ;
     
     
-    quaternaryHeading.      ::=  "####" line ;
+    quaternaryHeading        ::=  "####" line ;
 
 
-    table                   ::=  tableHead endOfLine tableDivider endOfLine tableBody ;
+    table                    ::=  tableHead endOfLine tableDivider endOfLine tableBody ;
 
 
-    footnote.               ::=  reference paragraph ;
+    footnote.                ::=  reference paragraph ;
 
 
-    orderedList             ::=  orderedItem ( endOfLine orderedItem )* ;
+    orderedList              ::=  orderedItem ( endOfLine orderedItem )* ;
 
 
-    unorderedList           ::=  unorderedItem ( endOfLine unorderedItem )* ;
+    unorderedList            ::=  unorderedItem ( endOfLine unorderedItem )* ;
 
 
-    blockListing            ::=  blockStart blockLine* blockEnd ;
+    blockListing             ::=  blockStart blockLine* blockEnd ;
 
 
-    paragraph               ::=  line ( endOfLine line )* ;
+    paragraph                ::=  line ( endOfLine line )* ;
     
 
-    indexDirective          ::=  "@index" ;
+    indexDirective           ::=  "@index" ;
 
 
-    ignoreDirective         ::=  "@ignore" ;
+    ignoreDirective          ::=  "@ignore" ;
 
 
-    embedDirective.         ::=  "@embed" ( path | nonsense ) ;
+    embedDirective           ::=  "@embed" ( path | nonsense ) ;
 
 
-    includeDirective.       ::=  "@include" ( path | nonsense ) ;
+    includeDirective         ::=  "@include" ( path | nonsense ) ;
 
 
-    contentsDirective       ::=  "@contents" ;
+    contentsDirective        ::=  "@contents" ;
 
 
-    footnotesDirective      ::=  "@footnotes" ;
+    footnotesDirective       ::=  "@footnotes" ;
 
 
-    pageNumberDirective     ::=  "@pageNumber" ;
+    pageNumberDirective      ::=  "@pageNumber" ;
 
 
-    nonsense                ::=  ( [escaped] | [number] | [identifier] | [word] | [special] | [unassigned] )+ ;
+    nonsense                 ::=  ( [escaped] | [number] | [identifier] | [word] | [special] | [unassigned] )+ ;
 
 
-    tableHead               ::=  tableHeadRow ;
+    tableHead                ::=  tableHeadRow ;
     
     
-    tableBody               ::=  tableBodyRow ( endOfLine tableBodyRow )* ;
+    tableBody                ::=  tableBodyRow ( endOfLine tableBodyRow )* ;
 
     
-    orderedItem             ::=  [marker] line ( endOfLine line )* ;
+    orderedItem              ::=  [marker] line ( endOfLine line )* ;
     
     
-    unorderedItem           ::=  [bullet] line ( endOfLine line )* ;
+    unorderedItem            ::=  [bullet] line ( endOfLine line )* ;
 
 
-    blockLine.              ::=  blockText* endOfLine ;
+    blockLine.               ::=  blockText* endOfLine ;
     
 
-    tableHeadRow            ::=  tableCellDivider tableHeadCell+ ;
+    tableHeadRow             ::=  tableCellDivider tableHeadCell+ ;
 
     
-    tableBodyRow            ::=  tableCellDivider tableBodyCell+ ;
+    tableBodyRow             ::=  tableCellDivider tableBodyCell+ ;
 
 
-    tableHeadCell.          ::=  emptyTableCell 
+    tableHeadCell            ::=  emptyTableCell 
     
-                              |  tableCell 
+                               |  tableCell 
                               
-                              ;
+                               ;
 
 
-    tableBodyCell.          ::=  emptyTableCell 
+    tableBodyCell            ::=  emptyTableCell 
     
-                              |  tableCell 
+                               |  tableCell 
                               
-                              ; 
+                               ; 
 
 
-    emptyTableCell          ::=  "." tableCellDivider ;
+    emptyTableCell           ::=  "." tableCellDivider ;
     
 
-    tableCell               ::=  line tableCellDivider ;
+    tableCell                ::=  line tableCellDivider ;
     
     
-    contentsList            ::=  contentsItem+ ;
-
-
-    contentsItem            ::=  contentsLink 
+    line                     ::=  ( inlineListing 
     
-                              |  contentsLink? contentsList
-                              
-                              ;
-
-
-    contentsLink            ::=  line ;
-
-
-    footnotesList           ::=  footnotesItem+ ;
-
-
-    footnotesItem           ::=  anchor paragraph ;
-
-
-    indexHeading            ::=  line ;
-    
-    
-    indexList               ::=  indexItem+ ;
-
-
-    indexItem               ::=  line... comma indexLink ( comma indexLink )* ;
-
-
-    line.                   ::=  ( inlineListing 
-    
-                                 | footnoteLink 
+                                  | footnoteLink 
                                  
-                                 | emailLink 
+                                  | emailLink 
                                  
-                                 | hyperlink 
+                                  | hyperlink 
                                  
-                                 | image 
+                                  | image 
                                  
-                                 | plainText 
+                                  | plainText 
                                  
-                                 | strongText 
+                                  | strongText 
                                  
-                                 | emphasisedText 
+                                  | emphasisedText 
                                  
-                                 | stronglyEmphasisedText )+ ;
+                                  | stronglyEmphasisedText )+ ;
     
     
-    emailLink.              ::=  "[" inlineText... "]"<NO_WHITESPACE>"(" [email-address] ")" 
+    footnoteLink.            ::=  [link] ;
+    
+
+    emailLink.               ::=  "[" inlineText... "]"<NO_WHITESPACE>"(" [email-address] ")" 
     
-                              |  [email-address] 
+                               |  [email-address] 
                               
-                              ;
+                               ;
 
 
-    hyperlink.              ::=  "[" inlineText... "]"<NO_WHITESPACE>"(" [url] ")" 
+    hyperlink.               ::=  "[" inlineText... "]"<NO_WHITESPACE>"(" [url] ")" 
     
-                              |  [url]
+                               |  [url]
                               
-                              ;
+                               ;
 
 
-    image.                  ::=  "![" inlineText... "]"<NO_WHITESPACE>"(" path ")" ;
+    image.                   ::=  "![" inlineText... "]"<NO_WHITESPACE>"(" path ")" ;
 
 
-    inlineText              ::=  plainText+ ;
-    
-    
-    strongText              ::=  "***" inlineText "***" ;
+    strongText               ::=  "***" inlineText "***" ;
 
 
-    emphasisedText          ::=  "**" inlineText "**" ;
+    emphasisedText           ::=  "**" inlineText "**" ;
 
 
-    stronglyEmphasisedText  ::=  "****" inlineText "****" ;
+    stronglyEmphasisedText.  ::=  "****" inlineText "****" ;
     
 
-    className               ::=  <NO_WHITESPACE>[identifier] ;
+    inlineText.              ::=  plainText+ ;
+    
+    
+    className                ::=  <NO_WHITESPACE>[identifier] ;
     
 
-    blockStart              ::=  [backticks] className? <END_OF_LINE> ;
-
+    blockStart               ::=  [backticks] className? <END_OF_LINE> ;
 
-    blockEnd                ::=  [backticks] ;
 
+    blockEnd                 ::=  [backticks] ;
 
-    footnoteLink.           ::=  [link] ;
-    
 
-    tableCellDivider        ::=  [vertical-bar] ;
+    tableCellDivider         ::=  [vertical-bar] ;
     
     
-    tableDivider            ::=  [dashes] ;
+    tableDivider             ::=  [dashes] ;
     
     
-    plainText               ::=  [escaped] 
+    plainText.               ::=  [escaped] 
                               
-                              |  [number] 
+                               |  [number] 
                               
-                              |  [identifier] 
+                               |  [identifier] 
                               
-                              |  [email-address]
+                               |  [email-address]
                               
-                              |  [url] 
+                               |  [url] 
                               
-                              |  [path] 
+                               |  [path] 
                               
-                              |  [word] 
+                               |  [word] 
                               
-                              |  [special] 
+                               |  [special] 
                               
-                              |  [unassigned] 
+                               |  [unassigned] 
                               
-                              ;
+                               ;
     
 
-    blockText               ::=  [escaped] 
+    blockText.               ::=  [escaped] 
                               
-                              |  [number] 
+                               |  [number] 
                               
-                              |  [identifier] 
+                               |  [identifier] 
                               
-                              |  [email-address]
+                               |  [email-address]
                               
-                              |  [url] 
+                               |  [url] 
                               
-                              |  [path] 
+                               |  [path] 
                               
-                              |  [word] 
+                               |  [word] 
                               
-                              |  [special] 
+                               |  [special] 
                               
-                              |  [unassigned]  
+                               |  [unassigned]  
                                 
-                              |  [dashes] 
+                               |  [dashes] 
  
-                              |  [vertical-bar]
+                               |  [vertical-bar]
                               
-                              ;
+                               ;
     
 
-    inlineListing           ::=  [backticked-literal] ;
+    inlineListing.           ::=  [backticked-literal] ;
     
 
-    reference.              ::=  [reference] ;
+    reference                ::=  [reference] ;
     
 
-    indexLink               ::=  [number] ;    
-
-
-    path                    ::=  [path] ;
+    path                     ::=  [path] ;
 
 
-    comma.                  ::=  "," ;    
-      
-
-    anchor.                 ::=  ε ;
-
-    
-    endOfLine.              ::=  <END_OF_LINE> ;
+    endOfLine                ::=  <END_OF_LINE> ;
 
 `;
 

package/src/node/html/anchor.js

@@ -2,73 +2,64 @@
 
 import HTMLNode from "../../node/html";
 
+import { EMPTY_STRING } from "../../constants";
+import { ANCHOR_RULE_NAME } from "../../ruleNames";
 import { ID_ATTRIBUTE_NAME } from "../../attributeNames";
 
 export default class AnchorHTMLNode extends HTMLNode {
-  attributeName(context) {
-    const attributeName = ID_ATTRIBUTE_NAME;
+  constructor(outerNode, parentNode, childNodes, domElement, prepend, identifier) {
+    super(outerNode, parentNode, childNodes, domElement);
 
-    return attributeName;
+    this.prepend = prepend;
+    this.identifier = identifier;
   }
 
-  attributeValue(context) {
-    const attributeValue = `${this.prepend}-${this.identifier}`;
-
-    return attributeValue;
+  getPrepend() {
+    return this.prepend;
   }
 
-  asHTML(indent, context) {
-    if (context === undefined) {
-      context = indent; ///
-
-      indent = null;
-    }
-
-    indent = this.adjustIndent(indent);
+  getIdentifier() {
+    return this.identifier;
+  }
 
-    const childNodesHTML = this.childNodesAsHTML(indent, context),
-          startingTag = this.startingTag(context),
-          closingTag = this.closingTag(context),
-          html = (indent === null) ?
-                   `${startingTag}${childNodesHTML}${closingTag}` :
-                     `${indent}${startingTag}
-  ${childNodesHTML}${indent}${closingTag}
-  `;
+  getRuleName() {
+    const ruleName = ANCHOR_RULE_NAME;  ///
 
-    return html;
+    return ruleName;
   }
 
-  createDOMElement(context) {
-    let domElement;
+  content(context) {
+    const content = EMPTY_STRING;
 
-    const content = this.content(context),
-          textNode = document.createTextNode(content);
+    return content;
+  }
 
-    domElement = super.createDOMElement(context)
+  attributeName(context) {
+    const attributeName = ID_ATTRIBUTE_NAME;
 
-    const parentDOMElement = domElement;  ///
+    return attributeName;
+  }
 
-    domElement = textNode; ///
+  attributeValue(context) {
+    const attributeValue = `#${this.prepend}-${this.identifier}`; ///
 
-    parentDOMElement.appendChild(domElement);
+    return attributeValue;
+  }
 
-    domElement = parentDOMElement;  ///
+  asString() {
+    const ruleName = this.getRuleName(),
+          string = ruleName;  ///
 
-    return domElement;
+    return string;
   }
 
-  // childNodesAsHTML(indent, context) {
-  //   const content = this.content(context),
-  //         childNodesHTML = content; ///
-  //
-  //   return childNodesHTML;
-  // }
-
   static tagName = "a";
 
   static className = "anchor";
 
-  static fromNothing() { return HTMLNode.fromNothing(AnchorHTMLNode); }
+  static fromPrependAndIdentifier(prepend, identifier) {
+    const anchorHTMLNode = HTMLNode.fromNothing(AnchorHTMLNode, prepend, identifier);
 
-  static fromOuterNode(outerNode) { return HTMLNode.fromOuterNode(AnchorHTMLNode, outerNode); }
+    return anchorHTMLNode;
+  }
 }

package/src/node/html/blockLine.js

@@ -2,26 +2,33 @@
 
 import HTMLNode from "../../node/html";
 
+import { assignIndexes, deleteIndexes } from "../../utilities/whitespace";
 import { EMPTY_STRING, CARRIAGE_RETURN } from "../../constants";
 
 export default class BlockLineHTMLNode extends HTMLNode {
   mount(parentDOMElement, siblingDOMElement, context) {
+    const node = this;  ///
+
+    assignIndexes(node, context);
+
     super.mount(parentDOMElement, siblingDOMElement, context);
 
     let domElement;
 
     domElement = this.getDOMElement();
 
-    parentDOMElement = domElement;
+    parentDOMElement = domElement;  ///
 
     siblingDOMElement = null;
 
     const content = CARRIAGE_RETURN,
           textNode = document.createTextNode(content);
 
-    domElement = textNode;
+    domElement = textNode;  ///
 
-    parentDOMElement.insertBefore(domElement, siblingDOMElement)
+    parentDOMElement.insertBefore(domElement, siblingDOMElement);
+
+    deleteIndexes(context);
   }
 
   unmount(parentDOMElement, context) {
@@ -54,8 +61,28 @@ export default class BlockLineHTMLNode extends HTMLNode {
     return html;
   }
 
+  childNodesAsHTML(indent, context) {
+    let childNodesHTML;
+
+    const node = this;  ///
+
+    assignIndexes(node, context);
+
+    childNodesHTML = super.childNodesAsHTML(indent, context);
+
+    deleteIndexes(context);
+
+    return childNodesHTML;
+  }
+
   childNodesAsPlainText(context) {
-    const childNodesPlainText = this.reduceChildNode((childNodesPlainText, childNode) => {
+    let childNodesPlainText;
+
+    const node = this;  ///
+
+    assignIndexes(node, context);
+
+    childNodesPlainText = this.reduceChildNode((childNodesPlainText, childNode) => {
       const childNodePlainText = childNode.asPlainText(context);
 
       childNodesPlainText = `${childNodesPlainText}${childNodePlainText}`;
@@ -63,6 +90,8 @@ export default class BlockLineHTMLNode extends HTMLNode {
       return childNodesPlainText;
     }, EMPTY_STRING);
 
+    deleteIndexes(context);
+
     return childNodesPlainText;
   }
 

package/src/node/html/directive/contents.js

@@ -0,0 +1,9 @@
+"use strict";
+
+import HTMLNode from "../../../node/html";
+
+export default class ContentsDirectiveHTMLNode extends HTMLNode {
+  static fromNothing() { return HTMLNode.fromNothing(ContentsDirectiveHTMLNode); }
+
+  static fromOuterNode(outerNode) { return HTMLNode.fromOuterNode(ContentsDirectiveHTMLNode, outerNode); }
+}

package/src/node/html/directive/footnotes.js

@@ -0,0 +1,9 @@
+"use strict";
+
+import HTMLNode from "../../../node/html";
+
+export default class FootnotesDirectiveHTMLNode extends HTMLNode {
+  static fromNothing() { return HTMLNode.fromNothing(FootnotesDirectiveHTMLNode); }
+
+  static fromOuterNode(outerNode) { return HTMLNode.fromOuterNode(FootnotesDirectiveHTMLNode, outerNode); }
+}

package/src/node/html/directive/index.js

@@ -0,0 +1,9 @@
+"use strict";
+
+import HTMLNode from "../../../node/html";
+
+export default class IndexDirectiveHTMLNode extends HTMLNode {
+  static fromNothing() { return HTMLNode.fromNothing(IndexDirectiveHTMLNode); }
+
+  static fromOuterNode(outerNode) { return HTMLNode.fromOuterNode(IndexDirectiveHTMLNode, outerNode); }
+}

package/src/node/html/directive/pageNumber.js

@@ -0,0 +1,9 @@
+"use strict";
+
+import HTMLNode from "../../../node/html";
+
+export default class PageNumberDirectiveHTMLNode extends HTMLNode {
+  static fromNothing() { return HTMLNode.fromNothing(PageNumberDirectiveHTMLNode); }
+
+  static fromOuterNode(outerNode) { return HTMLNode.fromOuterNode(PageNumberDirectiveHTMLNode, outerNode); }
+}