highmark-cli 0.0.178 → 0.0.180

package/README.md

@@ -56,7 +56,7 @@ Options:
 
   --copy-client-files|-c                     Copy the bundled client files next to the output file
 
-  --output-directory-path|-o                 The output directory path. The default is the current directory.
+  --output-directory-path|-o                 The output directory path. The default is the current directory
 ```
 
 ## Contact

package/bin/action/help.js

@@ -31,7 +31,7 @@ Options:
 
   --copy-client-files|-c                     Copy the bundled client files next to the output file
 
-  --output-directory-path|-o                 The output directory path. The default is the current directory.
+  --output-directory-path|-o                 The output directory path. The default is the current directory
 
 Further information:
 

package/bin/constants.js

@@ -4,8 +4,8 @@ const FONT = "font",
       ERROR = "error",
       PERIOD = ".",
       HIGHMARK_CLI = "Highmark-CLI",
-      INDEX_HTML_FILE_NAME = "index.html",
       LIVE_RELOAD_PATH = "/live-reload",
+      INDEX_HTML_FILE_NAME = "index.html",
       DIVS_SELECTOR_STRING = "body > div",
       INDEX_TEMPLATE_FILE_PATH = "template/index.html",
       CLIENT_TEMPLATE_FILE_PATH = "template/client.html",
@@ -18,6 +18,7 @@ module.exports = {
   PERIOD,
   HIGHMARK_CLI,
   LIVE_RELOAD_PATH,
+  INDEX_HTML_FILE_NAME,
   DIVS_SELECTOR_STRING,
   INDEX_TEMPLATE_FILE_PATH,
   CLIENT_TEMPLATE_FILE_PATH,

package/bin/messages.js

@@ -11,7 +11,6 @@ const FAILED_SERVER_MESSAGE = "Failed to serve.",
       UNABLE_TO_READ_DIRECTORY_MESSAGE = "Unable to read the directory.",
       UNABLE_TO_CREATE_DIRECTORY_MESSAGE = "Unable to create the directory.",
       UNABLE_TO_PARSE_MARKDOWN_FILE_MESSAGE = "Unable to parse the markdown file.",
-      UNABLE_TO_PARSE_TEMPLATE_FILE_MESSAGE = "Unable to parse the template file.",
       UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE = "Unable to convert Markdown to HTML.",
       UNABLE_TO_CONVERT_MARKDOWN_STYLES_TO_CSS_MESSAGE = "Unable to convert Markdown styles to CSS.";
 
@@ -27,7 +26,6 @@ module.exports = {
   UNABLE_TO_READ_DIRECTORY_MESSAGE,
   UNABLE_TO_CREATE_DIRECTORY_MESSAGE,
   UNABLE_TO_PARSE_MARKDOWN_FILE_MESSAGE,
-  UNABLE_TO_PARSE_TEMPLATE_FILE_MESSAGE,
   UNABLE_TO_CONVERT_MARKDOWN_TO_HTML_MESSAGE,
   UNABLE_TO_CONVERT_MARKDOWN_STYLES_TO_CSS_MESSAGE
 };

package/bin/operation/copyClientFiles.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { copyClientFiles: copyClientFilesAsync } = require("highmark-client");
+const { copyFiles: copyClientFilesAsync } = require("highmark-client");
 
 function copyClientFilesOperation(proceed, abort, context) {
   const { copyClientFiles } = context;

package/bin/operation/html.js

@@ -1,48 +1,11 @@
 "use strict";
 
-const { pathUtilities, packageUtilities } = require("necessary"),
-      { computerModernStyle: computerModernStyleCSS } = require("highmark-fonts");
-
-const { directoryPathFromFilePath } = require("../utilities/path"),
-      { writeFile, parseTemplateFile } = require("../utilities/fileSystem"),
-      { INDEX_TEMPLATE_FILE_PATH } = require("../constants");
-
-const { getPackagePath } = packageUtilities,
-      { concatenatePaths } = pathUtilities;
-
 function htmlOperation(proceed, abort, context) {
-  const { markdownHTML, outputFilePath, markdownStylesCSS } = context,
-        templateFilePath = getTemplateFilePath(context),
-        args = {
-          markdownHTML,
-          markdownStylesCSS,
-          computerModernStyleCSS
-        },
-        content = parseTemplateFile(templateFilePath, args);
+  const { markdownHTML, markdownStylesCSS } = context;
 
-  writeFile(outputFilePath, content);
+  debugger
 
   proceed();
 }
 
 module.exports = htmlOperation;
-
-function getTemplateFilePath(context) {
-  let templateFilePath;
-
-  ({templateFilePath} = context);
-
-  if (templateFilePath === null) {
-    const packagePath = getPackagePath(),
-          indexTemplateFilePath = concatenatePaths(packagePath, INDEX_TEMPLATE_FILE_PATH);
-
-    templateFilePath = indexTemplateFilePath; ///
-  } else {
-    const { inputFilePath } = context,
-          inputDirectoryPath = directoryPathFromFilePath(inputFilePath);
-
-    templateFilePath = concatenatePaths(inputDirectoryPath, templateFilePath);  ///
-  }
-
-  return templateFilePath;
-}

package/bin/operation/watch.js

@@ -1,18 +1,13 @@
 "use strict";
 
-const { createLiveReloadHandler } = require("lively-cli");
+const { pathUtilities } = require("necessary"),
+      { createLiveReloadHandler } = require("lively-cli");
 
-const { LIVE_RELOAD_PATH } = require("../constants");
+const { LIVE_RELOAD_PATH, INDEX_HTML_FILE_NAME } = require("../constants");
 
-function watchOperation(proceed, abort, context) {
-  const { watch } = context;
-
-  if (!watch) {
-    proceed();
-
-    return;
-  }
+const { concatenatePaths } = pathUtilities;
 
+function watchOperation(proceed, abort, context) {
   const { server = null } = context;
 
   if (server === null) {
@@ -21,11 +16,16 @@ function watchOperation(proceed, abort, context) {
     return;
   }
 
-  const { quietly, outputDirectoryPath } = context,
-        watchPattern = outputDirectoryPath, ///
-        liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);
+  const { watch } = context;
 
-  server.get(LIVE_RELOAD_PATH, liveReloadHandler);
+  if (watch) {
+    const { quietly, outputDirectoryPath } = context,
+          indexHTMLFilePath = concatenatePaths(outputDirectoryPath, INDEX_HTML_FILE_NAME),
+          watchPattern = indexHTMLFilePath, ///
+          liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);
+
+    server.get(LIVE_RELOAD_PATH, liveReloadHandler);
+  }
 
   proceed();
 }

package/bin/utilities/fileSystem.js

@@ -1,17 +1,15 @@
 "use strict";
 
-const { pathUtilities, templateUtilities, fileSystemUtilities } = require("necessary");
+const { pathUtilities, fileSystemUtilities } = require("necessary");
 
 const { isEntryNameHiddenName } = require("../utilities/path"),
       { UNABLE_TO_COPY_FILE_MESSAGE,
         UNABLE_TO_READ_FILE_MESSAGE,
         UNABLE_TO_WRITE_FILE_MESSAGE,
         UNABLE_TO_READ_DIRECTORY_MESSAGE,
-        UNABLE_TO_CREATE_DIRECTORY_MESSAGE,
-        UNABLE_TO_PARSE_TEMPLATE_FILE_MESSAGE } = require("../messages");
+        UNABLE_TO_CREATE_DIRECTORY_MESSAGE } = require("../messages");
 
-const { parseFile } = templateUtilities,
-      { concatenatePaths } = pathUtilities,
+const { concatenatePaths } = pathUtilities,
       { isEntryFile,
         checkEntryExists,
         copyFile: copyFileAsync,
@@ -144,35 +142,10 @@ function createDirectory(directoryPath) {
   }
 }
 
-function parseTemplateFile(templateFilePath, args) {
-  let content = null;
-
-  try {
-    const filePath = templateFilePath;  ///
-
-    content = parseFile(filePath, args);
-
-    console.log(`Parse template file '${filePath}'.`);
-  } catch (error) {
-    let message;
-
-    message = UNABLE_TO_PARSE_TEMPLATE_FILE_MESSAGE;
-
-    console.log(message);
-
-    ({ message } = error);
-
-    console.log(message);
-  }
-
-  return content;
-}
-
 module.exports = {
   copyFile,
   readFile,
   writeFile,
   readDirectory,
-  createDirectory,
-  parseTemplateFile
+  createDirectory
 };

package/bin/utilities/path.js

@@ -4,23 +4,7 @@ const { pathUtilities } = require("necessary");
 
 const { PERIOD } = require("../constants");
 
-const { isPathName, bottommostNameFromPath, pathWithoutBottommostNameFromPath } = pathUtilities;
-
-function isFilePathFileName(filePath) {
-  const path = filePath,  ///
-        pathName = isPathName(path),
-        filePathFileName = pathName;  ///
-
-  return filePathFileName;
-}
-
-function fileNameFromFilePath(filePath) {
-  const path = filePath,  ///
-        bottommostName = bottommostNameFromPath(path),
-        fileName = bottommostName;  ///
-
-  return fileName;
-}
+const { isPathName, pathWithoutBottommostNameFromPath } = pathUtilities;
 
 function isEntryNameHiddenName(entryName) {
   const nameHiddenName = /^\..+/.test(entryName);
@@ -46,8 +30,6 @@ function directoryPathFromFilePath(filePath) {
 }
 
 module.exports = {
-  isFilePathFileName,
-  fileNameFromFilePath,
   isEntryNameHiddenName,
   directoryPathFromFilePath
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.178",
+  "version": "0.0.180",
   "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.13",
+    "highmark-client": "^0.0.17",
     "highmark-fonts": "^1.0.43",
     "highmark-markdown": "^0.0.245",
     "lively-cli": "^2.0.59",