highmark-cli 0.0.150 → 0.0.153

package/bin/action/publish.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const htmlOperation = require("../operation/html"),
+      watchOperation = require("../operation/watch"),
       serverOperation = require("../operation/server"),
       copyFontsOperation = require("../operation/copyFonts"),
       copyClientOperation = require("../operation/copyClient"),
@@ -19,7 +20,8 @@ function publishAction(port, watch, server, quietly, copyFonts, copyClient, inpu
           copyClientOperation,
           copyFontsOperation,
           htmlOperation,
-          serverOperation
+          serverOperation,
+          watchOperation
         ],
         context = {
           port,

package/bin/action/server.js

@@ -1,13 +1,15 @@
 "use strict";
 
-const serverOperation = require("../operation/server");
+const watchOperation = require("../operation/watch"),
+      serverOperation = require("../operation/server");
 
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_SERVER_MESSAGE, FAILED_SERVER_MESSAGE } = require("../messages");
 
 function serverAction(port, watch, server, quietly, outputFilePath) {
   const operations = [
-          serverOperation
+          serverOperation,
+          watchOperation
         ],
         context = {
           port,

package/bin/main.js

@@ -47,15 +47,31 @@ function main(command, argument, options) {
   }
 
   switch (command) {
-    case HELP_COMMAND: helpAction(); break;
-    case SERVER_COMMAND: serverAction(port, watch, server, quietly, outputFilePath); break;
-    case VERSION_COMMAND: versionAction(); break;
-    case PUBLISH_COMMAND: publishAction(port, watch, server, quietly, copyFonts, copyClient, inputFilePath, outputFilePath, templateFilePath); break;
+    case HELP_COMMAND: {
+      helpAction();
 
-    default :
+      break;
+    }
+
+    case SERVER_COMMAND: {
+      const server = true;
+
+      serverAction(port, watch, server, quietly, outputFilePath);
+
+      break;
+    }
+
+    case VERSION_COMMAND: {
+      versionAction();
+
+      break;
+    }
+
+    default: {
       publishAction(port, watch, server, quietly, copyFonts, copyClient, inputFilePath, outputFilePath, templateFilePath);
 
       break;
+    }
   }
 }
 

package/bin/operation/copyClient.js

@@ -1,14 +1,9 @@
 "use strict";
 
-const { watch: watchFile } = require("lively-cli"),
-      { pathUtilities, packageUtilities } = require("necessary");
+const { watch: watchFile } = require("lively-cli");
 
-const { copyFile } = require("../utilities/fileSystem"),
-      { directoryPathFromFilePath } = require("../utilities/path"),
-      { DEFER_DELAY, CLIENT_FILE_NAME } = require("../constants");
-
-const { getPackagePath } = packageUtilities,
-      { concatenatePaths } = pathUtilities;
+const { DEFER_DELAY } = require("../constants"),
+      { copyClientFile: copyClientFileEx, getClientSourceFilePath } = require("../utilities/client");
 
 function copyClientOperation(proceed, abort, context) {
   const { copyClient } = context;
@@ -19,31 +14,27 @@ function copyClientOperation(proceed, abort, context) {
     return;
   }
 
-  const { outputFilePath } = context,
-        packagePath = getPackagePath(),
-        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
-        sourceFilePath = concatenatePaths(packagePath, CLIENT_FILE_NAME),
-        targetFilePath = concatenatePaths(outputDirectoryPath, CLIENT_FILE_NAME);
-
-  copyFile(sourceFilePath, targetFilePath);
+  copyClientFile();
 
-  const { watch } = context;
+  let { server } = context;
 
-  if (!watch) {
+  if (!server) {
     proceed();
 
     return;
   }
 
-  const watchPattern = sourceFilePath,  ///
-        registerHandler = watchFile(watchPattern);
+  const { quietly } = context,
+        clientSSourceFilePath = getClientSourceFilePath(context),
+        watchPattern = clientSSourceFilePath,  ///
+        registerHandler = watchFile(watchPattern, quietly);
 
   registerHandler(copyClientFile);
 
   proceed();
 
   function copyClientFile() {
-    copyFile(sourceFilePath, targetFilePath);
+    copyClientFileEx(context);
 
     defer(() => {
       registerHandler(copyClientFile);

package/bin/operation/server.js

@@ -2,9 +2,8 @@
 
 const express = require("express");
 
-const { createStaticRouter } = require("../router/static"),
-      { createLiveReloadHandler } = require("../handler/liveReload"),
-      { ERROR, LIVE_RELOAD_PATH } = require("../constants"),
+const { ERROR } = require("../constants"),
+      { directoryPathFromFilePath } = require("../utilities/path"),
       { UNABLE_TO_START_SERVER_MESSAGE } = require("../messages");
 
 function serverOperation(proceed, abort, context) {
@@ -18,16 +17,15 @@ function serverOperation(proceed, abort, context) {
 
   server = express(); ///
 
-  const { port, watch } = context,
-        staticRouter = createStaticRouter(context);
-
-  server.use(staticRouter);
+  Object.assign(context, {
+    server
+  });
 
-  if (watch) {
-    const liveReloadHandler = createLiveReloadHandler(context);
+  const { port, outputFilePath } = context,
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        staticRouter = express.static(outputDirectoryPath);
 
-    server.get(LIVE_RELOAD_PATH, liveReloadHandler);
-  }
+  server.use(staticRouter);
 
   const listener = server.listen(port, () => {
     console.log(`Server listening on port ${port}...`);

package/bin/operation/watch.js

@@ -0,0 +1,35 @@
+"use strict";
+
+const { createLiveReloadHandler } = require("lively-cli");
+
+const { LIVE_RELOAD_PATH } = require("../constants"),
+      { directoryPathFromFilePath } = require("../utilities/path");
+
+function watchOperation(proceed, abort, context) {
+  const { watch } = context;
+
+  if (!watch) {
+    proceed();
+
+    return;
+  }
+
+  const { server = null } = context;
+
+  if (server === null) {
+    proceed();
+
+    return;
+  }
+
+  const { quietly, outputFilePath } = context,
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        watchPattern = outputDirectoryPath, ///
+        liveReloadHandler = createLiveReloadHandler(watchPattern, quietly);
+
+  server.get(LIVE_RELOAD_PATH, liveReloadHandler);
+
+  proceed();
+}
+
+module.exports = watchOperation;

package/bin/utilities/client.js

@@ -0,0 +1,38 @@
+"use strict";
+
+const { pathUtilities, packageUtilities } = require("necessary");
+
+const { copyFile } = require("../utilities/fileSystem"),
+      { CLIENT_FILE_NAME } = require("../constants"),
+      { directoryPathFromFilePath } = require("../utilities/path");
+
+const { getPackagePath } = packageUtilities,
+      { concatenatePaths } = pathUtilities;
+
+function copyClientFile(context) {
+  const clientTargetFilePath = getClientTargetFilePath(context),
+        clientSSourceFilePath = getClientSourceFilePath(context);
+
+  copyFile(clientSSourceFilePath, clientTargetFilePath);
+}
+
+function getClientTargetFilePath(context) {
+  const { outputFilePath } = context,
+        outputDirectoryPath = directoryPathFromFilePath(outputFilePath),
+        clientTargetFilePath = concatenatePaths(outputDirectoryPath, CLIENT_FILE_NAME);
+
+  return clientTargetFilePath;
+}
+
+function getClientSourceFilePath(context) {
+  const packagePath = getPackagePath(),
+        clientSSourceFilePath = concatenatePaths(packagePath, CLIENT_FILE_NAME);
+
+  return clientSSourceFilePath;
+}
+
+module.exports = {
+  copyClientFile,
+  getClientTargetFilePath,
+  getClientSourceFilePath
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.150",
+  "version": "0.0.153",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",

package/bin/handler/liveReload.js

@@ -1,18 +0,0 @@
-"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/router/static.js

@@ -1,17 +0,0 @@
-"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
-};