occam-verify-cli 0.0.472 → 0.0.473

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,8 +6,7 @@ const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index
6
6
 
7
7
  const callbacks = require("../callbacks");
8
8
 
9
- const { last } = arrayUtilities,
10
- { loadProject } = occamFileSystemUtilities,
9
+ const { loadProject } = occamFileSystemUtilities,
11
10
  { concatenatePaths } = pathUtilities,
12
11
  { readFile, isEntryFile, checkEntryExists } = necessaryFileSystemUtilities;
13
12
 
@@ -42,14 +41,6 @@ function releaseContextFromDependencyAndDependentNames(dependency, dependentName
42
41
  return;
43
42
  }
44
43
 
45
- if (releaseContext !== null) {
46
- const releaseMatchesShortedVersion = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
47
-
48
- if (!releaseMatchesShortedVersion) {
49
- releaseContext = null;
50
- }
51
- }
52
-
53
44
  const error = null;
54
45
 
55
46
  callback(error, releaseContext);
@@ -59,31 +50,6 @@ module.exports = {
59
50
  releaseContextFromDependencyAndDependentNames
60
51
  };
61
52
 
62
- function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
63
- let releaseMatchesShortedVersion = true;
64
-
65
- const entries = releaseContext.getEntries(),
66
- shortenedVersion = dependency.getShortedVersion();
67
-
68
- if (shortenedVersion !== null) {
69
- releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
70
-
71
- if (!releaseMatchesShortedVersion) {
72
- const { log } = context,
73
- version = releaseContext.getVersion(),
74
- versionString = version.toString(),
75
- lastDependentName = last(dependentNames),
76
- dependentName = lastDependentName, ///
77
- dependencyName = dependency.getName(),
78
- shortenedVersionString = shortenedVersion.toString();
79
-
80
- log.error(`Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`);
81
- }
82
- }
83
-
84
- return releaseMatchesShortedVersion;
85
- }
86
-
87
53
  function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
88
54
  let releaseContext;
89
55
 
@@ -19,6 +19,7 @@ _export(exports, {
19
19
  return _default;
20
20
  }
21
21
  });
22
+ var _array = require("../utilities/array");
22
23
  function _arrayLikeToArray(arr, len) {
23
24
  if (len == null || len > arr.length) len = arr.length;
24
25
  for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -58,12 +59,20 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
58
59
  return;
59
60
  }
60
61
  releaseContextMap[releaseName] = releaseContext;
62
+ var log = context.log;
61
63
  if (releaseContext === null) {
62
- var log = context.log;
63
64
  log.error("The '".concat(releaseName, "' package could not be created."));
64
65
  callback(error);
65
66
  return;
66
67
  }
68
+ var releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
69
+ if (!releaseMatchesDependency) {
70
+ var version = releaseContext.getVersion(), versionString = version.toString(), lastDependentName = (0, _array.last)(dependentNames), dependentName = lastDependentName, dependencyName = dependency.getName(), shortenedVersion = dependency.getShortedVersion(), shortenedVersionString = shortenedVersion.toString();
71
+ error = "Version mismatch: '".concat(dependentName, "' requires '").concat(dependencyName, "' to be version ").concat(shortenedVersionString, ".0 or higher but version ").concat(versionString, " has been supplied.");
72
+ log.error(error);
73
+ callback(error);
74
+ return;
75
+ }
67
76
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
68
77
  }, context);
69
78
  }
@@ -107,6 +116,17 @@ function checkCyclicDependencyExists(dependency, dependentNames, context) {
107
116
  }
108
117
  return cyclicDependencyExists;
109
118
  }
119
+ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
120
+ var releaseMatchesDependency = true;
121
+ var entries = releaseContext.getEntries(), shortenedVersion = dependency.getShortedVersion();
122
+ if (shortenedVersion !== null) {
123
+ var entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
124
+ if (!entriesMatchShortenedVersion) {
125
+ releaseMatchesDependency = false;
126
+ }
127
+ }
128
+ return releaseMatchesDependency;
129
+ }
110
130
  function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
111
131
  var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName], dependencies = releaseContext.getDependencies();
112
132
  dependentNames = _toConsumableArray(dependentNames).concat([
@@ -149,4 +169,4 @@ function retrieveDependencyReleaseContexts(dependency, context) {
149
169
  return dependencyReleaseContexts;
150
170
  }
151
171
 
152
- //# 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        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = null;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependencyAndDependentNames } = context;\n\n  releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, dependentName, verified, context) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const releaseContextVerified = releaseContext.isVerified();\n\n  if (verified) {\n    if (!releaseContextVerified) {\n      const { log } = context;\n\n      log .error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);\n\n      return;\n    }\n  }\n\n  verified = releaseContextVerified;  ///\n\n  dependentName = releaseName;  ///\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    initialiseReleaseContext(dependency, dependentName, verified, context);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);\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  }, () => {\n    const error = null;\n\n    callback(error);\n  });\n}\n\nfunction retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          releaseName = dependencyName, ///\n          releaseContext = releaseContextMap[releaseName] || null;\n\n    if (releaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);\n\n    if (dependencyReleaseContextsIncludesReleaseContext) {\n      return;\n    }\n\n    retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);\n\n    dependencyReleaseContexts.push(releaseContext);\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContext","dependency","dependentNames","context","callback","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","releaseContextFromDependencyAndDependentNames","log","createDependencyReleaseContexts","dependentName","verified","initialised","isInitialised","releaseContextVerified","isVerified","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","asynchronousForEachDependency","next","done","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}
172
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = null;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependencyAndDependentNames } = context;\n\n  releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    const { log } = context;\n\n    if (releaseContext === null) {\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);\n\n    if (!releaseMatchesDependency) {\n      const version = releaseContext.getVersion(),\n            versionString = version.toString(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            dependencyName = dependency.getName(),\n            shortenedVersion = dependency.getShortedVersion(),\n            shortenedVersionString = shortenedVersion.toString();\n\n      error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;\n\n      log.error(error);\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, dependentName, verified, context) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const releaseContextVerified = releaseContext.isVerified();\n\n  if (verified) {\n    if (!releaseContextVerified) {\n      const { log } = context;\n\n      log .error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);\n\n      return;\n    }\n  }\n\n  verified = releaseContextVerified;  ///\n\n  dependentName = releaseName;  ///\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    initialiseReleaseContext(dependency, dependentName, verified, context);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {\n  let releaseMatchesDependency = true;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      releaseMatchesDependency = false;\n    }\n  }\n\n  return releaseMatchesDependency;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);\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  }, () => {\n    const error = null;\n\n    callback(error);\n  });\n}\n\nfunction retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          releaseName = dependencyName, ///\n          releaseContext = releaseContextMap[releaseName] || null;\n\n    if (releaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);\n\n    if (dependencyReleaseContextsIncludesReleaseContext) {\n      return;\n    }\n\n    retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);\n\n    dependencyReleaseContexts.push(releaseContext);\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContext","dependency","dependentNames","context","callback","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","releaseContextFromDependencyAndDependentNames","log","releaseMatchesDependency","checkReleaseMatchesDependency","version","getVersion","versionString","toString","lastDependentName","last","dependentName","shortenedVersion","getShortedVersion","shortenedVersionString","createDependencyReleaseContexts","verified","initialised","isInitialised","releaseContextVerified","isVerified","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","entriesMatchShortenedVersion","matchShortenedVersion","asynchronousForEachDependency","next","done","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "0.0.472",
4
+ "version": "0.0.473",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ import { last } from "../utilities/array";
4
+
3
5
  export function createReleaseContext(dependency, dependentNames, context, callback) {
4
6
  const { releaseContextMap } = context,
5
7
  dependencyName = dependency.getName(),
@@ -25,9 +27,9 @@ export function createReleaseContext(dependency, dependentNames, context, callba
25
27
 
26
28
  releaseContextMap[releaseName] = releaseContext;
27
29
 
28
- if (releaseContext === null) {
29
- const { log } = context;
30
+ const { log } = context;
30
31
 
32
+ if (releaseContext === null) {
31
33
  log.error(`The '${releaseName}' package could not be created.`);
32
34
 
33
35
  callback(error);
@@ -35,6 +37,26 @@ export function createReleaseContext(dependency, dependentNames, context, callba
35
37
  return;
36
38
  }
37
39
 
40
+ const releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
41
+
42
+ if (!releaseMatchesDependency) {
43
+ const version = releaseContext.getVersion(),
44
+ versionString = version.toString(),
45
+ lastDependentName = last(dependentNames),
46
+ dependentName = lastDependentName, ///
47
+ dependencyName = dependency.getName(),
48
+ shortenedVersion = dependency.getShortedVersion(),
49
+ shortenedVersionString = shortenedVersion.toString();
50
+
51
+ error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;
52
+
53
+ log.error(error);
54
+
55
+ callback(error);
56
+
57
+ return;
58
+ }
59
+
38
60
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
39
61
  }, context);
40
62
  }
@@ -107,6 +129,23 @@ function checkCyclicDependencyExists(dependency, dependentNames, context) {
107
129
  return cyclicDependencyExists;
108
130
  }
109
131
 
132
+ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
133
+ let releaseMatchesDependency = true;
134
+
135
+ const entries = releaseContext.getEntries(),
136
+ shortenedVersion = dependency.getShortedVersion();
137
+
138
+ if (shortenedVersion !== null) {
139
+ const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
140
+
141
+ if (!entriesMatchShortenedVersion) {
142
+ releaseMatchesDependency = false;
143
+ }
144
+ }
145
+
146
+ return releaseMatchesDependency;
147
+ }
148
+
110
149
  function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
111
150
  const { releaseContextMap } = context,
112
151
  dependencyName = dependency.getName(),