watchful-cli 1.7.51 → 1.7.52

package/README.md

@@ -56,14 +56,14 @@ If you would like to contribute or would simply like to have a look at the code,
 Watchful has the following commands and options:
 
 ```
-  watchful [<command>] [<options>]
+  watchful [<options>] [<command>] [<argument>] 
 
 Commands:
 
   help                                           Show this help
-  
-  version                                        Show theh version
 
+  version                                        Show the version
+  
   batch                                          Batch build
 
   [incremental]                                  Watch and build incrementally

package/bin/action/help.js

@@ -3,13 +3,13 @@
 function helpAction() {
   console.log(`Usage: 
   
-  watchful [<command>] [<options>]
+  watchful [<options>] [<command>] [<argument>] 
 
 Commands:
 
-  version                                        Show theh version
-
   help                                           Show this help
+
+  version                                        Show the version
   
   batch                                          Batch build
 

package/bin/configure.js

@@ -0,0 +1,20 @@
+"use strict";
+
+const { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
+      { HELP_COMMAND, VERSION_COMMAND } = require("./commands");
+
+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;
+  }
+
+  main(command, argument, options);
+}
+
+module.exports = configure;

package/bin/main.js

@@ -5,14 +5,13 @@ const helpAction = require("./action/help"),
       versionAction = require("./action/version"),
       incrementalAction = require("./action/incremental");
 
-const { HELP_COMMAND, BATCH_COMMAND, VERSION_COMMAND, INCREMENTAL_COMMAND } = require("./commands"),
-      { DEFAULT_HELP,
-        DEFAULT_WAIT,
+const { NO_COMMAND_GIVEN_MESSAGE, COMMAND_NOT_RECOGNISED_MESSAGE } = require("./messages"),
+      { HELP_COMMAND, BATCH_COMMAND, VERSION_COMMAND, INCREMENTAL_COMMAND } = require("./commands"),
+      { DEFAULT_WAIT,
         DEFAULT_NODE,
         DEFAULT_DEBUG,
         DEFAULT_RELEASE,
         DEFAULT_BUNDLER,
-        DEFAULT_VERSION,
         DEFAULT_QUIETLY,
         DEFAULT_METRICS,
         DEFAULT_ENTRY_FILE,
@@ -24,14 +23,11 @@ const { HELP_COMMAND, BATCH_COMMAND, VERSION_COMMAND, INCREMENTAL_COMMAND } = re
         DEFAULT_SOURCE_DIRECTORY } = require("./defaults");
 
 function main(command, argument, options) {
-  const commandMissing = (command === null),
-        { help = DEFAULT_HELP,
-          wait = DEFAULT_WAIT,
+  const { wait = DEFAULT_WAIT,
           node = DEFAULT_NODE,
           debug = DEFAULT_DEBUG,
           release = DEFAULT_RELEASE,
           bundler = DEFAULT_BUNDLER,
-          version = DEFAULT_VERSION,
           quietly = DEFAULT_QUIETLY,
           metrics = DEFAULT_METRICS,
           processes = DEFAULT_PROCESSES,
@@ -42,17 +38,15 @@ function main(command, argument, options) {
           tempDirectory = DEFAULT_TEMP_DIRECTORY,
           sourceDirectory = DEFAULT_SOURCE_DIRECTORY } = options;
 
-  if (false) {
-    ///
-  } else if (help) {
-    command = HELP_COMMAND;
-  } else if (version) {
-    command = VERSION_COMMAND;
-  } else if (commandMissing) {
-    command = INCREMENTAL_COMMAND;
-  }
-
   switch (command) {
+    case null: {
+      console.log(NO_COMMAND_GIVEN_MESSAGE);
+
+      process.exit(1);
+
+      break;
+    }
+
     case HELP_COMMAND: {
       helpAction();
 
@@ -77,6 +71,13 @@ function main(command, argument, options) {
       break;
     }
 
+    default: {
+      console.log(COMMAND_NOT_RECOGNISED_MESSAGE);
+
+      process.exit(1);
+
+      break;
+    }
   }
 }
 

package/bin/messages.js

@@ -10,6 +10,8 @@ const SWC_FAILED_MESSAGE = "swc failed:",
       BABEL_NOT_INSTALLED_MESSAGE = "The '@babel/core' package is not installed.",
       ESBUILD_NOT_INSTALLED_MESSAGE = "esbuild is not installed.",
       BROWSERIFY_NOT_INSTALLED_MESSAGE = "Browserify is not installed.",
+      NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
+      COMMAND_NOT_RECOGNISED_MESSAGE = "The command is not recognised.",
       NO_ENTRY_FILE_SPECIFIED_MESSAGE = "If a temp directory is specified then an entry file must also be given.",
       NO_BUNDLE_FILE_SPECIFIED_MESSAGE = "If a temp directory is specified then a bundle file must also be given.",
       DEBUG_AND_RELEAES_BOTH_SET_MESSAGE = "The debug and release flags cannot both be set at the same time.",
@@ -36,6 +38,8 @@ module.exports = {
   BABEL_NOT_INSTALLED_MESSAGE,
   ESBUILD_NOT_INSTALLED_MESSAGE,
   BROWSERIFY_NOT_INSTALLED_MESSAGE,
+  NO_COMMAND_GIVEN_MESSAGE,
+  COMMAND_NOT_RECOGNISED_MESSAGE,
   NO_ENTRY_FILE_SPECIFIED_MESSAGE,
   NO_BUNDLE_FILE_SPECIFIED_MESSAGE,
   DEBUG_AND_RELEAES_BOTH_SET_MESSAGE,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "watchful-cli",
   "author": "James Smith",
-  "version": "1.7.51",
+  "version": "1.7.52",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/watchful-cli",
   "description": "Incremental transpilation with bundling.",

package/watchful.js

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