watchful-cli 1.7.23 → 1.7.25

package/README.md

@@ -70,20 +70,20 @@ Watchful has the following commands and options:
 
 Commands:
 
-  version                                        Show theh version
-
   help                                           Show this help
   
+  version                                        Show theh version
+
   batch                                          Batch build
 
   [incremental]                                  Watch and build incrementally
   
 Options:
 
-  --version|-v                                   Show the version
-
   --help|-h                                      Show this help
   
+  --version|-v                                   Show the version
+
   --wait|-w                                      Wait before building incrementally
 
   --node|-n                                      Bundle for Node rather than the browser

package/bin/action/batch.js

@@ -10,7 +10,7 @@ const action = require("../action"),
 
 const { BATCH_BUILD_FAILED_MESSAGE } = require("../messages");
 
-function batch(options) {
+function batchAction(wait, node, debug, bundler, quietly, metrics, entryFile, processes, transpiler, bundleFile, libDirectory, tempDirectory, sourceDirectory) {
   const operations = [
           initialiseOperation,
           createTranspileFileFunctionOperation,
@@ -20,7 +20,19 @@ function batch(options) {
           bundleFilesOperation
         ],
         context = {
-          options
+          wait,
+          node,
+          debug,
+          bundler,
+          quietly,
+          metrics,
+          entryFile,
+          processes,
+          transpiler,
+          bundleFile,
+          libDirectory,
+          tempDirectory,
+          sourceDirectory
         };
 
   action(operations, (success) => {
@@ -34,4 +46,4 @@ function batch(options) {
   }, context);
 }
 
-module.exports = batch;
+module.exports = batchAction;

package/bin/action/help.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function help() {
+function helpAction() {
   console.log(`Usage: 
   
   watchful [<command>] [<options>]
@@ -55,4 +55,4 @@ Please see the readme file on GitHub:
 `);
 }
 
-module.exports = help;
+module.exports = helpAction;

package/bin/action/incremental.js

@@ -9,7 +9,7 @@ const watch = require("../watch"),
 
 const { INCREMENTAL_BUILD_FAILED_MESSAGE } = require("../messages");
 
-function incremental(options) {
+function incrementalAction(wait, node, debug, bundler, quietly, metrics, entryFile, processes, transpiler, bundleFile, libDirectory, tempDirectory, sourceDirectory) {
   const operations = [
           initialiseOperation,
           createTranspileFileFunctionOperation,
@@ -17,7 +17,19 @@ function incremental(options) {
           retrieveFilePathsOperation
         ],
         context = {
-          options
+          wait,
+          node,
+          debug,
+          bundler,
+          quietly,
+          metrics,
+          entryFile,
+          processes,
+          transpiler,
+          bundleFile,
+          libDirectory,
+          tempDirectory,
+          sourceDirectory
         };
 
   action(operations, (success) => {
@@ -31,4 +43,4 @@ function incremental(options) {
   }, context);
 }
 
-module.exports = incremental;
+module.exports = incrementalAction;

package/bin/action/version.js

@@ -3,11 +3,11 @@
 const { WATCHFUL_CLI } = require("../constants"),
       { getPackageVersion } = require("../utilities/packageJSON");
 
-function version() {
+function versionAction() {
   const packageVersion = getPackageVersion(),
         version = packageVersion; ///
 
   console.log(`${WATCHFUL_CLI} version ${version}`);
 }
 
-module.exports = version;
+module.exports = versionAction;

package/bin/actions.js

@@ -1,33 +1,60 @@
 "use strict";
 
-const help = require("./action/help"),
-      batch = require("./action/batch"),
-      version = require("./action/version"),
-      incremental = require("./action/incremental");
+const helpAction = require("./action/help"),
+      batchAction = require("./action/batch"),
+      versionAction = require("./action/version"),
+      incrementalAction = require("./action/incremental");
 
-const { HELP_OPTION, VERSION_OPTION } = require("./options"),
-      { HELP_COMMAND, BATCH_COMMAND, VERSION_COMMAND, INCREMENTAL_COMMAND } = require("./commands");
+const { HELP_COMMAND, BATCH_COMMAND, VERSION_COMMAND, INCREMENTAL_COMMAND } = require("./commands"),
+      { DEFAULT_HELP,
+        DEFAULT_WAIT,
+        DEFAULT_NODE,
+        DEFAULT_DEBUG,
+        DEFAULT_VERSION,
+        DEFAULT_BUNDLER,
+        DEFAULT_QUIETLY,
+        DEFAULT_METRICS,
+        DEFAULT_ENTRY_FILE,
+        DEFAULT_PROCESSES,
+        DEFAULT_TRANSPILER,
+        DEFAULT_BUNDLE_FILE,
+        DEFAULT_LIB_DIRECTORY,
+        DEFAULT_TEMP_DIRECTORY,
+        DEFAULT_SOURCE_DIRECTORY } = require("./defaults");
 
 function actions(command, argument, options) {
   const commandMissing = (command === null),
-        helpOptionPresent = options.hasOwnProperty(HELP_OPTION),
-        versionOptionPresent = options.hasOwnProperty(VERSION_OPTION);
+        { help = DEFAULT_HELP,
+          wait = DEFAULT_WAIT,
+          node = DEFAULT_NODE,
+          debug = DEFAULT_DEBUG,
+          version = DEFAULT_VERSION,
+          bundler = DEFAULT_BUNDLER,
+          quietly = DEFAULT_QUIETLY,
+          metrics = DEFAULT_METRICS,
+          entryFile = DEFAULT_ENTRY_FILE,
+          processes = DEFAULT_PROCESSES,
+          transpiler = DEFAULT_TRANSPILER,
+          bundleFile = DEFAULT_BUNDLE_FILE,
+          libDirectory = DEFAULT_LIB_DIRECTORY,
+          tempDirectory = DEFAULT_TEMP_DIRECTORY,
+          sourceDirectory = DEFAULT_SOURCE_DIRECTORY } = options;
 
   if (false) {
     ///
-  } else if (versionOptionPresent) {
-    command = VERSION_COMMAND;
-  } else if (helpOptionPresent) {
+  } else if (help) {
     command = HELP_COMMAND;
+  } else if (version) {
+    command = VERSION_COMMAND;
   } else if (commandMissing) {
     command = INCREMENTAL_COMMAND;
   }
 
   switch (command) {
-    case HELP_COMMAND : help(); break;
-    case BATCH_COMMAND : batch(options); break;
-    case VERSION_COMMAND : version(); break;
-    case INCREMENTAL_COMMAND : incremental(options); break;
+    case HELP_COMMAND : helpAction(); break;
+    case BATCH_COMMAND : batchAction(wait, node, debug, bundler, quietly, metrics, entryFile, processes, transpiler, bundleFile, libDirectory, tempDirectory, sourceDirectory); break;
+    case VERSION_COMMAND : versionAction(); break;
+    case INCREMENTAL_COMMAND : incrementalAction(wait, node, debug, bundler, quietly, metrics, entryFile, processes, transpiler, bundleFile, libDirectory, tempDirectory, sourceDirectory); break;
   }
 }
 

package/bin/defaults.js

@@ -2,22 +2,36 @@
 
 const { BABEL, BROWSERIFY } = require("./constants");
 
-const DEFAULT_WAIT = 0,
+const DEFAULT_HELP = false,
+      DEFAULT_WAIT = 0,
       DEFAULT_NODE = false,
       DEFAULT_DEBUG = false,
+      DEFAULT_VERSION = false,
       DEFAULT_BUNDLER = BROWSERIFY,
       DEFAULT_QUIETLY = false,
       DEFAULT_METRICS = false,
       DEFAULT_PROCESSES = 1,
-      DEFAULT_TRANSPILER = BABEL;
+      DEFAULT_TRANSPILER = BABEL,
+      DEFAULT_ENTRY_FILE = null,
+      DEFAULT_BUNDLE_FILE = null,
+      DEFAULT_LIB_DIRECTORY = null,
+      DEFAULT_TEMP_DIRECTORY = null,
+      DEFAULT_SOURCE_DIRECTORY = null;
 
 module.exports = {
+  DEFAULT_HELP,
   DEFAULT_WAIT,
   DEFAULT_NODE,
   DEFAULT_DEBUG,
+  DEFAULT_VERSION,
   DEFAULT_BUNDLER,
   DEFAULT_QUIETLY,
   DEFAULT_METRICS,
   DEFAULT_PROCESSES,
-  DEFAULT_TRANSPILER
+  DEFAULT_TRANSPILER,
+  DEFAULT_ENTRY_FILE,
+  DEFAULT_BUNDLE_FILE,
+  DEFAULT_LIB_DIRECTORY,
+  DEFAULT_TEMP_DIRECTORY,
+  DEFAULT_SOURCE_DIRECTORY
 };

package/bin/operation/initialise.js

@@ -2,14 +2,6 @@
 
 const { pathFromOption } = require("../utilities/path"),
       { initialiseMetrics } = require("../utilities/metrics"),
-      { DEFAULT_WAIT,
-        DEFAULT_NODE,
-        DEFAULT_DEBUG,
-        DEFAULT_BUNDLER,
-        DEFAULT_QUIETLY,
-        DEFAULT_METRICS,
-        DEFAULT_PROCESSES,
-        DEFAULT_TRANSPILER } = require("../defaults"),
       { NO_ENTRY_FILE_SPECIFIED_MESSAGE,
         NO_BUNDLE_FILE_SPECIFIED_MESSAGE,
         NO_SOURCE_DIRECTORY_SPECFIFIED_MESSAGE,
@@ -24,20 +16,19 @@ const { pathFromOption } = require("../utilities/path"),
         SOURCE_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE } = require("../messages");
 
 function initialiseOperation(proceed, abort, context) {
-  const { options } = context,
-        { wait = DEFAULT_WAIT,
-          node = DEFAULT_NODE,
-          debug = DEFAULT_DEBUG,
-          bundler = DEFAULT_BUNDLER,
-          quietly = DEFAULT_QUIETLY,
-          metrics = DEFAULT_METRICS,
-          processes = DEFAULT_PROCESSES,
-          transpiler = DEFAULT_TRANSPILER,
-          entryFile = null,
-          bundleFile = null,
-          libDirectory = null,
-          tempDirectory = null,
-          sourceDirectory } = options,
+  const { wait,
+          node,
+          debug,
+          bundler,
+          quietly,
+          metrics,
+          entryFile,
+          processes,
+          transpiler,
+          bundleFile,
+          libDirectory,
+          tempDirectory,
+          sourceDirectory } = context,
           processesLength = Number(processes);  ///
 
   let entryFilePath = null,
@@ -45,7 +36,7 @@ function initialiseOperation(proceed, abort, context) {
       sourceDirectoryPath = null,
       targetDirectoryPath = null;
 
-  if (!sourceDirectory) {
+  if (sourceDirectory === null) {
     console.log(NO_SOURCE_DIRECTORY_SPECFIFIED_MESSAGE);
 
     abort();
@@ -53,7 +44,7 @@ function initialiseOperation(proceed, abort, context) {
     return;
   }
 
-  if (!libDirectory && !tempDirectory) {
+  if ((libDirectory === null) && (tempDirectory === null)) {
     console.log(NEITHER_LIB_NOR_TEMP_DIRECTORY_SPECIFIED_MESSAGE);
 
     abort();
@@ -61,7 +52,7 @@ function initialiseOperation(proceed, abort, context) {
     return;
   }
 
-  if (libDirectory && tempDirectory) {
+  if ((libDirectory !== null) && (tempDirectory !== null)) {
     console.log(BOTH_LIB_AND_TEMP_DIRECTORIES_SPECIFIED_MESSAGE);
 
     abort();
@@ -69,8 +60,8 @@ function initialiseOperation(proceed, abort, context) {
     return;
   }
 
-  if (tempDirectory) {
-    if (!entryFile) {
+  if (tempDirectory !== null) {
+    if (entryFile === null) {
       console.log(NO_ENTRY_FILE_SPECIFIED_MESSAGE);
 
       abort();
@@ -78,7 +69,7 @@ function initialiseOperation(proceed, abort, context) {
       return;
     }
 
-    if (!bundleFile) {
+    if (bundleFile === null) {
       console.log(NO_BUNDLE_FILE_SPECIFIED_MESSAGE);
 
       abort();
@@ -87,7 +78,7 @@ function initialiseOperation(proceed, abort, context) {
     }
   }
 
-  if (entryFile && !bundleFile) {
+  if ((entryFile !== null) && (bundleFile === null)) {
     console.log(ENTRY_FILE_BUT_NO_BUNDLE_FILE_SPECIFIED_MESSAGE);
 
     abort();
@@ -95,7 +86,7 @@ function initialiseOperation(proceed, abort, context) {
     return;
   }
 
-  if (bundleFile && !entryFile) {
+  if ((bundleFile !== null) && (entryFile === null)) {
     console.log(BUNDLE_FILE_BUT_NO_ENTRY_FILE_SPECIFIED_MESSAGE);
 
     abort();
@@ -103,12 +94,12 @@ function initialiseOperation(proceed, abort, context) {
     return;
   }
 
-  if (entryFile) {
+  if (entryFile !== null) {
     const entryFileOption = entryFile;  ///
 
     entryFilePath = pathFromOption(entryFileOption);
 
-    if (!entryFilePath) {
+    if (entryFilePath === null) {
       console.log(ENTRY_FILE_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE);
 
       abort();
@@ -117,12 +108,12 @@ function initialiseOperation(proceed, abort, context) {
     }
   }
 
-  if (bundleFile) {
+  if (bundleFile !== null) {
     const bundleFileOption = bundleFile;  ///
 
     bundleFilePath = pathFromOption(bundleFile, bundleFileOption);
 
-    if (!bundleFilePath) {
+    if (bundleFilePath === null) {
       console.log(BUNDLE_FILE_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE);
 
       abort();
@@ -131,11 +122,11 @@ function initialiseOperation(proceed, abort, context) {
     }
   }
 
-  if (libDirectory) {
+  if (libDirectory !== null) {
     const libDirectoryOption = libDirectory,  ///
           libDirectoryPath = pathFromOption(libDirectory, libDirectoryOption);
 
-    if (!libDirectoryPath) {
+    if (libDirectoryPath === null) {
       console.log(LIB_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE);
 
       abort();
@@ -146,11 +137,11 @@ function initialiseOperation(proceed, abort, context) {
     targetDirectoryPath = libDirectoryPath; ///
   }
 
-  if (tempDirectory) {
+  if (tempDirectory !== null) {
     const tempDirectoryOption = tempDirectory,  ///
           tempDirectoryPath = pathFromOption(tempDirectory, tempDirectoryOption);
 
-    if (!tempDirectoryPath) {
+    if (tempDirectoryPath === null) {
       console.log(TEMP_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE);
 
       abort();
@@ -161,12 +152,12 @@ function initialiseOperation(proceed, abort, context) {
     targetDirectoryPath = tempDirectoryPath; ///
   }
 
-  if (sourceDirectory) {
+  if (sourceDirectory !== null) {
     const sourceDirectoryOption = sourceDirectory;  ///
 
     sourceDirectoryPath = pathFromOption(sourceDirectory, sourceDirectoryOption);
 
-    if (!sourceDirectoryPath) {
+    if (sourceDirectoryPath === null) {
       console.log(SOURCE_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE);
 
       abort();

package/bin/operation/transpileFiles.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const singleProcessTranspileFilesCallback = require(".//transpileFiles/singleProcess"),
-      multipleProcessesTranspileFilesCallback = require(".//transpileFiles/mutilpleProcesses");
+const singleProcessTranspileFilesCallback = require(".//transpileFiles/singleProcess"), ///
+      multipleProcessesTranspileFilesCallback = require(".//transpileFiles/mutilpleProcesses"); ///
 
 const { S, EMPTY_STRING } = require("../constants"),
       { startCountMetric, endCountMetric, startSecondsMetric, endSecondsMetric } = require("../utilities/metrics");
@@ -11,6 +11,7 @@ function transpileFilesOperation(proceed, abort, context) {
 
   if (metrics) {
     startCountMetric(context);
+
     startSecondsMetric(context);
   }
 

package/package.json

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