occam-verify-cli 0.0.388 → 0.0.390

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.
Files changed (5) hide show
  1. package/bin/action/verify.js +8 -10
  2. package/bin/utilities/fileSystem.js +24 -17
  3. package/lib/utilities/releaseContext.js +35 -46
  4. package/package.json +2 -2
  5. package/src/utilities/releaseContext.js +48 -58
package/bin/action/verify.js CHANGED
@@ -4,22 +4,21 @@ const { Dependency } = require("occam-file-system"),
4
4
  { loggingUtilities } = require("necessary"),
5
5
  { verifyRelease, releaseContextUtilities } = require("../../lib/index");
6
6
 
7
- const { releaseContextFromReleaseNameAndShortenedVersion } = require("../utilities/fileSystem");
7
+ const { releaseContextFromDependencyAndDependentNames } = require("../utilities/fileSystem");
8
8
 
9
9
  const { log } = loggingUtilities,
10
10
  { setLogLevel } = log,
11
- { createReleaseContext, initialiseReleaseContexts } = releaseContextUtilities;
11
+ { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
12
12
 
13
13
  function verifyAction(argument, logLevel) {
14
14
  const name = argument, ///
15
- releaseContextMap = {},
16
- shortenedVersion = null,
15
+ dependency = Dependency.fromName(name),
17
16
  dependentNames = [],
18
- dependency = Dependency.fromNameAndShortenedVersion(name, shortenedVersion),
17
+ releaseContextMap = {},
19
18
  context = {
20
19
  log,
21
20
  releaseContextMap,
22
- releaseContextFromReleaseNameAndShortenedVersion
21
+ releaseContextFromDependencyAndDependentNames
23
22
  };
24
23
 
25
24
  setLogLevel(logLevel);
@@ -31,11 +30,10 @@ function verifyAction(argument, logLevel) {
31
30
  return;
32
31
  }
33
32
 
34
- const releaseName = name; ///
35
-
36
- initialiseReleaseContexts(releaseName, releaseContextMap);
33
+ initialiseReleaseContext(dependency, context);
37
34
 
38
- const releaseVerified = verifyRelease(releaseName, releaseContextMap);
35
+ const releaseName = name, ///
36
+ releaseVerified = verifyRelease(releaseName, releaseContextMap);
39
37
 
40
38
  if (releaseVerified) {
41
39
  const releaseContext = releaseContextMap[releaseName];
package/bin/utilities/fileSystem.js CHANGED
@@ -1,15 +1,16 @@
1
1
  "use strict";
2
2
 
3
- const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index"), ///
4
- { fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary"),
5
- { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system");
3
+ const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index"), ///
4
+ { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system"),
5
+ { arrayUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
6
6
 
7
7
  const callbacks = require("../callbacks");
8
8
 
9
- const { loadRelease } = occamFileSystemUtilities,
9
+ const { last } = arrayUtilities,
10
+ { loadRelease } = occamFileSystemUtilities,
10
11
  { readFile, isEntryFile } = necessaryFileSystemUtilities;
11
12
 
12
- function releaseContextFromReleaseNameAndShortenedVersion(dependency, context, callback) {
13
+ function releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, callback) {
13
14
  const projectsDirectoryPath = process.cwd(), ///
14
15
  dependencyName = dependency.getName(),
15
16
  entryPath = `${projectsDirectoryPath}/${dependencyName}`,
@@ -28,7 +29,7 @@ function releaseContextFromReleaseNameAndShortenedVersion(dependency, context, c
28
29
  }
29
30
 
30
31
  if (releaseContext !== null) {
31
- const releaseMatchesShortedVersion = checkReleaseMatchesDependency(dependency, releaseContext, context);
32
+ const releaseMatchesShortedVersion = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
32
33
 
33
34
  if (!releaseMatchesShortedVersion) {
34
35
  releaseContext = null;
@@ -41,22 +42,28 @@ function releaseContextFromReleaseNameAndShortenedVersion(dependency, context, c
41
42
  }
42
43
 
43
44
  module.exports = {
44
- releaseContextFromReleaseNameAndShortenedVersion
45
+ releaseContextFromDependencyAndDependentNames
45
46
  };
46
47
 
47
- function checkReleaseMatchesDependency(dependency, releaseContext, context) {
48
+ function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
49
+ let releaseMatchesShortedVersion = true;
50
+
48
51
  const entries = releaseContext.getEntries(),
49
- shortenedVersion = dependency.getShortedVersion(),
50
- releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
52
+ shortenedVersion = dependency.getShortedVersion();
51
53
 
52
- if (!releaseMatchesShortedVersion) {
53
- const { log } = context,
54
- version = releaseContext.getVersion(),
55
- versionString = version.toString(),
56
- dependencyName = dependency.getName(),
57
- shortenedVersionString = shortenedVersion.toString();
54
+ if (shortenedVersion !== null) {
55
+ releaseMatchesShortedVersion = entries.matchShortenedVersion(shortenedVersion);
58
56
 
59
- log.error(`The '${dependencyName}' dependency's version of ${versionString} does not match the required shortened version of ${shortenedVersionString}.`);
57
+ if (!releaseMatchesShortedVersion) {
58
+ const { log } = context,
59
+ version = releaseContext.getVersion(),
60
+ versionString = version.toString(),
61
+ dependencyName = dependency.getName(),
62
+ lastDependentName = last(dependentNames),
63
+ shortenedVersionString = shortenedVersion.toString();
64
+
65
+ log.error(`Version mismatch: '${lastDependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`);
66
+ }
60
67
  }
61
68
 
62
69
  return releaseMatchesShortedVersion;
package/lib/utilities/releaseContext.js CHANGED
@@ -12,8 +12,8 @@ _export(exports, {
12
12
  createReleaseContext: function() {
13
13
  return createReleaseContext;
14
14
  },
15
- initialiseReleaseContexts: function() {
16
- return initialiseReleaseContexts;
15
+ initialiseReleaseContext: function() {
16
+ return initialiseReleaseContext;
17
17
  },
18
18
  default: function() {
19
19
  return _default;
@@ -45,44 +45,30 @@ function _unsupportedIterableToArray(o, minLen) {
45
45
  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
46
46
  }
47
47
  function createReleaseContext(dependency, dependentNames, context, callback) {
48
- var releaseContextMap = context.releaseContextMap, name = dependency.getName(), releaseName = name, releaseContext = releaseContextMap[releaseName] || null;
48
+ var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
49
49
  if (releaseContext !== null) {
50
- var error = false;
50
+ var error = null;
51
51
  callback(error);
52
52
  return;
53
53
  }
54
- var releaseContextFromReleaseNameAndShortenedVersion = context.releaseContextFromReleaseNameAndShortenedVersion;
55
- releaseContextFromReleaseNameAndShortenedVersion(dependency, context, function(error, releaseContext) {
54
+ var releaseContextFromDependencyAndDependentNames = context.releaseContextFromDependencyAndDependentNames;
55
+ releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, function(error, releaseContext) {
56
56
  if (error) {
57
57
  callback(error);
58
58
  return;
59
59
  }
60
+ releaseContextMap[releaseName] = releaseContext;
60
61
  if (releaseContext === null) {
61
62
  var log = context.log;
62
63
  log.error("The '".concat(releaseName, "' package could not be created."));
63
- releaseContextMap[releaseName] = releaseContext;
64
64
  callback(error);
65
65
  return;
66
66
  }
67
- createDependencyReleaseContexts(releaseContext, dependentNames, context, function(error) {
68
- if (error) {
69
- callback(error);
70
- return;
71
- }
72
- releaseContextMap[releaseName] = releaseContext;
73
- callback(error);
74
- });
67
+ createDependencyReleaseContexts(dependency, dependentNames, context, callback);
75
68
  }, context);
76
69
  }
77
- function initialiseReleaseContexts(releaseName, releaseContextMap) {
78
- var releaseContext = releaseContextMap[releaseName];
79
- initialiseReleaseContext(releaseContext, releaseContextMap);
80
- }
81
- var _default = {
82
- createReleaseContext: createReleaseContext,
83
- initialiseReleaseContexts: initialiseReleaseContexts
84
- };
85
- function initialiseReleaseContext(releaseContext, releaseContextMap) {
70
+ function initialiseReleaseContext(dependency, context) {
71
+ var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
86
72
  if (releaseContext === null) {
87
73
  return;
88
74
  }
@@ -92,32 +78,35 @@ function initialiseReleaseContext(releaseContext, releaseContextMap) {
92
78
  }
93
79
  var dependencies = releaseContext.getDependencies();
94
80
  dependencies.forEachDependency(function(dependency) {
95
- var name = dependency.getName(), releaseName = name, _$releaseContext = releaseContextMap[releaseName];
96
- initialiseReleaseContext(_$releaseContext, releaseContextMap);
81
+ initialiseReleaseContext(dependency, context);
97
82
  });
98
- var dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);
83
+ var dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);
99
84
  releaseContext.initialise(dependencyReleaseContexts);
100
85
  }
101
- function checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {
86
+ var _default = {
87
+ createReleaseContext: createReleaseContext,
88
+ initialiseReleaseContext: initialiseReleaseContext
89
+ };
90
+ function checkCyclicDependencyExists(dependency, dependentNames, context) {
102
91
  var dependencyName = dependency.getName(), dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName), cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
103
92
  if (cyclicDependencyExists) {
104
- var firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
93
+ var log = context.log, firstDependentName = first(dependentNames), dependencyNames = _toConsumableArray(dependentNames).concat([
105
94
  firstDependentName
106
95
  ]), dependencyNamesString = dependencyNames.join("' -> '");
107
- releaseContext.error("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
96
+ log.error("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
108
97
  }
109
98
  return cyclicDependencyExists;
110
99
  }
111
- function createDependencyReleaseContexts(releaseContext, dependentNames, context, callback) {
112
- var releaseName = releaseContext.getReleaseName(), dependencies = releaseContext.getDependencies(), done = function() {
100
+ function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
101
+ var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName], dependencies = releaseContext.getDependencies(), done = function() {
113
102
  var error = null;
114
103
  callback(error);
115
104
  };
116
105
  dependentNames = _toConsumableArray(dependentNames).concat([
117
- releaseName
106
+ dependencyName
118
107
  ]); ///
119
108
  dependencies.asynchronousForEachDependency(function(dependency, next, done) {
120
- var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);
109
+ var cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);
121
110
  if (cyclicDependencyExists) {
122
111
  var error = null;
123
112
  callback(error);
@@ -132,22 +121,22 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
132
121
  });
133
122
  }, done);
134
123
  }
135
- function retrieveDependencyReleaseContexts(releaseContext, releaseContextMap) {
124
+ function retrieveDependencyReleaseContexts(dependency, context) {
136
125
  var dependencyReleaseContexts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
126
+ var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
127
+ if (releaseContext === null) {
128
+ return;
129
+ }
130
+ var dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);
131
+ if (dependencyReleaseContextsIncludesReleaseContext) {
132
+ return;
133
+ }
137
134
  var dependencies = releaseContext.getDependencies();
138
135
  dependencies.forEachDependency(function(dependency) {
139
- var dependencyName = dependency.getName(), dependencyReleaseName = dependencyName, dependencyReleaseContext = releaseContextMap[dependencyReleaseName];
140
- if (dependencyReleaseContext === null) {
141
- return;
142
- }
143
- var dependencyReleaseContextsIncludesDependencyReleaseContext = dependencyReleaseContexts.includes(dependencyReleaseContext);
144
- if (!dependencyReleaseContextsIncludesDependencyReleaseContext) {
145
- var _$releaseContext = dependencyReleaseContext; ///
146
- retrieveDependencyReleaseContexts(_$releaseContext, releaseContextMap, dependencyReleaseContexts);
147
- dependencyReleaseContexts.push(dependencyReleaseContext);
148
- }
136
+ retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);
149
137
  });
138
+ dependencyReleaseContexts.push(releaseContext);
150
139
  return dependencyReleaseContexts;
151
140
  }
152
141
 
153
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nexport function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        name = dependency.getName(),\n        releaseName = name, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = false;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromReleaseNameAndShortenedVersion } = context;\n\n  releaseContextFromReleaseNameAndShortenedVersion(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      releaseContextMap[releaseName] = releaseContext;\n\n      callback(error);\n    });\n  }, context);\n}\n\nexport function initialiseReleaseContexts(releaseName, releaseContextMap) {\n  const releaseContext = releaseContextMap[releaseName];\n\n  initialiseReleaseContext(releaseContext, releaseContextMap);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContexts\n};\n\nfunction initialiseReleaseContext(releaseContext, releaseContextMap) {\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const name = dependency.getName(),\n          releaseName = name, ///\n          releaseContext = releaseContextMap[releaseName];\n\n    initialiseReleaseContext(releaseContext, releaseContextMap);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction createDependencyReleaseContexts(releaseContext, dependentNames, context, callback) {\n  const releaseName = releaseContext.getReleaseName(),\n        dependencies = releaseContext.getDependencies(),\n        done = () => {\n          const error = null;\n\n          callback(error);\n        }\n\n  dependentNames = [ ...dependentNames, releaseName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n}\n\nfunction retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts = []) {\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          dependencyReleaseName = dependencyName, ///\n          dependencyReleaseContext = releaseContextMap[dependencyReleaseName];\n\n    if (dependencyReleaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesDependencyReleaseContext = dependencyReleaseContexts.includes(dependencyReleaseContext);\n\n    if (!dependencyReleaseContextsIncludesDependencyReleaseContext) {\n      const releaseContext = dependencyReleaseContext;  ///\n\n      retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts);\n\n      dependencyReleaseContexts.push(dependencyReleaseContext);\n    }\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContexts","dependency","dependentNames","context","callback","releaseContextMap","name","getName","releaseName","releaseContext","error","releaseContextFromReleaseNameAndShortenedVersion","log","createDependencyReleaseContexts","initialiseReleaseContext","initialised","isInitialised","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependencyName","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","getReleaseName","done","asynchronousForEachDependency","next","dependencyReleaseName","dependencyReleaseContext","dependencyReleaseContextsIncludesDependencyReleaseContext","push"],"mappings":"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"}
142
+ //# 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, 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 dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    initialiseReleaseContext(dependency, 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        done = () => {\n          const error = null;\n\n          callback(error);\n        }\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  }, done);\n}\n\nfunction retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {\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 dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);\n\n  if (dependencyReleaseContextsIncludesReleaseContext) {\n    return;\n  }\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);\n  });\n\n  dependencyReleaseContexts.push(releaseContext);\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContext","dependency","dependentNames","context","callback","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","releaseContextFromDependencyAndDependentNames","log","createDependencyReleaseContexts","initialised","isInitialised","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","done","asynchronousForEachDependency","next","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.388",
4
+ "version": "0.0.390",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -14,7 +14,7 @@
14
14
  "necessary": "^11.1.11",
15
15
  "occam-custom-grammars": "^5.0.359",
16
16
  "occam-dom": "^3.0.171",
17
- "occam-file-system": "^5.0.80",
17
+ "occam-file-system": "^5.0.82",
18
18
  "occam-grammar-utilities": "^7.0.66"
19
19
  },
20
20
  "devDependencies": {
package/src/utilities/releaseContext.js CHANGED
@@ -2,65 +2,49 @@
2
2
 
3
3
  export function createReleaseContext(dependency, dependentNames, context, callback) {
4
4
  const { releaseContextMap } = context,
5
- name = dependency.getName(),
6
- releaseName = name, ///
5
+ dependencyName = dependency.getName(),
6
+ releaseName = dependencyName, ///
7
7
  releaseContext = releaseContextMap[releaseName] || null;
8
8
 
9
9
  if (releaseContext !== null) {
10
- const error = false;
10
+ const error = null;
11
11
 
12
12
  callback(error);
13
13
 
14
14
  return;
15
15
  }
16
16
 
17
- const { releaseContextFromReleaseNameAndShortenedVersion } = context;
17
+ const { releaseContextFromDependencyAndDependentNames } = context;
18
18
 
19
- releaseContextFromReleaseNameAndShortenedVersion(dependency, context, (error, releaseContext) => {
19
+ releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, (error, releaseContext) => {
20
20
  if (error) {
21
21
  callback(error);
22
22
 
23
23
  return;
24
24
  }
25
25
 
26
+ releaseContextMap[releaseName] = releaseContext;
27
+
26
28
  if (releaseContext === null) {
27
29
  const { log } = context;
28
30
 
29
31
  log.error(`The '${releaseName}' package could not be created.`);
30
32
 
31
- releaseContextMap[releaseName] = releaseContext;
32
-
33
33
  callback(error);
34
34
 
35
35
  return;
36
36
  }
37
37
 
38
- createDependencyReleaseContexts(releaseContext, dependentNames, context, (error) => {
39
- if (error) {
40
- callback(error);
41
-
42
- return;
43
- }
44
-
45
- releaseContextMap[releaseName] = releaseContext;
46
-
47
- callback(error);
48
- });
38
+ createDependencyReleaseContexts(dependency, dependentNames, context, callback);
49
39
  }, context);
50
40
  }
51
41
 
52
- export function initialiseReleaseContexts(releaseName, releaseContextMap) {
53
- const releaseContext = releaseContextMap[releaseName];
54
-
55
- initialiseReleaseContext(releaseContext, releaseContextMap);
56
- }
57
-
58
- export default {
59
- createReleaseContext,
60
- initialiseReleaseContexts
61
- };
42
+ export function initialiseReleaseContext(dependency, context) {
43
+ const { releaseContextMap } = context,
44
+ dependencyName = dependency.getName(),
45
+ releaseName = dependencyName, ///
46
+ releaseContext = releaseContextMap[releaseName] || null;
62
47
 
63
- function initialiseReleaseContext(releaseContext, releaseContextMap) {
64
48
  if (releaseContext === null) {
65
49
  return;
66
50
  }
@@ -74,39 +58,44 @@ function initialiseReleaseContext(releaseContext, releaseContextMap) {
74
58
  const dependencies = releaseContext.getDependencies();
75
59
 
76
60
  dependencies.forEachDependency((dependency) => {
77
- const name = dependency.getName(),
78
- releaseName = name, ///
79
- releaseContext = releaseContextMap[releaseName];
80
-
81
- initialiseReleaseContext(releaseContext, releaseContextMap);
61
+ initialiseReleaseContext(dependency, context);
82
62
  });
83
63
 
84
- const dependencyReleaseContexts = retrieveDependencyReleaseContexts(releaseContext, releaseContextMap);
64
+ const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);
85
65
 
86
66
  releaseContext.initialise(dependencyReleaseContexts);
87
67
  }
88
68
 
89
- function checkCyclicDependencyExists(dependency, dependentNames, releaseContext) {
69
+ export default {
70
+ createReleaseContext,
71
+ initialiseReleaseContext
72
+ };
73
+
74
+ function checkCyclicDependencyExists(dependency, dependentNames, context) {
90
75
  const dependencyName = dependency.getName(),
91
76
  dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),
92
77
  cyclicDependencyExists = dependentNamesIncludesDependencyName; ///
93
78
 
94
79
  if (cyclicDependencyExists) {
95
- const firstDependentName = first(dependentNames),
80
+ const { log } = context,
81
+ firstDependentName = first(dependentNames),
96
82
  dependencyNames = [ ///
97
83
  ...dependentNames,
98
84
  firstDependentName
99
85
  ],
100
86
  dependencyNamesString = dependencyNames.join(`' -> '`);
101
87
 
102
- releaseContext.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
88
+ log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);
103
89
  }
104
90
 
105
91
  return cyclicDependencyExists;
106
92
  }
107
93
 
108
- function createDependencyReleaseContexts(releaseContext, dependentNames, context, callback) {
109
- const releaseName = releaseContext.getReleaseName(),
94
+ function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
95
+ const { releaseContextMap } = context,
96
+ dependencyName = dependency.getName(),
97
+ releaseName = dependencyName, ///
98
+ releaseContext = releaseContextMap[releaseName],
110
99
  dependencies = releaseContext.getDependencies(),
111
100
  done = () => {
112
101
  const error = null;
@@ -114,10 +103,10 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
114
103
  callback(error);
115
104
  }
116
105
 
117
- dependentNames = [ ...dependentNames, releaseName ]; ///
106
+ dependentNames = [ ...dependentNames, dependencyName ]; ///
118
107
 
119
108
  dependencies.asynchronousForEachDependency((dependency, next, done) => {
120
- const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, releaseContext);
109
+ const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);
121
110
 
122
111
  if (cyclicDependencyExists) {
123
112
  const error = null;
@@ -139,28 +128,29 @@ function createDependencyReleaseContexts(releaseContext, dependentNames, context
139
128
  }, done);
140
129
  }
141
130
 
142
- function retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts = []) {
143
- const dependencies = releaseContext.getDependencies();
144
-
145
- dependencies.forEachDependency((dependency) => {
146
- const dependencyName = dependency.getName(),
147
- dependencyReleaseName = dependencyName, ///
148
- dependencyReleaseContext = releaseContextMap[dependencyReleaseName];
131
+ function retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {
132
+ const { releaseContextMap } = context,
133
+ dependencyName = dependency.getName(),
134
+ releaseName = dependencyName, ///
135
+ releaseContext = releaseContextMap[releaseName] || null;
149
136
 
150
- if (dependencyReleaseContext === null) {
151
- return;
152
- }
137
+ if (releaseContext === null) {
138
+ return;
139
+ }
153
140
 
154
- const dependencyReleaseContextsIncludesDependencyReleaseContext = dependencyReleaseContexts.includes(dependencyReleaseContext);
141
+ const dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);
155
142
 
156
- if (!dependencyReleaseContextsIncludesDependencyReleaseContext) {
157
- const releaseContext = dependencyReleaseContext; ///
143
+ if (dependencyReleaseContextsIncludesReleaseContext) {
144
+ return;
145
+ }
158
146
 
159
- retrieveDependencyReleaseContexts(releaseContext, releaseContextMap, dependencyReleaseContexts);
147
+ const dependencies = releaseContext.getDependencies();
160
148
 
161
- dependencyReleaseContexts.push(dependencyReleaseContext);
162
- }
149
+ dependencies.forEachDependency((dependency) => {
150
+ retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);
163
151
  });
164
152
 
153
+ dependencyReleaseContexts.push(releaseContext);
154
+
165
155
  return dependencyReleaseContexts;
166
156
  }