occam-verify-cli 1.0.693 → 1.0.695
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 +5 -12
- package/package.json +5 -5
- package/src/action/verify.js +9 -12
package/lib/action/verify.js
CHANGED
|
@@ -37,25 +37,18 @@ async function verifyAction(name, log) {
|
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
initialiseReleaseContexts(context);
|
|
40
|
-
const releaseContextsVerify = await verifyReleaseContexts(
|
|
40
|
+
const releaseContextsVerify = await verifyReleaseContexts(context);
|
|
41
41
|
if (!releaseContextsVerify) {
|
|
42
42
|
log.warning(`The '${name}' project or package cannot be verified.`);
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
// dependencyReleaseContexts = releaseContext.getDependencyReleaseContexts(),
|
|
49
|
-
// releaseContexts = [
|
|
50
|
-
// releaseContext,
|
|
51
|
-
// ...dependencyReleaseContexts
|
|
52
|
-
// ];
|
|
53
|
-
//
|
|
54
|
-
// ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, FileContextFromFilePath);
|
|
45
|
+
const json = releaseContext.toJSON(), entries = releaseContext.getEntries(), customGrammar = releaseContext.getCustomGrammar();
|
|
46
|
+
releaseContexts.reverse();
|
|
47
|
+
_occamlanguages.ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, _fileContext.FileContextFromFilePath);
|
|
55
48
|
// }
|
|
56
49
|
// catch (error) {
|
|
57
50
|
// log.error(error);
|
|
58
51
|
// }
|
|
59
52
|
}
|
|
60
53
|
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb24vdmVyaWZ5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgXCIuLi9wcmVhbWJsZVwiO1xuXG5pbXBvcnQgeyBEZXBlbmRlbmN5IH0gZnJvbSBcIm9jY2FtLW1vZGVsXCI7XG5pbXBvcnQgeyBhcnJheVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcbmltcG9ydCB7IHZlcmlmaWNhdGlvblV0aWxpdGllcywgUmVsZWFzZUNvbnRleHQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCB7IEZpbGVDb250ZXh0RnJvbUZpbGVQYXRoIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9maWxlQ29udGV4dFwiO1xuaW1wb3J0IHsgcmVsZWFzZUNvbnRleHRGcm9tRGVwZW5kZW5jeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcmVsZWFzZUNvbnRleHRcIjtcblxuY29uc3QgeyBsYXN0IH0gPSBhcnJheVV0aWxpdGllcyxcbiAgICAgIHsgY3JlYXRlUmVsZWFzZUNvbnRleHRzLCB2ZXJpZnlSZWxlYXNlQ29udGV4dHMsIGluaXRpYWxpc2VSZWxlYXNlQ29udGV4dHMgfSA9IHZlcmlmaWNhdGlvblV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgYXN5bmMgZnVuY3Rpb24gdmVyaWZ5QWN0aW9uKG5hbWUsIGxvZykge1xuICBjb25zdCBjYWxsYmFjayA9IGFzeW5jIChjb250ZXh0LCBmaWxlUGF0aCwgbGluZUluZGV4KSA9PiB7XG4gICAgICAgICAgLy8vXG4gICAgICAgIH0sXG4gICAgICAgIHJlbGVhc2VDb250ZXh0cyA9IFtdLFxuICAgICAgICBkZXBlbmRlbmN5ID0gRGVwZW5kZW5jeS5mcm9tTmFtZShuYW1lKSxcbiAgICAgICAgY29udGV4dCA9IHtcbiAgICAgICAgICBsb2csXG4gICAgICAgICAgY2FsbGJhY2ssXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHRzLFxuICAgICAgICAgIEZpbGVDb250ZXh0RnJvbUZpbGVQYXRoLFxuICAgICAgICAgIHJlbGVhc2VDb250ZXh0RnJvbURlcGVuZGVuY3lcbiAgICAgICAgfVxuXG4gIC8vIHRyeSB7XG5cbiAgICBjb25zdCByZWxlYXNlQ29udGV4dENyZWF0ZWQgPSBhd2FpdCBjcmVhdGVSZWxlYXNlQ29udGV4dHMoZGVwZW5kZW5jeSwgY29udGV4dCk7XG5cbiAgICBpZiAoIXJlbGVhc2VDb250ZXh0Q3JlYXRlZCkge1xuICAgICAgbG9nLndhcm5pbmcoYFRoZSAnJHtuYW1lfScgcHJvamVjdCBvciBwYWNrYWdlIGNhbm5vdCBiZSBjcmVhdGVkLmApO1xuXG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgbGFzdFJlbGVhc2VDb250ZXh0ID0gbGFzdChyZWxlYXNlQ29udGV4dHMpLFxuICAgICAgICAgIHJlbGVhc2VDb250ZXh0ID0gbGFzdFJlbGVhc2VDb250ZXh0LCAgLy8vXG4gICAgICAgICAgcmVsZWFzZWQgPSByZWxlYXNlQ29udGV4dC5pc1JlbGVhc2VkKCk7XG5cbiAgICBpZiAocmVsZWFzZWQpIHtcbiAgICAgIGxvZy53YXJuaW5nKGBUaGUgJyR7bmFtZX0nIHBhY2thZ2UgZG9lcyBub3QgbmVlZCB0byBiZSB2ZXJpZmllZC5gKTtcblxuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGluaXRpYWxpc2VSZWxlYXNlQ29udGV4dHMoY29udGV4dCk7XG5cbiAgICBjb25zdCByZWxlYXNlQ29udGV4dHNWZXJpZnkgPSBhd2FpdCB2ZXJpZnlSZWxlYXNlQ29udGV4dHMoY29udGV4dCk7XG5cbiAgICBpZiAoIXJlbGVhc2VDb250ZXh0c1ZlcmlmeSkge1xuICAgICAgbG9nLndhcm5pbmcoYFRoZSAnJHtuYW1lfScgcHJvamVjdCBvciBwYWNrYWdlIGNhbm5vdCBiZSB2ZXJpZmllZC5gKTtcblxuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGNvbnN0IGpzb24gPSByZWxlYXNlQ29udGV4dC50b0pTT04oKSxcbiAgICAgICAgICBlbnRyaWVzID0gcmVsZWFzZUNvbnRleHQuZ2V0RW50cmllcygpLFxuICAgICAgICAgIGN1c3RvbUdyYW1tYXIgPSByZWxlYXNlQ29udGV4dC5nZXRDdXN0b21HcmFtbWFyKCk7XG5cbiAgICByZWxlYXNlQ29udGV4dHMucmV2ZXJzZSgpO1xuXG4gICAgUmVsZWFzZUNvbnRleHQuZnJvbUxvZ05hbWVKU09ORW50cmllc0NhbGxiYWNrQW5kQ3VzdG9tR3JhbW1hcihsb2csIG5hbWUsIGpzb24sIGVudHJpZXMsIGNhbGxiYWNrLCBjdXN0b21HcmFtbWFyKS5pbml0aWFsaXNlKHJlbGVhc2VDb250ZXh0cywgRmlsZUNvbnRleHRGcm9tRmlsZVBhdGgpO1xuXG4gIC8vIH1cbiAgLy8gY2F0Y2ggKGVycm9yKSB7XG4gIC8vICAgbG9nLmVycm9yKGVycm9yKTtcbiAgLy8gfVxufVxuIl0sIm5hbWVzIjpbInZlcmlmeUFjdGlvbiIsImxhc3QiLCJhcnJheVV0aWxpdGllcyIsImNyZWF0ZVJlbGVhc2VDb250ZXh0cyIsInZlcmlmeVJlbGVhc2VDb250ZXh0cyIsImluaXRpYWxpc2VSZWxlYXNlQ29udGV4dHMiLCJ2ZXJpZmljYXRpb25VdGlsaXRpZXMiLCJuYW1lIiwibG9nIiwiY2FsbGJhY2siLCJjb250ZXh0IiwiZmlsZVBhdGgiLCJsaW5lSW5kZXgiLCJyZWxlYXNlQ29udGV4dHMiLCJkZXBlbmRlbmN5IiwiRGVwZW5kZW5jeSIsImZyb21OYW1lIiwiRmlsZUNvbnRleHRGcm9tRmlsZVBhdGgiLCJyZWxlYXNlQ29udGV4dEZyb21EZXBlbmRlbmN5IiwicmVsZWFzZUNvbnRleHRDcmVhdGVkIiwid2FybmluZyIsImxhc3RSZWxlYXNlQ29udGV4dCIsInJlbGVhc2VDb250ZXh0IiwicmVsZWFzZWQiLCJpc1JlbGVhc2VkIiwicmVsZWFzZUNvbnRleHRzVmVyaWZ5IiwianNvbiIsInRvSlNPTiIsImVudHJpZXMiLCJnZXRFbnRyaWVzIiwiY3VzdG9tR3JhbW1hciIsImdldEN1c3RvbUdyYW1tYXIiLCJyZXZlcnNlIiwiUmVsZWFzZUNvbnRleHQiLCJmcm9tTG9nTmFtZUpTT05FbnRyaWVzQ2FsbGJhY2tBbmRDdXN0b21HcmFtbWFyIiwiaW5pdGlhbGlzZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBY0E7OztlQUE4QkE7OztRQVp2Qjs0QkFFb0I7MkJBQ0k7Z0NBQ3VCOzZCQUVkO2dDQUNLO0FBRTdDLE1BQU0sRUFBRUMsSUFBSSxFQUFFLEdBQUdDLHlCQUFjLEVBQ3pCLEVBQUVDLHFCQUFxQixFQUFFQyxxQkFBcUIsRUFBRUMseUJBQXlCLEVBQUUsR0FBR0MscUNBQXFCO0FBRTFGLGVBQWVOLGFBQWFPLElBQUksRUFBRUMsR0FBRztJQUNsRCxNQUFNQyxXQUFXLE9BQU9DLFNBQVNDLFVBQVVDO0lBQ25DLEdBQUc7SUFDTCxHQUNBQyxrQkFBa0IsRUFBRSxFQUNwQkMsYUFBYUMsc0JBQVUsQ0FBQ0MsUUFBUSxDQUFDVCxPQUNqQ0csVUFBVTtRQUNSRjtRQUNBQztRQUNBSTtRQUNBSSx5QkFBQUEsb0NBQXVCO1FBQ3ZCQyw4QkFBQUEsNENBQTRCO0lBQzlCO0lBRU4sUUFBUTtJQUVOLE1BQU1DLHdCQUF3QixNQUFNaEIsc0JBQXNCVyxZQUFZSjtJQUV0RSxJQUFJLENBQUNTLHVCQUF1QjtRQUMxQlgsSUFBSVksT0FBTyxDQUFDLENBQUMsS0FBSyxFQUFFYixLQUFLLHVDQUF1QyxDQUFDO1FBRWpFO0lBQ0Y7SUFFQSxNQUFNYyxxQkFBcUJwQixLQUFLWSxrQkFDMUJTLGlCQUFpQkQsb0JBQ2pCRSxXQUFXRCxlQUFlRSxVQUFVO0lBRTFDLElBQUlELFVBQVU7UUFDWmYsSUFBSVksT0FBTyxDQUFDLENBQUMsS0FBSyxFQUFFYixLQUFLLHVDQUF1QyxDQUFDO1FBRWpFO0lBQ0Y7SUFFQUYsMEJBQTBCSztJQUUxQixNQUFNZSx3QkFBd0IsTUFBTXJCLHNCQUFzQk07SUFFMUQsSUFBSSxDQUFDZSx1QkFBdUI7UUFDMUJqQixJQUFJWSxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUViLEtBQUssd0NBQXdDLENBQUM7UUFFbEU7SUFDRjtJQUVBLE1BQU1tQixPQUFPSixlQUFlSyxNQUFNLElBQzVCQyxVQUFVTixlQUFlTyxVQUFVLElBQ25DQyxnQkFBZ0JSLGVBQWVTLGdCQUFnQjtJQUVyRGxCLGdCQUFnQm1CLE9BQU87SUFFdkJDLDhCQUFjLENBQUNDLDhDQUE4QyxDQUFDMUIsS0FBS0QsTUFBTW1CLE1BQU1FLFNBQVNuQixVQUFVcUIsZUFBZUssVUFBVSxDQUFDdEIsaUJBQWlCSSxvQ0FBdUI7QUFFdEssSUFBSTtBQUNKLGtCQUFrQjtBQUNsQixzQkFBc0I7QUFDdEIsSUFBSTtBQUNOIn0=
|
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.695",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -13,12 +13,12 @@
|
|
|
13
13
|
"argumentative": "^2.0.47",
|
|
14
14
|
"necessary": "^17.1.7",
|
|
15
15
|
"occam-file-system": "^6.0.505",
|
|
16
|
-
"occam-furtle": "^3.0.
|
|
16
|
+
"occam-furtle": "^3.0.157",
|
|
17
17
|
"occam-grammars": "^1.3.520",
|
|
18
|
-
"occam-languages": "^0.0.
|
|
18
|
+
"occam-languages": "^0.0.138",
|
|
19
19
|
"occam-lexers": "^23.1.44",
|
|
20
|
-
"occam-model": "^1.0.
|
|
21
|
-
"occam-nominal": "^1.0.
|
|
20
|
+
"occam-model": "^1.0.505",
|
|
21
|
+
"occam-nominal": "^1.0.70",
|
|
22
22
|
"occam-parsers": "^23.1.50"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
package/src/action/verify.js
CHANGED
|
@@ -4,7 +4,7 @@ import "../preamble";
|
|
|
4
4
|
|
|
5
5
|
import { Dependency } from "occam-model";
|
|
6
6
|
import { arrayUtilities } from "necessary";
|
|
7
|
-
import { verificationUtilities } from "occam-languages";
|
|
7
|
+
import { verificationUtilities, ReleaseContext } from "occam-languages";
|
|
8
8
|
|
|
9
9
|
import { FileContextFromFilePath } from "../utilities/fileContext";
|
|
10
10
|
import { releaseContextFromDependency } from "../utilities/releaseContext";
|
|
@@ -48,7 +48,7 @@ export default async function verifyAction(name, log) {
|
|
|
48
48
|
|
|
49
49
|
initialiseReleaseContexts(context);
|
|
50
50
|
|
|
51
|
-
const releaseContextsVerify = await verifyReleaseContexts(
|
|
51
|
+
const releaseContextsVerify = await verifyReleaseContexts(context);
|
|
52
52
|
|
|
53
53
|
if (!releaseContextsVerify) {
|
|
54
54
|
log.warning(`The '${name}' project or package cannot be verified.`);
|
|
@@ -56,16 +56,13 @@ export default async function verifyAction(name, log) {
|
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
// ];
|
|
67
|
-
//
|
|
68
|
-
// ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, FileContextFromFilePath);
|
|
59
|
+
const json = releaseContext.toJSON(),
|
|
60
|
+
entries = releaseContext.getEntries(),
|
|
61
|
+
customGrammar = releaseContext.getCustomGrammar();
|
|
62
|
+
|
|
63
|
+
releaseContexts.reverse();
|
|
64
|
+
|
|
65
|
+
ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, FileContextFromFilePath);
|
|
69
66
|
|
|
70
67
|
// }
|
|
71
68
|
// catch (error) {
|