@lionweb/validation 0.5.0-beta.8
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/LICENSE +201 -0
- package/README.md +31 -0
- package/build.sh +6 -0
- package/package.json +28 -0
- package/src/diff/LionwebDiff.ts +193 -0
- package/src/issues/LanguageIssues.ts +91 -0
- package/src/issues/ReferenceIssues.ts +60 -0
- package/src/issues/SyntaxIssues.ts +68 -0
- package/src/issues/ValidationIssue.ts +46 -0
- package/src/json/ChunkUtils.ts +53 -0
- package/src/json/LanguageUtils.ts +12 -0
- package/src/json/LionWebJson.ts +77 -0
- package/src/json/LionWebJsonChunkWrapper.ts +74 -0
- package/src/json/LionWebLanguageDefinition.ts +141 -0
- package/src/json/NodeUtils.ts +72 -0
- package/src/json/std-builtins-copy.json +369 -0
- package/src/runners/RunCheckFolder.ts +36 -0
- package/src/runners/RunCheckFolderWithLanguage.ts +44 -0
- package/src/runners/RunCheckOneFile.ts +16 -0
- package/src/runners/RunCheckOneFileWithLanguage.ts +28 -0
- package/src/runners/RunLioncoreDiff.ts +23 -0
- package/src/runners/Utils.ts +21 -0
- package/src/validators/LionWebLanguageReferenceValidator.ts +135 -0
- package/src/validators/LionWebLanguageValidator.ts +40 -0
- package/src/validators/LionWebReferenceValidator.ts +213 -0
- package/src/validators/LionWebSyntaxValidator.ts +297 -0
- package/src/validators/LionWebValidator.ts +76 -0
- package/src/validators/SimpleFieldValidator.ts +90 -0
- package/src/validators/ValidationResult.ts +18 -0
- package/tsconfig.json +8 -0
package/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright [yyyy] [name of copyright owner]
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
package/README.md
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
# @lionweb/validation
|
|
2
|
+
|
|
3
|
+
The code in this package implements the checks to run the tests in `lionweb-integration-testing/testset`.
|
|
4
|
+
|
|
5
|
+
This package is intentionally kept very lightweigt, e.g. it uses type instead of classes and has has zero dependencies on external libraries/packages.
|
|
6
|
+
|
|
7
|
+
It assumes that node.js 18 is used, but will propably work with other versions as well.
|
|
8
|
+
|
|
9
|
+
To run the tests checkout the `lionweb-integration-testing` project in next to the `lionweb-typescript` project
|
|
10
|
+
and run
|
|
11
|
+
|
|
12
|
+
# install ts-node
|
|
13
|
+
npm install
|
|
14
|
+
|
|
15
|
+
# run the tests
|
|
16
|
+
npm run testValid
|
|
17
|
+
npm run testInvalid
|
|
18
|
+
npm run testValidWithLanguage
|
|
19
|
+
npm run testInvalidWithLanguage
|
|
20
|
+
|
|
21
|
+
This will run the tests in the respective folders in the `testset` folder in `lionweb-integration-testing`.
|
|
22
|
+
|
|
23
|
+
Notes:
|
|
24
|
+
- testing with enums is not implemented yet
|
|
25
|
+
- all tests in the testset with duplicates are defined as invalid, are not invalid anymore, as decided in the meeting from 23-08-2023. They should be moved to valid.
|
|
26
|
+
|
|
27
|
+
The testrunner runs tests at various levels similar (but probably not quite) as described in
|
|
28
|
+
the model-correctness document (link).
|
|
29
|
+
These two should converge in the near future.
|
|
30
|
+
|
|
31
|
+
|
package/build.sh
ADDED
package/package.json
ADDED
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@lionweb/validation",
|
|
3
|
+
"version": "0.5.0-beta.8",
|
|
4
|
+
"license": "Apache 2.0",
|
|
5
|
+
"description": "LionWeb Serialization validation",
|
|
6
|
+
"author": "jos.warmer@openmodeling.nl",
|
|
7
|
+
"main": "index.js",
|
|
8
|
+
"keywords": [
|
|
9
|
+
"lionweb",
|
|
10
|
+
"serialization",
|
|
11
|
+
"testing"
|
|
12
|
+
],
|
|
13
|
+
"scripts": {
|
|
14
|
+
"build": "tsc",
|
|
15
|
+
"testValid": "ts-node src/runners/RunCheckFolder.ts ../../../lionweb-integration-testing/testset/valid",
|
|
16
|
+
"testInvalid": "ts-node src/runners/RunCheckFolder.ts ../../../lionweb-integration-testing/testset/invalid",
|
|
17
|
+
"testInvalidWithLanguage": "ts-node src/runners/RunCheckFolderWithLanguage.ts ../../../lionweb-integration-testing/testset/withLanguage/invalid/ ../../../lionweb-integration-testing/testset/withLanguage/myLang.language.json",
|
|
18
|
+
"testValidWithLanguage": "ts-node src/runners/RunCheckFolderWithLanguage.ts ../../../lionweb-integration-testing/testset/withLanguage/valid/ ../../../lionweb-integration-testing/testset/withLanguage/myLang.language.json",
|
|
19
|
+
"test": "npm run testValid && npm run testInvalid && npm run testInvalidWithLanguage && npm run testValidWithLanguage"
|
|
20
|
+
},
|
|
21
|
+
"devDependencies": {
|
|
22
|
+
"@types/node": "18.15.3",
|
|
23
|
+
"ts-node": "10.9.1",
|
|
24
|
+
"typescript": "5.2.2"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
// TODO The diff is outdated and need work to become ffully functional again.
|
|
2
|
+
|
|
3
|
+
import { LionWebSyntaxValidator } from "../validators/LionWebSyntaxValidator";
|
|
4
|
+
import {
|
|
5
|
+
isEqualMetaPointer,
|
|
6
|
+
LionWebJsonChild,
|
|
7
|
+
LionWebJsonChunk,
|
|
8
|
+
LionWebJsonNode, LionWebJsonProperty,
|
|
9
|
+
LionWebJsonReference, LwJsonUsedLanguage,
|
|
10
|
+
} from "../json/LionWebJson";
|
|
11
|
+
import { NodeUtils } from "../json/NodeUtils";
|
|
12
|
+
import { ChunkUtils } from "../json/ChunkUtils";
|
|
13
|
+
import { ValidationResult } from "../validators/ValidationResult";
|
|
14
|
+
|
|
15
|
+
export type ChangedType = {
|
|
16
|
+
path: string;
|
|
17
|
+
oldValue: unknown;
|
|
18
|
+
newValue: unknown;
|
|
19
|
+
};
|
|
20
|
+
export type AddedOrDeletedType = {
|
|
21
|
+
path: string;
|
|
22
|
+
value: unknown;
|
|
23
|
+
};
|
|
24
|
+
export type MatchedType = {
|
|
25
|
+
path: string;
|
|
26
|
+
value: unknown;
|
|
27
|
+
};
|
|
28
|
+
export type ResultType = {
|
|
29
|
+
matched: MatchedType[];
|
|
30
|
+
changed: ChangedType[];
|
|
31
|
+
added: AddedOrDeletedType[];
|
|
32
|
+
deleted: AddedOrDeletedType[];
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export class LwDiff {
|
|
36
|
+
errors: string[] = [];
|
|
37
|
+
lwChecker = new LionWebSyntaxValidator(new ValidationResult());
|
|
38
|
+
|
|
39
|
+
constructor() {
|
|
40
|
+
this.lwChecker.recursive = false;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
error(msg: string) {
|
|
44
|
+
this.errors.push(msg + "\n");
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
check(b: boolean, message: string): void {
|
|
48
|
+
if (!b) {
|
|
49
|
+
this.error("Check error: " + message);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Compare two LwNode objects and return their difference
|
|
55
|
+
* @param obj1
|
|
56
|
+
* @param obj2
|
|
57
|
+
*/
|
|
58
|
+
diffLwNode(obj1: LionWebJsonNode, obj2: LionWebJsonNode): void {
|
|
59
|
+
// console.log("Comparing nodes")
|
|
60
|
+
if (!isEqualMetaPointer(obj1.classifier, obj2.classifier)) {
|
|
61
|
+
this.error(`Object ${obj1.id} has classifier ${JSON.stringify(obj1.classifier)} vs. ${JSON.stringify(obj2.classifier)}`);
|
|
62
|
+
}
|
|
63
|
+
if (obj1.parent !== obj2.parent) {
|
|
64
|
+
this.error(`Object ${obj1.id} has parent ${obj1.parent} vs. ${obj2.parent}`);
|
|
65
|
+
}
|
|
66
|
+
for (const property of obj1.properties) {
|
|
67
|
+
const key = property.property.key;
|
|
68
|
+
// console.log(` property ${key} of node ${obj1.id}`)
|
|
69
|
+
const otherProp = NodeUtils.findLwProperty(obj2, key);
|
|
70
|
+
if (otherProp === null) {
|
|
71
|
+
this.error(`Property with concept key ${key} does not exist in second object`);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
// const tmp = this.diffLwProperty(prop, otherProp);
|
|
75
|
+
}
|
|
76
|
+
for (const containment of obj1.containments) {
|
|
77
|
+
const key = containment.containment.key;
|
|
78
|
+
// console.log(` property ${key} of node ${obj1.id}`)
|
|
79
|
+
const otherChild = NodeUtils.findLwChild(obj2, key);
|
|
80
|
+
if (otherChild === null) {
|
|
81
|
+
this.error(`Child with containment key ${key} does not exist in second object`);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
// const tmp = this.diffLwChild(child, otherChild);
|
|
85
|
+
}
|
|
86
|
+
for (const reference of obj1.references) {
|
|
87
|
+
const key = reference.reference.key;
|
|
88
|
+
const otherref = NodeUtils.findLwReference(obj2, key);
|
|
89
|
+
if (otherref === null) {
|
|
90
|
+
this.error(`Child with containment key ${key} does not exist in second object`);
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
// const tmp = this.diffLwReference(ref, otherref);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
diffLwChunk(chunk1: LionWebJsonChunk, chunk2: LionWebJsonChunk): void {
|
|
98
|
+
console.log("Comparing chuncks");
|
|
99
|
+
if (chunk1.serializationFormatVersion !== chunk2.serializationFormatVersion) {
|
|
100
|
+
this.error(`Serialization versions do not match: ${chunk1.serializationFormatVersion} vs ${chunk2.serializationFormatVersion}`);
|
|
101
|
+
}
|
|
102
|
+
for (const language of chunk1.languages) {
|
|
103
|
+
const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk2, language.key);
|
|
104
|
+
if (otherLanguage === null) {
|
|
105
|
+
// return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
|
|
106
|
+
this.error(`Language with key ${language.key} does not exist in second object`);
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
// const tmp = this.diffLwUsedLanguage(language, otherLanguage);
|
|
110
|
+
}
|
|
111
|
+
for (const language of chunk2.languages) {
|
|
112
|
+
console.log("Comparing languages");
|
|
113
|
+
const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk1, language.key);
|
|
114
|
+
if (otherLanguage === null) {
|
|
115
|
+
// return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
|
|
116
|
+
this.error(`Language with key ${language.key} does not exist in first object`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
for (const node of chunk1.nodes) {
|
|
120
|
+
const id = node.id;
|
|
121
|
+
const otherNode = ChunkUtils.findNode(chunk2, id);
|
|
122
|
+
if (otherNode === null) {
|
|
123
|
+
// return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
|
|
124
|
+
this.error(`Node with concept key ${id} does not exist in second object`);
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
127
|
+
// const tmp = this.diffLwNode(node, otherNode);
|
|
128
|
+
}
|
|
129
|
+
for (const node of chunk2.nodes) {
|
|
130
|
+
const id = node.id;
|
|
131
|
+
const otherNode = ChunkUtils.findNode(chunk1, id);
|
|
132
|
+
if (otherNode === null) {
|
|
133
|
+
// return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
|
|
134
|
+
this.error(`Node with concept key ${id} does not exist in first object`);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
diffLwChild(obj1: LionWebJsonChild, obj2: LionWebJsonChild): void {
|
|
140
|
+
if (!isEqualMetaPointer(obj1.containment, obj2.containment)) {
|
|
141
|
+
// return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
|
|
142
|
+
this.error(`Child Object has concept ${JSON.stringify(obj1.containment)} vs ${JSON.stringify(obj2.containment)}`);
|
|
143
|
+
}
|
|
144
|
+
// Check whether children exist in both objects (two for loops)
|
|
145
|
+
for (const childId1 of obj1.children) {
|
|
146
|
+
if (!obj2.children.includes(childId1)) {
|
|
147
|
+
this.error(`Child ${childId1} is missing in other object`);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
for (const childId2 of obj2.children) {
|
|
151
|
+
if (!obj1.children.includes(childId2)) {
|
|
152
|
+
console.error(`Child ${childId2} is missing in first object`);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
diffLwReference(ref1: LionWebJsonReference, ref2: LionWebJsonReference): void {
|
|
158
|
+
if (!isEqualMetaPointer(ref1.reference, ref2.reference)) {
|
|
159
|
+
// return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
|
|
160
|
+
this.error(`Reference has concept ${JSON.stringify(ref1.reference)} vs ${JSON.stringify(ref2.reference)}`);
|
|
161
|
+
}
|
|
162
|
+
for (const target of ref1.targets) {
|
|
163
|
+
const otherTarget = NodeUtils.findLwReferenceTarget(ref2.targets, target);
|
|
164
|
+
if (otherTarget === null) {
|
|
165
|
+
console.error(`REFERENCE Target ${JSON.stringify(target)} missing in second `);
|
|
166
|
+
} else {
|
|
167
|
+
if (target.reference !== otherTarget.reference || target.resolveInfo !== otherTarget.resolveInfo) {
|
|
168
|
+
this.error(`REFERENCE target ${JSON.stringify(target)} vs ${JSON.stringify(otherTarget)}`);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
for (const target of ref2.targets) {
|
|
173
|
+
if (NodeUtils.findLwReferenceTarget(ref1.targets, target) === null) {
|
|
174
|
+
this.error(`REFERENCE Target ${JSON.stringify(target)} missing in first `);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
private diffLwUsedLanguage(obj1: LwJsonUsedLanguage, obj2: LwJsonUsedLanguage) {
|
|
180
|
+
if (obj1.key !== obj2.key || obj1.version !== obj2.version) {
|
|
181
|
+
this.error(`Different used languages ${JSON.stringify(obj1)} vs ${JSON.stringify(obj2)}`);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
private diffLwProperty(obj1: LionWebJsonProperty, obj2: LionWebJsonProperty) {
|
|
186
|
+
if (!isEqualMetaPointer(obj1.property, obj2.property)) {
|
|
187
|
+
this.error(`Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`);
|
|
188
|
+
}
|
|
189
|
+
if (obj1.value !== obj2.value) {
|
|
190
|
+
this.error(`Property ${obj1.property.key} has value ${obj1.value} vs ${obj2.value}`);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { LionWebJsonMetaPointer } from "../json/LionWebJson";
|
|
2
|
+
import { JsonContext, ValidationIssue } from "./ValidationIssue";
|
|
3
|
+
|
|
4
|
+
export class Language_PropertyValue_Issue extends ValidationIssue {
|
|
5
|
+
readonly id = "PropertyValue";
|
|
6
|
+
|
|
7
|
+
constructor(context: JsonContext, public property: string, public value: string,public expectedType: string ) {
|
|
8
|
+
super(context);
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
msg = (): string => `Property "${this.property}" with value "${this.value}" is not of type "${this.expectedType}"`
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
// Incorrect Meta Pointers
|
|
15
|
+
export abstract class Language_IncorrectMetaPointerType_Issue extends ValidationIssue {
|
|
16
|
+
abstract readonly metaType: string;
|
|
17
|
+
|
|
18
|
+
constructor(context: JsonContext, public metaPointer: LionWebJsonMetaPointer, public incorrectType: string) {
|
|
19
|
+
super(context);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
msg = (): string => `${this.metaType} with key "${this.metaPointer.key}" does not refer to a ${this.metaType}, but to a "${this.incorrectType}"`
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export class Language_IncorrectPropertyMetaPointer_Issue extends Language_IncorrectMetaPointerType_Issue {
|
|
26
|
+
readonly id = "IncorrectPropertyMetaPointer";
|
|
27
|
+
readonly metaType = "Property";
|
|
28
|
+
}
|
|
29
|
+
export class Language_IncorrectConceptMetaPointer_Issue extends Language_IncorrectMetaPointerType_Issue {
|
|
30
|
+
readonly id = "IncorrectConceptMetaPointer";
|
|
31
|
+
readonly metaType = "Concept";
|
|
32
|
+
}
|
|
33
|
+
export class Language_IncorrectReferenceMetaPointer_Issue extends Language_IncorrectMetaPointerType_Issue {
|
|
34
|
+
readonly id = "IncorrectReferenceMetaPointer";
|
|
35
|
+
readonly metaType = "Reference";
|
|
36
|
+
}
|
|
37
|
+
export class Language_IncorrectContainmentMetaPointer_Issue extends Language_IncorrectMetaPointerType_Issue {
|
|
38
|
+
readonly id = "IncorrectContainmentMetaPointer";
|
|
39
|
+
readonly metaType = "Containment";
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
// Unknown Meta Pointers
|
|
43
|
+
export abstract class Language_UnknownMetaPointer_Issue extends ValidationIssue {
|
|
44
|
+
abstract readonly metaType: string;
|
|
45
|
+
|
|
46
|
+
constructor(context: JsonContext, public metaPointer: LionWebJsonMetaPointer) {
|
|
47
|
+
super(context);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
msg = (): string => `${this.metaType} with key ${this.metaPointer.key} is unknown in the language`;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export class Language_UnknownReference_Issue extends Language_UnknownMetaPointer_Issue {
|
|
54
|
+
readonly id = "UnknownReference";
|
|
55
|
+
readonly metaType = "Reference";
|
|
56
|
+
}
|
|
57
|
+
export class Language_UnknownContainment_Issue extends Language_UnknownMetaPointer_Issue {
|
|
58
|
+
readonly id = "UnknownContainment";
|
|
59
|
+
readonly metaType = "Containment";
|
|
60
|
+
}
|
|
61
|
+
export class Language_UnknownProperty_Issue extends Language_UnknownMetaPointer_Issue {
|
|
62
|
+
readonly id = "UnknownProperty";
|
|
63
|
+
readonly metaType = "Property";
|
|
64
|
+
}
|
|
65
|
+
export class Language_UnknownConcept_Issue extends Language_UnknownMetaPointer_Issue {
|
|
66
|
+
readonly id = "UnknownConcept";
|
|
67
|
+
readonly metaType = "Concept";
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
// Actual Language checks on M2
|
|
71
|
+
export class NumberOfLanguagesUsed_Issue extends ValidationIssue {
|
|
72
|
+
readonly id = "NumberOfLanguagesUsed";
|
|
73
|
+
constructor(context: JsonContext, public nrOfLanguages: number) {
|
|
74
|
+
super(context);
|
|
75
|
+
}
|
|
76
|
+
msg = () => `Is not a language: number of used languages should be 1, is ${this.nrOfLanguages}`
|
|
77
|
+
}
|
|
78
|
+
export class NotLionCoreLanguageKey_Issue extends ValidationIssue {
|
|
79
|
+
readonly id = "NotLionCoreLanguageKey";
|
|
80
|
+
constructor(context: JsonContext, public incorrectKey: string) {
|
|
81
|
+
super(context);
|
|
82
|
+
}
|
|
83
|
+
msg = () => `Is not a language: the used language key is not LionCore-M3, but ${this.incorrectKey}`
|
|
84
|
+
}
|
|
85
|
+
export class IncorrectLionCoreVersion_Issue extends ValidationIssue {
|
|
86
|
+
readonly id = "IncorrectLionCoreVersion";
|
|
87
|
+
constructor(context: JsonContext, public incorrectVersion: string) {
|
|
88
|
+
super(context);
|
|
89
|
+
}
|
|
90
|
+
msg = () => `Is not a language: the used language version is not 1, but ${this.incorrectVersion}`
|
|
91
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { LionWebJsonMetaPointer, LionWebJsonNode } from "../json/LionWebJson";
|
|
2
|
+
import { JsonContext, ValidationIssue } from "./ValidationIssue";
|
|
3
|
+
|
|
4
|
+
export class Reference_DuplicateNodeId_Issue extends ValidationIssue {
|
|
5
|
+
readonly id = "DuplicateNodeId";
|
|
6
|
+
|
|
7
|
+
constructor(context: JsonContext, public nodeId: string) {
|
|
8
|
+
super(context);
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
msg = () : string => `Node has duplicate id "${this.nodeId}"`
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export class Reference_ChildMissingInParent_Issue extends ValidationIssue {
|
|
15
|
+
readonly id = "ChildMissingInParent";
|
|
16
|
+
|
|
17
|
+
constructor(context: JsonContext, public child: LionWebJsonNode, public parent: LionWebJsonNode) {
|
|
18
|
+
super(context);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
msg = () : string => `Node with id "${this.child.id}" has parent with id "${this.parent.id}" but parent does not contains it as a child.`
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export class Reference_ParentMissingInChild_Issue extends ValidationIssue {
|
|
25
|
+
readonly id = "ParentMissingInChild";
|
|
26
|
+
|
|
27
|
+
constructor(context: JsonContext, public parent: LionWebJsonNode, public child: LionWebJsonNode) {
|
|
28
|
+
super(context);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
msg = () : string => `Node with id "${this.parent.id}" has child with id "${this.child.id}" but child has empty parent.`
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export class Reference_CirculairParent_Issue extends ValidationIssue {
|
|
35
|
+
readonly id = "CirculairParent";
|
|
36
|
+
|
|
37
|
+
constructor(context: JsonContext, public node: LionWebJsonNode | undefined, public parentPath: string[]) {
|
|
38
|
+
super(context);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
msg = () : string => `Node with id "${this.node?.id}" has circulair parent through "${this.parentPath}".`
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export class Reference_LanguageUnknown_Issue extends ValidationIssue {
|
|
45
|
+
readonly id = "LanguageUnknown";
|
|
46
|
+
|
|
47
|
+
constructor(context: JsonContext, public languageRef: LionWebJsonMetaPointer) {
|
|
48
|
+
super(context);
|
|
49
|
+
}
|
|
50
|
+
msg = () => `Node uses language { language = ${this.languageRef.language}, version = ${this.languageRef.version} } which is not declared in used languages`
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export class Duplicates_Issue extends ValidationIssue {
|
|
54
|
+
readonly id = "Duplicates";
|
|
55
|
+
|
|
56
|
+
constructor(context: JsonContext, public nodeid: string) {
|
|
57
|
+
super(context);
|
|
58
|
+
}
|
|
59
|
+
msg = () => `Duplicate value "${this.nodeid}"`
|
|
60
|
+
}
|