occam-verify-cli 0.0.473 → 0.0.475

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.
@@ -5,7 +5,7 @@ const { Dependency } = require("occam-file-system"),
5
5
  { verifyRelease, releaseContextUtilities } = require("../../lib/index"); ///
6
6
 
7
7
  const { trimTrailingSlash } = require("../utilities/string"),
8
- { releaseContextFromDependencyAndDependentNames } = require("../utilities/fileSystem");
8
+ { releaseContextFromDependencyAndDependentNames } = require("../utilities/releaseContext");
9
9
 
10
10
  const { log } = loggingUtilities,
11
11
  { setLogLevel } = log,
@@ -28,6 +28,8 @@ function verifyAction(argument, logLevel) {
28
28
 
29
29
  createReleaseContext(dependency, dependentNames, context, (error) => {
30
30
  if (error) {
31
+ log.error(error);
32
+
31
33
  return;
32
34
  }
33
35
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index"), ///
4
4
  { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system"),
5
- { pathUtilities, arrayUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
5
+ { pathUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
6
6
 
7
7
  const callbacks = require("../callbacks");
8
8
 
@@ -58,21 +58,18 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
58
58
  callback(error);
59
59
  return;
60
60
  }
61
- releaseContextMap[releaseName] = releaseContext;
62
- var log = context.log;
63
61
  if (releaseContext === null) {
64
- log.error("The '".concat(releaseName, "' package could not be created."));
65
- callback(error);
62
+ var _$error = "The '".concat(releaseName, "' package could not be created.");
63
+ callback(_$error);
66
64
  return;
67
65
  }
68
66
  var releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
69
67
  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);
68
+ var version = releaseContext.getVersion(), versionString = version.toString(), lastDependentName = (0, _array.last)(dependentNames), dependentName = lastDependentName, dependencyName = dependency.getName(), shortenedVersion = dependency.getShortedVersion(), shortenedVersionString = shortenedVersion.toString(), _$error1 = "Version mismatch: '".concat(dependentName, "' requires '").concat(dependencyName, "' to be version ").concat(shortenedVersionString, ".0 or higher but version ").concat(versionString, " has been supplied.");
69
+ callback(_$error1);
74
70
  return;
75
71
  }
72
+ releaseContextMap[releaseName] = releaseContext;
76
73
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
77
74
  }, context);
78
75
  }
@@ -106,14 +103,8 @@ var _default = {
106
103
  createReleaseContext: createReleaseContext,
107
104
  initialiseReleaseContext: initialiseReleaseContext
108
105
  };
109
- function checkCyclicDependencyExists(dependency, dependentNames, context) {
106
+ function checkCyclicDependencyExists(dependency, dependentNames) {
110
107
  var dependencyName = dependency.getName(), dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName), cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
111
- if (cyclicDependencyExists) {
112
- var log = context.log, firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
113
- firstDependentName
114
- ]), dependencyNamesString = dependencyNames.join("' -> '");
115
- log.error("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
116
- }
117
108
  return cyclicDependencyExists;
118
109
  }
119
110
  function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
@@ -133,9 +124,11 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
133
124
  dependencyName
134
125
  ]); ///
135
126
  dependencies.asynchronousForEachDependency(function(dependency, next, done) {
136
- var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);
127
+ var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);
137
128
  if (cyclicDependencyExists) {
138
- var error = null;
129
+ var firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
130
+ firstDependentName
131
+ ]), dependencyNamesString = dependencyNames.join("' -> '"), error = "There is a cyclic dependency: '".concat(dependencyNamesString, "'.");
139
132
  callback(error);
140
133
  return;
141
134
  }
@@ -169,4 +162,4 @@ function retrieveDependencyReleaseContexts(dependency, context) {
169
162
  return dependencyReleaseContexts;
170
163
  }
171
164
 
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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"}
165
+ //# 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    if (releaseContext === null) {\n      const 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            error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;\n\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\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) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\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);\n\n    if (cyclicDependencyExists) {\n      const firstDependentName = first(dependentNames),\n            dependencyNames = [  ///\n              ...dependentNames,\n              firstDependentName\n            ],\n            dependencyNamesString = dependencyNames.join(`' -> '`),\n            error =`There is a cyclic dependency: '${dependencyNamesString}'.`;\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","releaseMatchesDependency","checkReleaseMatchesDependency","version","getVersion","versionString","toString","lastDependentName","last","dependentName","shortenedVersion","getShortedVersion","shortenedVersionString","createDependencyReleaseContexts","verified","initialised","isInitialised","releaseContextVerified","isVerified","log","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","entries","getEntries","entriesMatchShortenedVersion","matchShortenedVersion","asynchronousForEachDependency","next","done","firstDependentName","first","dependencyNames","dependencyNamesString","join","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.473",
4
+ "version": "0.0.475",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -25,12 +25,8 @@ export function createReleaseContext(dependency, dependentNames, context, callba
25
25
  return;
26
26
  }
27
27
 
28
- releaseContextMap[releaseName] = releaseContext;
29
-
30
- const { log } = context;
31
-
32
28
  if (releaseContext === null) {
33
- log.error(`The '${releaseName}' package could not be created.`);
29
+ const error = `The '${releaseName}' package could not be created.`;
34
30
 
35
31
  callback(error);
36
32
 
@@ -39,24 +35,23 @@ export function createReleaseContext(dependency, dependentNames, context, callba
39
35
 
40
36
  const releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
41
37
 
42
- if (!releaseMatchesDependency) {
38
+ if (!releaseMatchesDependency) {
43
39
  const version = releaseContext.getVersion(),
44
40
  versionString = version.toString(),
45
41
  lastDependentName = last(dependentNames),
46
42
  dependentName = lastDependentName, ///
47
43
  dependencyName = dependency.getName(),
48
44
  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);
45
+ shortenedVersionString = shortenedVersion.toString(),
46
+ error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;
54
47
 
55
48
  callback(error);
56
49
 
57
50
  return;
58
51
  }
59
52
 
53
+ releaseContextMap[releaseName] = releaseContext;
54
+
60
55
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
61
56
  }, context);
62
57
  }
@@ -109,23 +104,11 @@ export default {
109
104
  initialiseReleaseContext
110
105
  };
111
106
 
112
- function checkCyclicDependencyExists(dependency, dependentNames, context) {
107
+ function checkCyclicDependencyExists(dependency, dependentNames) {
113
108
  const dependencyName = dependency.getName(),
114
109
  dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),
115
110
  cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
116
111
 
117
- if (cyclicDependencyExists) {
118
- const { log } = context,
119
- firstDependentName = first(dependentNames),
120
- dependencyNames = [ ///
121
- ...dependentNames,
122
- firstDependentName
123
- ],
124
- dependencyNamesString = dependencyNames.join(`' -> '`);
125
-
126
- log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
127
- }
128
-
129
112
  return cyclicDependencyExists;
130
113
  }
131
114
 
@@ -156,10 +139,16 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
156
139
  dependentNames = [ ...dependentNames, dependencyName ]; ///
157
140
 
158
141
  dependencies.asynchronousForEachDependency((dependency, next, done) => {
159
- const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);
142
+ const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);
160
143
 
161
144
  if (cyclicDependencyExists) {
162
- const error = null;
145
+ const firstDependentName = first(dependentNames),
146
+ dependencyNames = [ ///
147
+ ...dependentNames,
148
+ firstDependentName
149
+ ],
150
+ dependencyNamesString = dependencyNames.join(`' -> '`),
151
+ error =`There is a cyclic dependency: '${dependencyNamesString}'.`;
163
152
 
164
153
  callback(error);
165
154