highmark-cli 0.0.138 → 0.0.140

package/bin/action/publish.js

@@ -5,6 +5,7 @@ const htmlOperation = require("../operation/html"),
       copyFontsOperation = require("../operation/copyFonts"),
       copyClientOperation = require("../operation/copyClient"),
       markdownHTMLOperation = require("../operation/markdownHTML"),
+      copyCheckmarkOperation = require("../operation/copyCheckmark"),
       markdownStylesCSSOperation = require("../operation/markdownStylesCSS");
 
 const { executeOperations } = require("../utilities/operation"),
@@ -14,6 +15,7 @@ function publishAction(port, watch, server, quietly, copyFonts, copyClient, inpu
   const operations = [
           markdownStylesCSSOperation,
           markdownHTMLOperation,
+          copyCheckmarkOperation,
           copyClientOperation,
           copyFontsOperation,
           htmlOperation,

package/bin/constants.js

@@ -8,8 +8,10 @@ const FONT = "font",
       HIGHMARK_CLI = "Highmark-CLI",
       CLIENT_FILE_NAME = "client.js",
       LIVE_RELOAD_PATH = "/live-reload",
+      CHECKMARK_FILE_NAME = "checkmark.svg",
       LOADING_CSS_FILE_PATH = "css/loading.css",
-      DEFAULT_SELECTOR_STRING = "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",
@@ -24,8 +26,10 @@ module.exports = {
   HIGHMARK_CLI,
   CLIENT_FILE_NAME,
   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/handler/liveReload.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const { createLiveReloadHandler: createLiveReloadHandlerEx } = require("lively-cli");
+
+const { directoryPathFromFilePath } = require("../utilities/path");
+
+function createLiveReloadHandler(context) {
+  const { quietly, outputFilePath } = context,
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        watchPattern = outputDirectoryPath, ///
+        liveReloadHandler = createLiveReloadHandlerEx(watchPattern, quietly);
+
+  return liveReloadHandler;
+}
+
+module.exports = {
+  createLiveReloadHandler
+};

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/copyCheckmark.js

@@ -0,0 +1,32 @@
+"use strict";
+
+const { pathUtilities, packageUtilities } = require("necessary");
+
+const { copyFile } = require("../utilities/fileSystem"),
+      { CHECKMARK_FILE_NAME } = require("../constants"),
+      { directoryPathFromFilePath } = require("../utilities/path");
+
+const { getPackagePath } = packageUtilities,
+      { concatenatePaths } = pathUtilities;
+
+function copyCheckmarkOperation(proceed, abort, context) {
+  const { copyClient } = context;
+
+  if (!copyClient) {
+    proceed();
+
+    return;
+  }
+
+  const { outputFilePath } = context,
+        packagePath = getPackagePath(),
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        sourceFilePath = concatenatePaths(packagePath, CHECKMARK_FILE_NAME),  ///
+        targetFilePath = concatenatePaths(outputDirectoryPath, CHECKMARK_FILE_NAME);  ///
+
+  copyFile(sourceFilePath, targetFilePath);
+
+  proceed();
+}
+
+module.exports = copyCheckmarkOperation;

package/bin/operation/copyClient.js

@@ -22,10 +22,10 @@ function copyClientOperation(proceed, abort, context) {
   const { outputFilePath } = context,
         packagePath = getPackagePath(),
         outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
-        sourceClientFilePath = concatenatePaths(packagePath, CLIENT_FILE_NAME),
-        targetClientFilePath = concatenatePaths(outputDirectoryPath, CLIENT_FILE_NAME);
+        sourceFilePath = concatenatePaths(packagePath, CLIENT_FILE_NAME),
+        targetFilePath = concatenatePaths(outputDirectoryPath, CLIENT_FILE_NAME);
 
-  copyFile(sourceClientFilePath, targetClientFilePath);
+  copyFile(sourceFilePath, targetFilePath);
 
   const { watch } = context;
 
@@ -35,7 +35,7 @@ function copyClientOperation(proceed, abort, context) {
     return;
   }
 
-  const watchPattern = sourceClientFilePath,  ///
+  const watchPattern = sourceFilePath,  ///
         registerHandler = watchFile(watchPattern);
 
   registerHandler(copyClientFile);
@@ -43,7 +43,7 @@ function copyClientOperation(proceed, abort, context) {
   proceed();
 
   function copyClientFile() {
-    copyFile(sourceClientFilePath, targetClientFilePath);
+    copyFile(sourceFilePath, targetFilePath);
 
     defer(() => {
       registerHandler(copyClientFile);

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) ?
-                          `div.${className}` :
-                            `div`;
+        className = classNameFromFilePath(filePath);
+
+  if (className !== null) {
+    selectorString = `${selectorString}.${className}`;
+  }
 
   return selectorString;
 }

package/bin/operation/server.js

@@ -2,10 +2,9 @@
 
 const express = require("express");
 
-const { createLiveReloadHandler } = require("lively-cli");
-
-const { ERROR, LIVE_RELOAD_PATH } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path"),
+const { createStaticRouter } = require("../router/static"),
+      { createLiveReloadHandler } = require("../handler/liveReload"),
+      { ERROR, LIVE_RELOAD_PATH } = require("../constants"),
       { UNABLE_TO_START_SERVER_MESSAGE } = require("../messages");
 
 function serverOperation(proceed, abort, context) {
@@ -17,17 +16,15 @@ function serverOperation(proceed, abort, context) {
     return;
   }
 
-  const { port, watch, quietly, outputFilePath } = context,
-        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
-        staticRouter = express.static(outputDirectoryPath);
-
   server = express(); ///
 
+  const { port, watch } = context,
+        staticRouter = createStaticRouter(context);
+
   server.use(staticRouter);
 
   if (watch) {
-    const watchPattern = outputDirectoryPath, ///
-          liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);
+    const liveReloadHandler = createLiveReloadHandler(context);
 
     server.get(LIVE_RELOAD_PATH, liveReloadHandler);
   }

package/bin/router/static.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const express = require("express");
+
+const { directoryPathFromFilePath } = require("../utilities/path");
+
+function createStaticRouter(context) {
+  const { outputFilePath } = context,
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        staticRouter = express.static(outputDirectoryPath);
+
+  return staticRouter;
+}
+
+module.exports = {
+  createStaticRouter
+};

package/checkmark.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg width="20mm"
+     height="20mm"
+     viewBox="0 0 20 20"
+     version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+>
+  <g transform="matrix(0.70580178,0,0,0.69424702,3.0000007,2.999987)">
+    <path style="fill:#ffffff" d="M 6.0799812,16.1216 Q 7.3454978,13.232921 8.7898374,10.605598 10.247933,7.9645203 11.788561,5.7361107 13.604303,3.1225438 14.649729,1.9670722 15.323754,1.224269 15.915246,0.74282245 16.259136,0.46771016 17.001939,0.33015401 18.803925,1.9250438e-5 19.519217,1.9250438e-5 q 0.316379,0 0.316379,0.220089839562 0,0.20633422 -0.316379,0.49520213 -2.751123,2.44849948 -5.777358,7.00160798 -3.01248,4.5531088 -5.0895778,9.6701968 -0.78407,1.912031 -1.1004492,2.352211 -0.3026235,0.426424 -1.925786,0.426424 -1.0591824,0 -1.3342947,-0.206335 Q 4.0303946,19.753082 3.3288583,18.652633 2.1183642,16.823136 0.72904706,15.351285 -5.2992254e-7,14.580971 -5.2992254e-7,14.168303 q 0,-0.577736 0.81158127992254,-1.127961 0.81158125,-0.56398 1.33429465,-0.56398 0.7290476,0 1.7469631,0.825337 1.0316711,0.811581 2.1871427,2.819901 z" />
+  </g>
+</svg>