occam-verify-cli 0.0.494 → 0.0.496

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.
@@ -48,7 +48,7 @@ function _unsupportedIterableToArray(o, minLen) {
48
48
  function createReleaseContext(dependency, dependentNames, context, callback) {
49
49
  var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
50
50
  if (releaseContext !== null) {
51
- var error = null;
51
+ var error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);
52
52
  callback(error);
53
53
  return;
54
54
  }
@@ -63,10 +63,9 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
63
63
  callback(_$error);
64
64
  return;
65
65
  }
66
- var releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
67
- if (!releaseMatchesDependency) {
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);
66
+ error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);
67
+ if (error !== null) {
68
+ callback(error);
70
69
  return;
71
70
  }
72
71
  releaseContextMap[releaseName] = releaseContext;
@@ -104,19 +103,27 @@ var _default = {
104
103
  initialiseReleaseContext: initialiseReleaseContext
105
104
  };
106
105
  function checkCyclicDependencyExists(dependency, dependentNames) {
106
+ var error = null;
107
107
  var dependencyName = dependency.getName(), dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName), cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
108
- return cyclicDependencyExists;
108
+ if (cyclicDependencyExists) {
109
+ var firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
110
+ firstDependentName
111
+ ]), dependencyNamesString = dependencyNames.join("' -> '");
112
+ error = "There is a cyclic dependency: '".concat(dependencyNamesString, "'.");
113
+ }
114
+ return error;
109
115
  }
110
- function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
111
- var releaseMatchesDependency = true;
116
+ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext) {
117
+ var error = null;
112
118
  var entries = releaseContext.getEntries(), shortenedVersion = dependency.getShortedVersion();
113
119
  if (shortenedVersion !== null) {
114
120
  var entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
115
121
  if (!entriesMatchShortenedVersion) {
116
- releaseMatchesDependency = false;
122
+ var version = releaseContext.getVersion(), versionString = version.toString(), lastDependentName = (0, _array.last)(dependentNames), dependentName = lastDependentName, dependencyName = dependency.getName(), shortenedVersion1 = dependency.getShortedVersion(), shortenedVersionString = shortenedVersion1.toString();
123
+ error = "Version mismatch: '".concat(dependentName, "' requires '").concat(dependencyName, "' to be version ").concat(shortenedVersionString, ".0 or higher but version ").concat(versionString, " has been supplied.");
117
124
  }
118
125
  }
119
- return releaseMatchesDependency;
126
+ return error;
120
127
  }
121
128
  function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
122
129
  var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName], dependencies = releaseContext.getDependencies();
@@ -124,11 +131,8 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
124
131
  dependencyName
125
132
  ]); ///
126
133
  dependencies.asynchronousForEachDependency(function(dependency, next, done) {
127
- var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);
128
- if (cyclicDependencyExists) {
129
- var firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
130
- firstDependentName
131
- ]), dependencyNamesString = dependencyNames.join("' -> '"), error = "There is a cyclic dependency: '".concat(dependencyNamesString, "'.");
134
+ var error = checkCyclicDependencyExists(dependency, dependentNames);
135
+ if (error !== null) {
132
136
  callback(error);
133
137
  return;
134
138
  }
@@ -162,4 +166,4 @@ function retrieveDependencyReleaseContexts(dependency, context) {
162
166
  return dependencyReleaseContexts;
163
167
  }
164
168
 
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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"}
169
+ //# 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 = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\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    error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\n\n    if (error !== null)  {\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  let error = null;\n\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    error =`There is a cyclic dependency: '${dependencyNamesString}'.`;\n  }\n\n  return error;\n}\n\nfunction checkReleaseMatchesDependency(dependency, dependentNames, releaseContext) {\n  let error = null;\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      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  }\n\n  return error;\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 error = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (error !== null) {\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","checkReleaseMatchesDependency","releaseContextFromDependencyAndDependentNames","createDependencyReleaseContexts","dependentName","verified","initialised","isInitialised","releaseContextVerified","isVerified","log","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","versionString","toString","lastDependentName","last","shortenedVersionString","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.494",
4
+ "version": "0.0.496",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.21",
14
14
  "necessary": "^11.2.1",
15
- "occam-custom-grammars": "^5.0.381",
15
+ "occam-custom-grammars": "^5.0.382",
16
16
  "occam-dom": "^3.1.1",
17
- "occam-file-system": "^5.0.140",
17
+ "occam-file-system": "^5.0.142",
18
18
  "occam-grammar-utilities": "^7.0.66"
19
19
  },
20
20
  "devDependencies": {
@@ -9,7 +9,7 @@ export function createReleaseContext(dependency, dependentNames, context, callba
9
9
  releaseContext = releaseContextMap[releaseName] || null;
10
10
 
11
11
  if (releaseContext !== null) {
12
- const error = null;
12
+ const error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);
13
13
 
14
14
  callback(error);
15
15
 
@@ -33,18 +33,9 @@ export function createReleaseContext(dependency, dependentNames, context, callba
33
33
  return;
34
34
  }
35
35
 
36
- const releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
37
-
38
- if (!releaseMatchesDependency) {
39
- const version = releaseContext.getVersion(),
40
- versionString = version.toString(),
41
- lastDependentName = last(dependentNames),
42
- dependentName = lastDependentName, ///
43
- dependencyName = dependency.getName(),
44
- shortenedVersion = dependency.getShortedVersion(),
45
- shortenedVersionString = shortenedVersion.toString(),
46
- error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;
36
+ error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);
47
37
 
38
+ if (error !== null) {
48
39
  callback(error);
49
40
 
50
41
  return;
@@ -78,7 +69,7 @@ export function initialiseReleaseContext(dependency, dependentName, verified, co
78
69
  if (!releaseContextVerified) {
79
70
  const { log } = context;
80
71
 
81
- log .error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);
72
+ log.error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);
82
73
 
83
74
  return;
84
75
  }
@@ -105,15 +96,28 @@ export default {
105
96
  };
106
97
 
107
98
  function checkCyclicDependencyExists(dependency, dependentNames) {
99
+ let error = null;
100
+
108
101
  const dependencyName = dependency.getName(),
109
102
  dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),
110
103
  cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
111
104
 
112
- return cyclicDependencyExists;
105
+ if (cyclicDependencyExists) {
106
+ const firstDependentName = first(dependentNames),
107
+ dependencyNames = [ ///
108
+ ...dependentNames,
109
+ firstDependentName
110
+ ],
111
+ dependencyNamesString = dependencyNames.join(`' -> '`);
112
+
113
+ error =`There is a cyclic dependency: '${dependencyNamesString}'.`;
114
+ }
115
+
116
+ return error;
113
117
  }
114
118
 
115
- function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
116
- let releaseMatchesDependency = true;
119
+ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext) {
120
+ let error = null;
117
121
 
118
122
  const entries = releaseContext.getEntries(),
119
123
  shortenedVersion = dependency.getShortedVersion();
@@ -122,11 +126,19 @@ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContex
122
126
  const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
123
127
 
124
128
  if (!entriesMatchShortenedVersion) {
125
- releaseMatchesDependency = false;
129
+ const version = releaseContext.getVersion(),
130
+ versionString = version.toString(),
131
+ lastDependentName = last(dependentNames),
132
+ dependentName = lastDependentName, ///
133
+ dependencyName = dependency.getName(),
134
+ shortenedVersion = dependency.getShortedVersion(),
135
+ shortenedVersionString = shortenedVersion.toString();
136
+
137
+ error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;
126
138
  }
127
139
  }
128
140
 
129
- return releaseMatchesDependency;
141
+ return error;
130
142
  }
131
143
 
132
144
  function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
@@ -139,17 +151,9 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
139
151
  dependentNames = [ ...dependentNames, dependencyName ]; ///
140
152
 
141
153
  dependencies.asynchronousForEachDependency((dependency, next, done) => {
142
- const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);
143
-
144
- if (cyclicDependencyExists) {
145
- const firstDependentName = first(dependentNames),
146
- dependencyNames = [ ///
147
- ...dependentNames,
148
- firstDependentName
149
- ],
150
- dependencyNamesString = dependencyNames.join(`' -> '`),
151
- error =`There is a cyclic dependency: '${dependencyNamesString}'.`;
154
+ const error = checkCyclicDependencyExists(dependency, dependentNames);
152
155
 
156
+ if (error !== null) {
153
157
  callback(error);
154
158
 
155
159
  return;