highmark-markdown 0.0.443 → 0.0.445

package/src/node/markdown/division.js

@@ -5,19 +5,19 @@ import { arrayUtilities } from "necessary";
 import MarkdownNode from "../../node/markdown";
 import IndexReplacement from "../../replacement/index";
 import FootnoteReplacement from "../../replacement/footnote";
+import IndexAnchorReplacement from "../../replacement/indexAnchor";
 import ContentsListReplacement from "../../replacement/contentsList";
 import FootnotesListReplacement from "../../replacement/footnotesList";
 import FootnoteSubDivisionReplacement from "../../replacement/subDivision/footnote";
-import IndexAnchorSubDivisionReplacement from "../../replacement/subDivision/indexAnchor";
 import IndexDirectiveSubDivisionReplacement from "../../replacement/subDivision/indexDirective";
 import ContentsDirectiveSubDivisionReplacement from "../../replacement/subDivision/contentsDirective";
 import FootnotesDirectiveSubDivisionReplacement from "../../replacement/subDivision/footnotesDirective";
 import PageNumberDirectiveSubDivisionReplacement from "../../replacement/subDivision/pageNumberDirective";
 
 import { EMPTY_STRING } from "../../constants";
-import { DIVISION_RULE_NAME } from "../../ruleNames";
 import { renumberFootnoteLinkMarkdownNodes } from "../../utilities/footnotes";
 import { subDivisionMarkdownNodesFromNode, ignoreDirectiveMarkdownNodeFromNode, pageNumberDirectiveMarkdownNodeFromNode } from "../../utilities/query";
+import {DIVISION_RULE_NAME} from "../../ruleNames";
 
 const { clear, filter } = arrayUtilities;
 
@@ -50,52 +50,10 @@ export default class DivisionMarkdownNode extends MarkdownNode {
     return ignored;
   }
 
-  paginate(paginatedDivisionMarkdownNodes, context) {
-    const footnotesDirectiveSubDivisionReplacement = this.removeSubDivisionMarkdownNode(FootnotesDirectiveSubDivisionReplacement, context),
-          pageNumberDirectiveSubDivisionReplacement = this.removeSubDivisionMarkdownNode(PageNumberDirectiveSubDivisionReplacement, context),
-          subDivisionReplacements = [
-            footnotesDirectiveSubDivisionReplacement,
-            pageNumberDirectiveSubDivisionReplacement
-          ];
-
-    filter(subDivisionReplacements, (subDivisionReplacement) => {
-      if (subDivisionReplacement !== null) {
-        return true;
-      }
-    });
-
-    const { linesPerPage } = context,
-          paginatedChildNodes = [],
-          childNodes = this.getChildNodes();
-
-    let totalLines = 0;
-
-    childNodes.forEach((childNode) => {
-      const lines = childNode.lines(context),
-            paginatedChildNode = childNode;  ///
-
-      totalLines += lines;
+  isDivisionMarkdownNode() {
+    const divisionMarkdownNode = true;
 
-      paginatedChildNodes.push(paginatedChildNode);
-
-      if (totalLines > linesPerPage) {
-        const divisionMarkdownNode = DivisionMarkdownNode.fromPaginatedChildNodesSubDivisionReplacementsAndDivisionClassName(paginatedChildNodes, subDivisionReplacements, this.divisionClassName, context),
-              paginatedDivisionMarkdownNode = divisionMarkdownNode; ///
-
-        paginatedDivisionMarkdownNodes.push(paginatedDivisionMarkdownNode);
-
-        clear(paginatedChildNodes);
-
-        totalLines = 0;
-      }
-    });
-
-    if (totalLines > 0) {
-      const divisionMarkdownNode = DivisionMarkdownNode.fromPaginatedChildNodesSubDivisionReplacementsAndDivisionClassName(paginatedChildNodes, subDivisionReplacements, this.divisionClassName, context),
-            paginatedDivisionMarkdownNode = divisionMarkdownNode; ///
-
-      paginatedDivisionMarkdownNodes.push(paginatedDivisionMarkdownNode);
-    }
+    return divisionMarkdownNode;
   }
 
   getPageNumber() {
@@ -132,6 +90,51 @@ export default class DivisionMarkdownNode extends MarkdownNode {
     });
   }
 
+  paginate(markdownNodes, context) {
+    const footnotesDirectiveSubDivisionReplacement = this.removeSubDivisionMarkdownNode(FootnotesDirectiveSubDivisionReplacement, context),
+          pageNumberDirectiveSubDivisionReplacement = this.removeSubDivisionMarkdownNode(PageNumberDirectiveSubDivisionReplacement, context),
+          subDivisionReplacements = [
+            footnotesDirectiveSubDivisionReplacement,
+            pageNumberDirectiveSubDivisionReplacement
+          ];
+
+    filter(subDivisionReplacements, (subDivisionReplacement) => {
+      if (subDivisionReplacement !== null) {
+        return true;
+      }
+    });
+
+    const { linesPerPage } = context,
+          paginatedChildNodes = [],
+          childNodes = this.getChildNodes();
+
+    let totalLines = 0,
+        pageNumber = 1;
+
+    childNodes.forEach((childNode) => {
+      const lines = childNode.lines(context),
+            paginatedChildNode = childNode;  ///
+
+      paginatedChildNodes.push(paginatedChildNode);
+
+      totalLines += lines;
+
+      if (totalLines > linesPerPage) {
+        paginateDivisionMarkdownNode(paginatedChildNodes, subDivisionReplacements, this.divisionClassName, markdownNodes, pageNumber, context)
+
+        clear(paginatedChildNodes);
+
+        totalLines = 0;
+
+        pageNumber++;
+      }
+    });
+
+    if (totalLines > 0) {
+      paginateDivisionMarkdownNode(paginatedChildNodes, subDivisionReplacements, this.divisionClassName, markdownNodes, pageNumber, context);
+    }
+  }
+
   createIndex(divisionMarkdownNodes, context) {
     let indexCreated = false;
 
@@ -164,16 +167,6 @@ export default class DivisionMarkdownNode extends MarkdownNode {
         contentsListReplacement.replaceContentsDirectiveSubdivisionReplacement(contentsDirectiveSubDivisionReplacement, divisionMarkdownNode, context);
 
         contentsCreated = true;
-
-        divisionMarkdownNodes.forEach((divisionMarkdownNode) => {
-          const pageNumber = divisionMarkdownNode.getPageNumber();
-
-          if (pageNumber !== null) {
-            const indexAnchorSubDivisionReplacement = IndexAnchorSubDivisionReplacement.fromPageNumber(pageNumber, context);
-
-            indexAnchorSubDivisionReplacement.prependToDivisionMarkdownNode(divisionMarkdownNode, context);
-          }
-        });
       }
     }
 
@@ -331,13 +324,13 @@ ${childNodesHTML}${indent}${closingTag}
     return divisionMarkdownNode;
   }
 
-  static fromPaginatedChildNodesSubDivisionReplacementsAndDivisionClassName(paginatedChildNodes, subDivisionReplacements, divisionClassName, context) {
+  static fromPaginatedChildNodesAndSubDivisionReplacements(paginatedChildNodes, subDivisionReplacements, context) {
     const ruleName = DIVISION_RULE_NAME,
           childNodes = [
             ...paginatedChildNodes
           ],
           opacity = null,
-          divisionMarkdownNode = MarkdownNode.fromRuleNameChildNodesAndOpacity(DivisionMarkdownNode, ruleName, childNodes, opacity, divisionClassName);
+          divisionMarkdownNode = DivisionMarkdownNode.fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity);
 
     subDivisionReplacements.forEach((subDivisionReplacement) => {
       subDivisionReplacement = subDivisionReplacement.clone();  ///
@@ -348,3 +341,24 @@ ${childNodesHTML}${indent}${closingTag}
     return divisionMarkdownNode;
   }
 }
+
+function paginateDivisionMarkdownNode(paginatedChildNodes, subDivisionReplacements, divisionClassName, markdownNodes, pageNumber, context) {
+  let markdownNode;
+
+  const indexAnchorReplacement = IndexAnchorReplacement.fromPageNumber(pageNumber, context),
+        anchorMarkdownNode = indexAnchorReplacement.getAnchorMarkdownNode();
+
+  markdownNode = anchorMarkdownNode;  ///
+
+  markdownNodes.push(markdownNode);
+
+  const divisionMarkdownNode = DivisionMarkdownNode.fromPaginatedChildNodesAndSubDivisionReplacements(paginatedChildNodes, subDivisionReplacements, context);
+
+  divisionMarkdownNode.setDivisionClassName(divisionClassName);
+
+  divisionMarkdownNode.setPageNumber(pageNumber);
+
+  markdownNode = divisionMarkdownNode; ///
+
+  markdownNodes.push(markdownNode);
+}

package/src/node/markdown/subDivision.js

@@ -7,8 +7,6 @@ import VerticalSpaceMarkdownNode from "../../node/markdown/verticalSpace";
 import EmbedDirectivesSubDivisionReplacement from "../../replacement/subDivision/embedDirectives";
 import IncludeDirectivesSubDivisionReplacement from "../../replacement/subDivision/includeDirectives";
 
-import { SUB_DIVISION_RULE_NAME } from "../../ruleNames";
-
 const { second } = arrayUtilities;
 
 export default class SubDivisionMarkdownNode extends MarkdownNode {
@@ -79,18 +77,5 @@ export default class SubDivisionMarkdownNode extends MarkdownNode {
     return secondMarkdownNode;
   }
 
-  static fromAnchorMarkdownNode(anchorMarkdownNode) {
-    const ruleName = SUB_DIVISION_RULE_NAME,
-          verticalSpaceMarkdownNode = VerticalSpaceMarkdownNode.fromNothing(),
-          childNodes = [
-            verticalSpaceMarkdownNode,
-            anchorMarkdownNode
-          ],
-          opacity = null,
-          subDivisionMarkdownNode = MarkdownNode.fromRuleNameChildNodesAndOpacity(SubDivisionMarkdownNode, ruleName, childNodes, opacity);
-
-    return subDivisionMarkdownNode;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(SubDivisionMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/verticalSpace.js

@@ -1,11 +1,8 @@
 "use strict";
 
-import { EpsilonNode } from "occam-parsers";
-
 import MarkdownNode from "../../node/markdown";
 
 import { CARRIAGE_RETURN } from "../../constants";
-import { VERTICAL_SPACE_RULE_NAME } from "../../ruleNames";
 
 export default class VerticalSpaceMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {
@@ -24,17 +21,5 @@ export default class VerticalSpaceMarkdownNode extends MarkdownNode {
     return domElement;
   }
 
-  static fromNothing() {
-    const epsilonNode = EpsilonNode.fromNothing(),
-          ruleName = VERTICAL_SPACE_RULE_NAME,
-          childNodes = [
-            epsilonNode
-          ],
-          opacity = null,
-          verticalSpaceMarkdownNode = MarkdownNode.fromRuleNameChildNodesAndOpacity(VerticalSpaceMarkdownNode, ruleName, childNodes, opacity);
-
-    return verticalSpaceMarkdownNode;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(VerticalSpaceMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown.js

@@ -94,6 +94,12 @@ class MarkdownNode extends NonTerminalNode {
     return attributeValue;
   }
 
+  isDivisionMarkdownNode() {
+    const divisionMarkdownNode = false;
+
+    return divisionMarkdownNode;
+  }
+
   isPlainTextMarkdownNode() {
     const plainTextMarkdownNode = false;
 

package/src/replacement/indexAnchor.js

@@ -0,0 +1,27 @@
+"use strict";
+
+import Replacement from "../replacement";
+
+import AnchorMarkdownNode from "../node/markdown/anchor";
+
+import { INDEX_PREPEND } from "../prepends";
+
+export default class IndexAnchorReplacement extends Replacement {
+  getAnchorMarkdownNode() {
+    const node = this.getNode(),
+          anchorMarkdownNode = node;  ///
+
+    return anchorMarkdownNode;
+  }
+
+  static fromPageNumber(pageNumber, context) {
+    const prepend = INDEX_PREPEND,
+          identifier = pageNumber,  ///
+          anchorMarkdownNode = AnchorMarkdownNode.fromPrependAndIdentifier(prepend, identifier),
+          node = anchorMarkdownNode,  ///
+          tokens = [],
+          indexAnchorReplacement = Replacement.fromNodeAndTokens(IndexAnchorReplacement, node, tokens);
+
+    return indexAnchorReplacement;
+  }
+}

package/src/utilities/processing.js

@@ -7,9 +7,10 @@ export function postprocess(divisionMarkdownNode, context) {
 
   resolveEmbeddings(divisionMarkdownNodes, context);
 
-  const footnoteReplacementMap = prepareFootnotes(divisionMarkdownNodes, context);
+  const footnoteReplacementMap = prepareFootnotes(divisionMarkdownNodes, context),
+        markdownNodes = paginate(divisionMarkdownNodes, context);
 
-  divisionMarkdownNodes = paginate(divisionMarkdownNodes, context);
+  divisionMarkdownNodes = divisionMarkdownNodesFromMarkdownNodes(markdownNodes);  ///
 
   createFootnotes(divisionMarkdownNodes, footnoteReplacementMap, context);
 
@@ -17,25 +18,17 @@ export function postprocess(divisionMarkdownNode, context) {
 
   createIndex(divisionMarkdownNodes, context);
 
-  return divisionMarkdownNodes;
+  return markdownNodes;
 }
 
 function paginate(divisionMarkdownNodes, context) {
-  const paginatedDivisionMarkdownNodes = [];
+  const markdownNOdes = [];
 
   divisionMarkdownNodes.forEach((divisionMarkdownNode) => {
-    divisionMarkdownNode.paginate(paginatedDivisionMarkdownNodes, context);
-  });
-
-  paginatedDivisionMarkdownNodes.forEach((paginatedDivisionMarkdownNode, index) => {
-    const pageNumber = index + 1;
-
-    paginatedDivisionMarkdownNode.setPageNumber(pageNumber);
+    divisionMarkdownNode.paginate(markdownNOdes, context);
   });
 
-  divisionMarkdownNodes = paginatedDivisionMarkdownNodes; ///
-
-  return divisionMarkdownNodes;
+  return markdownNOdes;
 }
 
 function createIndex(divisionMarkdownNodes, context) {
@@ -100,6 +93,23 @@ function resolveEmbeddings(divisionMarkdownNodes, context) {
   });
 }
 
+export function divisionMarkdownNodesFromMarkdownNodes(markdownNodes) {
+  const divisionMarkdownNodes = markdownNodes.reduce((divisionMarkdownNodes, markdownNode) => {
+    const markdownNodeDivisionMarkdownNode = markdownNode.isDivisionMarkdownNode();
+
+    if (markdownNodeDivisionMarkdownNode) {
+      const divisionMarkdownNode = markdownNode;  ///
+
+      divisionMarkdownNodes.push(divisionMarkdownNode);
+    }
+
+    return divisionMarkdownNodes;
+  }, []);
+
+  return divisionMarkdownNodes;
+}
+
 export default {
-  postprocess
-};
+  postprocess,
+  divisionMarkdownNodesFromMarkdownNodes
+}

package/src/replacement/subDivision/indexAnchor.js

@@ -1,20 +0,0 @@
-"use strict";
-
-import SubDivisionReplacement from "../../replacement/subDivision";
-
-import AnchorMarkdownNode from "../../node/markdown/anchor";
-import SubDivisionMarkdownNode from "../../node/markdown/subDivision";
-
-import { INDEX_PREPEND } from "../../prepends";
-
-export default class IndexAnchorSubDivisionReplacement extends SubDivisionReplacement {
-  static fromPageNumber(pageNumber, context) {
-    const prepend = INDEX_PREPEND,
-          identifier = pageNumber,  ///
-          anchorMarkdownNode = AnchorMarkdownNode.fromPrependAndIdentifier(prepend, identifier),
-          subDivisionMarkdownNode = SubDivisionMarkdownNode.fromAnchorMarkdownNode(anchorMarkdownNode),
-          indexAnchorSubdivisionReplacement = SubDivisionReplacement.fromSubDivisionMarkdownNode(IndexAnchorSubDivisionReplacement, subDivisionMarkdownNode, context);
-
-    return indexAnchorSubdivisionReplacement;
-  }
-}