highmark-cli 0.0.179 → 0.0.181

package/README.md

@@ -48,10 +48,10 @@ Options:
 
   --watch|-w                                 Watch for changes to the client file and in the output directory 
 
-  --server|-s                                Start a server to view the output file
-
   --copy-fonts|-f                            Copy the fonts to a fonts folder next to the output file
 
+  --start-server|-s                          Start a server to view the output file
+
   --input-file-path|-i                       The input file path, the default being 'default.md'
 
   --copy-client-files|-c                     Copy the bundled client files next to the output file

package/bin/abbreviations.js

@@ -5,10 +5,10 @@ const options = require("./options");
 const { HELP_OPTION,
         PORT_OPTION,
         WATCH_OPTION,
-        SERVER_OPTION,
         VERSION_OPTION,
         QUIETLY_OPTION,
         COPY_FONTS_OPTION,
+        START_SERVER_OPTION,
         INPUT_FILE_PATH_OPTION,
         COPY_CLIENT_FILES_OPTION,
         OUTPUT_DIRECTORY_PATH_OPTION } = options;
@@ -16,10 +16,10 @@ const { HELP_OPTION,
 const h = HELP_OPTION,
       p = PORT_OPTION,
       w = WATCH_OPTION,
-      s = SERVER_OPTION,
       v = VERSION_OPTION,
       q = QUIETLY_OPTION,
       f = COPY_FONTS_OPTION,
+      s = START_SERVER_OPTION,
       i = INPUT_FILE_PATH_OPTION,
       c = COPY_CLIENT_FILES_OPTION,
       o = OUTPUT_DIRECTORY_PATH_OPTION;
@@ -28,10 +28,10 @@ module.exports = {
   h,
   p,
   w,
-  s,
   v,
   q,
   f,
+  s,
   i,
   c,
   o

package/bin/action/help.js

@@ -23,10 +23,10 @@ Options:
 
   --watch|-w                                 Watch for changes to the client file and in the output directory 
 
-  --server|-s                                Start a server to view the output file
-
   --copy-fonts|-f                            Copy the fonts to a fonts folder next to the output file
 
+  --start-server|-s                          Start a server to view the output file
+
   --input-file-path|-i                       The input file path, the default being 'default.md'
 
   --copy-client-files|-c                     Copy the bundled client files next to the output file

package/bin/action/publish.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const htmlOperation = require("../operation/html"),
-      watchOperation = require("../operation/watch"),
+const watchOperation = require("../operation/watch"),
       serverOperation = require("../operation/server"),
       copyFontsOperation = require("../operation/copyFonts"),
+      indexHTMLOperation = require("../operation/indexHTML"),
       markdownHTMLOperation = require("../operation/markdownHTML"),
       copyClientFilesOperation = require("../operation/copyClientFiles"),
       markdownStylesCSSOperation = require("../operation/markdownStylesCSS");
@@ -11,22 +11,22 @@ const htmlOperation = require("../operation/html"),
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_PUBLISH_MESSAGE, FAILED_PUBLISH_MESSAGE } = require("../messages");
 
-function publishAction(port, watch, server, quietly, copyFonts, inputFilePath, copyClientFiles, outputDirectoryPath) {
+function publishAction(port, watch, quietly, copyFonts, startServer, inputFilePath, copyClientFiles, outputDirectoryPath) {
   const operations = [
           markdownHTMLOperation,
           markdownStylesCSSOperation,
           copyClientFilesOperation,
           copyFontsOperation,
-          htmlOperation,
+          indexHTMLOperation,
           serverOperation,
           watchOperation
         ],
         context = {
           port,
           watch,
-          server,
           quietly,
           copyFonts,
+          startServer,
           inputFilePath,
           copyClientFiles,
           outputDirectoryPath

package/bin/action/server.js

@@ -6,7 +6,7 @@ const watchOperation = require("../operation/watch"),
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_SERVER_MESSAGE, FAILED_SERVER_MESSAGE } = require("../messages");
 
-function serverAction(port, watch, server, quietly, outputDirectoryPath) {
+function serverAction(port, watch, quietly, startServer, outputDirectoryPath) {
   const operations = [
           serverOperation,
           watchOperation
@@ -14,8 +14,8 @@ function serverAction(port, watch, server, quietly, outputDirectoryPath) {
         context = {
           port,
           watch,
-          server,
           quietly,
+          startServer,
           outputDirectoryPath
         };
 

package/bin/defaults.js

@@ -2,9 +2,9 @@
 
 const DEFAULT_PORT = 8888,
       DEFAULT_WATCH = false,
-      DEFAULT_SERVER = false,
       DEFAULT_QUIETLY = false,
       DEFAULT_COPY_FONTS = false,
+      DEFAULT_START_SERVER = false,
       DEFAULT_INPUT_FILE_PATH = "default.md",
       DEFAULT_COPY_CLIENT_FILES = false,
       DEFAULT_OUTPUT_DIRECTORY_PATH = ".";
@@ -12,9 +12,9 @@ const DEFAULT_PORT = 8888,
 module.exports = {
   DEFAULT_PORT,
   DEFAULT_WATCH,
-  DEFAULT_SERVER,
   DEFAULT_QUIETLY,
   DEFAULT_COPY_FONTS,
+  DEFAULT_START_SERVER,
   DEFAULT_INPUT_FILE_PATH,
   DEFAULT_COPY_CLIENT_FILES,
   DEFAULT_OUTPUT_DIRECTORY_PATH

package/bin/main.js

@@ -9,9 +9,9 @@ const { HELP_OPTION, SERVER_OPTION, VERSION_OPTION } = require("./options"),
       { HELP_COMMAND, SERVER_COMMAND, VERSION_COMMAND } = require("./commands"),
       { DEFAULT_PORT,
         DEFAULT_WATCH,
-        DEFAULT_SERVER,
         DEFAULT_QUIETLY,
         DEFAULT_COPY_FONTS,
+        DEFAULT_START_SERVER,
         DEFAULT_INPUT_FILE_PATH,
         DEFAULT_COPY_CLIENT_FILES,
         DEFAULT_OUTPUT_DIRECTORY_PATH } = require("./defaults");
@@ -23,9 +23,9 @@ function main(command, argument, options) {
         versionOptionPresent = options.hasOwnProperty(VERSION_OPTION),
         { port = DEFAULT_PORT,
           watch = DEFAULT_WATCH,
-          server = DEFAULT_SERVER,
           quietly = DEFAULT_QUIETLY,
           copyFonts = DEFAULT_COPY_FONTS,
+          startServer = DEFAULT_START_SERVER,
           inputFilePath = DEFAULT_INPUT_FILE_PATH,
           copyClientFiles = DEFAULT_COPY_CLIENT_FILES,
           outputDirectoryPath = DEFAULT_OUTPUT_DIRECTORY_PATH } = options;
@@ -52,9 +52,9 @@ function main(command, argument, options) {
     }
 
     case SERVER_COMMAND: {
-      const server = true;
+      const startServer = true;
 
-      serverAction(port, watch, server, quietly, outputDirectoryPath);
+      serverAction(port, watch, quietly, startServer, outputDirectoryPath);
 
       break;
     }
@@ -66,7 +66,7 @@ function main(command, argument, options) {
     }
 
     default: {
-      publishAction(port, watch, server, quietly, copyFonts, inputFilePath, copyClientFiles, outputDirectoryPath);
+      publishAction(port, watch, quietly, copyFonts, startServer, inputFilePath, copyClientFiles, outputDirectoryPath);
 
       break;
     }

package/bin/operation/indexHTML.js

@@ -0,0 +1,49 @@
+"use strict";
+
+const { liveReloadSnippet } = require("lively-cli"),
+      { pathUtilities, packageUtilities, templateUtilities } = require("necessary"),
+      { computerModernStyle: computerModernStyleCSS } = require("highmark-fonts");
+
+const { writeFile } = require("../utilities/fileSystem"),
+      { INDEX_HTML_FILE_NAME, INDEX_TEMPLATE_FILE_PATH } = require("../constants");
+
+const { parseFile } = templateUtilities,
+      { getPackagePath } = packageUtilities,
+      { concatenatePaths } = pathUtilities;
+
+function indexHTMLOperation(proceed, abort, context) {
+  const { copyClientFiles } = context;
+
+  if (copyClientFiles) {
+    proceed();
+
+    return;
+  }
+
+  const { outputDirectoryPath } = context,
+        indexHTML = createIndexHTML(context),
+        indexHTMLFilePath = concatenatePaths(outputDirectoryPath, INDEX_HTML_FILE_NAME),
+        filePath = indexHTMLFilePath, ///
+        content = indexHTML;  ///
+
+  writeFile(filePath, content);
+
+  proceed();
+}
+
+module.exports = indexHTMLOperation;
+
+function createIndexHTML(context) {
+  const { markdownHTML, markdownStylesCSS } = context,
+        packagePath = getPackagePath(),
+        indexTemplateFilePath = concatenatePaths(packagePath, INDEX_TEMPLATE_FILE_PATH),
+        args = {
+          markdownHTML,
+          markdownStylesCSS,
+          liveReloadSnippet,
+          computerModernStyleCSS
+        },
+        indexHTML = parseFile(indexTemplateFilePath, args);
+
+  return indexHTML;
+}

package/bin/operation/server.js

@@ -6,15 +6,15 @@ const { ERROR } = require("../constants"),
       { UNABLE_TO_START_SERVER_MESSAGE } = require("../messages");
 
 function serverOperation(proceed, abort, context) {
-  let { server } = context;
+  let { startServer } = context;
 
-  if (!server) {
+  if (!startServer) {
     proceed();
 
     return;
   }
 
-  server = express(); ///
+  const server = express(); ///
 
   Object.assign(context, {
     server

package/bin/operation/watch.js

@@ -8,9 +8,9 @@ const { LIVE_RELOAD_PATH, INDEX_HTML_FILE_NAME } = require("../constants");
 const { concatenatePaths } = pathUtilities;
 
 function watchOperation(proceed, abort, context) {
-  const { server = null } = context;
+  const { startServer } = context;
 
-  if (server === null) {
+  if (!startServer) {
     proceed();
 
     return;
@@ -19,7 +19,7 @@ function watchOperation(proceed, abort, context) {
   const { watch } = context;
 
   if (watch) {
-    const { quietly, outputDirectoryPath } = context,
+    const { server, quietly, outputDirectoryPath } = context,
           indexHTMLFilePath = concatenatePaths(outputDirectoryPath, INDEX_HTML_FILE_NAME),
           watchPattern = indexHTMLFilePath, ///
           liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);

package/bin/options.js

@@ -3,10 +3,10 @@
 const HELP_OPTION = "help",
       PORT_OPTION = "port",
       WATCH_OPTION = "watch",
-      SERVER_OPTION = "server",
       VERSION_OPTION = "version",
       QUIETLY_OPTION = "quietly",
       COPY_FONTS_OPTION = "copy-fonts",
+      START_SERVER_OPTION = "start-server",
       INPUT_FILE_PATH_OPTION = "input-file-path",
       COPY_CLIENT_FILES_OPTION = "copy-client-files",
       OUTPUT_DIRECTORY_PATH_OPTION = "output-directory-path";
@@ -15,10 +15,10 @@ module.exports = {
   HELP_OPTION,
   PORT_OPTION,
   WATCH_OPTION,
-  SERVER_OPTION,
   VERSION_OPTION,
   QUIETLY_OPTION,
   COPY_FONTS_OPTION,
+  START_SERVER_OPTION,
   INPUT_FILE_PATH_OPTION,
   COPY_CLIENT_FILES_OPTION,
   OUTPUT_DIRECTORY_PATH_OPTION

package/package.json

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

package/template/index.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+
+    <meta charset="utf-8" />
+
+    <link rel="preload" href="font/cmunbbx.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunbi.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunbmo.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunbmr.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunbx.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunbxo.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunit.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunobi.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunobx.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunorm.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunoti.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunrm.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunsi.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunso.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunss.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunsx.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmuntb.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmunti.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmuntt.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="font/cmuntx.woff2" as="font" type="font/woff2" crossorigin />
+
+    <style>
+
+        *,
+        *::after,
+        *::before {
+          border: 0;
+          margin: 0;
+          padding: 0;
+          box-sizing: border-box;
+        }
+
+        html,
+        html > body {
+          width: 100%;
+          height: 100%;
+        }
+
+    </style>
+    <style>
+
+        ${computerModernStyleCSS}
+
+    </style>
+    <style>
+
+        ${markdownStylesCSS}
+
+    </style>
+  </head>
+  <body>
+
+${markdownHTML}
+
+${liveReloadSnippet}
+
+  </body>
+</html>

package/bin/operation/html.js

@@ -1,11 +0,0 @@
-"use strict";
-
-function htmlOperation(proceed, abort, context) {
-  const { markdownHTML, markdownStylesCSS } = context;
-
-  debugger
-
-  proceed();
-}
-
-module.exports = htmlOperation;