occam-verify-cli 0.0.540 → 0.0.541

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 (23) hide show
  1. package/bin/action/verify.js +1 -5
  2. package/bin/utilities/releaseContext.js +30 -40
  3. package/lib/context/file.js +72 -73
  4. package/lib/context/release.js +22 -16
  5. package/lib/index.js +1 -9
  6. package/lib/metaType.js +9 -7
  7. package/lib/metavariable.js +31 -6
  8. package/lib/type.js +8 -8
  9. package/lib/utilities/node.js +16 -2
  10. package/lib/utilities/releaseContext.js +6 -5
  11. package/lib/variable.js +31 -6
  12. package/lib/verify/file.js +2 -2
  13. package/package.json +1 -1
  14. package/src/context/file.js +13 -14
  15. package/src/context/release.js +26 -15
  16. package/src/index.js +0 -2
  17. package/src/metaType.js +8 -5
  18. package/src/metavariable.js +35 -3
  19. package/src/type.js +8 -8
  20. package/src/utilities/node.js +25 -0
  21. package/src/utilities/releaseContext.js +4 -2
  22. package/src/variable.js +34 -2
  23. package/src/verify/file.js +1 -1
package/bin/action/verify.js CHANGED
@@ -43,11 +43,7 @@ function verifyAction(argument, log) {
43
43
  delete context.releaseContextMap;
44
44
  delete context.releaseContextFromDependencyAndDependentNames;
45
45
 
46
- const releaseVerified = verifyRelease(releaseName, releaseContextMap);
47
-
48
- if (releaseVerified) {
49
- releaseContext.toJSON();
50
- }
46
+ verifyRelease(releaseName, releaseContextMap);
51
47
  });
52
48
  });
53
49
  }
package/bin/utilities/releaseContext.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index"), ///
3
+ const { ReleaseContext } = require("../../lib/index"), ///
4
4
  { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system"),
5
5
  { pathUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
6
6
 
@@ -25,15 +25,27 @@ function releaseContextFromDependencyAndDependentNames(dependency, dependentName
25
25
 
26
26
  const entryFile = isEntryFile(entryPath);
27
27
 
28
- let releaseContext;
28
+ let releaseContext = null;
29
29
 
30
30
  try {
31
- releaseContext = entryFile ?
32
- fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) :
33
- directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context);
31
+ const { log } = context;
32
+
33
+ if (entryFile) {
34
+ const filePath = entryPath, ///
35
+ content = readFile(filePath),
36
+ jsonString = content, ///
37
+ json = JSON.parse(jsonString);
38
+
39
+ releaseContext = releaseContextFromLogAndJSON(log, json);
40
+ } else {
41
+ const projectName = dependencyName, ///
42
+ project = loadProject(projectName, projectsDirectoryPath);
43
+
44
+ if (project !== null) {
45
+ releaseContext = releaseContextFromLogAndProject(log, project);
46
+ }
47
+ }
34
48
  } catch (error) {
35
- const releaseContext = null;
36
-
37
49
  callback(error, releaseContext);
38
50
 
39
51
  return;
@@ -48,49 +60,27 @@ module.exports = {
48
60
  releaseContextFromDependencyAndDependentNames
49
61
  };
50
62
 
51
- function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
52
- let releaseContext;
53
-
54
- const { log } = context,
55
- dependencyName = dependency.getName(),
56
- filePath = concatenatePaths(projectsDirectoryPath, dependencyName),
57
- content = readFile(filePath),
58
- releaseJSONString = content, ///
59
- releaseJSON = JSON.parse(releaseJSONString);
60
-
61
- ({ context } = releaseJSON);
62
-
63
- const contextJSON = context; ///
63
+ function releaseContextFromLogAndJSON(log, json) {
64
+ const { name, context } = json;
64
65
 
65
- let { entries } = releaseJSON;
66
+ let { entries } = json;
66
67
 
67
- const json = entries; ///
68
+ json = entries; ///
68
69
 
69
70
  entries = Entries.fromJSON(json);
70
71
 
71
- const name = dependencyName, ///
72
- fileReleaseContext = FileReleaseContext.fromLogNameEntriesAndContextJSON(log, name, entries, contextJSON);
72
+ json = context; ///
73
73
 
74
- releaseContext = fileReleaseContext; ///
74
+ const releaseContext = ReleaseContext.fromLogJSONNameAndEntries(log, json, name, entries);
75
75
 
76
76
  return releaseContext;
77
77
  }
78
78
 
79
- function directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
80
- let releaseContext = null;
81
-
82
- const dependencyName = dependency.getName(),
83
- projectName = dependencyName, ///
84
- project = loadProject(projectName, projectsDirectoryPath);
85
-
86
- if (project !== null) {
87
- const { log } = context,
88
- name = project.getName(),
89
- entries = project.getEntries(),
90
- directoryReleaseContext = DirectoryReleaseContext.fromLogNameAndEntries(log, name, entries);
91
-
92
- releaseContext = directoryReleaseContext; ///
93
- }
79
+ function releaseContextFromLogAndProject(log, project) {
80
+ const json = null,
81
+ name = project.getName(),
82
+ entries = project.getEntries(),
83
+ releaseContext = ReleaseContext.fromLogJSONNameAndEntries(log, json, name, entries);
94
84
 
95
85
  return releaseContext;
96
86
  }