highmark-cli 0.0.76 → 0.0.78

package/bin/action/publish.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const markdownToHTMLOperation = require("../operation/markdownToHTML"),
-      markdownStylesToCSSOperation = require("../operation/markdownStylesToCSS");
+const markdownHTMLOperation = require("../operation/markdownHTML"),
+      markdownStylesCSSOperation = require("../operation/markdownStylesCSS");
 
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_PUBLISH_MESSAGE, FAILED_PUBLISH_MESSAGE } = require("../messages");
@@ -10,8 +10,8 @@ function publishAction(inputFilePath, outputFilePath) {
   const markdownFilePath = inputFilePath, ///
         htmlFilePath = outputFilePath,  ///
         operations = [
-          markdownToHTMLOperation,
-          markdownStylesToCSSOperation
+          markdownHTMLOperation,
+          markdownStylesCSSOperation
         ],
         context = {
           htmlFilePath,

package/bin/constants.js

@@ -1,13 +1,15 @@
 "use strict";
 
-const PERIOD = ".";
-const DEFAULT = "default";
-const DOUBLE_SPACE = "  ";
-const HIGHMARK_CLI = "Highmark-CLI";
+const PERIOD = ".",
+      DOUBLE_SPACE = "  ",
+      HIGHMARK_CLI = "Highmark-CLI",
+      DEFAULT_SELECTOR_STRING = "div",
+      DEFAULT_DIVISION_IDENTIFIER = "default";
 
 module.exports = {
   PERIOD,
-  DEFAULT,
   DOUBLE_SPACE,
-  HIGHMARK_CLI
+  HIGHMARK_CLI,
+  DEFAULT_SELECTOR_STRING,
+  DEFAULT_DIVISION_IDENTIFIER
 };

package/bin/operation/{markdownToHTML.js → markdownHTML.js}

@@ -5,7 +5,7 @@ const importer = require("../importer");
 const { DOUBLE_SPACE } = require("../constants"),
       { UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE } = require("../messages");
 
-function markdownToHTML(proceed, abort, context) {
+function markdownHTMLOperation(proceed, abort, context) {
   const { markdownFilePath } = context,
         filePath = markdownFilePath, ///
         indent = DOUBLE_SPACE,
@@ -21,11 +21,13 @@ function markdownToHTML(proceed, abort, context) {
     return;
   }
 
+  const markdownHTML = html;  ///
+
   Object.assign(context, {
-    html
+    markdownHTML
   });
 
   proceed();
 }
 
-module.exports = markdownToHTML;
+module.exports = markdownHTMLOperation;

package/bin/operation/{markdownStylesToCSS.js → markdownStylesCSS.js}

@@ -1,40 +1,44 @@
 "use strict";
 
-const { cssUtilities } = require("highmark-markdown-style"),
-      { filePathUtilities } = require("occam-entities");
+const { filePathUtilities } = require("occam-entities"),
+      { cssUtilities, defaultMarkdownStyle } = require("highmark-markdown-style")
 
-const { PERIOD } = require("../constants"),
-      { readFile, readDirectory } = require("../utilities/fileSystem"),
-      { divisionIdentifierFromFilePath } = require("../utilities/division");
+const { readFile, readDirectory } = require("../utilities/fileSystem"),
+      { divisionIdentifierFromFilePath } = require("../utilities/division"),
+      { PERIOD, DEFAULT_SELECTOR_STRING } = require("../constants");
 
 const { isFilePathMarkdownStyleFilePath } = filePathUtilities,
       { cssFromMarkdownStyleAndSelectorString } = cssUtilities;
 
-function markdownStylesToCSS(proceed, abort, context) {
-  let css = null;
+function markdownStylesCSSOperation(proceed, abort, context) {
+  const selectorString = DEFAULT_SELECTOR_STRING,
+        markdownStyle = defaultMarkdownStyle, ///
+        directoryPath = PERIOD, ///
+        css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString);
 
-  const directoryPath = PERIOD; ///
+  let markdownStylesCSS = css; ///
 
   readDirectory(directoryPath, (filePath) => {
     const filePathMarkdownStyleFilePath = isFilePathMarkdownStyleFilePath(filePath);
 
     if (filePathMarkdownStyleFilePath) {
       const markdownStyleFilePath = filePath, ///
+            selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath),
             markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
-            selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath);
+            css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString, markdownStylesCSS);  ///
 
-      css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString, css);  ///
+      markdownStylesCSS = `${markdownStylesCSS}${css}`;
     }
   });
 
   Object.assign(context, {
-    css
+    markdownStylesCSS
   });
 
   proceed();
 }
 
-module.exports = markdownStylesToCSS;
+module.exports = markdownStylesCSSOperation;
 
 function markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath) {
   const filePath = markdownStyleFilePath, ///

package/bin/utilities/division.js

@@ -2,7 +2,7 @@
 
 const { pathUtilities, arrayUtilities } = require("necessary");
 
-const { DEFAULT } = require("../constants");
+const { DEFAULT_DIVISION_IDENTIFIER } = require("../constants");
 
 const { second } = arrayUtilities,
       { isPathName, bottommostNameFromPath } = pathUtilities;
@@ -18,7 +18,7 @@ function divisionIdentifierFromFilePath(filePath) {
         matches = name.match(/^([^.]+)\..+$/),
         secondMatch = second(matches);
 
-  if (secondMatch !== DEFAULT) {
+  if (secondMatch !== DEFAULT_DIVISION_IDENTIFIER) {
     divisionIdentifier = secondMatch; ///
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",
@@ -12,7 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "highmark-markdown": "^0.0.121",
-    "highmark-markdown-style": "^0.0.168",
+    "highmark-markdown-style": "^0.0.172",
     "necessary": "^13.4.2",
     "occam-entities": "^1.0.83"
   },