occam-verify-cli 1.0.691 → 1.0.694
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 +11 -17
- package/package.json +5 -5
- package/src/action/verify.js +13 -22
package/lib/action/verify.js
CHANGED
|
@@ -10,50 +10,44 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
require("../preamble");
|
|
12
12
|
const _occammodel = require("occam-model");
|
|
13
|
+
const _necessary = require("necessary");
|
|
13
14
|
const _occamlanguages = require("occam-languages");
|
|
14
15
|
const _fileContext = require("../utilities/fileContext");
|
|
15
16
|
const _releaseContext = require("../utilities/releaseContext");
|
|
16
|
-
const { createReleaseContexts, verifyReleaseContexts, initialiseReleaseContexts } = _occamlanguages.verificationUtilities;
|
|
17
|
+
const { last } = _necessary.arrayUtilities, { createReleaseContexts, verifyReleaseContexts, initialiseReleaseContexts } = _occamlanguages.verificationUtilities;
|
|
17
18
|
async function verifyAction(name, log) {
|
|
18
19
|
const callback = async (context, filePath, lineIndex)=>{
|
|
19
20
|
///
|
|
20
|
-
},
|
|
21
|
+
}, releaseContexts = [], dependency = _occammodel.Dependency.fromName(name), context = {
|
|
21
22
|
log,
|
|
22
23
|
callback,
|
|
23
|
-
|
|
24
|
+
releaseContexts,
|
|
24
25
|
FileContextFromFilePath: _fileContext.FileContextFromFilePath,
|
|
25
26
|
releaseContextFromDependency: _releaseContext.releaseContextFromDependency
|
|
26
27
|
};
|
|
27
28
|
// try {
|
|
28
|
-
const
|
|
29
|
+
const releaseContextCreated = await createReleaseContexts(dependency, context);
|
|
29
30
|
if (!releaseContextCreated) {
|
|
30
31
|
log.warning(`The '${name}' project or package cannot be created.`);
|
|
31
32
|
return;
|
|
32
33
|
}
|
|
33
|
-
const
|
|
34
|
+
const lastReleaseContext = last(releaseContexts), releaseContext = lastReleaseContext, released = releaseContext.isReleased();
|
|
34
35
|
if (released) {
|
|
35
36
|
log.warning(`The '${name}' package does not need to be verified.`);
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
log.warning(`The '${name}' project or package cannot be initialised.`);
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
const releaseContextsVerify = await verifyReleaseContexts(dependency, releaseContextMap);
|
|
39
|
+
initialiseReleaseContexts(context);
|
|
40
|
+
const releaseContextsVerify = await verifyReleaseContexts(dependency, context);
|
|
44
41
|
if (!releaseContextsVerify) {
|
|
45
42
|
log.warning(`The '${name}' project or package cannot be verified.`);
|
|
46
43
|
return;
|
|
47
44
|
}
|
|
48
|
-
const json = releaseContext.toJSON(), entries = releaseContext.getEntries(), customGrammar = releaseContext.getCustomGrammar()
|
|
49
|
-
|
|
50
|
-
...dependencyReleaseContexts
|
|
51
|
-
];
|
|
52
|
-
_occamlanguages.ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, _fileContext.FileContextFromFilePath);
|
|
45
|
+
const json = releaseContext.toJSON(), entries = releaseContext.getEntries(), customGrammar = releaseContext.getCustomGrammar();
|
|
46
|
+
ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, _fileContext.FileContextFromFilePath);
|
|
53
47
|
// }
|
|
54
48
|
// catch (error) {
|
|
55
49
|
// log.error(error);
|
|
56
50
|
// }
|
|
57
51
|
}
|
|
58
52
|
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb24vdmVyaWZ5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgXCIuLi9wcmVhbWJsZVwiO1xuXG5pbXBvcnQgeyBEZXBlbmRlbmN5IH0gZnJvbSBcIm9jY2FtLW1vZGVsXCI7XG5pbXBvcnQgeyBhcnJheVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcbmltcG9ydCB7IHZlcmlmaWNhdGlvblV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IHsgRmlsZUNvbnRleHRGcm9tRmlsZVBhdGggfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2ZpbGVDb250ZXh0XCI7XG5pbXBvcnQgeyByZWxlYXNlQ29udGV4dEZyb21EZXBlbmRlbmN5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9yZWxlYXNlQ29udGV4dFwiO1xuXG5jb25zdCB7IGxhc3QgfSA9IGFycmF5VXRpbGl0aWVzLFxuICAgICAgeyBjcmVhdGVSZWxlYXNlQ29udGV4dHMsIHZlcmlmeVJlbGVhc2VDb250ZXh0cywgaW5pdGlhbGlzZVJlbGVhc2VDb250ZXh0cyB9ID0gdmVyaWZpY2F0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBhc3luYyBmdW5jdGlvbiB2ZXJpZnlBY3Rpb24obmFtZSwgbG9nKSB7XG4gIGNvbnN0IGNhbGxiYWNrID0gYXN5bmMgKGNvbnRleHQsIGZpbGVQYXRoLCBsaW5lSW5kZXgpID0+IHtcbiAgICAgICAgICAvLy9cbiAgICAgICAgfSxcbiAgICAgICAgcmVsZWFzZUNvbnRleHRzID0gW10sXG4gICAgICAgIGRlcGVuZGVuY3kgPSBEZXBlbmRlbmN5LmZyb21OYW1lKG5hbWUpLFxuICAgICAgICBjb250ZXh0ID0ge1xuICAgICAgICAgIGxvZyxcbiAgICAgICAgICBjYWxsYmFjayxcbiAgICAgICAgICByZWxlYXNlQ29udGV4dHMsXG4gICAgICAgICAgRmlsZUNvbnRleHRGcm9tRmlsZVBhdGgsXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHRGcm9tRGVwZW5kZW5jeVxuICAgICAgICB9XG5cbiAgLy8gdHJ5IHtcblxuICAgIGNvbnN0IHJlbGVhc2VDb250ZXh0Q3JlYXRlZCA9IGF3YWl0IGNyZWF0ZVJlbGVhc2VDb250ZXh0cyhkZXBlbmRlbmN5LCBjb250ZXh0KTtcblxuICAgIGlmICghcmVsZWFzZUNvbnRleHRDcmVhdGVkKSB7XG4gICAgICBsb2cud2FybmluZyhgVGhlICcke25hbWV9JyBwcm9qZWN0IG9yIHBhY2thZ2UgY2Fubm90IGJlIGNyZWF0ZWQuYCk7XG5cbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjb25zdCBsYXN0UmVsZWFzZUNvbnRleHQgPSBsYXN0KHJlbGVhc2VDb250ZXh0cyksXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHQgPSBsYXN0UmVsZWFzZUNvbnRleHQsICAvLy9cbiAgICAgICAgICByZWxlYXNlZCA9IHJlbGVhc2VDb250ZXh0LmlzUmVsZWFzZWQoKTtcblxuICAgIGlmIChyZWxlYXNlZCkge1xuICAgICAgbG9nLndhcm5pbmcoYFRoZSAnJHtuYW1lfScgcGFja2FnZSBkb2VzIG5vdCBuZWVkIHRvIGJlIHZlcmlmaWVkLmApO1xuXG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaW5pdGlhbGlzZVJlbGVhc2VDb250ZXh0cyhjb250ZXh0KTtcblxuICAgIGNvbnN0IHJlbGVhc2VDb250ZXh0c1ZlcmlmeSA9IGF3YWl0IHZlcmlmeVJlbGVhc2VDb250ZXh0cyhkZXBlbmRlbmN5LCBjb250ZXh0KTtcblxuICAgIGlmICghcmVsZWFzZUNvbnRleHRzVmVyaWZ5KSB7XG4gICAgICBsb2cud2FybmluZyhgVGhlICcke25hbWV9JyBwcm9qZWN0IG9yIHBhY2thZ2UgY2Fubm90IGJlIHZlcmlmaWVkLmApO1xuXG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QganNvbiA9IHJlbGVhc2VDb250ZXh0LnRvSlNPTigpLFxuICAgICAgICAgIGVudHJpZXMgPSByZWxlYXNlQ29udGV4dC5nZXRFbnRyaWVzKCksXG4gICAgICAgICAgY3VzdG9tR3JhbW1hciA9IHJlbGVhc2VDb250ZXh0LmdldEN1c3RvbUdyYW1tYXIoKTtcblxuICAgIFJlbGVhc2VDb250ZXh0LmZyb21Mb2dOYW1lSlNPTkVudHJpZXNDYWxsYmFja0FuZEN1c3RvbUdyYW1tYXIobG9nLCBuYW1lLCBqc29uLCBlbnRyaWVzLCBjYWxsYmFjaywgY3VzdG9tR3JhbW1hcikuaW5pdGlhbGlzZShyZWxlYXNlQ29udGV4dHMsIEZpbGVDb250ZXh0RnJvbUZpbGVQYXRoKTtcblxuICAvLyB9XG4gIC8vIGNhdGNoIChlcnJvcikge1xuICAvLyAgIGxvZy5lcnJvcihlcnJvcik7XG4gIC8vIH1cbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlBY3Rpb24iLCJsYXN0IiwiYXJyYXlVdGlsaXRpZXMiLCJjcmVhdGVSZWxlYXNlQ29udGV4dHMiLCJ2ZXJpZnlSZWxlYXNlQ29udGV4dHMiLCJpbml0aWFsaXNlUmVsZWFzZUNvbnRleHRzIiwidmVyaWZpY2F0aW9uVXRpbGl0aWVzIiwibmFtZSIsImxvZyIsImNhbGxiYWNrIiwiY29udGV4dCIsImZpbGVQYXRoIiwibGluZUluZGV4IiwicmVsZWFzZUNvbnRleHRzIiwiZGVwZW5kZW5jeSIsIkRlcGVuZGVuY3kiLCJmcm9tTmFtZSIsIkZpbGVDb250ZXh0RnJvbUZpbGVQYXRoIiwicmVsZWFzZUNvbnRleHRGcm9tRGVwZW5kZW5jeSIsInJlbGVhc2VDb250ZXh0Q3JlYXRlZCIsIndhcm5pbmciLCJsYXN0UmVsZWFzZUNvbnRleHQiLCJyZWxlYXNlQ29udGV4dCIsInJlbGVhc2VkIiwiaXNSZWxlYXNlZCIsInJlbGVhc2VDb250ZXh0c1ZlcmlmeSIsImpzb24iLCJ0b0pTT04iLCJlbnRyaWVzIiwiZ2V0RW50cmllcyIsImN1c3RvbUdyYW1tYXIiLCJnZXRDdXN0b21HcmFtbWFyIiwiUmVsZWFzZUNvbnRleHQiLCJmcm9tTG9nTmFtZUpTT05FbnRyaWVzQ2FsbGJhY2tBbmRDdXN0b21HcmFtbWFyIiwiaW5pdGlhbGlzZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBY0E7OztlQUE4QkE7OztRQVp2Qjs0QkFFb0I7MkJBQ0k7Z0NBQ087NkJBRUU7Z0NBQ0s7QUFFN0MsTUFBTSxFQUFFQyxJQUFJLEVBQUUsR0FBR0MseUJBQWMsRUFDekIsRUFBRUMscUJBQXFCLEVBQUVDLHFCQUFxQixFQUFFQyx5QkFBeUIsRUFBRSxHQUFHQyxxQ0FBcUI7QUFFMUYsZUFBZU4sYUFBYU8sSUFBSSxFQUFFQyxHQUFHO0lBQ2xELE1BQU1DLFdBQVcsT0FBT0MsU0FBU0MsVUFBVUM7SUFDbkMsR0FBRztJQUNMLEdBQ0FDLGtCQUFrQixFQUFFLEVBQ3BCQyxhQUFhQyxzQkFBVSxDQUFDQyxRQUFRLENBQUNULE9BQ2pDRyxVQUFVO1FBQ1JGO1FBQ0FDO1FBQ0FJO1FBQ0FJLHlCQUFBQSxvQ0FBdUI7UUFDdkJDLDhCQUFBQSw0Q0FBNEI7SUFDOUI7SUFFTixRQUFRO0lBRU4sTUFBTUMsd0JBQXdCLE1BQU1oQixzQkFBc0JXLFlBQVlKO0lBRXRFLElBQUksQ0FBQ1MsdUJBQXVCO1FBQzFCWCxJQUFJWSxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUViLEtBQUssdUNBQXVDLENBQUM7UUFFakU7SUFDRjtJQUVBLE1BQU1jLHFCQUFxQnBCLEtBQUtZLGtCQUMxQlMsaUJBQWlCRCxvQkFDakJFLFdBQVdELGVBQWVFLFVBQVU7SUFFMUMsSUFBSUQsVUFBVTtRQUNaZixJQUFJWSxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUViLEtBQUssdUNBQXVDLENBQUM7UUFFakU7SUFDRjtJQUVBRiwwQkFBMEJLO0lBRTFCLE1BQU1lLHdCQUF3QixNQUFNckIsc0JBQXNCVSxZQUFZSjtJQUV0RSxJQUFJLENBQUNlLHVCQUF1QjtRQUMxQmpCLElBQUlZLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRWIsS0FBSyx3Q0FBd0MsQ0FBQztRQUVsRTtJQUNGO0lBRUEsTUFBTW1CLE9BQU9KLGVBQWVLLE1BQU0sSUFDNUJDLFVBQVVOLGVBQWVPLFVBQVUsSUFDbkNDLGdCQUFnQlIsZUFBZVMsZ0JBQWdCO0lBRXJEQyxlQUFlQyw4Q0FBOEMsQ0FBQ3pCLEtBQUtELE1BQU1tQixNQUFNRSxTQUFTbkIsVUFBVXFCLGVBQWVJLFVBQVUsQ0FBQ3JCLGlCQUFpQkksb0NBQXVCO0FBRXRLLElBQUk7QUFDSixrQkFBa0I7QUFDbEIsc0JBQXNCO0FBQ3RCLElBQUk7QUFDTiJ9
|
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.694",
|
|
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.155",
|
|
17
17
|
"occam-grammars": "^1.3.520",
|
|
18
|
-
"occam-languages": "^0.0.
|
|
18
|
+
"occam-languages": "^0.0.136",
|
|
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.69",
|
|
22
22
|
"occam-parsers": "^23.1.50"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
package/src/action/verify.js
CHANGED
|
@@ -3,30 +3,32 @@
|
|
|
3
3
|
import "../preamble";
|
|
4
4
|
|
|
5
5
|
import { Dependency } from "occam-model";
|
|
6
|
-
import {
|
|
6
|
+
import { arrayUtilities } from "necessary";
|
|
7
|
+
import { verificationUtilities } from "occam-languages";
|
|
7
8
|
|
|
8
9
|
import { FileContextFromFilePath } from "../utilities/fileContext";
|
|
9
10
|
import { releaseContextFromDependency } from "../utilities/releaseContext";
|
|
10
11
|
|
|
11
|
-
const {
|
|
12
|
+
const { last } = arrayUtilities,
|
|
13
|
+
{ createReleaseContexts, verifyReleaseContexts, initialiseReleaseContexts } = verificationUtilities;
|
|
12
14
|
|
|
13
15
|
export default async function verifyAction(name, log) {
|
|
14
16
|
const callback = async (context, filePath, lineIndex) => {
|
|
15
17
|
///
|
|
16
18
|
},
|
|
17
|
-
|
|
19
|
+
releaseContexts = [],
|
|
20
|
+
dependency = Dependency.fromName(name),
|
|
18
21
|
context = {
|
|
19
22
|
log,
|
|
20
23
|
callback,
|
|
21
|
-
|
|
24
|
+
releaseContexts,
|
|
22
25
|
FileContextFromFilePath,
|
|
23
26
|
releaseContextFromDependency
|
|
24
27
|
}
|
|
25
28
|
|
|
26
29
|
// try {
|
|
27
30
|
|
|
28
|
-
const
|
|
29
|
-
releaseContextCreated = await createReleaseContexts(dependency, context);
|
|
31
|
+
const releaseContextCreated = await createReleaseContexts(dependency, context);
|
|
30
32
|
|
|
31
33
|
if (!releaseContextCreated) {
|
|
32
34
|
log.warning(`The '${name}' project or package cannot be created.`);
|
|
@@ -34,8 +36,8 @@ export default async function verifyAction(name, log) {
|
|
|
34
36
|
return;
|
|
35
37
|
}
|
|
36
38
|
|
|
37
|
-
const
|
|
38
|
-
releaseContext =
|
|
39
|
+
const lastReleaseContext = last(releaseContexts),
|
|
40
|
+
releaseContext = lastReleaseContext, ///
|
|
39
41
|
released = releaseContext.isReleased();
|
|
40
42
|
|
|
41
43
|
if (released) {
|
|
@@ -44,15 +46,9 @@ export default async function verifyAction(name, log) {
|
|
|
44
46
|
return;
|
|
45
47
|
}
|
|
46
48
|
|
|
47
|
-
|
|
49
|
+
initialiseReleaseContexts(context);
|
|
48
50
|
|
|
49
|
-
|
|
50
|
-
log.warning(`The '${name}' project or package cannot be initialised.`);
|
|
51
|
-
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
const releaseContextsVerify = await verifyReleaseContexts(dependency, releaseContextMap);
|
|
51
|
+
const releaseContextsVerify = await verifyReleaseContexts(dependency, context);
|
|
56
52
|
|
|
57
53
|
if (!releaseContextsVerify) {
|
|
58
54
|
log.warning(`The '${name}' project or package cannot be verified.`);
|
|
@@ -62,12 +58,7 @@ export default async function verifyAction(name, log) {
|
|
|
62
58
|
|
|
63
59
|
const json = releaseContext.toJSON(),
|
|
64
60
|
entries = releaseContext.getEntries(),
|
|
65
|
-
customGrammar = releaseContext.getCustomGrammar()
|
|
66
|
-
dependencyReleaseContexts = releaseContext.getDependencyReleaseContexts(),
|
|
67
|
-
releaseContexts = [
|
|
68
|
-
releaseContext,
|
|
69
|
-
...dependencyReleaseContexts
|
|
70
|
-
];
|
|
61
|
+
customGrammar = releaseContext.getCustomGrammar();
|
|
71
62
|
|
|
72
63
|
ReleaseContext.fromLogNameJSONEntriesCallbackAndCustomGrammar(log, name, json, entries, callback, customGrammar).initialise(releaseContexts, FileContextFromFilePath);
|
|
73
64
|
|