occam-verify-cli 0.0.319 → 0.0.320

package/bin/main.js

@@ -1,22 +1,49 @@
 "use strict";
 
 const { verifyRelease } = require("../lib/index"),
-      { arrayUtilities } = require("necessary");
+      { arrayUtilities } = require("necessary"),
+      { fileSystemUtilities } = require("occam-file-system")
 
-const { createReleaseContext } = require("./utilities/release");
+const callbacks = require("./callbacks");
 
-const { first } = arrayUtilities;
+const { log } = require("./utilities/logging"),
+      { PERIOD } = require("./constants"),
+      { createReleaseContext } = require("./utilities/release");
+
+const { first } = arrayUtilities,
+      { loadRelease } = fileSystemUtilities;
 
 function main(commands, options) {
   const firstCommand = first(commands),
         { name = firstCommand } = options, ///
         releaseContextMap = {},
         shortenedVersion = null,
-        releaseContext = createReleaseContext(name, shortenedVersion, releaseContextMap);
+        dependentNames = [],
+        connection = null,  ///
+        context = {
+          log,
+          callbacks,
+          createRelease,
+          releaseContextMap
+        };
+
+  createReleaseContext(connection, name, dependentNames, shortenedVersion, context, (error) => {
+    if (error) {
+      ///
+
+      return;
+    }
 
-  if (releaseContext !== null) {
     verifyRelease(name, releaseContextMap);
-  }
+  });
 }
 
 module.exports = main;
+
+function createRelease(name, callback) {
+  const topmostDirectoryName = name, ///
+        projectsDirectoryPath = PERIOD, ///
+        release = loadRelease(topmostDirectoryName, projectsDirectoryPath);
+
+  callback(release);
+}

package/bin/utilities/release.js

@@ -1,77 +1,124 @@
 "use strict";
 
-const { fileSystemUtilities } = require("occam-file-system"),
-      { ReleaseContext, verificationUtilities } = require("../../lib/index");
+const { ReleaseContext } = require("../../lib/index");
 
-const callbacks = require("../callbacks");
+function createReleaseContext(connection, name, dependentNames, shortenedVersion, context, callback) {
+  const { releaseContextMap } = context,
+        releaseContext = releaseContextMap[name] || null;
 
-const { log } = require("../utilities/logging"),
-      { PERIOD } = require("../constants");
+  if (releaseContext !== null) {
+    const error = false;
+
+    callback(error);
+
+    return;
+  }
 
-const { loadRelease } = fileSystemUtilities,
-      { checkCyclicDependencyExists, checkReleaseMatchesShortenedVersion} = verificationUtilities;
+  const { createRelease } = context;
 
-function createReleaseContext(name, shortenedVersion, releaseContextMap, dependentNames = []) {
-  let releaseContext = releaseContextMap[name] || null;
+  createRelease(name, (release) => {
+    if (release === null) {
+      const error = true;
 
-  if (releaseContext === null) {
-    const release = createRelease(name);
+      callback(error);
 
-    if (release !== null) {
-      releaseContext = ReleaseContext.fromLogReleaseAndCallbacks(log, release, callbacks);
+      return;
     }
-  }
 
-  if (releaseContext !== null) {
-    const releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion),
-          dependencyReleaseContextsCreated = createDependencyReleaseContexts(releaseContext, releaseContextMap, dependentNames);
+    const { log, callbacks } = context,
+          releaseContext = ReleaseContext.fromLogReleaseAndCallbacks(log, release, callbacks),
+          releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion);
+
+    if (!releaseMatchesShortedVersion) {
+      const error = true;
 
-    if (!releaseMatchesShortedVersion || !dependencyReleaseContextsCreated) {
-      releaseContext = null;
+      callback(error);
+
+      return;
     }
-  }
 
-  releaseContextMap[name] = releaseContext;
+    createDependencyReleaseContexts(connection, releaseContext, dependentNames, context, (error) => {
+      if (!error) {
+        releaseContextMap[name] = releaseContext;
+      }
 
-  return releaseContext;
+      callback(error);
+    });
+  });
 }
 
 module.exports = {
   createReleaseContext
 };
 
-function createRelease(name) {
-  const topmostDirectoryName = name, ///
-        projectsDirectoryPath = PERIOD;
+function checkCyclicDependencyExists(name, dependentNames, releaseContext) {
+  const dependentNamesIncludesName = dependentNames.includes(name),
+        cyclicDependencyExists = dependentNamesIncludesName;  ///
 
-  let release = loadRelease(topmostDirectoryName, projectsDirectoryPath);
+  if (cyclicDependencyExists) {
+    const firstDependentName = first(dependentNames),
+          dependencyNames = dependentNames.concat(firstDependentName),
+          dependencyNamesString = dependencyNames.join(`' -> '`);
 
-  if (release === null) {
-    log.error(`The '${name}' package cannot be loaded.`);
+    releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
   }
 
-  return release;
+  return cyclicDependencyExists;
 }
 
-function createDependencyReleaseContexts(releaseContext, releaseContextMap, dependentNames = []) {
+function createDependencyReleaseContexts(connection, releaseContext, dependentNames, context, callback) {
   const name = releaseContext.getName(),
         dependencies = releaseContext.getDependencies();
 
   dependentNames = [ ...dependentNames, name ];  ///
 
-  const dependencyReleaseContextsCreated = dependencies.everyDependency((dependency) => {
+  dependencies.asynchronousForEachDependency(dependencies, (dependency, next, done) => {
     const name = dependency.getName(),
           shortenedVersion = dependency.getShortedVersion(),
           cyclicDependencyExists = checkCyclicDependencyExists(name, dependentNames, releaseContext);
 
-    if (!cyclicDependencyExists) {
-      const releaseContext = createReleaseContext(name, shortenedVersion, releaseContextMap, dependentNames);
+    if (cyclicDependencyExists) {
+      noError = false;
 
-      if (releaseContext !== null) {
-        return true;
-      }
+      done();
+
+      return;
     }
-  });
 
-  return dependencyReleaseContextsCreated;
+    createReleaseContext(connection, name, dependentNames, shortenedVersion, context, (error) => {
+      if (error) {
+        noError = false;
+
+        done();
+
+        return;
+      }
+
+      next();
+    });
+  }, done);
+
+  let noError = true;
+
+  function done() {
+    const error = !noError;
+
+    callback(error);
+  }
+}
+
+function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
+  const release = releaseContext.getRelease(),
+        releaseMatchesShortedVersion = release.matchShortenedVersion(shortenedVersion);
+
+  if (!releaseMatchesShortedVersion) {
+    const name = releaseContext.getName(),
+          version = releaseContext.getVersion(),
+          versionString = version.toString(),
+          shortenedVersionString = shortenedVersion.toString();
+
+    releaseContext.error(`The '${name}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);
+  }
+
+  return releaseMatchesShortedVersion;
 }

package/lib/index.js

@@ -17,19 +17,15 @@ _export(exports, {
     },
     ReleaseContext: function() {
         return _release1.default;
-    },
-    verificationUtilities: function() {
-        return _verification.default;
     }
 });
 var _callbacks = /*#__PURE__*/ _interopRequireDefault(require("./callbacks"));
 var _release = /*#__PURE__*/ _interopRequireDefault(require("./verify/release"));
 var _release1 = /*#__PURE__*/ _interopRequireDefault(require("./context/release"));
-var _verification = /*#__PURE__*/ _interopRequireDefault(require("./utilities/verification"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IHsgZGVmYXVsdCBhcyBDYWxsYmFja3MgfSBmcm9tIFwiLi9jYWxsYmFja3NcIjtcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdmVyaWZ5UmVsZWFzZSB9IGZyb20gXCIuL3ZlcmlmeS9yZWxlYXNlXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIFJlbGVhc2VDb250ZXh0IH0gZnJvbSBcIi4vY29udGV4dC9yZWxlYXNlXCI7XG5cbmV4cG9ydCB7IGRlZmF1bHQgYXMgdmVyaWZpY2F0aW9uVXRpbGl0aWVzIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3ZlcmlmaWNhdGlvblwiO1xuIl0sIm5hbWVzIjpbIkNhbGxiYWNrcyIsInZlcmlmeVJlbGVhc2UiLCJSZWxlYXNlQ29udGV4dCIsInZlcmlmaWNhdGlvblV0aWxpdGllcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBRW9CQSxTQUFTO2VBQVRBLGtCQUFTOztJQUNUQyxhQUFhO2VBQWJBLGdCQUFhOztJQUNiQyxjQUFjO2VBQWRBLGlCQUFjOztJQUVkQyxxQkFBcUI7ZUFBckJBLHFCQUFxQjs7OzhEQUpKOzREQUNJOzZEQUNDO2lFQUVPIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IHsgZGVmYXVsdCBhcyBDYWxsYmFja3MgfSBmcm9tIFwiLi9jYWxsYmFja3NcIjtcbmV4cG9ydCB7IGRlZmF1bHQgYXMgdmVyaWZ5UmVsZWFzZSB9IGZyb20gXCIuL3ZlcmlmeS9yZWxlYXNlXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIFJlbGVhc2VDb250ZXh0IH0gZnJvbSBcIi4vY29udGV4dC9yZWxlYXNlXCI7XG4iXSwibmFtZXMiOlsiQ2FsbGJhY2tzIiwidmVyaWZ5UmVsZWFzZSIsIlJlbGVhc2VDb250ZXh0Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFFb0JBLFNBQVM7ZUFBVEEsa0JBQVM7O0lBQ1RDLGFBQWE7ZUFBYkEsZ0JBQWE7O0lBQ2JDLGNBQWM7ZUFBZEEsaUJBQWM7Ozs4REFGRzs0REFDSTs2REFDQyJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.319",
+  "version": "0.0.320",
   "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.44",
+    "occam-file-system": "^5.0.45",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/index.js

@@ -3,5 +3,3 @@
 export { default as Callbacks } from "./callbacks";
 export { default as verifyRelease } from "./verify/release";
 export { default as ReleaseContext } from "./context/release";
-
-export { default as verificationUtilities } from "./utilities/verification";

package/lib/utilities/verification.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    checkCyclicDependencyExists: function() {
-        return checkCyclicDependencyExists;
-    },
-    checkReleaseMatchesShortenedVersion: function() {
-        return checkReleaseMatchesShortenedVersion;
-    },
-    default: function() {
-        return _default;
-    }
-});
-var _necessary = require("necessary");
-var first = _necessary.arrayUtilities.first;
-function checkCyclicDependencyExists(name, dependentNames, releaseContext) {
-    var dependentNamesIncludesName = dependentNames.includes(name), cyclicDependencyExists = dependentNamesIncludesName; ///
-    if (cyclicDependencyExists) {
-        var firstDependentName = first(dependentNames), dependencyNames = dependentNames.concat(firstDependentName), dependencyNamesString = dependencyNames.join("' -> '");
-        releaseContext.error("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
-    }
-    return cyclicDependencyExists;
-}
-function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
-    var release = releaseContext.getRelease(), releaseMatchesShortedVersion = release.matchShortenedVersion(shortenedVersion);
-    if (!releaseMatchesShortedVersion) {
-        var name = releaseContext.getName(), version = releaseContext.getVersion(), versionString = version.toString(), shortenedVersionString = shortenedVersion.toString();
-        releaseContext.error("The '".concat(name, "' package's version of ").concat(versionString, " does not match the dependency's shortened version of ").concat(shortenedVersionString, "."));
-    }
-    return releaseMatchesShortedVersion;
-}
-var _default = {
-    checkCyclicDependencyExists: checkCyclicDependencyExists,
-    checkReleaseMatchesShortenedVersion: checkReleaseMatchesShortenedVersion
-};
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdmVyaWZpY2F0aW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBhcnJheVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuY29uc3QgeyBmaXJzdCB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBmdW5jdGlvbiBjaGVja0N5Y2xpY0RlcGVuZGVuY3lFeGlzdHMobmFtZSwgZGVwZW5kZW50TmFtZXMsIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IGRlcGVuZGVudE5hbWVzSW5jbHVkZXNOYW1lID0gZGVwZW5kZW50TmFtZXMuaW5jbHVkZXMobmFtZSksXG4gICAgICAgIGN5Y2xpY0RlcGVuZGVuY3lFeGlzdHMgPSBkZXBlbmRlbnROYW1lc0luY2x1ZGVzTmFtZTsgIC8vL1xuXG4gIGlmIChjeWNsaWNEZXBlbmRlbmN5RXhpc3RzKSB7XG4gICAgY29uc3QgZmlyc3REZXBlbmRlbnROYW1lID0gZmlyc3QoZGVwZW5kZW50TmFtZXMpLFxuICAgICAgICAgIGRlcGVuZGVuY3lOYW1lcyA9IGRlcGVuZGVudE5hbWVzLmNvbmNhdChmaXJzdERlcGVuZGVudE5hbWUpLFxuICAgICAgICAgIGRlcGVuZGVuY3lOYW1lc1N0cmluZyA9IGRlcGVuZGVuY3lOYW1lcy5qb2luKGAnIC0+ICdgKTtcblxuICAgIHJlbGVhc2VDb250ZXh0LmVycm9yKGBUaGVyZSBpcyBhIGN5Y2xpYyBkZXBlbmRlbmN5OiAnJHtkZXBlbmRlbmN5TmFtZXNTdHJpbmd9Jy5gKTtcbiAgfVxuXG4gIHJldHVybiBjeWNsaWNEZXBlbmRlbmN5RXhpc3RzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY2hlY2tSZWxlYXNlTWF0Y2hlc1Nob3J0ZW5lZFZlcnNpb24ocmVsZWFzZUNvbnRleHQsIHNob3J0ZW5lZFZlcnNpb24pIHtcbiAgY29uc3QgcmVsZWFzZSA9IHJlbGVhc2VDb250ZXh0LmdldFJlbGVhc2UoKSxcbiAgICAgICAgcmVsZWFzZU1hdGNoZXNTaG9ydGVkVmVyc2lvbiA9IHJlbGVhc2UubWF0Y2hTaG9ydGVuZWRWZXJzaW9uKHNob3J0ZW5lZFZlcnNpb24pO1xuXG4gIGlmICghcmVsZWFzZU1hdGNoZXNTaG9ydGVkVmVyc2lvbikge1xuICAgIGNvbnN0IG5hbWUgPSByZWxlYXNlQ29udGV4dC5nZXROYW1lKCksXG4gICAgICAgICAgdmVyc2lvbiA9IHJlbGVhc2VDb250ZXh0LmdldFZlcnNpb24oKSxcbiAgICAgICAgICB2ZXJzaW9uU3RyaW5nID0gdmVyc2lvbi50b1N0cmluZygpLFxuICAgICAgICAgIHNob3J0ZW5lZFZlcnNpb25TdHJpbmcgPSBzaG9ydGVuZWRWZXJzaW9uLnRvU3RyaW5nKCk7XG5cbiAgICByZWxlYXNlQ29udGV4dC5lcnJvcihgVGhlICcke25hbWV9JyBwYWNrYWdlJ3MgdmVyc2lvbiBvZiAke3ZlcnNpb25TdHJpbmd9IGRvZXMgbm90IG1hdGNoIHRoZSBkZXBlbmRlbmN5J3Mgc2hvcnRlbmVkIHZlcnNpb24gb2YgJHtzaG9ydGVuZWRWZXJzaW9uU3RyaW5nfS5gKTtcbiAgfVxuXG4gIHJldHVybiByZWxlYXNlTWF0Y2hlc1Nob3J0ZWRWZXJzaW9uO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIGNoZWNrQ3ljbGljRGVwZW5kZW5jeUV4aXN0cyxcbiAgY2hlY2tSZWxlYXNlTWF0Y2hlc1Nob3J0ZW5lZFZlcnNpb25cbn07XG4iXSwibmFtZXMiOlsiY2hlY2tDeWNsaWNEZXBlbmRlbmN5RXhpc3RzIiwiY2hlY2tSZWxlYXNlTWF0Y2hlc1Nob3J0ZW5lZFZlcnNpb24iLCJmaXJzdCIsImFycmF5VXRpbGl0aWVzIiwibmFtZSIsImRlcGVuZGVudE5hbWVzIiwicmVsZWFzZUNvbnRleHQiLCJkZXBlbmRlbnROYW1lc0luY2x1ZGVzTmFtZSIsImluY2x1ZGVzIiwiY3ljbGljRGVwZW5kZW5jeUV4aXN0cyIsImZpcnN0RGVwZW5kZW50TmFtZSIsImRlcGVuZGVuY3lOYW1lcyIsImNvbmNhdCIsImRlcGVuZGVuY3lOYW1lc1N0cmluZyIsImpvaW4iLCJlcnJvciIsInNob3J0ZW5lZFZlcnNpb24iLCJyZWxlYXNlIiwiZ2V0UmVsZWFzZSIsInJlbGVhc2VNYXRjaGVzU2hvcnRlZFZlcnNpb24iLCJtYXRjaFNob3J0ZW5lZFZlcnNpb24iLCJnZXROYW1lIiwidmVyc2lvbiIsImdldFZlcnNpb24iLCJ2ZXJzaW9uU3RyaW5nIiwidG9TdHJpbmciLCJzaG9ydGVuZWRWZXJzaW9uU3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFNZ0JBLDJCQUEyQjtlQUEzQkE7O0lBZUFDLG1DQUFtQztlQUFuQ0E7O0lBZ0JoQixPQUdFO2VBSEY7Ozt5QkFuQytCO0FBRS9CLElBQU0sQUFBRUMsUUFBVUMseUJBQWMsQ0FBeEJEO0FBRUQsU0FBU0YsNEJBQTRCSSxJQUFJLEVBQUVDLGNBQWMsRUFBRUMsY0FBYyxFQUFFO0lBQ2hGLElBQU1DLDZCQUE2QkYsZUFBZUcsUUFBUSxDQUFDSixPQUNyREsseUJBQXlCRiw0QkFBNkIsR0FBRztJQUUvRCxJQUFJRSx3QkFBd0I7UUFDMUIsSUFBTUMscUJBQXFCUixNQUFNRyxpQkFDM0JNLGtCQUFrQk4sZUFBZU8sTUFBTSxDQUFDRixxQkFDeENHLHdCQUF3QkYsZ0JBQWdCRyxJQUFJLENBQUU7UUFFcERSLGVBQWVTLEtBQUssQ0FBQyxBQUFDLGtDQUF1RCxPQUF0QkYsdUJBQXNCO0lBQy9FLENBQUM7SUFFRCxPQUFPSjtBQUNUO0FBRU8sU0FBU1Isb0NBQW9DSyxjQUFjLEVBQUVVLGdCQUFnQixFQUFFO0lBQ3BGLElBQU1DLFVBQVVYLGVBQWVZLFVBQVUsSUFDbkNDLCtCQUErQkYsUUFBUUcscUJBQXFCLENBQUNKO0lBRW5FLElBQUksQ0FBQ0csOEJBQThCO1FBQ2pDLElBQU1mLE9BQU9FLGVBQWVlLE9BQU8sSUFDN0JDLFVBQVVoQixlQUFlaUIsVUFBVSxJQUNuQ0MsZ0JBQWdCRixRQUFRRyxRQUFRLElBQ2hDQyx5QkFBeUJWLGlCQUFpQlMsUUFBUTtRQUV4RG5CLGVBQWVTLEtBQUssQ0FBQyxBQUFDLFFBQXFDUyxPQUE5QnBCLE1BQUssMkJBQStGc0IsT0FBdEVGLGVBQWMsMERBQStFLE9BQXZCRSx3QkFBdUI7SUFDMUosQ0FBQztJQUVELE9BQU9QO0FBQ1Q7SUFFQSxXQUFlO0lBQ2JuQiw2QkFBQUE7SUFDQUMscUNBQUFBO0FBQ0YifQ==

package/src/utilities/verification.js

@@ -1,41 +0,0 @@
-"use strict";
-
-import { arrayUtilities } from "necessary";
-
-const { first } = arrayUtilities;
-
-export function checkCyclicDependencyExists(name, dependentNames, releaseContext) {
-  const dependentNamesIncludesName = dependentNames.includes(name),
-        cyclicDependencyExists = dependentNamesIncludesName;  ///
-
-  if (cyclicDependencyExists) {
-    const firstDependentName = first(dependentNames),
-          dependencyNames = dependentNames.concat(firstDependentName),
-          dependencyNamesString = dependencyNames.join(`' -> '`);
-
-    releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
-  }
-
-  return cyclicDependencyExists;
-}
-
-export function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
-  const release = releaseContext.getRelease(),
-        releaseMatchesShortedVersion = release.matchShortenedVersion(shortenedVersion);
-
-  if (!releaseMatchesShortedVersion) {
-    const name = releaseContext.getName(),
-          version = releaseContext.getVersion(),
-          versionString = version.toString(),
-          shortenedVersionString = shortenedVersion.toString();
-
-    releaseContext.error(`The '${name}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);
-  }
-
-  return releaseMatchesShortedVersion;
-}
-
-export default {
-  checkCyclicDependencyExists,
-  checkReleaseMatchesShortenedVersion
-};