highmark-cli 0.0.68 → 0.0.69

package/bin/action/publish.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const readInputFileOperation = require("../operation/readInputFile"),
-      inputFileContentToHTMLOperation = require("../operation/inputFileContentToHTML");
+      inputFileToHTMLOperation = require("../operation/inputFileToHTML");
 
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_PUBLISH_MESSAGE, FAILED_PUBLISH_MESSAGE } = require("../messages");
@@ -9,7 +9,7 @@ const { executeOperations } = require("../utilities/operation"),
 function publishAction(inputFilePath, outputFilePath) {
   const operations = [
           readInputFileOperation,
-          inputFileContentToHTMLOperation
+          inputFileToHTMLOperation
         ],
         context = {
           inputFilePath,

package/bin/importer.js

@@ -1,10 +1,28 @@
 "use strict";
 
 const { readFile } = require("./utilities/file");
-const { nodeFromContent } = require("./utilities/markdown");
+const { nodeFromTokens, tokensFromContent } = require("./utilities/markdown");
 
-function importer(path, indent, context) {
-  debugger
+function importer(filePath, indent, context) {
+  let html = null;
+
+  const content = readFile(filePath);
+
+  if (content !== null) {
+    const tokens = tokensFromContent(content),
+          node = nodeFromTokens(tokens);
+
+    let { indent } = context;
+
+    if (node !== null) {
+      html = node.asHTML({
+        tokens,
+        importer
+      });
+    }
+  }
+
+  return html;
 }
 
 module.exports = importer;

package/bin/operation/inputFileToHTML.js

@@ -0,0 +1,32 @@
+"use strict";
+
+const importer = require("../importer");
+
+const { nodeFromTokens, tokensFromContent } = require("../utilities/markdown");
+
+function inputFileHTMLOperation(proceed, abort, context) {
+  const { inputFileContent } = context,
+        content = inputFileContent, ///
+        tokens = tokensFromContent(content),
+        node = nodeFromTokens(tokens);
+
+  if (node === null) {
+    abort();
+
+    return;
+  }
+
+  const html = node.asHTML({ ///
+          tokens,
+          importer
+        }),
+        inputFileHTML = html; ///
+
+  Object.assign(context, {
+    inputFileHTML
+  });
+
+  proceed();
+}
+
+module.exports = inputFileHTMLOperation;

package/bin/utilities/markdown.js

@@ -7,9 +7,14 @@ const { UNABLE_TO_PARSE_INPUT_FILE_MESSAGE } = require("../messages");
 const markdownLexer = MarkdownLexer.fromNothing(),
       markdownParser = MarkdownParser.fromNothing();
 
-function nodeFromContent(content) {
-  const tokens = markdownLexer.tokenise(content),
-        node = markdownParser.parse(tokens);
+function tokensFromContent(content) {
+  const tokens = markdownLexer.tokenise(content);
+
+  return tokens;
+}
+
+function nodeFromTokens(tokens) {
+  const node = markdownParser.parse(tokens);
 
   if (node === null) {
     const message = UNABLE_TO_PARSE_INPUT_FILE_MESSAGE;
@@ -21,5 +26,6 @@ function nodeFromContent(content) {
 }
 
 module.exports = {
-  nodeFromContent
+  tokensFromContent,
+  nodeFromTokens
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "argumentative": "^2.0.28",
-    "highmark-markdown": "^0.0.114",
-    "highmark-markdown-style": "^0.0.153",
+    "highmark-markdown": "^0.0.117",
+    "highmark-markdown-style": "^0.0.154",
     "necessary": "^13.4.2"
   },
   "scripts": {},

package/bin/operation/inputFileContentToHTML.js

@@ -1,29 +0,0 @@
-"use strict";
-
-const importer = require("../importer");
-
-const { nodeFromContent } = require("../utilities/markdown");
-
-function inputFileContentToHTMLOperation(proceed, abort, context) {
-  const { inputFileContent } = context,
-        content = inputFileContent, ///
-        node = nodeFromContent(content);
-
-  if (node === null) {
-    abort();
-
-    return;
-  }
-
-  const html = node.asHTML({ ///
-    importer
-  });
-
-  Object.assign(context, {
-    html
-  });
-
-  proceed();
-}
-
-module.exports = inputFileContentToHTMLOperation;