watchful-cli 1.7.14 → 1.7.18

package/bin/action/batch.js

@@ -1,29 +1,29 @@
 "use strict";
 
 const action = require("../action"),
-      initialiseCallback = require("../callback/initialise"),
-      bundleFilesCallback = require("../callback/bundleFiles"),
-      transpileFilesCallback = require("../callback/transpileFiles"),
-      retrieveFilePathsCallback = require("../callback/retrieveFilePaths"),
-      createBundleFilesFunctionCallback = require("../callback/createBundleFilesFunction"),
-      createTranspileFileFunctionCallback = require("../callback/createTranspileFileFunction");
+      initialiseOperation = require("../operation/initialise"),
+      bundleFilesOperation = require("../operation/bundleFiles"),
+      transpileFilesOperation = require("../operation/transpileFiles"),
+      retrieveFilePathsOperation = require("../operation/retrieveFilePaths"),
+      createBundleFilesFunctionOperation = require("../operation/createBundleFilesFunction"),
+      createTranspileFileFunctionOperation = require("../operation/createTranspileFileFunction");
 
 const { BATCH_BUILD_FAILED_MESSAGE } = require("../messages");
 
 function batch(options) {
-  const callbacks = [
-          initialiseCallback,
-          createTranspileFileFunctionCallback,
-          createBundleFilesFunctionCallback,
-          retrieveFilePathsCallback,
-          transpileFilesCallback,
-          bundleFilesCallback
+  const operations = [
+          initialiseOperation,
+          createTranspileFileFunctionOperation,
+          createBundleFilesFunctionOperation,
+          retrieveFilePathsOperation,
+          transpileFilesOperation,
+          bundleFilesOperation
         ],
         context = {
           options
         };
 
-  action(callbacks, (success) => {
+  action(operations, (success) => {
     if (!success) {
       console.log(BATCH_BUILD_FAILED_MESSAGE);
 

package/bin/action/incremental.js

@@ -2,25 +2,25 @@
 
 const watch = require("../watch"),
       action = require("../action"),
-      initialiseCallback = require("../callback/initialise"),
-      retrieveFilePathsCallback = require("../callback/retrieveFilePaths"),
-      createBundleFilesFunctionCallback = require("../callback/createBundleFilesFunction"),
-      createTranspileFileFunctionCallback = require("../callback/createTranspileFileFunction");
+      initialiseOperation = require("../operation/initialise"),
+      retrieveFilePathsOperation = require("../operation/retrieveFilePaths"),
+      createBundleFilesFunctionOperation = require("../operation/createBundleFilesFunction"),
+      createTranspileFileFunctionOperation = require("../operation/createTranspileFileFunction");
 
 const { INCREMENTAL_BUILD_FAILED_MESSAGE } = require("../messages");
 
 function incremental(options) {
-  const callbacks = [
-          initialiseCallback,
-          createTranspileFileFunctionCallback,
-          createBundleFilesFunctionCallback,
-          retrieveFilePathsCallback
+  const operations = [
+          initialiseOperation,
+          createTranspileFileFunctionOperation,
+          createBundleFilesFunctionOperation,
+          retrieveFilePathsOperation
         ],
         context = {
           options
         };
 
-  action(callbacks, (success) => {
+  action(operations, (success) => {
     if (!success) {
       console.log(INCREMENTAL_BUILD_FAILED_MESSAGE);
 

package/bin/action.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const { executeCallbacks } = require("./utilities/callback");
+const { executeOperations } = require("./utilities/callback");
 
-function action(callbacks, callback, context) {
-  executeCallbacks(callbacks, (completed) => {
+function action(operations, callback, context) {
+  executeOperations(operations, (completed) => {
     const success = completed;  ///
 
     callback(success);

package/bin/constants.js

@@ -6,11 +6,8 @@ const S = "s",
       BABEL = "babel",
       W_PLUS = "w+",
       INLINE = "inline",
-      BASE_64 = "base64",
       MESSAGE = "message",
       ESBUILD = "esbuild",
-      FULL_STOP = ".",
-      DELIMITER = "/",
       BROWSERIFY = "browserify",
       EMPTY_STRING = "",
       WATCHFUL_CLI = "watchful-cli",
@@ -26,11 +23,8 @@ module.exports = {
   BABEL,
   W_PLUS,
   INLINE,
-  BASE_64,
   MESSAGE,
   ESBUILD,
-  FULL_STOP,
-  DELIMITER,
   BROWSERIFY,
   EMPTY_STRING,
   WATCHFUL_CLI,

package/bin/{callback → operation}/bundleFiles.js

@@ -2,7 +2,7 @@
 
 const bundleFiles = require("../bundleFiles");
 
-function bundleFilesCallback(proceed, abort, context) {
+function bundleFilesOperation(proceed, abort, context) {
   const { entryFilePath } = context;
 
   if (!entryFilePath) {
@@ -16,4 +16,4 @@ function bundleFilesCallback(proceed, abort, context) {
   });
 }
 
-module.exports = bundleFilesCallback;
+module.exports = bundleFilesOperation;

package/bin/{callback → operation}/createBundleFilesFunction.js

@@ -2,7 +2,7 @@
 
 const { createBundleFilesFunction } = require("../utilities/bundle");
 
-function createBundleFilesFunctionCallback(proceed, abort, context) {
+function createBundleFilesFunctionOperation(proceed, abort, context) {
   const { bundleFilePath } = context;
 
   if (bundleFilePath === null) {
@@ -26,4 +26,4 @@ function createBundleFilesFunctionCallback(proceed, abort, context) {
   proceed();
 }
 
-module.exports = createBundleFilesFunctionCallback;
+module.exports = createBundleFilesFunctionOperation;

package/bin/{callback → operation}/createTranspileFileFunction.js

@@ -2,7 +2,7 @@
 
 const { createTranspileFileFunction } = require("../utilities/transpile");
 
-function createTranspileFileFunctionCallback(proceed, abort, context) {
+function createTranspileFileFunctionOperation(proceed, abort, context) {
   const transpileFileFunction = createTranspileFileFunction(context);
 
   if (transpileFileFunction === null) {
@@ -18,4 +18,4 @@ function createTranspileFileFunctionCallback(proceed, abort, context) {
   proceed();
 }
 
-module.exports = createTranspileFileFunctionCallback;
+module.exports = createTranspileFileFunctionOperation;

package/bin/{callback → operation}/initialise.js

@@ -23,7 +23,7 @@ const { pathFromOption } = require("../utilities/path"),
         TEMP_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE,
         SOURCE_DIRECTORY_PATH_NOT_RELATIVE_TO_CURRENT_DIRECTORY_MESSAGE } = require("../messages");
 
-function initialiseCallback(proceed, abort, context) {
+function initialiseOperation(proceed, abort, context) {
   const { options } = context,
         { wait = DEFAULT_WAIT,
           node = DEFAULT_NODE,
@@ -199,4 +199,4 @@ function initialiseCallback(proceed, abort, context) {
   proceed();
 }
 
-module.exports = initialiseCallback;
+module.exports = initialiseOperation;

package/bin/{callback → operation}/retrieveFilePaths.js

@@ -6,7 +6,7 @@ const { ADD_EVENT, READY_EVENT } = require("../events"),
       { ENTRY_FILE_NOT_INCLUDED_IN_BUNDLED_FILES_MESSAGE } = require("../messages"),
       { pathWithoutDirectoryPathFromPathAndDirectoryPath } = require("../utilities/path");
 
-function retrieveFilePathsCallback(proceed, abort, context) {
+function retrieveFilePathsOperation(proceed, abort, context) {
   const { sourceDirectoryPath } = context,
         globPattern = `${sourceDirectoryPath}/**/*.js`,
         filePaths = [],
@@ -44,4 +44,4 @@ function retrieveFilePathsCallback(proceed, abort, context) {
   });
 }
 
-module.exports = retrieveFilePathsCallback;
+module.exports = retrieveFilePathsOperation;

package/bin/{callback → operation}/transpileFiles/mutilpleProcesses.js

@@ -4,7 +4,7 @@ const TranspileFileWrapper = require("../../wrapper/transpileFile");
 
 const { updateCountMetric } = require("../../utilities/metrics");
 
-function multipleProcessesTranspileFilesCallback(done, context) {
+function multipleProcessesTranspileFilesOperation(done, context) {
   const { filePaths, processesLength } = context,
         filePathsLength = filePaths.length,
         transpileFileWrappers = [],
@@ -54,4 +54,4 @@ function multipleProcessesTranspileFilesCallback(done, context) {
   }
 }
 
-module.exports = multipleProcessesTranspileFilesCallback;
+module.exports = multipleProcessesTranspileFilesOperation;

package/bin/{callback → operation}/transpileFiles/singleProcess.js

@@ -8,15 +8,15 @@ const { updateCountMetric } = require("../../utilities/metrics");
 
 const { forEach } = asynchronousUtilities;
 
-function singleProcessTranspileFilesCallback(done, context) {
+function singleProcessTranspileFilesOperation(done, context) {
   const { filePaths } = context;
 
-  forEach(filePaths, transpileFileCallback, done, context);
+  forEach(filePaths, transpileFileOperation, done, context);
 }
 
-module.exports = singleProcessTranspileFilesCallback;
+module.exports = singleProcessTranspileFilesOperation;
 
-function transpileFileCallback(filePath, next, done, context) {
+function transpileFileOperation(filePath, next, done, context) {
   transpileFile(filePath, context, (success) => {
     if (success) {
       updateCountMetric(context);

package/bin/{callback → operation}/transpileFiles.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const singleProcessTranspileFilesCallback = require("../callback/transpileFiles/singleProcess"),
-      multipleProcessesTranspileFilesCallback = require("../callback/transpileFiles/mutilpleProcesses");
+const singleProcessTranspileFilesCallback = require(".//transpileFiles/singleProcess"),
+      multipleProcessesTranspileFilesCallback = require(".//transpileFiles/mutilpleProcesses");
 
 const { S, EMPTY_STRING } = require("../constants"),
       { startCountMetric, endCountMetric, startSecondsMetric, endSecondsMetric } = require("../utilities/metrics");
 
-function transpileFilesCallback(proceed, abort, context) {
+function transpileFilesOperation(proceed, abort, context) {
   const { metrics, processesLength } = context;
 
   if (metrics) {
@@ -33,4 +33,4 @@ function transpileFilesCallback(proceed, abort, context) {
   }
 }
 
-module.exports = transpileFilesCallback;
+module.exports = transpileFilesOperation;

package/bin/utilities/callback.js

@@ -4,18 +4,18 @@ const { asynchronousUtilities } = require("necessary");
 
 const { whilst } = asynchronousUtilities;
 
-function executeCallbacks(callbacks, callback, context) {
+function executeOperations(operations, callback, context) {
   const completed = true;
 
   Object.assign(context, {
-    callbacks,
+    operations,
     completed
   });
 
-  whilst(executeCallback, () => {
+  whilst(executeOperation, () => {
     const { completed } = context;
 
-    delete context.callbacks;
+    delete context.operations;
 
     delete context.completed;
 
@@ -24,13 +24,13 @@ function executeCallbacks(callbacks, callback, context) {
 }
 
 module.exports = {
-  executeCallbacks
+  executeOperations
 };
 
-function executeCallback(next, done, context, index) {
-  const { callbacks } = context,
-        callbacksLength = callbacks.length,
-        lastIndex = callbacksLength - 1;
+function executeOperation(next, done, context, index) {
+  const { operations } = context,
+        operationsLength = operations.length,
+        lastIndex = operationsLength - 1;
 
   if (index > lastIndex) {
     done();
@@ -38,9 +38,9 @@ function executeCallback(next, done, context, index) {
     return;
   }
 
-  const callback = callbacks[index];
+  const operation = operations[index];
 
-  callback(proceed, abort, context);
+  operation(proceed, abort, context);
 
   function proceed() {
     next();

package/bin/utilities/fileSystem.js

@@ -2,14 +2,16 @@
 
 const fs = require("fs");
 
-const { fileSystemUtilities } = require("necessary");
+const { characters, fileSystemUtilities } = require("necessary");
 
-const { W_PLUS, FULL_STOP } = require("../constants"),
+const { W_PLUS } = require("../constants"),
       { pathWithoutBottommostNameFromPath } = require("../utilities/path");
 
 const { openSync, writeSync, rmdirSync, unlinkSync } = fs,
       { readDirectory, isEntryDirectory, createDirectory } = fileSystemUtilities;
 
+const { PERIOD_CHARACTER } = characters;
+
 function deleteFile(filePath, done) {
   unlinkSync(filePath);
 
@@ -33,7 +35,7 @@ function deleteDirectory(directoryPath, done) {
 function createParentDirectory(filePath) {
   const filePathWithoutBottommostName = pathWithoutBottommostNameFromPath(filePath);
 
-  if ((filePathWithoutBottommostName !== FULL_STOP) && (filePathWithoutBottommostName !== null)) {
+  if ((filePathWithoutBottommostName !== PERIOD_CHARACTER) && (filePathWithoutBottommostName !== null)) {
     const parentDirectoryPath = filePathWithoutBottommostName;  ///
 
     createDirectory(parentDirectoryPath);

package/bin/utilities/path.js

@@ -1,10 +1,11 @@
 "use strict";
 
-const { pathUtilities } = require("necessary");
+const { characters, pathUtilities } = require("necessary");
 
-const { EMPTY_STRING, DELIMITER } = require("../constants");
+const { EMPTY_STRING } = require("../constants");
 
-const { isPathName, bottommostNameFromPath } = pathUtilities;
+  const { FORWARD_SLASH_CHARACTER } = characters,
+      { isPathName, bottommostNameFromPath } = pathUtilities;
 
 const currentWorkingDirectoryPath = process.cwd(),
       currentWorkingDirectoryPathLength = currentWorkingDirectoryPath.length;
@@ -61,9 +62,9 @@ function pathFromFullyQualifiedPath(fullyQualifiedPath) {
 }
 
 function pathWithoutDirectoryPathFromPathAndDirectoryPath(path, directoryPath) {
-  const delimiterLength = DELIMITER.length,
-        directoryPathLength = directoryPath.length,
-        pathWithoutDirectoryPath = path.substring(directoryPathLength + delimiterLength);
+    const directoryPathLength = directoryPath.length,
+          forwardSlashCharacterLength = FORWARD_SLASH_CHARACTER.length,
+          pathWithoutDirectoryPath = path.substring(directoryPathLength + forwardSlashCharacterLength);
 
   return pathWithoutDirectoryPath;
 }

package/bin/utilities/transpile.js

@@ -2,15 +2,19 @@
 
 const path = require("path");
 
+const { encodings } = require("necessary");
+
 const { SWC_CORE_PATH, BABEL_CORE_PATH } = require("../paths"),
       { readFile, writeFile, createParentDirectory } = require("../utilities/fileSystem"),
-      { BABEL, INLINE, BASE_64, SOURCE_MAP_PREAMBLE } = require("../constants"),
+      { BABEL, INLINE, SOURCE_MAP_PREAMBLE } = require("../constants"),
       { sourceFileNameFromSourceFilePathAndTargetFilePath } = require("../utilities/sourceMap"),
       { SWC_FAILED_MESSAGE,
         BABEL_FAILED_MESSAGE,
         SWC_NOT_INSTALLED_MESSAGE,
         BABEL_NOT_INSTALLED_MESSAGE } = require("../messages");
 
+const { BASE64_ENCODING } = encodings;
+
 function createTranspileFileFunction(context) {
   const { debug, transpiler } = context,
         transpileFileFunction = (transpiler === BABEL) ?
@@ -122,7 +126,7 @@ function createSWCTranspileFileFunction(debug) {
             });
 
             const mapJSONString = JSON.stringify(mapJSON),
-                  base64EncodedMapJSONString = Buffer.from(mapJSONString).toString(BASE_64);
+                  base64EncodedMapJSONString = Buffer.from(mapJSONString).toString(BASE64_ENCODING);
 
             targetFileContent = `${code}
 ${SOURCE_MAP_PREAMBLE}${base64EncodedMapJSONString}`; ///

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "watchful-cli",
   "author": "James Smith",
-  "version": "1.7.14",
+  "version": "1.7.18",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/watchful-cli",
   "description": "Incremental transpilation with bundling.",
@@ -15,7 +15,7 @@
   "dependencies": {
     "argumentative": "^2.0.14",
     "chokidar": "^3.3.1",
-    "necessary": "^10.0.0"
+    "necessary": "^11.0.25"
   },
   "devDependencies": {},
   "scripts": {}