occam-verify-cli 0.0.377 → 0.0.379

package/bin/main.js

@@ -4,7 +4,7 @@ const { arrayUtilities, loggingUtilities } = require("necessary"),
       { verifyRelease, releaseContextUtilities } = require("../lib/index");
 
 const { DEFAULT_LOG_LEVEL } = require("./defaults"),
-      { releaseContextFromReleaseName } = require("./utilities/fileSystem");
+      { releaseContextFromReleaseNameAndShortenedVersion } = require("./utilities/fileSystem");
 
 const { log } = loggingUtilities,
       { first } = arrayUtilities,
@@ -19,7 +19,7 @@ function main(commands, options) {
         dependentNames = [],
         context = {
           releaseContextMap,
-          releaseContextFromReleaseName
+          releaseContextFromReleaseNameAndShortenedVersion
         };
 
   setLogLevel(logLevel);

package/bin/utilities/fileSystem.js

@@ -10,23 +10,30 @@ const { log } = loggingUtilities,
       { loadRelease } = occamFileSystemUtilities,
       { readFile, isEntryFile } = necessaryFileSystemUtilities;
 
-function releaseContextFromReleaseName(name, context, callback) {
+function releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, callback) {
   const projectsDirectoryPath = process.cwd(), ///
-        entryPath = `${projectsDirectoryPath}/${name}`,
-        entryFile = isEntryFile(entryPath),
-        releaseContext = entryFile ?
-                           fileReleaseContextFromNameAndProjectsDirectoryPath(name, projectsDirectoryPath) :
-                             directoryReleaseContextFromNameAndProjectsDirectoryPath(name, projectsDirectoryPath);
+        entryPath = `${projectsDirectoryPath}/${releaseName}`,
+        entryFile = isEntryFile(entryPath);
+
+  let releaseContext = entryFile ?
+                         fileReleaseContextFromEntryPath(entryPath) :
+                           directoryReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath);
+
+  const releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion);
+
+  if (!releaseMatchesShortedVersion) {
+    releaseContext = null;
+  }
 
   callback(releaseContext);
 }
 
 module.exports = {
-  releaseContextFromReleaseName
+  releaseContextFromReleaseNameAndShortenedVersion
 };
 
-function fileReleaseContextFromNameAndProjectsDirectoryPath(name, projectsDirectoryPath) {
-  const filePath = `${projectsDirectoryPath}/${name}`,
+function fileReleaseContextFromEntryPath(entryPath) {
+  const filePath = entryPath, ///
         content = readFile(filePath),
         releaseJSONString = content,  ///
         releaseJSON = JSON.parse(releaseJSONString),
@@ -45,10 +52,26 @@ function fileReleaseContextFromNameAndProjectsDirectoryPath(name, projectsDirect
   return releaseContext;
 }
 
-function directoryReleaseContextFromNameAndProjectsDirectoryPath(name, projectsDirectoryPath) {
+function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
+  const entries = releaseContext.getEntries(),
+        releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
+
+  if (!releaseMatchesShortedVersion) {
+    const version = releaseContext.getVersion(),
+          releaseName = releaseContext.getReleaseName(),
+          versionString = version.toString(),
+          shortenedVersionString = shortenedVersion.toString();
+
+    releaseContext.error(`The '${releaseName}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);
+  }
+
+  return releaseMatchesShortedVersion;
+}
+
+function directoryReleaseContextFromReleaseNameAndProjectsDirectoryPath(releaseName, projectsDirectoryPath) {
   let releaseContext = null;
 
-  const topmostDirectoryName = name, ///
+  const topmostDirectoryName = releaseName, ///
         release = loadRelease(topmostDirectoryName, projectsDirectoryPath);
 
   if (release !== null) {

package/lib/utilities/releaseContext.js

@@ -51,19 +51,13 @@ function createReleaseContext(releaseName, dependentNames, shortenedVersion, con
         callback(error);
         return;
     }
-    var releaseContextFromReleaseName = context.releaseContextFromReleaseName;
-    releaseContextFromReleaseName(releaseName, context, function(releaseContext) {
+    var releaseContextFromReleaseNameAndShortenedVersion = context.releaseContextFromReleaseNameAndShortenedVersion;
+    releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, function(releaseContext) {
         if (releaseContext === null) {
             var error = true;
             callback(error);
             return;
         }
-        var releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion);
-        if (!releaseMatchesShortedVersion) {
-            var error1 = true;
-            callback(error1);
-            return;
-        }
         createDependencyReleaseContexts(releaseContext, dependentNames, context, function(error) {
             if (!error) {
                 releaseContextMap[releaseName] = releaseContext;
@@ -139,13 +133,5 @@ function retrieveDependencyReleaseContexts(releaseContext, releaseContextMap) {
     });
     return dependencyReleaseContexts;
 }
-function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
-    var entries = releaseContext.getEntries(), releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
-    if (!releaseMatchesShortedVersion) {
-        var version = releaseContext.getVersion(), releaseName = releaseContext.getReleaseName(), versionString = version.toString(), shortenedVersionString = shortenedVersion.toString();
-        releaseContext.error("The '".concat(releaseName, "' package's version of ").concat(versionString, " does not match the dependency's shortened version of ").concat(shortenedVersionString, "."));
-    }
-    return releaseMatchesShortedVersion;
-}
 
-//# 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 { releaseContextFromReleaseName } = context;\n\n  releaseContextFromReleaseName(releaseName, context, (releaseContext) => {\n    if (releaseContext === null) {\n      const error = true;\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion);\n\n    if (!releaseMatchesShortedVersion) {\n      const error = true;\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {\n      if (!error) {\n        releaseContextMap[releaseName] = releaseContext;\n      }\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  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 = false;\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 = true;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {\n      if (error) {\n        error = !!error;  ///\n\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          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\nfunction checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {\n  const entries = releaseContext.getEntries(),\n        releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n  if (!releaseMatchesShortedVersion) {\n    const version = releaseContext.getVersion(),\n          releaseName = releaseContext.getReleaseName(),\n          versionString = version.toString(),\n          shortenedVersionString = shortenedVersion.toString();\n\n    releaseContext.error(`The '${releaseName}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);\n  }\n\n  return releaseMatchesShortedVersion;\n}\n"],"names":["createReleaseContext","initialiseReleaseContexts","releaseName","dependentNames","shortenedVersion","context","callback","releaseContextMap","releaseContext","error","releaseContextFromReleaseName","releaseMatchesShortedVersion","checkReleaseMatchesShortenedVersion","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","entries","getEntries","matchShortenedVersion","version","getVersion","versionString","toString","shortenedVersionString"],"mappings":"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"}
+//# 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, (releaseContext) => {\n    if (releaseContext === null) {\n      const error = true;\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {\n      if (!error) {\n        releaseContextMap[releaseName] = releaseContext;\n      }\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  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 = false;\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 = true;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {\n      if (error) {\n        error = !!error;  ///\n\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          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","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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"}

package/package.json

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

package/src/utilities/releaseContext.js

@@ -12,9 +12,9 @@ export function createReleaseContext(releaseName, dependentNames, shortenedVersi
     return;
   }
 
-  const { releaseContextFromReleaseName } = context;
+  const { releaseContextFromReleaseNameAndShortenedVersion } = context;
 
-  releaseContextFromReleaseName(releaseName, context, (releaseContext) => {
+  releaseContextFromReleaseNameAndShortenedVersion(releaseName, shortenedVersion, context, (releaseContext) => {
     if (releaseContext === null) {
       const error = true;
 
@@ -23,16 +23,6 @@ export function createReleaseContext(releaseName, dependentNames, shortenedVersi
       return;
     }
 
-    const releaseMatchesShortedVersion = checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion);
-
-    if (!releaseMatchesShortedVersion) {
-      const error = true;
-
-      callback(error);
-
-      return;
-    }
-
     createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {
       if (!error) {
         releaseContextMap[releaseName] = releaseContext;
@@ -150,19 +140,3 @@ function retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, de
 
   return dependencyReleaseContexts;
 }
-
-function checkReleaseMatchesShortenedVersion(releaseContext, shortenedVersion) {
-  const entries = releaseContext.getEntries(),
-        releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
-
-  if (!releaseMatchesShortedVersion) {
-    const version = releaseContext.getVersion(),
-          releaseName = releaseContext.getReleaseName(),
-          versionString = version.toString(),
-          shortenedVersionString = shortenedVersion.toString();
-
-    releaseContext.error(`The '${releaseName}' package's version of ${versionString} does not match the dependency's shortened version of ${shortenedVersionString}.`);
-  }
-
-  return releaseMatchesShortedVersion;
-}