highmark-markdown 0.0.362 → 0.0.363

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-markdown",
   "author": "James Smith",
-  "version": "0.0.362",
+  "version": "0.0.363",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-markdown",
   "description": "Highmark's Markdown and Markdown Style languages.",

package/src/markdown/bnf.js

@@ -99,7 +99,7 @@ const bnf = `
     includeDirective        ::=  "@include" [path] ;
 
 
-    contentsDirective       ::=  "@contents" [number]? ;
+    contentsDirective       ::=  "@contents" ;
 
 
     footnotesDirective      ::=  "@footnotes" ;

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

@@ -1,28 +1,7 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../../node/markdown";
 
-const { second } = arrayUtilities;
-
 export default class ContentsDirectiveMarkdownNode extends MarkdownNode {
-  maximumLevel(context) {
-    let maximumLevel = 1;
-
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    if (childNodesLength> 1) {
-      const secondChildNode = second(childNodes),
-            terminalNode = secondChildNode, ///
-            content = terminalNode.getContent();
-
-      maximumLevel = Number(content); ///
-    }
-
-    return maximumLevel;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ContentsDirectiveMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/division.js

@@ -197,8 +197,8 @@ ${childNodesHTML}${indent}${closingTag}
 }
 
 function headingMarkdownNodesFromDivisionMarkdownNodeAndContentsDirectiveMarkdownNode(divisionMarkdownNode, contentsDirectiveMarkdownNode, context) {
-  const headingMarkdownNodes = [],
-        maximumLevel = contentsDirectiveMarkdownNode.maximumLevel(context);
+  const { contentsDepth } = context,
+        headingMarkdownNodes = [];
 
   let { divisionMarkdownNodes } = context;
 
@@ -214,9 +214,9 @@ function headingMarkdownNodesFromDivisionMarkdownNodeAndContentsDirectiveMarkdow
   });
 
   filter(headingMarkdownNodes, (headingMarkdownNode) => {
-    const level = headingMarkdownNode.getLevel();
+    const depth = headingMarkdownNode.getDepth();
 
-    if (level <= maximumLevel) {
+    if (depth <= contentsDepth) {
       return true;
     }
   });

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

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

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

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

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

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

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

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

package/src/node/markdown/heading.js

@@ -11,10 +11,10 @@ import { replaceSpacesWithHyphens, removedLeadingWhitespace, removeNonAlphabetic
 const { last } = arrayUtilities;
 
 export default class HeadingMarkdownNode extends MarkdownNode {
-  getLevel() {
-    const { level } = this.constructor;
+  getDepth() {
+    const { depth } = this.constructor;
 
-    return level;
+    return depth;
   }
 
   addAnchor(context) {

package/src/utilities/contents.js

@@ -8,16 +8,16 @@ export function nestNodes(nodes) {
   const nestedNodesStack = NestedNodeStack.fromNothing();
 
   nodes.forEach((node) => {
-    const level = node.getLevel();
+    const depth = node.getDepth();
 
-    let nestedNodesStackLevel = nestedNodesStack.getLevel()
+    let nestedNodesStackDepth = nestedNodesStack.getDepth()
 
-    while (nestedNodesStackLevel < level) {
-      nestedNodesStackLevel = nestedNodesStack.increment();
+    while (nestedNodesStackDepth < depth) {
+      nestedNodesStackDepth = nestedNodesStack.increment();
     }
 
-    while (nestedNodesStackLevel > level) {
-      nestedNodesStackLevel = nestedNodesStack.decrement();
+    while (nestedNodesStackDepth > depth) {
+      nestedNodesStackDepth = nestedNodesStack.decrement();
     }
 
     const nestedNode = NestedNode.fromNode(node);
@@ -88,11 +88,11 @@ class NestedNodeStack {
     return nestedNode;
   }
 
-  getLevel() {
+  getDepth() {
     const nestedNodesLength = this.nestedNodes.length,
-          level = nestedNodesLength;  ///
+          depth = nestedNodesLength;  ///
 
-    return level;
+    return depth;
   }
 
   increment() {
@@ -100,17 +100,17 @@ class NestedNodeStack {
 
     this.addNestedNode(nestedNode);
 
-    const level = this.getLevel();
+    const depth = this.getDepth();
 
-    return level;
+    return depth;
   }
 
   decrement() {
     this.removeNestedNode();
 
-    const level = this.getLevel();
+    const depth = this.getDepth();
 
-    return level;
+    return depth;
   }
 
   addNestedNode(nestedNode) {