highmark-cli 0.0.113 → 0.0.115

package/bin/importer.js

@@ -1,27 +1,22 @@
 "use strict";
 
 const { readFile } = require("./utilities/fileSystem"),
-      { divisionClassNameFromFilePath } = require("./utilities/division"),
+      { classNameFromFilePath } = require("./utilities/division"),
       { nodeFromTokens, tokensFromContent } = require("./utilities/markdown");
 
 function importer(filePath, context) {
   const content = readFile(filePath);
 
   if (content !== null) {
-    const divisionClassName = divisionClassNameFromFilePath(filePath),
+    const className = classNameFromFilePath(filePath),
           tokens = tokensFromContent(content),
           node = nodeFromTokens(tokens);
 
     if (node !== null) {
-      const importedNode = node,  ///
-            importedTokens = tokens,  ///
-            divisionMarkdownNode = node;  ///
-
-      divisionMarkdownNode.setDivisionClassName(divisionClassName);
-
       Object.assign(context, {
-        importedNode,
-        importedTokens
+        node,
+        tokens,
+        className
       });
     }
   }

package/bin/operation/markdownHTML.js

@@ -2,21 +2,31 @@
 
 const importer = require("../importer");
 
-const { UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE } = require("../messages");
+const { readFile } = require("../utilities/fileSystem"),
+      { classNameFromFilePath } = require("../utilities/division"),
+      { nodeFromTokens, tokensFromContent } = require("../utilities/markdown"),
+      { UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE } = require("../messages");
 
 function markdownHTMLOperation(proceed, abort, context) {
   const { inputFilePath } = context,
-        filePath = inputFilePath; ///
+        filePath = inputFilePath, ///
+        content = readFile(filePath);
 
-  Object.assign(context, {
-    importer
-  });
+  if (content === null) {
+    const message = UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE;
 
-  importer(filePath, context);
+    console.log(message);
 
-  const { importedNode = null, importedTokens = null } = context;
+    abort();
 
-  if (importedNode === null) {
+    return;
+  }
+
+  const className = classNameFromFilePath(filePath),
+        tokens = tokensFromContent(content),
+        node = nodeFromTokens(tokens);
+
+  if (node === null) {
     const message = UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE;
 
     console.log(message);
@@ -26,17 +36,16 @@ function markdownHTMLOperation(proceed, abort, context) {
     return;
   }
 
-  delete context.importedNode;
-  delete context.importedTokens;
+  Object.assign(context, {
+    tokens,
+    importer
+  });
 
-  const node = importedNode,  ///
-        tokens = importedTokens,  ///
-        parentNode = null,
+  const parentNode = null,
+        divisionClassName = className,  ///
         divisionMarkdownNode = node;  ///
 
-  Object.assign(context, {
-    tokens
-  });
+  divisionMarkdownNode.setDivisionClassName(divisionClassName);
 
   divisionMarkdownNode.resolveImports(parentNode, context);
 

package/bin/operation/markdownStylesCSS.js

@@ -3,10 +3,10 @@
 const { filePathUtilities } = require("occam-entities"),
       { cssUtilities, defaultMarkdownStyle } = require("highmark-markdown-style")
 
-const { readFile, readDirectory } = require("../utilities/fileSystem"),
+const { classNameFromFilePath } = require("../utilities/division"),
+      { readFile, readDirectory } = require("../utilities/fileSystem"),
       { DEFAULT_SELECTOR_STRING } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path"),
-      { divisionClassNameFromFilePath } = require("../utilities/division");
+      { directoryPathFromFilePath } = require("../utilities/path");
 
 const { isFilePathMarkdownStyleFilePath } = filePathUtilities,
       { cssFromMarkdownStyleAndSelectorString } = cssUtilities;
@@ -50,9 +50,9 @@ function markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath) {
 
 function selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath) {
   const filePath = markdownStyleFilePath,  ///
-        divisionClassName = divisionClassNameFromFilePath(filePath),
-        selectorString = (divisionClassName !== null) ?
-                          `div.${divisionClassName}` :
+        className = classNameFromFilePath(filePath),
+        selectorString = (className !== null) ?
+                          `div.${className}` :
                             `div`;
 
   return selectorString;

package/bin/utilities/division.js

@@ -7,24 +7,21 @@ const { DEFAULT_DIVISION_IDENTIFIER } = require("../constants");
 const { second } = arrayUtilities,
       { isPathName, bottommostNameFromPath } = pathUtilities;
 
-function divisionClassNameFromFilePath(filePath) {
-  let divisionClassName = null;
-
+function classNameFromFilePath(filePath) {
   const path = filePath,
         pathName = isPathName(path),
         name = pathName ?
                  path :
                    bottommostNameFromPath(path),
         matches = name.match(/^([^.]+)\..+$/),
-        secondMatch = second(matches);
-
-  if (secondMatch !== DEFAULT_DIVISION_IDENTIFIER) {
-    divisionClassName = secondMatch; ///
-  }
+        secondMatch = second(matches),
+        className = (secondMatch !== DEFAULT_DIVISION_IDENTIFIER) ?
+                      secondMatch : ///
+                        null;
 
-  return divisionClassName;
+  return className;
 }
 
 module.exports = {
-  divisionClassNameFromFilePath
+  classNameFromFilePath
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.113",
+  "version": "0.0.115",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",
@@ -13,8 +13,8 @@
     "argumentative": "^2.0.28",
     "express": "^4.19.2",
     "highmark-fonts": "^1.0.36",
-    "highmark-markdown": "^0.0.188",
-    "highmark-markdown-style": "^0.0.210",
+    "highmark-markdown": "^0.0.197",
+    "highmark-markdown-style": "^0.0.212",
     "lively-cli": "^2.0.55",
     "necessary": "^13.6.1",
     "occam-entities": "^1.0.90"