highmark-cli 0.0.139 → 0.0.141

package/bin/constants.js

@@ -10,7 +10,8 @@ const FONT = "font",
       LIVE_RELOAD_PATH = "/live-reload",
       CHECKMARK_FILE_NAME = "checkmark.svg",
       LOADING_CSS_FILE_PATH = "css/loading.css",
-      DEFAULT_SELECTOR_STRING = "div.overlay div",
+      CLIENT_SELECTOR_STRING = "body > div.view > div.overlay > div",
+      RAW_HTML_SELECTOR_STRING = "body > div",
       CLIENT_TEMPLATE_FILE_PATH = "template/client.html",
       DEFAULT_TEMPLATE_FILE_PATH = "template/default.html",
       LOADING_TEMPLATE_FILE_PATH = "template/loading.html",
@@ -27,7 +28,8 @@ module.exports = {
   LIVE_RELOAD_PATH,
   CHECKMARK_FILE_NAME,
   LOADING_CSS_FILE_PATH,
-  DEFAULT_SELECTOR_STRING,
+  CLIENT_SELECTOR_STRING,
+  RAW_HTML_SELECTOR_STRING,
   CLIENT_TEMPLATE_FILE_PATH,
   DEFAULT_TEMPLATE_FILE_PATH,
   LOADING_TEMPLATE_FILE_PATH,

package/bin/importer.js

@@ -10,13 +10,16 @@ function importer(filePath, context) {
   if (content !== null) {
     const className = classNameFromFilePath(filePath),
           tokens = tokensFromContent(content),
-          node = nodeFromTokens(tokens);
+          node = nodeFromTokens(tokens),
+          importedNode = node,  ///
+          importedTokens = tokens,  ///
+          importedClassName = className;  ///
 
     if (node !== null) {
       Object.assign(context, {
-        node,
-        tokens,
-        className
+        importedNode,
+        importedTokens,
+        importedClassName
       });
     }
   }

package/bin/operation/markdownHTML.js

@@ -36,25 +36,47 @@ function markdownHTMLOperation(proceed, abort, context) {
     return;
   }
 
+  const divisionClassName = className,  ///
+        divisionMarkdownNode = node,  ///
+        divisionMarkdownNodes = [];
+
   Object.assign(context, {
     tokens,
-    importer
+    importer,
+    divisionMarkdownNodes
   });
 
-  const parentNode = null,
-        divisionClassName = className,  ///
-        divisionMarkdownNode = node;  ///
+  const ignored = divisionMarkdownNode.isIgnored();
+
+  if (!ignored) {
+    divisionMarkdownNodes.push(divisionMarkdownNode);
+  }
 
   divisionMarkdownNode.setDivisionClassName(divisionClassName);
 
-  divisionMarkdownNode.resolveImports(parentNode, context);
+  divisionMarkdownNode.resolveImports(context);
+
+  divisionMarkdownNodes.forEach((divisionMarkdownNode) => {
+    divisionMarkdownNode.createFootnotes(context);
+  });
+
+  divisionMarkdownNodes.some((divisionMarkdownNode) => {
+    const contentsCreated = divisionMarkdownNode.createContents(context);
+
+    if (contentsCreated) {
+      return true;
+    }
+  });
 
-  divisionMarkdownNode.createContents(context);
+  const markdownHTML = divisionMarkdownNodes.reduce((markdownHTML, divisionMarkdownNode) => {
+    const html = divisionMarkdownNode.asHTML(context);
 
-  divisionMarkdownNode.createFootnotes(context);
+    markdownHTML = (markdownHTML === null) ?
+                     html :  ///
+                      `${markdownHTML}${html}`;
 
-  const html = divisionMarkdownNode.asHTML(context),
-        markdownHTML = html;  ///
+    return markdownHTML;
+  }, null);
 
   Object.assign(context, {
     markdownHTML

package/bin/operation/markdownStylesCSS.js

@@ -6,15 +6,15 @@ const { mediaTypeNames } = require("highmark-markdown"),
 
 const { classNameFromFilePath } = require("../utilities/division"),
       { readFile, readDirectory } = require("../utilities/fileSystem"),
-      { DEFAULT_SELECTOR_STRING } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path");
+      { directoryPathFromFilePath } = require("../utilities/path"),
+      { CLIENT_SELECTOR_STRING, RAW_HTML_SELECTOR_STRING } = require("../constants");
 
 const { WEB_MEDIA_TYPE_NAME } = mediaTypeNames,
       { cssFromMarkdownStyleMediaTypeNameAndSelectorString } = cssUtilities,
       { isFilePathMarkdownStyleFilePath, isFilePathDefaultMarkdownStyleFilePath } = filePathUtilities;
 
 function markdownStylesCSSOperation(proceed, abort, context) {
-  const { inputFilePath } = context,
+  const { copyClient, inputFilePath } = context,
         inputDirectoryPath = directoryPathFromFilePath(inputFilePath),
         markdownStyleFilePaths = [];
 
@@ -31,7 +31,9 @@ function markdownStylesCSSOperation(proceed, abort, context) {
     }
   });
 
-  const selectorString = DEFAULT_SELECTOR_STRING,
+  const selectorString = copyClient ?
+                           CLIENT_SELECTOR_STRING :
+                             RAW_HTML_SELECTOR_STRING,
         markdownStyle = defaultMarkdownStyle, ///
         mediaTypeName = WEB_MEDIA_TYPE_NAME,
         defaultCSS = cssFromMarkdownStyleMediaTypeNameAndSelectorString(markdownStyle, mediaTypeName, selectorString);
@@ -39,7 +41,7 @@ function markdownStylesCSSOperation(proceed, abort, context) {
   let markdownStylesCSS = defaultCSS; ///
 
   markdownStyleFilePaths.forEach((markdownStyleFilePath) => {
-    const selectorString = selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath),
+    const selectorString = selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClient),
           markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
           css = cssFromMarkdownStyleMediaTypeNameAndSelectorString(markdownStyle, mediaTypeName, selectorString, markdownStylesCSS);  ///
 
@@ -63,12 +65,17 @@ function markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath) {
   return markdownStyle;
 }
 
-function selectorStringFromMarkdownStyleFilePath(markdownStyleFilePath) {
+function selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClient) {
+  let selectorString = copyClient ?
+                         CLIENT_SELECTOR_STRING :
+                           RAW_HTML_SELECTOR_STRING;
+
   const filePath = markdownStyleFilePath,  ///
-        className = classNameFromFilePath(filePath),
-        selectorString = (className !== null) ?
-                          `${DEFAULT_SELECTOR_STRING}.${className}` :
-                            `${DEFAULT_SELECTOR_STRING}`;
+        className = classNameFromFilePath(filePath);
+
+  if (className !== null) {
+    selectorString = `${selectorString}.${className}`;
+  }
 
   return selectorString;
 }