occam-verify-cli 0.0.321 → 0.0.322

package/bin/main.js

@@ -4,10 +4,9 @@ const { arrayUtilities } = require("necessary"),
       { fileSystemUtilities } = require("occam-file-system"),
       { verifyRelease, releaseContextUtilities } = require("../lib/index");
 
-const callbacks = require("./callbacks");
-
 const { log } = require("./utilities/logging"),
-      { PERIOD } = require("./constants");
+      { PERIOD } = require("./constants"),
+      { callbacksFromLog } = require("./utilities/callbacks");
 
 const { first } = arrayUtilities,
       { loadRelease } = fileSystemUtilities,
@@ -20,6 +19,7 @@ function main(commands, options) {
         shortenedVersion = null,
         dependentNames = [],
         connection = null,  ///
+        callbacks = callbacksFromLog(log),
         context = {
           log,
           callbacks,

package/bin/utilities/callbacks.js

@@ -0,0 +1,57 @@
+"use strict";
+
+const { levels } = require("necessary"),
+      { Callbacks } = require("../../lib/index");
+
+const { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = require("../messages");
+
+const { TRACE_LEVEL } = levels;
+
+function callbacksFromLog(log) {
+  const level = TRACE_LEVEL;
+
+  function halt(filePath, leastLineIndex, greatestLineIndex) {
+    let message = HALT_MESSAGE;
+
+    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
+
+    log(level, message);
+  }
+
+  function begin(filePath, leastLineIndex, greatestLineIndex) {
+    let message = BEGIN_MESSAGE;
+
+    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
+
+    log(level, message);
+  }
+
+  function complete(filePath, leastLineIndex, greatestLineIndex) {
+    let message = COMPLETED_MESSAGE;
+
+    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
+
+    log(level, message);
+  }
+
+  const callbacks = Callbacks.fromHaltBeginAndComplete(halt, begin, complete);
+
+  return callbacks;
+}
+
+
+module.exports = {
+  callbacksFromLog
+};
+
+function messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex) {
+  if (leastLineIndex === greatestLineIndex) {
+    const lineIndex = leastLineIndex; ///
+
+    message = `'${filePath}' : [${lineIndex}] - ${message}`;
+  } else {
+    message = `'${filePath}' : [${leastLineIndex}-${greatestLineIndex}] - ${message}`;
+  }
+
+  return message;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.321",
+  "version": "0.0.322",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/bin/callbacks.js

@@ -1,27 +0,0 @@
-"use strict";
-
-const { Callbacks } = require("../lib/index");
-
-const { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = require("./messages");
-
-function halt(filePath, leastLineIndex, greatestLineIndex) { message(HALT_MESSAGE, filePath, leastLineIndex, greatestLineIndex); }  ///
-
-function begin(filePath, leastLineIndex, greatestLineIndex) { message(BEGIN_MESSAGE, filePath, leastLineIndex, greatestLineIndex); }  ///
-
-function complete(filePath, leastLineIndex, greatestLineIndex) { message(COMPLETED_MESSAGE, filePath, leastLineIndex, greatestLineIndex); }  ///
-
-const callbacks = Callbacks.fromHaltBeginAndComplete(halt, begin, complete);
-
-module.exports = callbacks;
-
-function message(message, filePath, leastLineIndex, greatestLineIndex) {
-  if (leastLineIndex === greatestLineIndex) {
-    const lineIndex = leastLineIndex; ///
-
-    message = `'${filePath}' : [${lineIndex}] - ${message}`;
-  } else {
-    message = `'${filePath}' : [${leastLineIndex}-${greatestLineIndex}] - ${message}`;
-  }
-
-  console.log(message);
-}