occam-verify-cli 0.0.387 → 0.0.389

package/bin/action/verify.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const { loggingUtilities } = require("necessary"),
+const { Dependency } = require("occam-file-system"),
+      { loggingUtilities } = require("necessary"),
       { verifyRelease, releaseContextUtilities } = require("../../lib/index");
 
 const { releaseContextFromReleaseNameAndShortenedVersion } = require("../utilities/fileSystem");
@@ -10,10 +11,11 @@ const { log } = loggingUtilities,
       { createReleaseContext, initialiseReleaseContexts } = releaseContextUtilities;
 
 function verifyAction(argument, logLevel) {
-  const releaseName = argument, ///
+  const name = argument, ///
         releaseContextMap = {},
         shortenedVersion = null,
         dependentNames = [],
+        dependency = Dependency.fromNameAndShortenedVersion(name, shortenedVersion),
         context = {
           log,
           releaseContextMap,
@@ -22,13 +24,15 @@ function verifyAction(argument, logLevel) {
 
   setLogLevel(logLevel);
 
-  createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {
+  createReleaseContext(dependency, dependentNames, context, (error) => {
     if (error) {
       ///
 
       return;
     }
 
+    const releaseName = name; ///
+
     initialiseReleaseContexts(releaseName, releaseContextMap);
 
     const releaseVerified = verifyRelease(releaseName, releaseContextMap);

package/bin/utilities/fileSystem.js

@@ -9,17 +9,18 @@ const callbacks = require("../callbacks");
 const { loadRelease } = occamFileSystemUtilities,
       { readFile, isEntryFile } = necessaryFileSystemUtilities;
 
-function releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, callback) {
+function releaseContextFromReleaseNameAndShortenedVersion(dependency, context, callback) {
   const projectsDirectoryPath = process.cwd(), ///
-        entryPath = `${projectsDirectoryPath}/${releaseName}`,
+        dependencyName = dependency.getName(),
+        entryPath = `${projectsDirectoryPath}/${dependencyName}`,
         entryFile = isEntryFile(entryPath);
 
   let releaseContext;
 
   try {
     releaseContext = entryFile ?
-                       fileReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath, context) :
-                         directoryReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath, context);
+                       fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) :
+                         directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context);
   } catch (error) {
     const releaseContext = null;
 
@@ -27,7 +28,7 @@ function releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortened
   }
 
   if (releaseContext !== null) {
-    const releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion, context);
+    const releaseMatchesShortedVersion = checkReleaseMatchesDependency(dependency, releaseContext, context);
 
     if (!releaseMatchesShortedVersion) {
       releaseContext = null;
@@ -43,11 +44,30 @@ module.exports = {
   releaseContextFromReleaseNameAndShortenedVersion
 };
 
-function fileReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath, context) {
+function checkReleaseMatchesDependency(dependency, releaseContext, context) {
+  const entries = releaseContext.getEntries(),
+        shortenedVersion = dependency.getShortedVersion(),
+        releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
+
+  if (!releaseMatchesShortedVersion) {
+    const { log } = context,
+          version = releaseContext.getVersion(),
+          versionString = version.toString(),
+          dependencyName = dependency.getName(),
+          shortenedVersionString = shortenedVersion.toString();
+
+    log.error(`The '${dependencyName}' dependency's version of ${versionString} does not match the required shortened version of ${shortenedVersionString}.`);
+  }
+
+  return releaseMatchesShortedVersion;
+}
+
+function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
   let releaseContext;
 
   const { log } = context,
-        filePath = `${projectsDirectoryPath}/${releaseName}`,
+        dependencyName = dependency.getName(),
+        filePath = `${projectsDirectoryPath}/${dependencyName}`,
         content = readFile(filePath),
         releaseJSONString = content,  ///
         releaseJSON = JSON.parse(releaseJSONString);
@@ -62,7 +82,7 @@ function fileReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName,
 
   entries = Entries.fromJSON(json);
 
-  const name = releaseName, ///
+  const name = dependencyName, ///
         fileReleaseContext = FileReleaseContext.fromLogNameEntriesCallbacksAndContextJSON(log, name, entries, callbacks, contextJSON);
 
   releaseContext = fileReleaseContext;  ///
@@ -70,32 +90,16 @@ function fileReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName,
   return releaseContext;
 }
 
-function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion, context) {
-  const entries = releaseContext.getEntries(),
-        releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
-
-  if (!releaseMatchesShortedVersion) {
-    const { log } = context,
-          version = releaseContext.getVersion(),
-          releaseName = releaseContext.getReleaseName(),
-          versionString = version.toString(),
-          shortenedVersionString = shortenedVersion.toString();
-
-    log.error(`The '${releaseName}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);
-  }
-
-  return releaseMatchesShortedVersion;
-}
-
-function directoryReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath, context) {
+function directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
   let releaseContext = null;
 
-  const topmostDirectoryName = releaseName, ///
+  const dependencyName = dependency.getName(),
+        topmostDirectoryName = dependencyName, ///
         release = loadRelease(topmostDirectoryName, projectsDirectoryPath);
 
   if (release !== null) {
     const { log } = context,
-          name = releaseName, ///
+          name = dependencyName, ///
           entries = release.getEntries(),
           directoryReleaseContext = DirectoryReleaseContext.fromLogNameEntriesAndCallbacks(log, name, entries, callbacks);
 

package/lib/utilities/releaseContext.js

@@ -44,15 +44,15 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-function createReleaseContext(releaseName, dependentNames, shortenedVersion, context, callback) {
-    var releaseContextMap = context.releaseContextMap, releaseContext = releaseContextMap[releaseName] || null;
+function createReleaseContext(dependency, dependentNames, context, callback) {
+    var releaseContextMap = context.releaseContextMap, name = dependency.getName(), releaseName = name, releaseContext = releaseContextMap[releaseName] || null;
     if (releaseContext !== null) {
         var error = false;
         callback(error);
         return;
     }
     var releaseContextFromReleaseNameAndShortenedVersion = context.releaseContextFromReleaseNameAndShortenedVersion;
-    releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, function(error, releaseContext) {
+    releaseContextFromReleaseNameAndShortenedVersion(dependency, context, function(error, releaseContext) {
         if (error) {
             callback(error);
             return;
@@ -98,10 +98,12 @@ function initialiseReleaseContext(releaseContext, releaseContextMap) {
     var dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);
     releaseContext.initialise(dependencyReleaseContexts);
 }
-function checkCyclicDependencyExists(releaseName, dependentNames, releaseContext) {
-    var dependentNamesIncludesReleaseName = dependentNames.includes(releaseName), cyclicDependencyExists = dependentNamesIncludesReleaseName; ///
+function checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {
+    var dependencyName = dependency.getName(), dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName), cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
     if (cyclicDependencyExists) {
-        var firstDependentName = first(dependentNames), dependencyNames = dependentNames.concat(firstDependentName), dependencyNamesString = dependencyNames.join("' -> '");
+        var firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
+            firstDependentName
+        ]), dependencyNamesString = dependencyNames.join("' -> '");
         releaseContext.error("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
     }
     return cyclicDependencyExists;
@@ -115,13 +117,13 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
         releaseName
     ]); ///
     dependencies.asynchronousForEachDependency(function(dependency, next, done) {
-        var name = dependency.getName(), releaseName = name, shortenedVersion = dependency.getShortedVersion(), cyclicDependencyExists = checkCyclicDependencyExists(releaseName, dependentNames, releaseContext);
+        var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);
         if (cyclicDependencyExists) {
             var error = null;
             callback(error);
             return;
         }
-        createReleaseContext(releaseName, dependentNames, shortenedVersion, context, function(error) {
+        createReleaseContext(dependency, dependentNames, context, function(error) {
             if (error) {
                 callback(error);
                 return;
@@ -148,4 +150,4 @@ function retrieveDependencyReleaseContexts(releaseContext, releaseContextMap) {
     return dependencyReleaseContexts;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nexport function createReleaseContext(releaseName, dependentNames, shortenedVersion, context, callback) {\n  const { releaseContextMap } = context,\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = false;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromReleaseNameAndShortenedVersion } = context;\n\n  releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n    });\n  }, context);\n}\n\nexport function initialiseReleaseContexts(releaseName, releaseContextMap) {\n  const releaseContext = releaseContextMap[releaseName];\n\n  initialiseReleaseContext(releaseContext, releaseContextMap);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContexts\n};\n\nfunction initialiseReleaseContext(releaseContext, releaseContextMap) {\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const name = dependency.getName(),\n          releaseName = name, ///\n          releaseContext = releaseContextMap[releaseName];\n\n    initialiseReleaseContext(releaseContext, releaseContextMap);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nfunction checkCyclicDependencyExists(releaseName, dependentNames, releaseContext) {\n  const dependentNamesIncludesReleaseName = dependentNames.includes(releaseName),\n        cyclicDependencyExists = dependentNamesIncludesReleaseName;  ///\n\n  if (cyclicDependencyExists) {\n    const firstDependentName = first(dependentNames),\n          dependencyNames = dependentNames.concat(firstDependentName),\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction createDependencyReleaseContexts(releaseContext, dependentNames, context, callback) {\n  const releaseName = releaseContext.getReleaseName(),\n        dependencies = releaseContext.getDependencies(),\n        done = () => {\n          const error = null;\n\n          callback(error);\n        }\n\n  dependentNames = [ ...dependentNames, releaseName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const name = dependency.getName(),\n          releaseName = name, //\n          shortenedVersion = dependency.getShortedVersion(),\n          cyclicDependencyExists = checkCyclicDependencyExists(releaseName, dependentNames, releaseContext);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n}\n\nfunction retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts = []) {\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          dependencyReleaseName = dependencyName, ///\n          dependencyReleaseContext = releaseContextMap[dependencyReleaseName];\n\n    if (dependencyReleaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesDependencyReleaseContext = dependencyReleaseContexts.includes(dependencyReleaseContext);\n\n    if (!dependencyReleaseContextsIncludesDependencyReleaseContext) {\n      const releaseContext = dependencyReleaseContext;  ///\n\n      retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts);\n\n      dependencyReleaseContexts.push(dependencyReleaseContext);\n    }\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContexts","releaseName","dependentNames","shortenedVersion","context","callback","releaseContextMap","releaseContext","error","releaseContextFromReleaseNameAndShortenedVersion","log","createDependencyReleaseContexts","initialiseReleaseContext","initialised","isInitialised","dependencies","getDependencies","forEachDependency","dependency","name","getName","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesReleaseName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","concat","dependencyNamesString","join","getReleaseName","done","asynchronousForEachDependency","next","getShortedVersion","dependencyName","dependencyReleaseName","dependencyReleaseContext","dependencyReleaseContextsIncludesDependencyReleaseContext","push"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nexport function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        name = dependency.getName(),\n        releaseName = name, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = false;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromReleaseNameAndShortenedVersion } = context;\n\n  releaseContextFromReleaseNameAndShortenedVersion(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n    });\n  }, context);\n}\n\nexport function initialiseReleaseContexts(releaseName, releaseContextMap) {\n  const releaseContext = releaseContextMap[releaseName];\n\n  initialiseReleaseContext(releaseContext, releaseContextMap);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContexts\n};\n\nfunction initialiseReleaseContext(releaseContext, releaseContextMap) {\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const name = dependency.getName(),\n          releaseName = name, ///\n          releaseContext = releaseContextMap[releaseName];\n\n    initialiseReleaseContext(releaseContext, releaseContextMap);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction createDependencyReleaseContexts(releaseContext, dependentNames, context, callback) {\n  const releaseName = releaseContext.getReleaseName(),\n        dependencies = releaseContext.getDependencies(),\n        done = () => {\n          const error = null;\n\n          callback(error);\n        }\n\n  dependentNames = [ ...dependentNames, releaseName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n}\n\nfunction retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts = []) {\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          dependencyReleaseName = dependencyName, ///\n          dependencyReleaseContext = releaseContextMap[dependencyReleaseName];\n\n    if (dependencyReleaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesDependencyReleaseContext = dependencyReleaseContexts.includes(dependencyReleaseContext);\n\n    if (!dependencyReleaseContextsIncludesDependencyReleaseContext) {\n      const releaseContext = dependencyReleaseContext;  ///\n\n      retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts);\n\n      dependencyReleaseContexts.push(dependencyReleaseContext);\n    }\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContexts","dependency","dependentNames","context","callback","releaseContextMap","name","getName","releaseName","releaseContext","error","releaseContextFromReleaseNameAndShortenedVersion","log","createDependencyReleaseContexts","initialiseReleaseContext","initialised","isInitialised","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependencyName","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","getReleaseName","done","asynchronousForEachDependency","next","dependencyReleaseName","dependencyReleaseContext","dependencyReleaseContextsIncludesDependencyReleaseContext","push"],"mappings":"AAAA;;;;;;;;;;;IAEgBA,oBAAoB;eAApBA;;IAiDAC,yBAAyB;eAAzBA;;IAMhB,OAGE;eAHF;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAvDO,SAASD,qBAAqBE,UAAU,EAAEC,cAAc,EAAEC,OAAO,EAAEC,QAAQ,EAAE;IAClF,IAAM,AAAEC,oBAAsBF,QAAtBE,mBACFC,OAAOL,WAAWM,OAAO,IACzBC,cAAcF,MACdG,iBAAiBJ,iBAAiB,CAACG,YAAY,IAAI,IAAI;IAE7D,IAAIC,mBAAmB,IAAI,EAAE;QAC3B,IAAMC,QAAQ,KAAK;QAEnBN,SAASM;QAET;IACF,CAAC;IAED,IAAM,AAAEC,mDAAqDR,QAArDQ;IAERA,iDAAiDV,YAAYE,SAAS,SAACO,OAAOD,gBAAmB;QAC/F,IAAIC,OAAO;YACTN,SAASM;YAET;QACF,CAAC;QAED,IAAID,mBAAmB,IAAI,EAAE;YAC3B,IAAM,AAAEG,MAAQT,QAARS;YAERA,IAAIF,KAAK,CAAC,AAAC,QAAmB,OAAZF,aAAY;YAE9BH,iBAAiB,CAACG,YAAY,GAAGC;YAEjCL,SAASM;YAET;QACF,CAAC;QAEDG,gCAAgCJ,gBAAgBP,gBAAgBC,SAAS,SAACO,OAAU;YAClF,IAAIA,OAAO;gBACTN,SAASM;gBAET;YACF,CAAC;YAEDL,iBAAiB,CAACG,YAAY,GAAGC;YAEjCL,SAASM;QACX;IACF,GAAGP;AACL;AAEO,SAASH,0BAA0BQ,WAAW,EAAEH,iBAAiB,EAAE;IACxE,IAAMI,iBAAiBJ,iBAAiB,CAACG,YAAY;IAErDM,yBAAyBL,gBAAgBJ;AAC3C;IAEA,WAAe;IACbN,sBAAAA;IACAC,2BAAAA;AACF;AAEA,SAASc,yBAAyBL,cAAc,EAAEJ,iBAAiB,EAAE;IACnE,IAAII,mBAAmB,IAAI,EAAE;QAC3B;IACF,CAAC;IAED,IAAMM,cAAcN,eAAeO,aAAa;IAEhD,IAAID,aAAa;QACf;IACF,CAAC;IAED,IAAME,eAAeR,eAAeS,eAAe;IAEnDD,aAAaE,iBAAiB,CAAC,SAAClB,YAAe;QAC7C,IAAMK,OAAOL,WAAWM,OAAO,IACzBC,cAAcF,MACdG,mBAAiBJ,iBAAiB,CAACG,YAAY;QAErDM,yBAAyBL,kBAAgBJ;IAC3C;IAEA,IAAMe,4BAA4BC,kCAAkCZ,gBAAgBJ;IAEpFI,eAAea,UAAU,CAACF;AAC5B;AAEA,SAASG,4BAA4BtB,UAAU,EAAEC,cAAc,EAAEO,cAAc,EAAE;IAC/E,IAAMe,iBAAiBvB,WAAWM,OAAO,IACnCkB,uCAAuCvB,eAAewB,QAAQ,CAACF,iBAC/DG,yBAAyBF,sCAAuC,GAAG;IAEzE,IAAIE,wBAAwB;QAC1B,IAAMC,qBAAqBC,MAAM3B,iBAC3B4B,kBAAkB,AACd,mBAAG5B,uBADW;YAEhB0B;SACD,GACDG,wBAAwBD,gBAAgBE,IAAI,CAAE;QAEpDvB,eAAeC,KAAK,CAAC,AAAC,kCAAuD,OAAtBqB,uBAAsB;IAC/E,CAAC;IAED,OAAOJ;AACT;AAEA,SAASd,gCAAgCJ,cAAc,EAAEP,cAAc,EAAEC,OAAO,EAAEC,QAAQ,EAAE;IAC1F,IAAMI,cAAcC,eAAewB,cAAc,IAC3ChB,eAAeR,eAAeS,eAAe,IAC7CgB,OAAO,WAAM;QACX,IAAMxB,QAAQ,IAAI;QAElBN,SAASM;IACX;IAENR,iBAAiB,AAAE,mBAAGA,uBAAL;QAAqBM;KAAa,GAAG,GAAG;IAEzDS,aAAakB,6BAA6B,CAAC,SAAClC,YAAYmC,MAAMF,MAAS;QACrE,IAAMP,yBAAyBJ,4BAA4BtB,YAAYC,gBAAgBO;QAEvF,IAAIkB,wBAAwB;YAC1B,IAAMjB,QAAQ,IAAI;YAElBN,SAASM;YAET;QACF,CAAC;QAEDX,qBAAqBE,YAAYC,gBAAgBC,SAAS,SAACO,OAAU;YACnE,IAAIA,OAAO;gBACTN,SAASM;gBAET;YACF,CAAC;YAED0B;QACF;IACF,GAAGF;AACL;AAEA,SAASb,kCAAkCZ,cAAc,EAAEJ,iBAAiB,EAAkC;QAAhCe,4BAAAA,iEAA4B,EAAE;IAC1G,IAAMH,eAAeR,eAAeS,eAAe;IAEnDD,aAAaE,iBAAiB,CAAC,SAAClB,YAAe;QAC7C,IAAMuB,iBAAiBvB,WAAWM,OAAO,IACnC8B,wBAAwBb,gBACxBc,2BAA2BjC,iBAAiB,CAACgC,sBAAsB;QAEzE,IAAIC,6BAA6B,IAAI,EAAE;YACrC;QACF,CAAC;QAED,IAAMC,4DAA4DnB,0BAA0BM,QAAQ,CAACY;QAErG,IAAI,CAACC,2DAA2D;YAC9D,IAAM9B,mBAAiB6B,0BAA2B,GAAG;YAErDjB,kCAAkCZ,kBAAgBJ,mBAAmBe;YAErEA,0BAA0BoB,IAAI,CAACF;QACjC,CAAC;IACH;IAEA,OAAOlB;AACT"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.387",
+  "version": "0.0.389",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -14,7 +14,7 @@
     "necessary": "^11.1.11",
     "occam-custom-grammars": "^5.0.359",
     "occam-dom": "^3.0.171",
-    "occam-file-system": "^5.0.79",
+    "occam-file-system": "^5.0.82",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/utilities/releaseContext.js

@@ -1,7 +1,9 @@
 "use strict";
 
-export function createReleaseContext(releaseName, dependentNames, shortenedVersion, context, callback) {
+export function createReleaseContext(dependency, dependentNames, context, callback) {
   const { releaseContextMap } = context,
+        name = dependency.getName(),
+        releaseName = name, ///
         releaseContext = releaseContextMap[releaseName] || null;
 
   if (releaseContext !== null) {
@@ -14,7 +16,7 @@ export function createReleaseContext(releaseName, dependentNames, shortenedVersi
 
   const { releaseContextFromReleaseNameAndShortenedVersion } = context;
 
-  releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, (error, releaseContext) => {
+  releaseContextFromReleaseNameAndShortenedVersion(dependency, context, (error, releaseContext) => {
     if (error) {
       callback(error);
 
@@ -84,13 +86,17 @@ function initialiseReleaseContext(releaseContext, releaseContextMap) {
   releaseContext.initialise(dependencyReleaseContexts);
 }
 
-function checkCyclicDependencyExists(releaseName, dependentNames, releaseContext) {
-  const dependentNamesIncludesReleaseName = dependentNames.includes(releaseName),
-        cyclicDependencyExists = dependentNamesIncludesReleaseName;  ///
+function checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {
+  const dependencyName = dependency.getName(),
+        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),
+        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///
 
   if (cyclicDependencyExists) {
     const firstDependentName = first(dependentNames),
-          dependencyNames = dependentNames.concat(firstDependentName),
+          dependencyNames = [  ///
+              ...dependentNames,
+            firstDependentName
+          ],
           dependencyNamesString = dependencyNames.join(`' -> '`);
 
     releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
@@ -111,10 +117,7 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
   dependentNames = [ ...dependentNames, releaseName ];  ///
 
   dependencies.asynchronousForEachDependency((dependency, next, done) => {
-    const name = dependency.getName(),
-          releaseName = name, //
-          shortenedVersion = dependency.getShortedVersion(),
-          cyclicDependencyExists = checkCyclicDependencyExists(releaseName, dependentNames, releaseContext);
+    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);
 
     if (cyclicDependencyExists) {
       const error = null;
@@ -124,7 +127,7 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
       return;
     }
 
-    createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {
+    createReleaseContext(dependency, dependentNames, context, (error) => {
       if (error) {
         callback(error);