highmark-cli 0.0.175 → 0.0.178

package/bin/action/publish.js

@@ -4,9 +4,8 @@ const htmlOperation = require("../operation/html"),
       watchOperation = require("../operation/watch"),
       serverOperation = require("../operation/server"),
       copyFontsOperation = require("../operation/copyFonts"),
-      copyClientOperation = require("../operation/copyClient"),
       markdownHTMLOperation = require("../operation/markdownHTML"),
-      copyCheckmarkOperation = require("../operation/copyCheckmark"),
+      copyClientFilesOperation = require("../operation/copyClientFiles"),
       markdownStylesCSSOperation = require("../operation/markdownStylesCSS");
 
 const { executeOperations } = require("../utilities/operation"),
@@ -14,10 +13,9 @@ const { executeOperations } = require("../utilities/operation"),
 
 function publishAction(port, watch, server, quietly, copyFonts, inputFilePath, copyClientFiles, outputDirectoryPath) {
   const operations = [
-          markdownStylesCSSOperation,
           markdownHTMLOperation,
-          copyCheckmarkOperation,
-          copyClientOperation,
+          markdownStylesCSSOperation,
+          copyClientFilesOperation,
           copyFontsOperation,
           htmlOperation,
           serverOperation,

package/bin/constants.js

@@ -3,31 +3,24 @@
 const FONT = "font",
       ERROR = "error",
       PERIOD = ".",
-      DEFER_DELAY = 100,
-      EMPTY_STRING = "",
       HIGHMARK_CLI = "Highmark-CLI",
-      CLIENT_FILE_NAME = "client.js",
+      INDEX_HTML_FILE_NAME = "index.html",
       LIVE_RELOAD_PATH = "/live-reload",
-      CHECKMARK_FILE_NAME = "checkmark.svg",
-      CLIENT_SELECTOR_STRING = "body > div.view > div.overlay > div",
-      RAW_HTML_SELECTOR_STRING = "body > div",
+      DIVS_SELECTOR_STRING = "body > div",
       INDEX_TEMPLATE_FILE_PATH = "template/index.html",
       CLIENT_TEMPLATE_FILE_PATH = "template/client.html",
+      CLIENT_DIVS_SELECTOR_STRING = "body > div.view > div.overlay > div",
       DEFAULT_DIVISION_IDENTIFIER = "default";
 
 module.exports = {
   FONT,
   ERROR,
   PERIOD,
-  DEFER_DELAY,
-  EMPTY_STRING,
   HIGHMARK_CLI,
-  CLIENT_FILE_NAME,
   LIVE_RELOAD_PATH,
-  CHECKMARK_FILE_NAME,
-  CLIENT_SELECTOR_STRING,
-  RAW_HTML_SELECTOR_STRING,
+  DIVS_SELECTOR_STRING,
   INDEX_TEMPLATE_FILE_PATH,
   CLIENT_TEMPLATE_FILE_PATH,
+  CLIENT_DIVS_SELECTOR_STRING,
   DEFAULT_DIVISION_IDENTIFIER
 };

package/bin/operation/copyClientFiles.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const { copyClientFiles: copyClientFilesAsync } = require("highmark-client");
+
+function copyClientFilesOperation(proceed, abort, context) {
+  const { copyClientFiles } = context;
+
+  if (copyClientFiles) {
+    const { markdownHTML, markdownStylesCSS, outputDirectoryPath } = context,
+          targetDirectoryPath = outputDirectoryPath; ///
+
+    copyClientFilesAsync(markdownHTML, markdownStylesCSS, targetDirectoryPath);
+  }
+
+  proceed();
+}
+
+module.exports = copyClientFilesOperation;

package/bin/operation/copyFonts.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const { copyFonts: copyFontsAsync } = require("highmark-client");
+const { pathUtilities } = require("necessary"),
+      { copyFonts: copyFontsAsync } = require("highmark-client");
 
-const { FONT } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path");
+const { FONT } = require("../constants");
 
 const { concatenatePaths } = pathUtilities;
 
@@ -16,8 +16,7 @@ function copyFontsOperation(proceed, abort, context) {
     return;
   }
 
-  const { outputFilePath } = context,
-        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+  const { outputDirectoryPath } = context,
         fontDirectoryPath = concatenatePaths(outputDirectoryPath, FONT);
 
   copyFontsAsync(fontDirectoryPath);

package/bin/operation/markdownStylesCSS.js

@@ -7,14 +7,14 @@ const { mediaTypeNames } = require("highmark-markdown"),
 const { classNameFromFilePath } = require("../utilities/division"),
       { readFile, readDirectory } = require("../utilities/fileSystem"),
       { directoryPathFromFilePath } = require("../utilities/path"),
-      { CLIENT_SELECTOR_STRING, RAW_HTML_SELECTOR_STRING } = require("../constants");
+      { DIVS_SELECTOR_STRING, CLIENT_DIVS_SELECTOR_STRING } = require("../constants");
 
 const { WEB_MEDIA_TYPE_NAME } = mediaTypeNames,
       { cssFromMarkdownStyleMediaTypeNameAndSelectorString } = cssUtilities,
       { isFilePathMarkdownStyleFilePath, isFilePathDefaultMarkdownStyleFilePath } = filePathUtilities;
 
 function markdownStylesCSSOperation(proceed, abort, context) {
-  const { copyClient, inputFilePath } = context,
+  const { inputFilePath, copyClientFiles } = context,
         inputDirectoryPath = directoryPathFromFilePath(inputFilePath),
         markdownStyleFilePaths = [];
 
@@ -31,9 +31,9 @@ function markdownStylesCSSOperation(proceed, abort, context) {
     }
   });
 
-  const selectorString = copyClient ?
-                           CLIENT_SELECTOR_STRING :
-                             RAW_HTML_SELECTOR_STRING,
+  const selectorString = copyClientFiles ?
+                           CLIENT_DIVS_SELECTOR_STRING :
+                             DIVS_SELECTOR_STRING,
         markdownStyle = defaultMarkdownStyle, ///
         mediaTypeName = WEB_MEDIA_TYPE_NAME,
         defaultCSS = cssFromMarkdownStyleMediaTypeNameAndSelectorString(markdownStyle, mediaTypeName, selectorString);
@@ -41,7 +41,7 @@ function markdownStylesCSSOperation(proceed, abort, context) {
   let markdownStylesCSS = defaultCSS; ///
 
   markdownStyleFilePaths.forEach((markdownStyleFilePath) => {
-    const selectorString = selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClient),
+    const selectorString = selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClientFiles),
           markdownStyle = markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath),
           css = cssFromMarkdownStyleMediaTypeNameAndSelectorString(markdownStyle, mediaTypeName, selectorString, markdownStylesCSS);  ///
 
@@ -65,10 +65,10 @@ function markdownStyleFromMarkdownStyleFilePath(markdownStyleFilePath) {
   return markdownStyle;
 }
 
-function selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClient) {
-  let selectorString = copyClient ?
-                         CLIENT_SELECTOR_STRING :
-                           RAW_HTML_SELECTOR_STRING;
+function selectorStringFromMarkdownStyleFilePathAndCopyClient(markdownStyleFilePath, copyClientFiles) {
+  let selectorString = copyClientFiles ?
+                         CLIENT_DIVS_SELECTOR_STRING :
+                           DIVS_SELECTOR_STRING;
 
   const filePath = markdownStyleFilePath,  ///
         className = classNameFromFilePath(filePath);

package/bin/operation/server.js

@@ -3,7 +3,6 @@
 const express = require("express");
 
 const { ERROR } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path"),
       { UNABLE_TO_START_SERVER_MESSAGE } = require("../messages");
 
 function serverOperation(proceed, abort, context) {
@@ -21,8 +20,7 @@ function serverOperation(proceed, abort, context) {
     server
   });
 
-  const { port, outputFilePath } = context,
-        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+  const { port, outputDirectoryPath } = context,
         staticRouter = express.static(outputDirectoryPath);
 
   server.use(staticRouter);

package/bin/operation/watch.js

@@ -2,8 +2,7 @@
 
 const { createLiveReloadHandler } = require("lively-cli");
 
-const { LIVE_RELOAD_PATH } = require("../constants"),
-      { directoryPathFromFilePath } = require("../utilities/path");
+const { LIVE_RELOAD_PATH } = require("../constants");
 
 function watchOperation(proceed, abort, context) {
   const { watch } = context;
@@ -22,8 +21,7 @@ function watchOperation(proceed, abort, context) {
     return;
   }
 
-  const { quietly, outputFilePath } = context,
-        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+  const { quietly, outputDirectoryPath } = context,
         watchPattern = outputDirectoryPath, ///
         liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.175",
+  "version": "0.0.178",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",
@@ -12,7 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "express": "^4.19.2",
-    "highmark-client": "^0.0.8",
+    "highmark-client": "^0.0.13",
     "highmark-fonts": "^1.0.43",
     "highmark-markdown": "^0.0.245",
     "lively-cli": "^2.0.59",

package/bin/operation/copyCheckmark.js

@@ -1,32 +0,0 @@
-"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

@@ -1,51 +0,0 @@
-"use strict";
-
-const { watch: watchFile } = require("lively-cli");
-
-const { DEFER_DELAY } = require("../constants"),
-      { copyClientFile: copyClientFileEx, getClientSourceFilePath } = require("../utilities/client");
-
-function copyClientOperation(proceed, abort, context) {
-  const { copyClient } = context;
-
-  if (!copyClient) {
-    proceed();
-
-    return;
-  }
-
-  copyClientFile();
-
-  let { server } = context;
-
-  if (!server) {
-    proceed();
-
-    return;
-  }
-
-  const { quietly } = context,
-        clientSSourceFilePath = getClientSourceFilePath(context),
-        watchPattern = clientSSourceFilePath,  ///
-        registerHandler = watchFile(watchPattern, quietly);
-
-  registerHandler(copyClientFile);
-
-  proceed();
-
-  function copyClientFile() {
-    copyClientFileEx(context);
-
-    defer(() => {
-      registerHandler(copyClientFile);
-    });
-  }
-}
-
-module.exports = copyClientOperation;
-
-function defer(func) {
-  const delay = DEFER_DELAY;
-
-  setTimeout(func, delay);
-}