highmark-cli 0.0.74 → 0.0.76

package/bin/constants.js

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

package/bin/importer.js

@@ -1,7 +1,8 @@
 "use strict";
 
-const { readFile } = require("./utilities/fileSystem");
-const { nodeFromTokens, tokensFromContent } = require("./utilities/markdown");
+const { readFile } = require("./utilities/fileSystem"),
+      { divisionIdentifierFromFilePath } = require("./utilities/division"),
+      { nodeFromTokens, tokensFromContent } = require("./utilities/markdown");
 
 function importer(filePath, indent) {
   let html = null;
@@ -9,13 +10,15 @@ function importer(filePath, indent) {
   const content = readFile(filePath);
 
   if (content !== null) {
-    const tokens = tokensFromContent(content),
+    const divisionIdentifier = divisionIdentifierFromFilePath(filePath),
+          tokens = tokensFromContent(content),
           node = nodeFromTokens(tokens);
 
     if (node !== null) {
       html = node.asHTML(indent, {  ///
         tokens,
-        importer
+        importer,
+        divisionIdentifier
       });
     }
   }
@@ -23,4 +26,4 @@ function importer(filePath, indent) {
   return html;
 }
 
-module.exports = importer;
+module.exports = importer;

package/bin/operation/markdownStylesToCSS.js

@@ -1,13 +1,18 @@
 "use strict";
 
-const { filePathUtilities } = require("occam-entities");
+const { cssUtilities } = require("highmark-markdown-style"),
+      { filePathUtilities } = require("occam-entities");
 
 const { PERIOD } = require("../constants"),
-      { readFile, readDirectory } = require("../utilities/fileSystem");
+      { readFile, readDirectory } = require("../utilities/fileSystem"),
+      { divisionIdentifierFromFilePath } = require("../utilities/division");
 
-const { isFilePathMarkdownStyleFilePath } = filePathUtilities;
+const { isFilePathMarkdownStyleFilePath } = filePathUtilities,
+      { cssFromMarkdownStyleAndSelectorString } = cssUtilities;
 
 function markdownStylesToCSS(proceed, abort, context) {
+  let css = null;
+
   const directoryPath = PERIOD; ///
 
   readDirectory(directoryPath, (filePath) => {
@@ -15,13 +20,36 @@ function markdownStylesToCSS(proceed, abort, context) {
 
     if (filePathMarkdownStyleFilePath) {
       const markdownStyleFilePath = filePath, ///
-            markdownStyleContent = readFile(markdownStyleFilePath);
+            markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
+            selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath);
 
-      debugger
+      css = cssFromMarkdownStyleAndSelectorString(markdownStyle, selectorString, css);  ///
     }
   });
 
+  Object.assign(context, {
+    css
+  });
+
   proceed();
 }
 
 module.exports = markdownStylesToCSS;
+
+function markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath) {
+  const filePath = markdownStyleFilePath, ///
+        content = readFile(filePath),
+        markdownStyle = content;  ///
+
+  return markdownStyle;
+}
+
+function selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath) {
+  const filePath = markdownStyleFilePath,  ///
+        divisionIdentifier = divisionIdentifierFromFilePath(filePath),
+        selectorString = (divisionIdentifier !== null) ?
+                          `div#${divisionIdentifier}` :
+                            `div`;
+
+  return selectorString;
+}

package/bin/utilities/division.js

@@ -0,0 +1,30 @@
+"use strict";
+
+const { pathUtilities, arrayUtilities } = require("necessary");
+
+const { DEFAULT } = require("../constants");
+
+const { second } = arrayUtilities,
+      { isPathName, bottommostNameFromPath } = pathUtilities;
+
+function divisionIdentifierFromFilePath(filePath) {
+  let divisionIdentifier = null;
+
+  const path = filePath,
+        pathName = isPathName(path),
+        name = pathName ?
+                 path :
+                   bottommostNameFromPath(path),
+        matches = name.match(/^([^.]+)\..+$/),
+        secondMatch = second(matches);
+
+  if (secondMatch !== DEFAULT) {
+    divisionIdentifier = secondMatch; ///
+  }
+
+  return divisionIdentifier;
+}
+
+module.exports = {
+  divisionIdentifierFromFilePath
+}

package/bin/utilities/fileSystem.js

@@ -1,11 +1,12 @@
 "use strict";
 
-const { fileSystemUtilities } = require("necessary");
+const { pathUtilities, fileSystemUtilities } = require("necessary");
 
 const { isEntryNameHiddenName } = require("../utilities/name"),
       { UNABLE_TO_READ_FILE_MESSAGE, UNABLE_TO_READ_DIRECTORY_MESSAGE } = require("../messages");
 
-const { isEntryFile, readFile: readFileAsync, readDirectory: readDirectoryAsync  } = fileSystemUtilities;
+const { concatenatePaths } = pathUtilities,
+      { isEntryFile, readFile: readFileAsync, readDirectory: readDirectoryAsync  } = fileSystemUtilities;
 
 function readFile(filePath) {
   let content = null;
@@ -37,7 +38,7 @@ function readDirectory(directoryPath, callback) {
       const entryNameHiddenName = isEntryNameHiddenName(entryName);
 
       if (!entryNameHiddenName) {
-        const entryPath = `${directoryPath}/${entryName}`, ///
+        const entryPath = concatenatePaths(directoryPath, entryName), ///
               entryFile = isEntryFile(entryPath);
 
         if (entryFile) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "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.165",
+    "highmark-markdown-style": "^0.0.168",
     "necessary": "^13.4.2",
     "occam-entities": "^1.0.83"
   },