occam-verify-cli 0.0.325 → 0.0.328

package/bin/callbacks.js

@@ -1,25 +1,41 @@
 "use strict";
 
-const { levels } = require("necessary"),
-      { Callbacks } = require("../lib/index"),
+const { Callbacks } = require("../lib/index"),
       { loggingUtilities } = require("necessary");
 
-const { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = require("./messages");
-
 const { log } = loggingUtilities,
-      { TRACE_LEVEL } = levels;
+      { trace } = log,
+      { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = Callbacks;
+
+function halt(filePath, leastLineIndex, greatestLineIndex) {
+  let message = HALT_MESSAGE;
+
+  message = formatMessage(message, filePath, leastLineIndex, greatestLineIndex); ///
+
+  trace(message);
+}
+
+function begin(filePath, leastLineIndex, greatestLineIndex) {
+  let message = BEGIN_MESSAGE;
 
-function halt(filePath, leastLineIndex, greatestLineIndex) { logMessage(HALT_MESSAGE, filePath, leastLineIndex, greatestLineIndex); } ///
+  message = formatMessage(message, filePath, leastLineIndex, greatestLineIndex); ///
 
-function begin(filePath, leastLineIndex, greatestLineIndex) { logMessage(BEGIN_MESSAGE, filePath, leastLineIndex, greatestLineIndex); } ///
+  trace(message);
+}
+
+function complete(filePath, leastLineIndex, greatestLineIndex) {
+  let message = COMPLETED_MESSAGE;
+
+  message = formatMessage(message, filePath, leastLineIndex, greatestLineIndex); ///
 
-function complete(filePath, leastLineIndex, greatestLineIndex) { logMessage(COMPLETED_MESSAGE, filePath, leastLineIndex, greatestLineIndex); }  ///
+  trace(message);
+}
 
 const callbacks = Callbacks.fromHaltBeginAndComplete(halt, begin, complete);
 
 module.exports = callbacks;
 
-function logMessage(message, filePath, leastLineIndex, greatestLineIndex) {
+function formatMessage(message, filePath, leastLineIndex, greatestLineIndex) {
   if (leastLineIndex === greatestLineIndex) {
     const lineIndex = leastLineIndex; ///
 
@@ -28,9 +44,5 @@ function logMessage(message, filePath, leastLineIndex, greatestLineIndex) {
     message = `'${filePath}' : [${leastLineIndex}-${greatestLineIndex}] - ${message}`;
   }
 
-  const level = TRACE_LEVEL;
-
-  log(message, level);
-
   return message;
 }

package/lib/callbacks.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "default", {
     enumerable: true,
     get: function() {
-        return Callbacks;
+        return _default;
     }
 });
 function _classCallCheck(instance, Constructor) {
@@ -27,6 +27,7 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
+var HALT_MESSAGE = "Halted verification.", BEGIN_MESSAGE = "Begun verification...", COMPLETED_MESSAGE = "...completed verification.";
 var Callbacks = /*#__PURE__*/ function() {
     function Callbacks(halt, begin, complete) {
         _classCallCheck(this, Callbacks);
@@ -64,5 +65,11 @@ var Callbacks = /*#__PURE__*/ function() {
     ]);
     return Callbacks;
 }();
+Object.assign(Callbacks, {
+    HALT_MESSAGE: HALT_MESSAGE,
+    BEGIN_MESSAGE: BEGIN_MESSAGE,
+    COMPLETED_MESSAGE: COMPLETED_MESSAGE
+});
+var _default = Callbacks;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jYWxsYmFja3MuanMiLCI8PGpzeC1jb25maWctcHJhZ21hLmpzPj4iXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENhbGxiYWNrcyB7XG4gIGNvbnN0cnVjdG9yKGhhbHQsIGJlZ2luLCBjb21wbGV0ZSkge1xuICAgIHRoaXMuaGFsdCA9IGhhbHQ7XG4gICAgdGhpcy5iZWdpbiA9IGJlZ2luO1xuICAgIHRoaXMuY29tcGxldGUgPSBjb21wbGV0ZTtcbiAgfVxuXG4gIGdldEhhbHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuaGFsdDtcbiAgfVxuXG4gIGdldEJlZ2luKCkge1xuICAgIHJldHVybiB0aGlzLmJlZ2luO1xuICB9XG5cbiAgZ2V0Q29tcGxldGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuY29tcGxldGU7XG4gIH1cblxuICBzdGF0aWMgZnJvbUhhbHRCZWdpbkFuZENvbXBsZXRlKGhhbHQsIGJlZ2luLCBjb21wbGV0ZSkge1xuICAgIGNvbnN0IGNhbGxiYWNrcyA9IG5ldyBDYWxsYmFja3MoaGFsdCwgYmVnaW4sIGNvbXBsZXRlKTtcblxuICAgIHJldHVybiBjYWxsYmFja3M7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ2FsbGJhY2tzIiwiaGFsdCIsImJlZ2luIiwiY29tcGxldGUiLCJnZXRIYWx0IiwiZ2V0QmVnaW4iLCJnZXRDb21wbGV0ZSIsImZyb21IYWx0QmVnaW5BbmRDb21wbGV0ZSIsImNhbGxiYWNrcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFFcUJBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQU4sSUFBQSxBQUFNQSwwQkFBTjthQUFNQSxVQUNQQyxJQUFJLEVBQUVDLEtBQUssRUFBRUMsUUFBUTs4QkFEZEg7UUFFakIsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxLQUFLLEdBQUdBO1FBQ2IsSUFBSSxDQUFDQyxRQUFRLEdBQUdBOztpQkFKQ0g7O1lBT25CSSxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVTtnQkFDUixPQUFPLElBQUksQ0FBQ0gsSUFBSTtZQUNsQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQSxXQUFXO2dCQUNULE9BQU8sSUFBSSxDQUFDSCxLQUFLO1lBQ25COzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBLGNBQWM7Z0JBQ1osT0FBTyxJQUFJLENBQUNILFFBQVE7WUFDdEI7Ozs7WUFFT0ksS0FBQUE7bUJBQVAsU0FBT0EseUJBQXlCTixJQUFJLEVBQUVDLEtBQUssRUFBRUMsUUFBUSxFQUFFO2dCQUNyRCxJQUFNSyxZQUFZLElBcEJEUixVQW9CZUMsTUFBTUMsT0FBT0M7Z0JBRTdDLE9BQU9LO1lBQ1Q7OztXQXZCbUJSIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jYWxsYmFja3MuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmNvbnN0IEhBTFRfTUVTU0FHRSA9IFwiSGFsdGVkIHZlcmlmaWNhdGlvbi5cIixcbiAgICAgIEJFR0lOX01FU1NBR0UgPSBcIkJlZ3VuIHZlcmlmaWNhdGlvbi4uLlwiLFxuICAgICAgQ09NUExFVEVEX01FU1NBR0UgPSBcIi4uLmNvbXBsZXRlZCB2ZXJpZmljYXRpb24uXCI7XG5cbmNsYXNzIENhbGxiYWNrcyB7XG4gIGNvbnN0cnVjdG9yKGhhbHQsIGJlZ2luLCBjb21wbGV0ZSkge1xuICAgIHRoaXMuaGFsdCA9IGhhbHQ7XG4gICAgdGhpcy5iZWdpbiA9IGJlZ2luO1xuICAgIHRoaXMuY29tcGxldGUgPSBjb21wbGV0ZTtcbiAgfVxuXG4gIGdldEhhbHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuaGFsdDtcbiAgfVxuXG4gIGdldEJlZ2luKCkge1xuICAgIHJldHVybiB0aGlzLmJlZ2luO1xuICB9XG5cbiAgZ2V0Q29tcGxldGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuY29tcGxldGU7XG4gIH1cblxuICBzdGF0aWMgZnJvbUhhbHRCZWdpbkFuZENvbXBsZXRlKGhhbHQsIGJlZ2luLCBjb21wbGV0ZSkge1xuICAgIGNvbnN0IGNhbGxiYWNrcyA9IG5ldyBDYWxsYmFja3MoaGFsdCwgYmVnaW4sIGNvbXBsZXRlKTtcblxuICAgIHJldHVybiBjYWxsYmFja3M7XG4gIH1cbn1cblxuT2JqZWN0LmFzc2lnbihDYWxsYmFja3MsIHtcbiAgSEFMVF9NRVNTQUdFLFxuICBCRUdJTl9NRVNTQUdFLFxuICBDT01QTEVURURfTUVTU0FHRVxufSk7XG5cbmV4cG9ydCBkZWZhdWx0IENhbGxiYWNrcztcbiJdLCJuYW1lcyI6WyJIQUxUX01FU1NBR0UiLCJCRUdJTl9NRVNTQUdFIiwiQ09NUExFVEVEX01FU1NBR0UiLCJDYWxsYmFja3MiLCJoYWx0IiwiYmVnaW4iLCJjb21wbGV0ZSIsImdldEhhbHQiLCJnZXRCZWdpbiIsImdldENvbXBsZXRlIiwiZnJvbUhhbHRCZWdpbkFuZENvbXBsZXRlIiwiY2FsbGJhY2tzIiwiT2JqZWN0IiwiYXNzaWduIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFzQ0E7OztlQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBcENBLElBQU1BLGVBQWUsd0JBQ2ZDLGdCQUFnQix5QkFDaEJDLG9CQUFvQjtBQUUxQixJQUFBLEFBQU1DLDBCQTBCSCxBQTFCSDthQUFNQSxVQUNRQyxJQUFJLEVBQUVDLEtBQUssRUFBRUMsUUFBUTs4QkFEN0JIO1FBRUYsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxLQUFLLEdBQUdBO1FBQ2IsSUFBSSxDQUFDQyxRQUFRLEdBQUdBOztpQkFKZEg7O1lBT0pJLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVO2dCQUNSLE9BQU8sSUFBSSxDQUFDSCxJQUFJO1lBQ2xCOzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBLFdBQVc7Z0JBQ1QsT0FBTyxJQUFJLENBQUNILEtBQUs7WUFDbkI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUEsY0FBYztnQkFDWixPQUFPLElBQUksQ0FBQ0gsUUFBUTtZQUN0Qjs7OztZQUVPSSxLQUFBQTttQkFBUCxTQUFPQSx5QkFBeUJOLElBQUksRUFBRUMsS0FBSyxFQUFFQyxRQUFRLEVBQUU7Z0JBQ3JELElBQU1LLFlBQVksSUFwQmhCUixVQW9COEJDLE1BQU1DLE9BQU9DO2dCQUU3QyxPQUFPSztZQUNUOzs7V0F2QklSOztBQTBCTlMsT0FBT0MsTUFBTSxDQUFDVixXQUFXO0lBQ3ZCSCxjQUFBQTtJQUNBQyxlQUFBQTtJQUNBQyxtQkFBQUE7QUFDRjtJQUVBLFdBQWVDIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.325",
+  "version": "0.0.328",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -14,7 +14,7 @@
     "necessary": "^11.0.40",
     "occam-custom-grammars": "^5.0.357",
     "occam-dom": "^3.0.171",
-    "occam-file-system": "^5.0.45",
+    "occam-file-system": "^5.0.46",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/callbacks.js

@@ -1,6 +1,10 @@
 "use strict";
 
-export default class Callbacks {
+const HALT_MESSAGE = "Halted verification.",
+      BEGIN_MESSAGE = "Begun verification...",
+      COMPLETED_MESSAGE = "...completed verification.";
+
+class Callbacks {
   constructor(halt, begin, complete) {
     this.halt = halt;
     this.begin = begin;
@@ -25,3 +29,11 @@ export default class Callbacks {
     return callbacks;
   }
 }
+
+Object.assign(Callbacks, {
+  HALT_MESSAGE,
+  BEGIN_MESSAGE,
+  COMPLETED_MESSAGE
+});
+
+export default Callbacks;

package/bin/messages.js

@@ -1,11 +0,0 @@
-"use strict";
-
-const HALT_MESSAGE = "Halted verification.",
-      BEGIN_MESSAGE = "Begun verification...",
-      COMPLETED_MESSAGE = "...completed verification.";
-
-module.exports = {
-  HALT_MESSAGE,
-  BEGIN_MESSAGE,
-  COMPLETED_MESSAGE
-};