highmark-markdown 0.0.123 → 0.0.126

package/src/markdown/bnf.js

@@ -2,13 +2,12 @@
 
 const bnf = `
 
-    division                ::=  ( directive | subDivision | verticalSpace | error )+ ;
+    division                ::=  ( subDivision | verticalSpace | error )+ ;
     
     
-    directive.              ::=  ( <END_OF_LINE> | <START_OF_CONTENT> ) import ;
-
+    subDivision..           ::=  ( <END_OF_LINE> | <START_OF_CONTENT> ) ( header 
     
-    subDivision..           ::=  ( <END_OF_LINE> | <START_OF_CONTENT> ) ( primaryHeading 
+                                                                        | primaryHeading 
                                  
                                                                         | secondaryHeading 
                                                                            
@@ -37,7 +36,7 @@ const bnf = `
     error.                  ::=  . ;
 
 
-    import                  ::= "@"<NO_WHITESPACE>"import" [string-literal] ;
+    header                  ::=  import+ ;
 
 
     primaryHeading          ::=  [single-hash] line ;
@@ -79,6 +78,9 @@ const bnf = `
     blockListing            ::=  blockListingStart blockText blockListingEnd ;
 
 
+    import                  ::=  "@"<NO_WHITESPACE>"import" [string-literal] <END_OF_LINE> ;
+
+
     tableHead               ::=  tableHeadRow ;
 
     

package/src/node/markdown/Header.js

@@ -0,0 +1,14 @@
+"use strict";
+
+import MarkdownNode from "../../node/markdown";
+
+export default class HeaderMarkdownNode extends MarkdownNode {
+  asHTML(indent, context) {
+    const childNodesHTML = this.childNodesAsHTML(indent, context),
+          html = childNodesHTML;  ///
+
+    return html;
+  }
+
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(HeaderMarkdownNode, ruleName, childNodes, opacity); }
+}

package/src/node/markdown/import.js

@@ -15,11 +15,12 @@ export default class ImportMarkdownNode extends MarkdownNode {
     const { importer = null } = context;
 
     if (importer !== null) {
-      const { tokens } = context,
-            filePath = this.filePath(context);
+      const filePath = this.filePath(context);
 
       indent = this.adjustIndent(indent);
 
+      const { tokens } = context;
+
       html = importer(filePath, indent, context);
 
       Object.assign(context, {

package/src/nodeMap.js

@@ -7,11 +7,11 @@ import ImageMarkdownNode from "./node/markdown/image";
 import TableMarkdownNode from "./node/markdown/table";
 import ErrorMarkdownNode from "./node/markdown/error";
 import AnchorMarkdownNode from "./node/markdown/anchor";
+import HeaderMarkdownNode from "./node/markdown/header";
 import ImportMarkdownNode from "./node/markdown/import";
 import AddressMarkdownNode from "./node/markdown/address";
 import DivisionMarkdownNode from "./node/markdown/division";
 import FootnoteMarkdownNode from "./node/markdown/footnote";
-import DirectiveMarkdownNode from "./node/markdown/directive";
 import ReferenceMarkdownNode from "./node/markdown/reference";
 import ParagraphMarkdownNode from "./node/markdown/paragraph";
 import HyperlinkMarkdownNode from "./node/markdown/hyperlink";
@@ -59,11 +59,11 @@ import {
   TABLE_RULE_NAME,
   ERROR_RULE_NAME,
   ANCHOR_RULE_NAME,
+  HEADER_RULE_NAME,
   IMPORT_RULE_NAME,
   ADDRESS_RULE_NAME,
   FOOTNOTE_RULE_NAME,
   DIVISION_RULE_NAME,
-  DIRECTIVE_RULE_NAME,
   REFERENCE_RULE_NAME,
   PARAGRAPH_RULE_NAME,
   HYPERLINK_RULE_NAME,
@@ -111,11 +111,11 @@ const nodeMap = {
   [TABLE_RULE_NAME]: TableMarkdownNode,
   [ERROR_RULE_NAME]: ErrorMarkdownNode,
   [ANCHOR_RULE_NAME]: AnchorMarkdownNode,
+  [HEADER_RULE_NAME]: HeaderMarkdownNode,
   [IMPORT_RULE_NAME]: ImportMarkdownNode,
   [ADDRESS_RULE_NAME]: AddressMarkdownNode,
   [FOOTNOTE_RULE_NAME]: FootnoteMarkdownNode,
   [DIVISION_RULE_NAME]: DivisionMarkdownNode,
-  [DIRECTIVE_RULE_NAME]: DirectiveMarkdownNode,
   [REFERENCE_RULE_NAME]: ReferenceMarkdownNode,
   [PARAGRAPH_RULE_NAME]: ParagraphMarkdownNode,
   [HYPERLINK_RULE_NAME]: HyperlinkMarkdownNode,

package/src/ruleNameToHTMLMap.js

@@ -7,11 +7,11 @@ import { URL_RULE_NAME,
          TABLE_RULE_NAME,
          ERROR_RULE_NAME,
          ANCHOR_RULE_NAME,
+         HEADER_RULE_NAME,
          IMPORT_RULE_NAME,
          ADDRESS_RULE_NAME,
          FOOTNOTE_RULE_NAME,
          DIVISION_RULE_NAME,
-         DIRECTIVE_RULE_NAME,
          REFERENCE_RULE_NAME,
          PARAGRAPH_RULE_NAME,
          HYPERLINK_RULE_NAME,
@@ -79,6 +79,10 @@ const ruleNameToHTMLMap = {
     tagName: "a",
     className: "anchor"
   },
+  [HEADER_RULE_NAME]: {
+    tagName: null,
+    className: null
+  },
   [IMPORT_RULE_NAME]: {
     tagName: null,
     className: null
@@ -95,10 +99,6 @@ const ruleNameToHTMLMap = {
     tagName: "div",
     className: null
   },
-  [DIRECTIVE_RULE_NAME]: {
-    tagName: null,
-    className: null
-  },
   [REFERENCE_RULE_NAME]: {
     tagName: null,
     className: null

package/src/ruleNames.js

@@ -7,11 +7,11 @@ export const IMAGE_RULE_NAME = "image";
 export const TABLE_RULE_NAME = "table";
 export const ERROR_RULE_NAME = "error";
 export const ANCHOR_RULE_NAME = "anchor";
+export const HEADER_RULE_NAME = "header";
 export const IMPORT_RULE_NAME = "import";
 export const ADDRESS_RULE_NAME = "address";
 export const FOOTNOTE_RULE_NAME = "footnote";
 export const DIVISION_RULE_NAME = "division";
-export const DIRECTIVE_RULE_NAME = "directive";
 export const REFERENCE_RULE_NAME = "reference";
 export const PARAGRAPH_RULE_NAME = "paragraph";
 export const HYPERLINK_RULE_NAME = "hyperlink";
@@ -59,11 +59,11 @@ const ruleNames = {
   TABLE_RULE_NAME,
   ERROR_RULE_NAME,
   ANCHOR_RULE_NAME,
+  HEADER_RULE_NAME,
   IMPORT_RULE_NAME,
   ADDRESS_RULE_NAME,
   FOOTNOTE_RULE_NAME,
   DIVISION_RULE_NAME,
-  DIRECTIVE_RULE_NAME,
   REFERENCE_RULE_NAME,
   PARAGRAPH_RULE_NAME,
   HYPERLINK_RULE_NAME,

package/src/node/markdown/directive.js

@@ -1,20 +0,0 @@
-"use strict";
-
-import { arrayUtilities } from "necessary";
-
-import MarkdownNode from "../../node/markdown";
-
-const { second } = arrayUtilities;
-
-export default class DirectiveMarkdownNode extends MarkdownNode {
-  asHTML(indent, context) {
-    const childNodes = this.getChildNodes(),
-          secondChildNode = second(childNodes),
-          secondChildNodeHTML = secondChildNode.asHTML(indent, context),
-          html = secondChildNodeHTML;  ///
-
-    return html;
-  }
-
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(DirectiveMarkdownNode, ruleName, childNodes, opacity); }
-}