@lionweb/validation 0.5.0 → 0.6.0-beta.2
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/README.md +2 -0
- package/dist/diff/DiffResult.d.ts +9 -0
- package/dist/diff/DiffResult.d.ts.map +1 -0
- package/dist/diff/DiffResult.js +18 -0
- package/dist/diff/DiffResult.js.map +1 -0
- package/dist/diff/LionWebJsonDiff.d.ts +25 -0
- package/dist/diff/LionWebJsonDiff.d.ts.map +1 -0
- package/dist/diff/LionWebJsonDiff.js +205 -0
- package/dist/diff/LionWebJsonDiff.js.map +1 -0
- package/dist/diff/changes/Change.d.ts +16 -0
- package/dist/diff/changes/Change.d.ts.map +1 -0
- package/dist/diff/changes/Change.js +19 -0
- package/dist/diff/changes/Change.js.map +1 -0
- package/dist/diff/changes/ChunkChange.d.ts +43 -0
- package/dist/diff/changes/ChunkChange.d.ts.map +1 -0
- package/dist/diff/changes/ChunkChange.js +57 -0
- package/dist/diff/changes/ChunkChange.js.map +1 -0
- package/dist/diff/changes/ContainmentChange.d.ts +26 -0
- package/dist/diff/changes/ContainmentChange.d.ts.map +1 -0
- package/dist/diff/changes/ContainmentChange.js +34 -0
- package/dist/diff/changes/ContainmentChange.js.map +1 -0
- package/dist/diff/changes/NodeChange.d.ts +22 -0
- package/dist/diff/changes/NodeChange.d.ts.map +1 -0
- package/dist/diff/changes/NodeChange.js +24 -0
- package/dist/diff/changes/NodeChange.js.map +1 -0
- package/dist/diff/changes/PropertyChange.d.ts +23 -0
- package/dist/diff/changes/PropertyChange.d.ts.map +1 -0
- package/dist/diff/changes/PropertyChange.js +28 -0
- package/dist/diff/changes/PropertyChange.js.map +1 -0
- package/dist/diff/changes/ReferenceChange.d.ts +19 -0
- package/dist/diff/changes/ReferenceChange.d.ts.map +1 -0
- package/dist/diff/changes/ReferenceChange.js +25 -0
- package/dist/diff/changes/ReferenceChange.js.map +1 -0
- package/dist/diff/changes/index.d.ts +7 -0
- package/dist/diff/changes/index.d.ts.map +1 -0
- package/dist/diff/changes/index.js +7 -0
- package/dist/diff/changes/index.js.map +1 -0
- package/dist/diff/index.d.ts +4 -0
- package/dist/diff/index.d.ts.map +1 -0
- package/dist/diff/index.js +4 -0
- package/dist/diff/index.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/issues/LanguageIssues.d.ts +1 -1
- package/dist/issues/LanguageIssues.d.ts.map +1 -1
- package/dist/issues/LanguageIssues.js.map +1 -1
- package/dist/issues/ReferenceIssues.d.ts +1 -1
- package/dist/issues/ReferenceIssues.d.ts.map +1 -1
- package/dist/issues/ReferenceIssues.js.map +1 -1
- package/dist/issues/SyntaxIssues.d.ts +1 -1
- package/dist/issues/SyntaxIssues.d.ts.map +1 -1
- package/dist/issues/SyntaxIssues.js +4 -4
- package/dist/issues/SyntaxIssues.js.map +1 -1
- package/dist/issues/ValidationIssue.d.ts +1 -1
- package/dist/issues/ValidationIssue.d.ts.map +1 -1
- package/dist/issues/ValidationIssue.js.map +1 -1
- package/dist/issues/index.d.ts +1 -1
- package/dist/issues/index.d.ts.map +1 -1
- package/dist/issues/index.js +1 -1
- package/dist/issues/index.js.map +1 -1
- package/dist/json/ChunkUtils.d.ts.map +1 -1
- package/dist/json/ChunkUtils.js.map +1 -1
- package/dist/json/JsonContext.d.ts.map +1 -0
- package/dist/json/JsonContext.js.map +1 -0
- package/dist/json/LanguageUtils.d.ts.map +1 -1
- package/dist/json/LanguageUtils.js.map +1 -1
- package/dist/json/LionWebJson.d.ts +10 -9
- package/dist/json/LionWebJson.d.ts.map +1 -1
- package/dist/json/LionWebJson.js +1 -0
- package/dist/json/LionWebJson.js.map +1 -1
- package/dist/json/LionWebJsonChunkWrapper.d.ts +7 -4
- package/dist/json/LionWebJsonChunkWrapper.d.ts.map +1 -1
- package/dist/json/LionWebJsonChunkWrapper.js +48 -10
- package/dist/json/LionWebJsonChunkWrapper.js.map +1 -1
- package/dist/json/LionWebLanguageDefinition.d.ts.map +1 -1
- package/dist/json/LionWebLanguageDefinition.js +3 -3
- package/dist/json/LionWebLanguageDefinition.js.map +1 -1
- package/dist/json/NodeUtils.d.ts +5 -4
- package/dist/json/NodeUtils.d.ts.map +1 -1
- package/dist/json/NodeUtils.js +5 -2
- package/dist/json/NodeUtils.js.map +1 -1
- package/dist/json/index.d.ts +1 -0
- package/dist/json/index.d.ts.map +1 -1
- package/dist/json/index.js +1 -0
- package/dist/json/index.js.map +1 -1
- package/dist/runners/FileUtils.d.ts.map +1 -1
- package/dist/runners/FileUtils.js.map +1 -1
- package/dist/runners/RunCheckFolder.js.map +1 -1
- package/dist/runners/RunCheckFolderWithLanguage.js.map +1 -1
- package/dist/runners/RunCheckOneFile.js.map +1 -1
- package/dist/runners/RunCheckOneFileWithLanguage.js.map +1 -1
- package/dist/runners/RunLioncoreDiff.js +5 -5
- package/dist/runners/RunLioncoreDiff.js.map +1 -1
- package/dist/runners/Utils.d.ts.map +1 -1
- package/dist/runners/Utils.js +1 -1
- package/dist/runners/Utils.js.map +1 -1
- package/dist/runners/index.d.ts.map +1 -1
- package/dist/runners/index.js.map +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.d.ts +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.js +6 -6
- package/dist/validators/LionWebLanguageReferenceValidator.js.map +1 -1
- package/dist/validators/LionWebLanguageValidator.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageValidator.js +1 -1
- package/dist/validators/LionWebLanguageValidator.js.map +1 -1
- package/dist/validators/LionWebReferenceValidator.d.ts +1 -1
- package/dist/validators/LionWebReferenceValidator.d.ts.map +1 -1
- package/dist/validators/LionWebReferenceValidator.js +6 -6
- package/dist/validators/LionWebReferenceValidator.js.map +1 -1
- package/dist/validators/LionWebSyntaxValidator.d.ts +1 -1
- package/dist/validators/LionWebSyntaxValidator.d.ts.map +1 -1
- package/dist/validators/LionWebSyntaxValidator.js +21 -11
- package/dist/validators/LionWebSyntaxValidator.js.map +1 -1
- package/dist/validators/LionWebValidator.d.ts.map +1 -1
- package/dist/validators/LionWebValidator.js.map +1 -1
- package/dist/validators/SimpleFieldValidator.d.ts +1 -1
- package/dist/validators/SimpleFieldValidator.d.ts.map +1 -1
- package/dist/validators/SimpleFieldValidator.js +1 -1
- package/dist/validators/SimpleFieldValidator.js.map +1 -1
- package/dist/validators/ValidationResult.d.ts.map +1 -1
- package/dist/validators/ValidationResult.js.map +1 -1
- package/dist/validators/index.d.ts.map +1 -1
- package/dist/validators/index.js.map +1 -1
- package/package.json +5 -2
- package/src/diff/DiffResult.ts +21 -0
- package/src/diff/LionWebJsonDiff.ts +259 -0
- package/src/diff/changes/Change.ts +52 -0
- package/src/diff/changes/ChunkChange.ts +68 -0
- package/src/diff/changes/ContainmentChange.ts +34 -0
- package/src/diff/changes/NodeChange.ts +32 -0
- package/src/diff/changes/PropertyChange.ts +29 -0
- package/src/diff/changes/ReferenceChange.ts +24 -0
- package/src/diff/changes/index.ts +6 -0
- package/src/diff/index.ts +3 -0
- package/src/index.ts +5 -4
- package/src/issues/LanguageIssues.ts +61 -39
- package/src/issues/ReferenceIssues.ts +51 -29
- package/src/issues/SyntaxIssues.ts +38 -23
- package/src/issues/ValidationIssue.ts +7 -7
- package/src/issues/index.ts +5 -5
- package/src/json/ChunkUtils.ts +7 -11
- package/src/json/JsonContext.ts +31 -0
- package/src/json/LanguageUtils.ts +5 -6
- package/src/json/LionWebJson.ts +44 -43
- package/src/json/LionWebJsonChunkWrapper.ts +76 -29
- package/src/json/LionWebLanguageDefinition.ts +44 -49
- package/src/json/NodeUtils.ts +25 -19
- package/src/json/index.ts +7 -6
- package/src/json/std-builtins-copy.json +347 -349
- package/src/runners/FileUtils.ts +48 -49
- package/src/runners/RunCheckFolder.ts +3 -3
- package/src/runners/RunCheckFolderWithLanguage.ts +31 -30
- package/src/runners/RunCheckOneFile.ts +3 -3
- package/src/runners/RunCheckOneFileWithLanguage.ts +21 -19
- package/src/runners/RunLioncoreDiff.ts +15 -15
- package/src/runners/Utils.ts +24 -24
- package/src/runners/index.ts +2 -2
- package/src/validators/LionWebLanguageReferenceValidator.ts +63 -55
- package/src/validators/LionWebLanguageValidator.ts +11 -12
- package/src/validators/LionWebReferenceValidator.ts +90 -76
- package/src/validators/LionWebSyntaxValidator.ts +108 -99
- package/src/validators/LionWebValidator.ts +33 -33
- package/src/validators/SimpleFieldValidator.ts +33 -28
- package/src/validators/ValidationResult.ts +5 -6
- package/src/validators/index.ts +7 -7
- package/dist/diff/LionwebDiff.d.ts +0 -40
- package/dist/diff/LionwebDiff.d.ts.map +0 -1
- package/dist/diff/LionwebDiff.js +0 -158
- package/dist/diff/LionwebDiff.js.map +0 -1
- package/dist/issues/JsonContext.d.ts.map +0 -1
- package/dist/issues/JsonContext.js.map +0 -1
- package/src/diff/LionwebDiff.ts +0 -193
- package/src/issues/JsonContext.ts +0 -31
- /package/dist/{issues → json}/JsonContext.d.ts +0 -0
- /package/dist/{issues → json}/JsonContext.js +0 -0
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { isEqualMetaPointer, LION_CORE_BUILTINS_INAMED_NAME, LION_CORE_BUILTINS_KEY, LION_CORE_M3_VERSION } from "./LionWebJson.js";
|
|
1
2
|
import { NodeUtils } from "./NodeUtils.js";
|
|
2
3
|
/**
|
|
3
4
|
* Wraps around a LionWebJsonChunk, providing access to information inside, using caches to improve performance.
|
|
5
|
+
* NB Make sure that the contents of the chunk are not changed after creating the wrapper!
|
|
4
6
|
*/
|
|
5
7
|
export class LionWebJsonChunkWrapper {
|
|
6
8
|
constructor(chunk) {
|
|
@@ -11,25 +13,24 @@ export class LionWebJsonChunkWrapper {
|
|
|
11
13
|
*/
|
|
12
14
|
this.nodesIdMap = new Map();
|
|
13
15
|
this.jsonChunk = chunk;
|
|
14
|
-
|
|
16
|
+
this.prepareNodeIds();
|
|
15
17
|
}
|
|
16
18
|
/** Put all nodes in a map, validate that there are no two nodes with the same id.
|
|
17
19
|
* The check should logically be in LionWebReferenceValidator, but the created map is needed here.
|
|
18
20
|
*/
|
|
19
21
|
prepareNodeIds() {
|
|
20
|
-
this.
|
|
21
|
-
this.jsonChunk.nodes.forEach((node) => {
|
|
22
|
+
this.jsonChunk.nodes.forEach(node => {
|
|
22
23
|
this.nodesIdMap.set(node.id, node);
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
|
-
getMap() {
|
|
26
|
-
if (this.nodesIdMap === undefined) {
|
|
27
|
-
this.prepareNodeIds();
|
|
28
|
-
}
|
|
29
|
-
return this.nodesIdMap;
|
|
30
|
-
}
|
|
31
26
|
getNode(id) {
|
|
32
|
-
return this.
|
|
27
|
+
return this.nodesIdMap.get(id);
|
|
28
|
+
}
|
|
29
|
+
findContainment(node, containment) {
|
|
30
|
+
return node.containments.find(cont => isEqualMetaPointer(cont.containment, containment));
|
|
31
|
+
}
|
|
32
|
+
findProperty(node, property) {
|
|
33
|
+
return node.properties.find(prop => isEqualMetaPointer(prop.property, property));
|
|
33
34
|
}
|
|
34
35
|
findNodesOfConcept(conceptKey) {
|
|
35
36
|
return this.jsonChunk.nodes.filter(node => node.classifier.key === conceptKey);
|
|
@@ -49,5 +50,42 @@ export class LionWebJsonChunkWrapper {
|
|
|
49
50
|
}
|
|
50
51
|
return result;
|
|
51
52
|
}
|
|
53
|
+
asString() {
|
|
54
|
+
let result = "";
|
|
55
|
+
const partitions = this.jsonChunk.nodes.filter(n => n.parent === null);
|
|
56
|
+
partitions.forEach(partition => {
|
|
57
|
+
const pString = this.recursiveToString(partition, 1);
|
|
58
|
+
result += pString;
|
|
59
|
+
});
|
|
60
|
+
return result;
|
|
61
|
+
}
|
|
62
|
+
recursiveToString(node, depth) {
|
|
63
|
+
if (node === undefined) {
|
|
64
|
+
return "";
|
|
65
|
+
}
|
|
66
|
+
let result = "";
|
|
67
|
+
const nameProperty = this.findProperty(node, {
|
|
68
|
+
language: LION_CORE_BUILTINS_KEY,
|
|
69
|
+
version: LION_CORE_M3_VERSION,
|
|
70
|
+
key: LION_CORE_BUILTINS_INAMED_NAME,
|
|
71
|
+
});
|
|
72
|
+
const name = nameProperty === undefined ? "" : " " + nameProperty.value;
|
|
73
|
+
result += Array(depth).join(" ") + "(" + node.id + ")" + name + "\n";
|
|
74
|
+
node.properties.filter(p => p !== nameProperty).forEach(property => {
|
|
75
|
+
result += Array(depth + 1).join(" ") + "*" + property.property.key + "*: " + property.value + "\n";
|
|
76
|
+
});
|
|
77
|
+
node.references.forEach(ref => {
|
|
78
|
+
result += Array(depth + 1).join(" ") + "*" + ref.reference.key + "*: " + JSON.stringify(ref.targets) + "\n";
|
|
79
|
+
});
|
|
80
|
+
node.containments.forEach(cont => {
|
|
81
|
+
if (cont.children.length !== 0) {
|
|
82
|
+
result += Array(depth + 1).join(" ") + "*" + cont.containment.key + "*" + "\n";
|
|
83
|
+
cont.children.forEach(ch => {
|
|
84
|
+
result += this.recursiveToString(this.getNode(ch), depth + 1);
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
return result;
|
|
89
|
+
}
|
|
52
90
|
}
|
|
53
91
|
//# sourceMappingURL=LionWebJsonChunkWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebJsonChunkWrapper.js","sourceRoot":"","sources":["../../src/json/LionWebJsonChunkWrapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LionWebJsonChunkWrapper.js","sourceRoot":"","sources":["../../src/json/LionWebJsonChunkWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageDefinition.d.ts","sourceRoot":"","sources":["../../src/json/LionWebLanguageDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageDefinition.d.ts","sourceRoot":"","sources":["../../src/json/LionWebLanguageDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC1G,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAGtE,KAAK,UAAU,GAAG;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,uBAAuB,aAAa,CAAA;AACjD,eAAO,MAAM,sBAAsB,YAAY,CAAA;AAC/C,eAAO,MAAM,wBAAwB,cAAc,CAAA;AACnD,eAAO,MAAM,yBAAyB,eAAe,CAAA;AACrD,eAAO,MAAM,wBAAwB,cAAc,CAAA;AACnD,eAAO,MAAM,uBAAuB,aAAa,CAAA;AACjD,eAAO,MAAM,+BAA+B,qBAAqB,CAAA;AACjE,eAAO,MAAM,yBAAyB,eAAe,CAAA;AACrD,eAAO,MAAM,4BAA4B,kBAAkB,CAAA;AAC3D;;GAEG;AA8BH;;GAEG;AACH,qBAAa,yBAAyB;IAClC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAO;IACpC;;OAEG;IACH,UAAU,+BAAqC;IAC/C,oBAAoB,EAAE,uBAAuB,CAAA;IAE7C;;;OAGG;gBACS,KAAK,EAAE,uBAAuB;IAa1C,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,eAAe;IAYnD;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI;IAItD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAItD,oBAAoB,CAAC,WAAW,EAAE,sBAAsB,GAAG,eAAe,GAAG,SAAS;IAetF,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAY1D,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;CAW5D"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LION_CORE_BUILTINS_INAMED_NAME
|
|
1
|
+
import { LION_CORE_BUILTINS_INAMED_NAME } from "./LionWebJson.js";
|
|
2
2
|
import { NodeUtils } from "./NodeUtils.js";
|
|
3
3
|
export const LIONWEB_M3_PROPERTY_KEY = "Property";
|
|
4
4
|
export const LIONWEB_M3_CONCEPT_KEY = "Concept";
|
|
@@ -74,7 +74,7 @@ export class LionWebLanguageDefinition {
|
|
|
74
74
|
this.languageId = {
|
|
75
75
|
name: nameProp?.value,
|
|
76
76
|
version: versionProp?.value,
|
|
77
|
-
key: keyProp?.value
|
|
77
|
+
key: keyProp?.value,
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
@@ -96,7 +96,7 @@ export class LionWebLanguageDefinition {
|
|
|
96
96
|
// const versionProp = NodeUtils.findLwProperty(n, "Language-version");
|
|
97
97
|
// return ((!!keyProp) && (keyProp.value === metaPointer.key) && (!!versionProp) && (versionProp.value === metaPointer.version));
|
|
98
98
|
// console.log(" getNodeByMetaPointer.looking into " + node.id + " found " + JSON.stringify(keyProp));
|
|
99
|
-
return
|
|
99
|
+
return !!keyProp && keyProp.value === metaPointer.key;
|
|
100
100
|
});
|
|
101
101
|
return result;
|
|
102
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageDefinition.js","sourceRoot":"","sources":["../../src/json/LionWebLanguageDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageDefinition.js","sourceRoot":"","sources":["../../src/json/LionWebLanguageDefinition.ts"],"names":[],"mappings":"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"}
|
package/dist/json/NodeUtils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LionWebJsonContainment, LionWebJsonNode, LionWebJsonProperty, LionWebJsonReference, LionWebJsonReferenceTarget } from "./LionWebJson.js";
|
|
2
2
|
/**
|
|
3
3
|
* Utility functions for LionWebJsonNode's
|
|
4
4
|
*/
|
|
@@ -14,13 +14,14 @@ export declare class NodeUtils {
|
|
|
14
14
|
* @param node
|
|
15
15
|
* @param key
|
|
16
16
|
*/
|
|
17
|
-
static findLwChild(node: LionWebJsonNode, key: string):
|
|
17
|
+
static findLwChild(node: LionWebJsonNode, key: string): LionWebJsonContainment | null;
|
|
18
18
|
static findLwReference(node: LionWebJsonNode, key: string): LionWebJsonReference | null;
|
|
19
19
|
static findLwReferenceTarget(lwReferenceTargets: LionWebJsonReferenceTarget[], target: LionWebJsonReferenceTarget): LionWebJsonReferenceTarget | null;
|
|
20
20
|
/**
|
|
21
|
-
* Get all nodes that are children for
|
|
21
|
+
* Get all nodes that are children for _node_: both the containment and annotation children
|
|
22
22
|
* @param node
|
|
23
23
|
*/
|
|
24
|
-
static
|
|
24
|
+
static allDirectChildren(node: LionWebJsonNode): string[];
|
|
25
|
+
static findContainmentContainingChild(containments: LionWebJsonContainment[], childId: string): LionWebJsonContainment | undefined;
|
|
25
26
|
}
|
|
26
27
|
//# sourceMappingURL=NodeUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeUtils.d.ts","sourceRoot":"","sources":["../../src/json/NodeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"NodeUtils.d.ts","sourceRoot":"","sources":["../../src/json/NodeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,0BAA0B,EAC7B,MAAM,kBAAkB,CAAA;AAEzB;;GAEG;AACH,qBAAa,SAAS;IAClB;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IASrF;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI;IASrF,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI;IASvF,MAAM,CAAC,qBAAqB,CACxB,kBAAkB,EAAE,0BAA0B,EAAE,EAChD,MAAM,EAAE,0BAA0B,GACnC,0BAA0B,GAAG,IAAI;IASpC;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE;IASzD,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,sBAAsB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS;CAGrI"}
|
package/dist/json/NodeUtils.js
CHANGED
|
@@ -45,10 +45,10 @@ export class NodeUtils {
|
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
47
|
/**
|
|
48
|
-
* Get all nodes that are children for
|
|
48
|
+
* Get all nodes that are children for _node_: both the containment and annotation children
|
|
49
49
|
* @param node
|
|
50
50
|
*/
|
|
51
|
-
static
|
|
51
|
+
static allDirectChildren(node) {
|
|
52
52
|
const result = [];
|
|
53
53
|
for (const containment of node.containments) {
|
|
54
54
|
result.push(...containment.children);
|
|
@@ -56,5 +56,8 @@ export class NodeUtils {
|
|
|
56
56
|
result.push(...node.annotations);
|
|
57
57
|
return result;
|
|
58
58
|
}
|
|
59
|
+
static findContainmentContainingChild(containments, childId) {
|
|
60
|
+
return containments.find(cont => cont.children.includes(childId));
|
|
61
|
+
}
|
|
59
62
|
}
|
|
60
63
|
//# sourceMappingURL=NodeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeUtils.js","sourceRoot":"","sources":["../../src/json/NodeUtils.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,OAAO,SAAS;IAClB;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,IAAqB,EAAE,GAAW;QACpD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBAChC,OAAO,QAAQ,
|
|
1
|
+
{"version":3,"file":"NodeUtils.js","sourceRoot":"","sources":["../../src/json/NodeUtils.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,OAAO,SAAS;IAClB;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,IAAqB,EAAE,GAAW;QACpD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBAChC,OAAO,QAAQ,CAAA;YACnB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,IAAqB,EAAE,GAAW;QACjD,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,IAAI,WAAW,CAAC,WAAW,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBACtC,OAAO,WAAW,CAAA;YACtB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,IAAqB,EAAE,GAAW;QACrD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,IAAI,SAAS,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBAClC,OAAO,SAAS,CAAA;YACpB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,CAAC,qBAAqB,CACxB,kBAAgD,EAChD,MAAkC;QAElC,KAAK,MAAM,SAAS,IAAI,kBAAkB,EAAE,CAAC;YACzC,IAAI,SAAS,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC3F,OAAO,SAAS,CAAA;YACpB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,IAAqB;QAC1C,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAA;QAChC,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,MAAM,CAAC,8BAA8B,CAAC,YAAsC,EAAE,OAAe;QACzF,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;IACrE,CAAC;CACJ"}
|
package/dist/json/index.d.ts
CHANGED
package/dist/json/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,oBAAoB,CAAA"}
|
package/dist/json/index.js
CHANGED
package/dist/json/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,oBAAoB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/runners/FileUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,
|
|
1
|
+
{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/runners/FileUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAGpE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAG/C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAYjE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,gBAAgB,CA2B3G;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA+BnD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../../src/runners/FileUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../../src/runners/FileUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunCheckFolder.js","sourceRoot":"","sources":["../../src/runners/RunCheckFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"RunCheckFolder.js","sourceRoot":"","sources":["../../src/runners/RunCheckFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAE9B,cAAc,CAAC,MAAM,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunCheckFolderWithLanguage.js","sourceRoot":"","sources":["../../src/runners/RunCheckFolderWithLanguage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"RunCheckFolderWithLanguage.js","sourceRoot":"","sources":["../../src/runners/RunCheckFolderWithLanguage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE3D,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAEhC,IAAI,YAAY,GAAG,CAAC,CAAA;AACpB,IAAI,WAAW,GAAG,CAAC,CAAA;AAEnB,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AACzD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAC/C,MAAM,iBAAiB,GAAG,IAAI,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;AAElE,iBAAiB,CAAC,cAAc,EAAE,CAAA;AAClC,iBAAiB,CAAC,kBAAkB,EAAE,CAAA;AACtC,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;IAC5D,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC;AAED,KAAK,MAAM,SAAS,IAAI,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;IACpD,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,cAAc,GAAG,IAAI,gBAAgB,CACvC,SAAS,EACT,IAAI,yBAAyB,CAAC,iBAAiB,CAAC,KAAgC,CAAC,CACpF,CAAA;IAED,cAAc,CAAC,WAAW,EAAE,CAAA;IAC5B,IAAI,cAAc,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC;QAC9C,WAAW,EAAE,CAAA;QACb,sCAAsC;QACtC,WAAW,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;IAC3D,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,CAAA;QACtC,YAAY,EAAE,CAAA;IAClB,CAAC;AACL,CAAC;AAED,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,YAAY,CAAC,CAAA;AACpD,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,WAAW,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunCheckOneFile.js","sourceRoot":"","sources":["../../src/runners/RunCheckOneFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"RunCheckOneFile.js","sourceRoot":"","sources":["../../src/runners/RunCheckOneFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAE7B,YAAY,CAAC,KAAK,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunCheckOneFileWithLanguage.js","sourceRoot":"","sources":["../../src/runners/RunCheckOneFileWithLanguage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"RunCheckOneFileWithLanguage.js","sourceRoot":"","sources":["../../src/runners/RunCheckOneFileWithLanguage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAEhC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;IACrB,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAE/C,MAAM,iBAAiB,GAAG,IAAI,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAElE,iBAAiB,CAAC,cAAc,EAAE,CAAA;IAClC,iBAAiB,CAAC,kBAAkB,EAAE,CAAA;IACtC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;IAC3C,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IAE/C,MAAM,cAAc,GAAG,IAAI,gBAAgB,CACvC,SAAS,EACT,IAAI,yBAAyB,CAAC,iBAAiB,CAAC,KAAgC,CAAC,CACpF,CAAA;IACD,cAAc,CAAC,WAAW,EAAE,CAAA;IAC5B,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;IACxC,WAAW,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAA;AAChD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "fs";
|
|
2
|
-
import {
|
|
2
|
+
import { LionWebJsonDiff } from "../diff/index.js";
|
|
3
3
|
const file1 = process.argv[2];
|
|
4
4
|
const file2 = process.argv[3];
|
|
5
5
|
if (file1 !== null && file1 !== undefined) {
|
|
@@ -7,13 +7,13 @@ if (file1 !== null && file1 !== undefined) {
|
|
|
7
7
|
const json1 = JSON.parse(jsonString1);
|
|
8
8
|
const jsonString2 = fs.readFileSync(file2, "utf-8");
|
|
9
9
|
const json2 = JSON.parse(jsonString2);
|
|
10
|
-
const lwDiff = new
|
|
10
|
+
const lwDiff = new LionWebJsonDiff();
|
|
11
11
|
lwDiff.diffLwChunk(json1, json2);
|
|
12
|
-
if (lwDiff.
|
|
13
|
-
console.log("
|
|
12
|
+
if (lwDiff.diffResult.changes.length === 0) {
|
|
13
|
+
console.log("LionWebJsonDiff: equal");
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
console.log("
|
|
16
|
+
console.log("LionWebJsonDiff: " + lwDiff.diff);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunLioncoreDiff.js","sourceRoot":"","sources":["../../src/runners/RunLioncoreDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"RunLioncoreDiff.js","sourceRoot":"","sources":["../../src/runners/RunLioncoreDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAGlD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAE7B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACrC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAErC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,MAAM,CAAC,WAAW,CAAC,KAAyB,EAAE,KAAyB,CAAC,CAAA;IACxE,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;IACzC,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAClD,CAAC;AACL,CAAC;KAAM,CAAC;IACJ,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;AACrC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/runners/Utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,
|
|
1
|
+
{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/runners/Utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAEpE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAaxE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAUrE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAavE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAI/E"}
|
package/dist/runners/Utils.js
CHANGED
|
@@ -43,7 +43,7 @@ export function printIssues(result, file) {
|
|
|
43
43
|
}
|
|
44
44
|
export function issuestoString(vresult, file) {
|
|
45
45
|
let result = "";
|
|
46
|
-
vresult.issues.forEach(issue => result += (file == undefined ? "" : `File ${file}: `) + issue.errorMsg() + "\n");
|
|
46
|
+
vresult.issues.forEach(issue => (result += (file == undefined ? "" : `File ${file}: `) + issue.errorMsg() + "\n"));
|
|
47
47
|
return result;
|
|
48
48
|
}
|
|
49
49
|
//# sourceMappingURL=Utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/runners/Utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/runners/Utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAGvB,MAAM,UAAU,iBAAiB,CAAC,OAAe,EAAE,YAAsB;IACrE,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAA;IAEjC,KAAK,CAAC,OAAO,CAAC,UAAU,IAAY;QAChC,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YAClD,YAAY,GAAG,iBAAiB,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,EAAE,YAAY,CAAC,CAAA;YACpE,oDAAoD;QACxD,CAAC;aAAM,CAAC;YACJ,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;QACpD,CAAC;IACL,CAAC,CAAC,CAAA;IACF,OAAO,YAAY,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,YAAsB;IAClE,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACrC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAA;IAEjC,KAAK,CAAC,OAAO,CAAC,UAAU,IAAY;QAChC,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;IACL,CAAC,CAAC,CAAA;IACF,OAAO,YAAY,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe,EAAE,WAAqB;IACpE,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9D,WAAW,GAAG,WAAW,IAAI,EAAE,CAAA;IAE/B,KAAK,CAAC,OAAO,CAAC,UAAU,IAAe;QACnC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,WAAW,GAAG,iBAAiB,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;YACvE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACxD,CAAC;aAAM,CAAC;YACJ,eAAe;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;IACF,OAAO,WAAW,CAAA;AACtB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAwB,EAAE,IAAa;IAC/D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AAC/G,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAyB,EAAE,IAAa;IACnE,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAClH,OAAO,MAAM,CAAA;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runners/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runners/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runners/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runners/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { JsonContext } from "
|
|
1
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
2
2
|
import { LionWebJsonProperty } from "../json/LionWebJson.js";
|
|
3
3
|
import { LionWebJsonChunkWrapper } from "../json/LionWebJsonChunkWrapper.js";
|
|
4
4
|
import { LionWebLanguageDefinition } from "../json/LionWebLanguageDefinition.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LionWebLanguageReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAOH,mBAAmB,EAEtB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAIH,yBAAyB,EAC5B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD;;GAEG;AACH,qBAAa,iCAAiC;IAC1C,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,QAAQ,EAAE,yBAAyB,CAAA;IACnC,oBAAoB,EAAE,oBAAoB,CAAA;gBAE9B,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,yBAAyB;IAW/E,QAAQ,CAAC,GAAG,EAAE,uBAAuB,GAAG,IAAI;IAuB5C,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,iBAAiB;IAezB;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI;CAuC1E"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Language_IncorrectContainmentMetaPointer_Issue, Language_IncorrectPropertyMetaPointer_Issue, Language_IncorrectReferenceMetaPointer_Issue, Language_UnknownConcept_Issue, Language_UnknownContainment_Issue, Language_UnknownProperty_Issue, Language_UnknownReference_Issue } from "../issues/LanguageIssues.js";
|
|
2
|
-
import { JsonContext } from "
|
|
3
|
-
import { LION_CORE_BUILTINS_INAMED_NAME, LIONWEB_BOOLEAN_TYPE, LIONWEB_INTEGER_TYPE, LIONWEB_JSON_TYPE, LIONWEB_STRING_TYPE } from "../json/LionWebJson.js";
|
|
4
|
-
import { LIONWEB_M3_CONCEPT_KEY, LIONWEB_M3_PROPERTY_KEY, LIONWEB_M3_PROPERTY_TYPE_KEY } from "../json/LionWebLanguageDefinition.js";
|
|
1
|
+
import { Language_IncorrectContainmentMetaPointer_Issue, Language_IncorrectPropertyMetaPointer_Issue, Language_IncorrectReferenceMetaPointer_Issue, Language_UnknownConcept_Issue, Language_UnknownContainment_Issue, Language_UnknownProperty_Issue, Language_UnknownReference_Issue, } from "../issues/LanguageIssues.js";
|
|
2
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
3
|
+
import { LION_CORE_BUILTINS_INAMED_NAME, LIONWEB_BOOLEAN_TYPE, LIONWEB_INTEGER_TYPE, LIONWEB_JSON_TYPE, LIONWEB_STRING_TYPE, } from "../json/LionWebJson.js";
|
|
4
|
+
import { LIONWEB_M3_CONCEPT_KEY, LIONWEB_M3_PROPERTY_KEY, LIONWEB_M3_PROPERTY_TYPE_KEY, } from "../json/LionWebLanguageDefinition.js";
|
|
5
5
|
import { SimpleFieldValidator } from "./SimpleFieldValidator.js";
|
|
6
6
|
/**
|
|
7
7
|
* Check against the language definition
|
|
@@ -81,7 +81,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
81
81
|
}
|
|
82
82
|
// TODO check for property to exist inside the concept in the language
|
|
83
83
|
// Need to find inherited and implemented properties as well: complex!
|
|
84
|
-
const refType = type.references.find(
|
|
84
|
+
const refType = type.references.find(ref => ref.reference.key === LIONWEB_M3_PROPERTY_TYPE_KEY);
|
|
85
85
|
const propertyName = type.properties.find(p => p.property.key === LION_CORE_BUILTINS_INAMED_NAME)?.value;
|
|
86
86
|
// console.log("Fount type should be " + refType.targets[0].reference);
|
|
87
87
|
if (propertyName !== undefined) {
|
|
@@ -101,7 +101,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
else {
|
|
104
|
-
// TODO refType not found, but
|
|
104
|
+
// TODO refType not found, but
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,8CAA8C,EAC9C,2CAA2C,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,qBAAa,wBAAwB;IACjC,gBAAgB,EAAE,gBAAgB,CAAA;;IAMlC;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,gBAAgB;CAqBxC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IncorrectLionCoreVersion_Issue, NotLionCoreLanguageKey_Issue, NumberOfLanguagesUsed_Issue } from "../issues/LanguageIssues.js";
|
|
2
|
-
import { JsonContext } from "
|
|
2
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
3
3
|
import { LionWebJsonChunkWrapper } from "../json/LionWebJsonChunkWrapper.js";
|
|
4
4
|
import { ValidationResult } from "./ValidationResult.js";
|
|
5
5
|
export class LionWebLanguageValidator {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AACvI,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,OAAO,wBAAwB;IAGjC;QACI,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;IAClD,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAAuB;QACjC,6DAA6D;QAC7D,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,0FAA0F;YAC1F,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,2BAA2B,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;YAC1H,OAAM;QACV,CAAC;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACvC,IAAI,YAAY,CAAC,GAAG,KAAK,aAAa,EAAE,CAAC;YACrC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,4BAA4B,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5H,CAAC;QACD,IAAI,YAAY,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;YAC/B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,8BAA8B,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;QAClI,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,aAAa,GAAG,YAAY,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QACjE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,8BAA8B;YAC9B,OAAO,CAAC,KAAK,CAAC,4CAA4C,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAA;QAC/H,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { JsonContext } from "
|
|
1
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
2
2
|
import { LionWebJsonChunk, LionWebJsonMetaPointer, LionWebJsonNode, LwJsonUsedLanguage } from "../json/LionWebJson.js";
|
|
3
3
|
import { LionWebJsonChunkWrapper } from "../json/LionWebJsonChunkWrapper.js";
|
|
4
4
|
import { SimpleFieldValidator } from "./SimpleFieldValidator.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebReferenceValidator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LionWebReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebReferenceValidator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEpD,OAAO,EAGH,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,kBAAkB,EACrB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD;;;GAGG;AACH,qBAAa,yBAAyB;IAClC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAqC;IAC7E,oBAAoB,EAAE,oBAAoB,CAAA;gBAE9B,gBAAgB,EAAE,gBAAgB;IAK9C,eAAe,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI;IAW9D,QAAQ,CAAC,GAAG,EAAE,uBAAuB,GAAG,IAAI;IAqD5C;;;;;OAKG;IACH,yBAAyB,CAAC,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,sBAAsB,EAAE,OAAO,EAAE,WAAW;IAenH;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IActD;;;;;OAKG;IACH,0BAA0B,CAAC,aAAa,EAAE,kBAAkB,EAAE,EAAE,OAAO,EAAE,WAAW;IAiBpF;;;OAGG;IACH,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,WAAW;IAsB/D,qBAAqB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe;IAevG,iCAAiC,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,WAAW;CAmChF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Duplicates_Issue, Reference_ChildMissingInParent_Issue, Reference_CirculairParent_Issue, Reference_DuplicateNodeId_Issue, Reference_LanguageUnknown_Issue, Reference_ParentMissingInChild_Issue } from "../issues/ReferenceIssues.js";
|
|
2
|
-
import { JsonContext } from "
|
|
1
|
+
import { Duplicates_Issue, Reference_ChildMissingInParent_Issue, Reference_CirculairParent_Issue, Reference_DuplicateNodeId_Issue, Reference_LanguageUnknown_Issue, Reference_ParentMissingInChild_Issue, } from "../issues/ReferenceIssues.js";
|
|
2
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
3
3
|
import { ChunkUtils } from "../json/ChunkUtils.js";
|
|
4
|
-
import { LION_CORE_BUILTINS_KEY } from "../json/LionWebJson.js";
|
|
4
|
+
import { LION_CORE_BUILTINS_KEY, } from "../json/LionWebJson.js";
|
|
5
5
|
import { SimpleFieldValidator } from "./SimpleFieldValidator.js";
|
|
6
6
|
/**
|
|
7
7
|
* Assuming that the syntax is correct, check whether all LionWeb references are correct,
|
|
@@ -43,7 +43,7 @@ export class LionWebReferenceValidator {
|
|
|
43
43
|
node.containments.forEach((containment, childIndex) => {
|
|
44
44
|
this.validateLanguageReference(obj, containment.containment, rootCtx.concat("node", nodeIndex, "containments", childIndex));
|
|
45
45
|
this.checkDuplicate(containment.children, rootCtx.concat("node", nodeIndex, "containments", childIndex));
|
|
46
|
-
containment.children.forEach(
|
|
46
|
+
containment.children.forEach(childId => {
|
|
47
47
|
const childNode = this.nodesIdMap.get(childId);
|
|
48
48
|
if (childNode !== undefined) {
|
|
49
49
|
if (childNode.parent !== null && childNode.parent !== undefined && childNode.parent !== node.id) {
|
|
@@ -56,7 +56,7 @@ export class LionWebReferenceValidator {
|
|
|
56
56
|
}
|
|
57
57
|
});
|
|
58
58
|
});
|
|
59
|
-
node.annotations.forEach(
|
|
59
|
+
node.annotations.forEach(annotationId => {
|
|
60
60
|
const annotation = this.nodesIdMap.get(annotationId);
|
|
61
61
|
if (annotation !== undefined) {
|
|
62
62
|
if (annotation.parent !== null && annotation.parent !== undefined && annotation.parent !== node.id) {
|
|
@@ -106,7 +106,7 @@ export class LionWebReferenceValidator {
|
|
|
106
106
|
return;
|
|
107
107
|
}
|
|
108
108
|
const alreadySeen = {};
|
|
109
|
-
strings.forEach(
|
|
109
|
+
strings.forEach(str => {
|
|
110
110
|
if (alreadySeen[str]) {
|
|
111
111
|
this.validationResult.issue(new Duplicates_Issue(context, str));
|
|
112
112
|
}
|