occam-verify-cli 1.0.658 → 1.0.660
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.
- package/lib/action/verify.js +25 -29
- package/package.json +9 -9
- package/src/action/verify.js +7 -44
package/lib/action/verify.js
CHANGED
|
@@ -133,10 +133,10 @@ function _ts_generator(thisArg, body) {
|
|
|
133
133
|
};
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
|
-
var
|
|
136
|
+
var createReleaseContext = _occamlanguages.verificationUtilities.createReleaseContext, verifyReleaseContext = _occamlanguages.verificationUtilities.verifyReleaseContext, initialiseReleaseContext = _occamlanguages.verificationUtilities.initialiseReleaseContext;
|
|
137
137
|
function verifyAction(name, log) {
|
|
138
138
|
return _async_to_generator(function() {
|
|
139
|
-
var callback, releaseContextMap, context, dependentNames, dependency, success, releaseName, releaseContext, released, dependentName, dependentReleased, releaseVerifies,
|
|
139
|
+
var callback, releaseContextMap, context, dependentNames, dependency, success, releaseName, releaseContext, released, dependentName, dependentReleased, releaseVerifies, error;
|
|
140
140
|
return _ts_generator(this, function(_state) {
|
|
141
141
|
switch(_state.label){
|
|
142
142
|
case 0:
|
|
@@ -156,12 +156,20 @@ function verifyAction(name, log) {
|
|
|
156
156
|
FileContextFromFilePath: _fileContext.FileContextFromFilePath,
|
|
157
157
|
releaseContextFromDependency: _releaseContext.releaseContextFromDependency
|
|
158
158
|
};
|
|
159
|
+
_state.label = 1;
|
|
160
|
+
case 1:
|
|
161
|
+
_state.trys.push([
|
|
162
|
+
1,
|
|
163
|
+
4,
|
|
164
|
+
,
|
|
165
|
+
5
|
|
166
|
+
]);
|
|
159
167
|
dependentNames = [], dependency = _occammodel.Dependency.fromName(name);
|
|
160
168
|
return [
|
|
161
169
|
4,
|
|
162
170
|
createReleaseContext(dependency, dependentNames, context)
|
|
163
171
|
];
|
|
164
|
-
case
|
|
172
|
+
case 2:
|
|
165
173
|
success = _state.sent();
|
|
166
174
|
if (!success) {
|
|
167
175
|
log.warning("The '".concat(name, "' project or package cannot be created."));
|
|
@@ -182,7 +190,7 @@ function verifyAction(name, log) {
|
|
|
182
190
|
4,
|
|
183
191
|
verifyReleaseContext(releaseName, dependentName, dependentReleased, releaseContextMap)
|
|
184
192
|
];
|
|
185
|
-
case
|
|
193
|
+
case 3:
|
|
186
194
|
releaseVerifies = _state.sent();
|
|
187
195
|
if (!releaseVerifies) {
|
|
188
196
|
log.warning("The '".concat(name, "' project or package cannot be verified."));
|
|
@@ -190,36 +198,24 @@ function verifyAction(name, log) {
|
|
|
190
198
|
2
|
|
191
199
|
];
|
|
192
200
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
log: log,
|
|
206
|
-
callback: callback
|
|
207
|
-
};
|
|
208
|
-
var releaseContext = releaseContextFromJSON(json, context), releaseContexts = [
|
|
209
|
-
releaseContext
|
|
210
|
-
];
|
|
211
|
-
releaseContext.initialise(releaseContexts, _fileContext.FileContextFromFilePath);
|
|
212
|
-
})();
|
|
201
|
+
return [
|
|
202
|
+
3,
|
|
203
|
+
5
|
|
204
|
+
];
|
|
205
|
+
case 4:
|
|
206
|
+
error = _state.sent();
|
|
207
|
+
log.error(error);
|
|
208
|
+
return [
|
|
209
|
+
3,
|
|
210
|
+
5
|
|
211
|
+
];
|
|
212
|
+
case 5:
|
|
213
213
|
return [
|
|
214
214
|
2
|
|
215
215
|
];
|
|
216
216
|
}
|
|
217
217
|
});
|
|
218
|
-
// }
|
|
219
|
-
// catch (error) {
|
|
220
|
-
// log.error(error);
|
|
221
|
-
// }
|
|
222
218
|
})();
|
|
223
219
|
}
|
|
224
220
|
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
221
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb24vdmVyaWZ5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgXCIuLi9wcmVhbWJsZVwiO1xuXG5pbXBvcnQgeyBEZXBlbmRlbmN5IH0gZnJvbSBcIm9jY2FtLW1vZGVsXCI7XG5pbXBvcnQgeyB2ZXJpZmljYXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCB7IEZpbGVDb250ZXh0RnJvbUZpbGVQYXRoIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9maWxlQ29udGV4dFwiO1xuaW1wb3J0IHsgcmVsZWFzZUNvbnRleHRGcm9tRGVwZW5kZW5jeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcmVsZWFzZUNvbnRleHRcIjtcblxuY29uc3QgeyBjcmVhdGVSZWxlYXNlQ29udGV4dCwgdmVyaWZ5UmVsZWFzZUNvbnRleHQsIGluaXRpYWxpc2VSZWxlYXNlQ29udGV4dCB9ID0gdmVyaWZpY2F0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBhc3luYyBmdW5jdGlvbiB2ZXJpZnlBY3Rpb24obmFtZSwgbG9nKSB7XG4gIGNvbnN0IGNhbGxiYWNrID0gYXN5bmMgKGNvbnRleHQsIGZpbGVQYXRoLCBsaW5lSW5kZXgpID0+IHtcbiAgICAgICAgICAvLy9cbiAgICAgICAgfSxcbiAgICAgICAgcmVsZWFzZUNvbnRleHRNYXAgPSB7fSxcbiAgICAgICAgY29udGV4dCA9IHtcbiAgICAgICAgICBsb2csXG4gICAgICAgICAgY2FsbGJhY2ssXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHRNYXAsXG4gICAgICAgICAgRmlsZUNvbnRleHRGcm9tRmlsZVBhdGgsXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHRGcm9tRGVwZW5kZW5jeVxuICAgICAgICB9XG5cbiAgdHJ5IHtcbiAgICBjb25zdCBkZXBlbmRlbnROYW1lcyA9IFtdLFxuICAgICAgICAgIGRlcGVuZGVuY3kgPSBEZXBlbmRlbmN5LmZyb21OYW1lKG5hbWUpLFxuICAgICAgICAgIHN1Y2Nlc3MgPSBhd2FpdCBjcmVhdGVSZWxlYXNlQ29udGV4dChkZXBlbmRlbmN5LCBkZXBlbmRlbnROYW1lcywgY29udGV4dCk7XG5cbiAgICBpZiAoIXN1Y2Nlc3MpIHtcbiAgICAgIGxvZy53YXJuaW5nKGBUaGUgJyR7bmFtZX0nIHByb2plY3Qgb3IgcGFja2FnZSBjYW5ub3QgYmUgY3JlYXRlZC5gKTtcblxuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGNvbnN0IHJlbGVhc2VOYW1lID0gbmFtZSwgLy8vXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHQgPSByZWxlYXNlQ29udGV4dE1hcFtyZWxlYXNlTmFtZV0sXG4gICAgICAgICAgcmVsZWFzZWQgPSByZWxlYXNlQ29udGV4dC5pc1JlbGVhc2VkKCk7XG5cbiAgICBpZiAocmVsZWFzZWQpIHtcbiAgICAgIGxvZy53YXJuaW5nKGBUaGUgJyR7bmFtZX0nIHBhY2thZ2UgZG9lcyBub3QgbmVlZCB0byBiZSB2ZXJpZmllZC5gKTtcblxuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGluaXRpYWxpc2VSZWxlYXNlQ29udGV4dChkZXBlbmRlbmN5LCBjb250ZXh0KTtcblxuICAgIGNvbnN0IGRlcGVuZGVudE5hbWUgPSBudWxsLFxuICAgICAgICAgIGRlcGVuZGVudFJlbGVhc2VkID0gZmFsc2UsXG4gICAgICAgICAgcmVsZWFzZVZlcmlmaWVzID0gYXdhaXQgdmVyaWZ5UmVsZWFzZUNvbnRleHQocmVsZWFzZU5hbWUsIGRlcGVuZGVudE5hbWUsIGRlcGVuZGVudFJlbGVhc2VkLCByZWxlYXNlQ29udGV4dE1hcCk7XG5cbiAgICBpZiAoIXJlbGVhc2VWZXJpZmllcykge1xuICAgICAgbG9nLndhcm5pbmcoYFRoZSAnJHtuYW1lfScgcHJvamVjdCBvciBwYWNrYWdlIGNhbm5vdCBiZSB2ZXJpZmllZC5gKTtcblxuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgfVxuICBjYXRjaCAoZXJyb3IpIHtcbiAgICBsb2cuZXJyb3IoZXJyb3IpO1xuICB9XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5QWN0aW9uIiwiY3JlYXRlUmVsZWFzZUNvbnRleHQiLCJ2ZXJpZmljYXRpb25VdGlsaXRpZXMiLCJ2ZXJpZnlSZWxlYXNlQ29udGV4dCIsImluaXRpYWxpc2VSZWxlYXNlQ29udGV4dCIsIm5hbWUiLCJsb2ciLCJjYWxsYmFjayIsInJlbGVhc2VDb250ZXh0TWFwIiwiY29udGV4dCIsImRlcGVuZGVudE5hbWVzIiwiZGVwZW5kZW5jeSIsInN1Y2Nlc3MiLCJyZWxlYXNlTmFtZSIsInJlbGVhc2VDb250ZXh0IiwicmVsZWFzZWQiLCJkZXBlbmRlbnROYW1lIiwiZGVwZW5kZW50UmVsZWFzZWQiLCJyZWxlYXNlVmVyaWZpZXMiLCJlcnJvciIsImZpbGVQYXRoIiwibGluZUluZGV4IiwiRmlsZUNvbnRleHRGcm9tRmlsZVBhdGgiLCJyZWxlYXNlQ29udGV4dEZyb21EZXBlbmRlbmN5IiwiRGVwZW5kZW5jeSIsImZyb21OYW1lIiwid2FybmluZyIsImlzUmVsZWFzZWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVlBOzs7ZUFBOEJBOzs7UUFWdkI7MEJBRW9COzhCQUNXOzJCQUVFOzhCQUNLOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTdDLElBQVFDLHVCQUF5RUMscUNBQXFCLENBQTlGRCxzQkFBc0JFLHVCQUFtREQscUNBQXFCLENBQXhFQyxzQkFBc0JDLDJCQUE2QkYscUNBQXFCLENBQWxERTtBQUVyQyxTQUFlSixhQUFhSyxJQUFJLEVBQUVDLEdBQUc7O1lBQzVDQyxVQUdBQyxtQkFDQUMsU0FTRUMsZ0JBQ0FDLFlBQ0FDLFNBUUFDLGFBQ0FDLGdCQUNBQyxVQVVBQyxlQUNBQyxtQkFDQUMsaUJBUURDOzs7O29CQTdDRFosV0FBVyxTQUFPRSxTQUFTVyxVQUFVQzs7Ozs7Ozt3QkFDbkMsR0FBRzt3QkFDTDt1QkFDQWIsb0JBQW9CLENBQUMsR0FDckJDLFVBQVU7d0JBQ1JILEtBQUFBO3dCQUNBQyxVQUFBQTt3QkFDQUMsbUJBQUFBO3dCQUNBYyx5QkFBQUEsb0NBQXVCO3dCQUN2QkMsOEJBQUFBLDRDQUE0QjtvQkFDOUI7Ozs7Ozs7OztvQkFHRWIscUJBQ0FDLGFBQWFhLHNCQUFVLENBQUNDLFFBQVEsQ0FBQ3BCO29CQUN2Qjs7d0JBQU1KLHFCQUFxQlUsWUFBWUQsZ0JBQWdCRDs7O29CQUFqRUcsVUFBVTtvQkFFaEIsSUFBSSxDQUFDQSxTQUFTO3dCQUNaTixJQUFJb0IsT0FBTyxDQUFDLEFBQUMsUUFBWSxPQUFMckIsTUFBSzt3QkFFekI7OztvQkFDRjtvQkFFTVEsY0FBY1IsTUFDZFMsaUJBQWlCTixpQkFBaUIsQ0FBQ0ssWUFBWSxFQUMvQ0UsV0FBV0QsZUFBZWEsVUFBVTtvQkFFMUMsSUFBSVosVUFBVTt3QkFDWlQsSUFBSW9CLE9BQU8sQ0FBQyxBQUFDLFFBQVksT0FBTHJCLE1BQUs7d0JBRXpCOzs7b0JBQ0Y7b0JBRUFELHlCQUF5Qk8sWUFBWUY7b0JBRS9CTyxnQkFBZ0IsTUFDaEJDLG9CQUFvQjtvQkFDRjs7d0JBQU1kLHFCQUFxQlUsYUFBYUcsZUFBZUMsbUJBQW1CVDs7O29CQUE1RlUsa0JBQWtCO29CQUV4QixJQUFJLENBQUNBLGlCQUFpQjt3QkFDcEJaLElBQUlvQixPQUFPLENBQUMsQUFBQyxRQUFZLE9BQUxyQixNQUFLO3dCQUV6Qjs7O29CQUNGOzs7Ozs7b0JBRUtjO29CQUNMYixJQUFJYSxLQUFLLENBQUNBOzs7Ozs7Ozs7OztJQUVkIn0=
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.660",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -11,15 +11,15 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.36",
|
|
14
|
-
"necessary": "^17.
|
|
14
|
+
"necessary": "^17.1.1",
|
|
15
15
|
"occam-file-system": "^6.0.505",
|
|
16
|
-
"occam-furtle": "^3.0.
|
|
17
|
-
"occam-grammars": "^1.3.
|
|
18
|
-
"occam-languages": "^0.0.
|
|
19
|
-
"occam-lexers": "^23.1.
|
|
20
|
-
"occam-model": "^1.0.
|
|
21
|
-
"occam-nominal": "^1.0.
|
|
22
|
-
"occam-parsers": "^23.1.
|
|
16
|
+
"occam-furtle": "^3.0.130",
|
|
17
|
+
"occam-grammars": "^1.3.514",
|
|
18
|
+
"occam-languages": "^0.0.109",
|
|
19
|
+
"occam-lexers": "^23.1.38",
|
|
20
|
+
"occam-model": "^1.0.497",
|
|
21
|
+
"occam-nominal": "^1.0.53",
|
|
22
|
+
"occam-parsers": "^23.1.44"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@swc/core": "1.13.20",
|
package/src/action/verify.js
CHANGED
|
@@ -3,13 +3,12 @@
|
|
|
3
3
|
import "../preamble";
|
|
4
4
|
|
|
5
5
|
import { Dependency } from "occam-model";
|
|
6
|
-
import { verificationUtilities
|
|
6
|
+
import { verificationUtilities } from "occam-languages";
|
|
7
7
|
|
|
8
8
|
import { FileContextFromFilePath } from "../utilities/fileContext";
|
|
9
9
|
import { releaseContextFromDependency } from "../utilities/releaseContext";
|
|
10
10
|
|
|
11
|
-
const {
|
|
12
|
-
{ createReleaseContext, verifyReleaseContext, initialiseReleaseContext } = verificationUtilities;
|
|
11
|
+
const { createReleaseContext, verifyReleaseContext, initialiseReleaseContext } = verificationUtilities;
|
|
13
12
|
|
|
14
13
|
export default async function verifyAction(name, log) {
|
|
15
14
|
const callback = async (context, filePath, lineIndex) => {
|
|
@@ -24,8 +23,7 @@ export default async function verifyAction(name, log) {
|
|
|
24
23
|
releaseContextFromDependency
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
try {
|
|
29
27
|
const dependentNames = [],
|
|
30
28
|
dependency = Dependency.fromName(name),
|
|
31
29
|
success = await createReleaseContext(dependency, dependentNames, context);
|
|
@@ -57,43 +55,8 @@ export default async function verifyAction(name, log) {
|
|
|
57
55
|
|
|
58
56
|
return;
|
|
59
57
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
(() => {
|
|
65
|
-
|
|
66
|
-
let context;
|
|
67
|
-
|
|
68
|
-
const entriesJSON = entries.toJSON();
|
|
69
|
-
|
|
70
|
-
entries = entriesJSON; ///
|
|
71
|
-
|
|
72
|
-
context = json; ///
|
|
73
|
-
|
|
74
|
-
json = {
|
|
75
|
-
name,
|
|
76
|
-
entries,
|
|
77
|
-
context
|
|
78
|
-
};
|
|
79
|
-
|
|
80
|
-
context = {
|
|
81
|
-
log,
|
|
82
|
-
callback
|
|
83
|
-
};
|
|
84
|
-
|
|
85
|
-
const releaseContext = releaseContextFromJSON(json, context),
|
|
86
|
-
releaseContexts = [
|
|
87
|
-
releaseContext
|
|
88
|
-
];
|
|
89
|
-
|
|
90
|
-
releaseContext.initialise(releaseContexts, FileContextFromFilePath);
|
|
91
|
-
|
|
92
|
-
})();
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
// }
|
|
96
|
-
// catch (error) {
|
|
97
|
-
// log.error(error);
|
|
98
|
-
// }
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
log.error(error);
|
|
61
|
+
}
|
|
99
62
|
}
|