highmark-cli 1.3.43 → 1.3.44

package/bin/changeDirectory.js

@@ -0,0 +1,37 @@
+"use strict";
+
+const { pathUtilities } = require("necessary");
+
+const { DOUBLE_DOTS } = require("./constants"),
+      { migrateConfigurationFile, checkConfigurationFileExists } = require("./configuration");
+
+const { bottommostNameFromPath } = pathUtilities;
+
+function changeDirectory() {
+  let directoryName = null,
+    configurationFileExists = checkConfigurationFileExists();
+
+  if (!configurationFileExists) {
+    const currentWorkingDirectoryPath = process.cwd(); ///
+
+    process.chdir(DOUBLE_DOTS);
+
+    const oldCurrentWorkingDirectoryPath = currentWorkingDirectoryPath; ///
+
+    configurationFileExists = checkConfigurationFileExists();
+
+    if (configurationFileExists) {
+      const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
+
+      directoryName = bottommostOldCurrentWorkingDirectoryName; ///
+    } else {
+      process.chdir(oldCurrentWorkingDirectoryPath);
+    }
+  }
+
+  migrateConfigurationFile();
+
+  return directoryName;
+}
+
+module.exports = changeDirectory;

package/bin/main.js

@@ -7,7 +7,7 @@ const helpAction = require("./action/help"),
       initialiseAction = require("./action/initialise"),
       setOptionsAction = require("./action/setOptions");
 
-const { NO_COMMAND_GIVEN_MESSAGE, COMMAND_NOT_RECOGNISED_MESSAGE } = require("./messages"),
+const { NO_ARGUMENT_GIVEN_MESSAGE, COMMAND_NOT_RECOGNISED_MESSAGE } = require("./messages"),
       { HELP_COMMAND, SERVER_COMMAND, VERSION_COMMAND, PUBLISH_COMMAND, INITIALISE_COMMAND, SET_OPTIONS_COMMAND } = require("./commands"),
       { DEFAULT_PORT,
         DEFAULT_FONTS,
@@ -25,42 +25,44 @@ function main(command, argument, options) {
           inputFileName = DEFAULT_INPUT_FILE_NAME } = options;
 
   switch (command) {
-    case null: {
-      console.log(NO_COMMAND_GIVEN_MESSAGE);
-
-      break;
-    }
-
     case HELP_COMMAND:  {
       helpAction();
 
       break;
     }
 
-    case SERVER_COMMAND: {
-      const projectDirectoryName = argument;  ///
-
-      serverAction(port, watch, quietly, projectDirectoryName);
+    case VERSION_COMMAND: {
+      versionAction();
 
       break;
     }
 
-    case VERSION_COMMAND: {
-      versionAction();
+    case INITIALISE_COMMAND: {
+      initialiseAction();
 
       break;
     }
 
-    case PUBLISH_COMMAND: {
-      const projectDirectoryName = argument;  ///
+    case SERVER_COMMAND: {
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const projectDirectoryName = argument;  ///
 
-      publishAction(port, fonts, watch, client, quietly, inputFileName, projectDirectoryName);
+        serverAction(port, watch, quietly, projectDirectoryName);
+      }
 
       break;
     }
 
-    case INITIALISE_COMMAND: {
-      initialiseAction();
+    case PUBLISH_COMMAND: {
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const projectDirectoryName = argument;  ///
+
+        publishAction(port, fonts, watch, client, quietly, inputFileName, projectDirectoryName);
+      }
 
       break;
     }

package/bin/messages.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
+const NO_ARGUMENT_GIVEN_MESSAGE = "No argument has been given.",
       COMMAND_NOT_RECOGNISED_MESSAGE = "The command is not recognised.",
       INVALID_LINES_PER_PAGE_MESSAGE = "The lines per page must either be a number or left blank for the default of Infinity, which effectively suppresses pagination.",
       INVALID_CONTENTS_DEPTH_MESSAGE = "The contents depth must be a number between 1 and 4 inclusive, with 1 being primary headings only, 4 down to quaternary headings.",
@@ -25,7 +25,7 @@ const NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
       UNABLE_TO_CONVERT_MARKDOWN_STYLES_TO_CSS_MESSAGE = "Unable to convert Markdown styles to CSS.";
 
 module.exports = {
-  NO_COMMAND_GIVEN_MESSAGE,
+  NO_ARGUMENT_GIVEN_MESSAGE,
   COMMAND_NOT_RECOGNISED_MESSAGE,
   INVALID_LINES_PER_PAGE_MESSAGE,
   INVALID_CONTENTS_DEPTH_MESSAGE,

package/bin/prepare.js

@@ -0,0 +1,50 @@
+"use strict";
+
+const changeDirectory = require("./changeDirectory");
+
+const { DEFAULT_HELP, DEFAULT_VERSION, DEFAULT_SERVER } = require("./defaults"),
+      { HELP_COMMAND, VERSION_COMMAND, INITIALISE_COMMAND, PUBLISH_COMMAND, SERVER_COMMAND } = require("./commands");
+
+function prepare(command, argument, options, main) {
+  const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
+
+  if (false) {
+    ///
+  } else if (help) {
+    command = HELP_COMMAND;
+  } else if (version) {
+    command = VERSION_COMMAND;
+  }
+
+  if ((command === HELP_COMMAND) || (command === VERSION_COMMAND) || (command === INITIALISE_COMMAND)) {
+    main(command, argument, options);
+
+    return;
+  }
+
+  const { server = DEFAULT_SERVER } = options;
+
+  if (server) {
+    command = SERVER_COMMAND;
+  }
+
+  const directoryName = changeDirectory();
+
+  if (directoryName !== null) {
+    argument = directoryName; ///
+  }
+
+  if (argument === null) {
+    argument = command; ///
+
+    command = PUBLISH_COMMAND;
+  }
+
+  if (command === null) {
+    command = PUBLISH_COMMAND;
+  }
+
+  main(command, argument, options);
+}
+
+module.exports = prepare;

package/highmark.js

@@ -4,7 +4,7 @@ const { parseArgv } = require("argumentative"),
       { arrayUtilities } = require("necessary");
 
 const main = require("./bin/main"),
-      configure = require("./bin/configure"),
+      prepare = require("./bin/prepare"),
       abbreviations = require("./bin/abbreviations");
 
 const { argv } = process,
@@ -16,4 +16,4 @@ const { commands, options } = parseArgv(argv, abbreviations),
       command = firstCommand || null, ///
       argument = secondCommand || null; ///
 
-configure(command, argument, options, main);
+prepare(command, argument, options, main);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "1.3.43",
+  "version": "1.3.44",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Highmark's LIC tool.",

package/bin/configure.js

@@ -1,83 +0,0 @@
-"use strict";
-
-const { pathUtilities } = require("necessary");
-
-const { DOUBLE_DOTS } = require("./constants"),
-      { DEFAULT_HELP, DEFAULT_VERSION, DEFAULT_SERVER } = require("./defaults"),
-      { migrateConfigurationFile, checkConfigurationFileExists } = require("./configuration"),
-      { HELP_COMMAND, VERSION_COMMAND, INITIALISE_COMMAND, PUBLISH_COMMAND, SERVER_COMMAND } = require("./commands");
-
-const { bottommostNameFromPath } = pathUtilities;
-
-function configure(command, argument, options, main) {
-  const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
-
-  if (false) {
-    ///
-  } else if (help) {
-    command = HELP_COMMAND;
-  } else if (version) {
-    command = VERSION_COMMAND;
-  }
-
-  if ((command === HELP_COMMAND) || (command === VERSION_COMMAND)) {
-    main(command, argument, options);
-
-    return;
-  }
-
-  const directoryName = changeDirectory(command);
-
-  const { server = DEFAULT_SERVER } = options;
-
-  if (server) {
-    command = SERVER_COMMAND;
-  }
-
-  if (directoryName !== null) {
-    if (command === null) {
-      command = PUBLISH_COMMAND;
-    }
-
-    argument = directoryName; ///
-  }
-
-  if (argument === null) {
-    argument = command; ///
-
-    command = PUBLISH_COMMAND;
-  }
-
-  main(command, argument, options);
-}
-
-module.exports = configure;
-
-function changeDirectory(command) {
-  let directoryName = null,
-    configurationFileExists = checkConfigurationFileExists();
-
-  if (!configurationFileExists) {
-    const currentWorkingDirectoryPath = process.cwd(); ///
-
-    process.chdir(DOUBLE_DOTS);
-
-    const oldCurrentWorkingDirectoryPath = currentWorkingDirectoryPath; ///
-
-    configurationFileExists = checkConfigurationFileExists();
-
-    if (configurationFileExists) {
-      const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
-
-      directoryName = bottommostOldCurrentWorkingDirectoryName; ///
-    } else {
-      process.chdir(oldCurrentWorkingDirectoryPath);
-    }
-  }
-
-  if (command !== INITIALISE_COMMAND) {
-    migrateConfigurationFile();
-  }
-
-  return directoryName;
-}