highmark-cli 0.0.114 → 0.0.116

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,34 +3,44 @@
 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;
+const { cssFromMarkdownStyleAndSelectorString } = cssUtilities,
+      { isFilePathMarkdownStyleFilePath, isFilePathDefaultMarkdownStyleFilePath } = filePathUtilities;
 
 function markdownStylesCSSOperation(proceed, abort, context) {
   const { inputFilePath } = context,
-        defaultCSS = cssFromMarkdownStyleAndSelectorString(defaultMarkdownStyle, DEFAULT_SELECTOR_STRING),
-        inputDirectoryPath = directoryPathFromFilePath(inputFilePath);
-
-  let markdownStylesCSS = defaultCSS; ///
+        inputDirectoryPath = directoryPathFromFilePath(inputFilePath),
+        markdownStyleFilePaths = [];
 
   readDirectory(inputDirectoryPath, (filePath) => {
     const filePathMarkdownStyleFilePath = isFilePathMarkdownStyleFilePath(filePath);
 
     if (filePathMarkdownStyleFilePath) {
-      const markdownStyleFilePath = filePath, ///
-            selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath),
-            markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
-            css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString, markdownStylesCSS);  ///
+      const markdownStyleFilePath = filePath,
+            filePathDefaultMarkdownStyleFilePath = isFilePathDefaultMarkdownStyleFilePath(filePath);
 
-      markdownStylesCSS = `${markdownStylesCSS}${css}`;
+      filePathDefaultMarkdownStyleFilePath ?
+        markdownStyleFilePaths.unshift(markdownStyleFilePath) :
+          markdownStyleFilePaths.push(markdownStyleFilePath);
     }
   });
 
+  const defaultCSS = cssFromMarkdownStyleAndSelectorString(defaultMarkdownStyle, DEFAULT_SELECTOR_STRING);
+
+  let markdownStylesCSS = defaultCSS; ///
+
+  markdownStyleFilePaths.forEach((markdownStyleFilePath) => {
+    const selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath),
+          markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
+          css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString, markdownStylesCSS);  ///
+
+    markdownStylesCSS = `${markdownStylesCSS}${css}`;
+  });
+
   Object.assign(context, {
     markdownStylesCSS
   });
@@ -50,9 +60,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

@@ -8,19 +8,16 @@ const { second } = arrayUtilities,
       { isPathName, bottommostNameFromPath } = pathUtilities;
 
 function classNameFromFilePath(filePath) {
-  let className = null;
-
   const path = filePath,
         pathName = isPathName(path),
         name = pathName ?
                  path :
                    bottommostNameFromPath(path),
         matches = name.match(/^([^.]+)\..+$/),
-        secondMatch = second(matches);
-
-  if (secondMatch !== DEFAULT_DIVISION_IDENTIFIER) {
-    className = secondMatch; ///
-  }
+        secondMatch = second(matches),
+        className = (secondMatch !== DEFAULT_DIVISION_IDENTIFIER) ?
+                      secondMatch : ///
+                        null;
 
   return className;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.114",
+  "version": "0.0.116",
   "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.189",
-    "highmark-markdown-style": "^0.0.211",
+    "highmark-markdown": "^0.0.199",
+    "highmark-markdown-style": "^0.0.213",
     "lively-cli": "^2.0.55",
     "necessary": "^13.6.1",
     "occam-entities": "^1.0.90"

package/template/default.html

@@ -41,7 +41,7 @@
     </style>
     <style>
 
-        ${computerModernStyle}
+        ${computerModernStyleCSS}
 
     </style>
     <style>