occam-verify-cli 0.0.318 → 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,59 +1,56 @@
 "use strict";
 
-const { arrayUtilities } = require("necessary"),
-      { ReleaseContext } = require("../../lib/index"),
-      { fileSystemUtilities } = require("occam-file-system");
+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 { first } = arrayUtilities,
-      { loadRelease } = fileSystemUtilities;
+  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;
-
-  let release = loadRelease(topmostDirectoryName, projectsDirectoryPath);
-
-  if (release === null) {
-    log.error(`The '${name}' package cannot be loaded.`);
-  }
-
-  return release;
-}
-
 function checkCyclicDependencyExists(name, dependentNames, releaseContext) {
   const dependentNamesIncludesName = dependentNames.includes(name),
         cyclicDependencyExists = dependentNamesIncludesName;  ///
@@ -69,27 +66,45 @@ function checkCyclicDependencyExists(name, dependentNames, releaseContext) {
   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) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.318",
+  "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": {