@lionweb/validation 0.7.0-beta.2 → 0.7.0-beta.20
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/CHANGELOG.md +6 -1
- package/dist/issues/ValidationIssue.d.ts +3 -3
- package/dist/issues/ValidationIssue.d.ts.map +1 -1
- package/dist/issues/ValidationIssue.js +1 -1
- package/dist/issues/ValidationIssue.js.map +1 -1
- package/dist/languages/LanguageUtils.d.ts.map +1 -1
- package/dist/languages/LionWebLanguageWrapper.d.ts.map +1 -1
- package/dist/runners/Utils.js +2 -2
- package/dist/runners/Utils.js.map +1 -1
- package/dist/validators/LionWebChunkDefinitions.d.ts +4 -4
- package/dist/validators/LionWebChunkDefinitions.d.ts.map +1 -1
- package/dist/validators/LionWebChunkDefinitions.js +80 -90
- package/dist/validators/LionWebChunkDefinitions.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 +3 -3
- package/dist/validators/LionWebLanguageReferenceValidator.js.map +1 -1
- package/dist/validators/LionWebLanguageValidator.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageValidator.js +2 -1
- package/dist/validators/LionWebLanguageValidator.js.map +1 -1
- package/dist/validators/LionWebSyntaxValidator.js +2 -2
- package/dist/validators/LionWebValidator.js +1 -1
- package/dist/validators/LionWebValidator.js.map +1 -1
- package/dist/validators/ValidationFunctions.d.ts +1 -1
- package/dist/validators/ValidationFunctions.d.ts.map +1 -1
- package/dist/validators/ValidationFunctions.js +7 -13
- package/dist/validators/ValidationFunctions.js.map +1 -1
- package/dist/validators/generic/SyntaxValidator.d.ts +7 -7
- package/dist/validators/generic/SyntaxValidator.d.ts.map +1 -1
- package/dist/validators/generic/SyntaxValidator.js +28 -33
- package/dist/validators/generic/SyntaxValidator.js.map +1 -1
- package/dist/validators/generic/index.d.ts +1 -1
- package/dist/validators/generic/index.d.ts.map +1 -1
- package/dist/validators/generic/index.js +1 -1
- package/dist/validators/generic/index.js.map +1 -1
- package/dist/validators/generic/schema/DefinitionSchema.d.ts +23 -0
- package/dist/validators/generic/schema/DefinitionSchema.d.ts.map +1 -0
- package/dist/validators/generic/schema/DefinitionSchema.js +43 -0
- package/dist/validators/generic/schema/DefinitionSchema.js.map +1 -0
- package/dist/validators/generic/{ValidationTypes.d.ts → schema/ValidationTypes.d.ts} +45 -12
- package/dist/validators/generic/schema/ValidationTypes.d.ts.map +1 -0
- package/dist/validators/generic/{ValidationTypes.js → schema/ValidationTypes.js} +18 -21
- package/dist/validators/generic/schema/ValidationTypes.js.map +1 -0
- package/dist/validators/generic/schema/index.d.ts +3 -0
- package/dist/validators/generic/schema/index.d.ts.map +1 -0
- package/dist/validators/generic/schema/index.js +3 -0
- package/dist/validators/generic/schema/index.js.map +1 -0
- package/package.json +37 -37
- package/src/issues/ValidationIssue.ts +4 -4
- package/src/runners/Utils.ts +2 -2
- package/src/validators/LionWebChunkDefinitions.ts +80 -90
- package/src/validators/LionWebLanguageReferenceValidator.ts +3 -3
- package/src/validators/LionWebLanguageValidator.ts +2 -1
- package/src/validators/LionWebSyntaxValidator.ts +2 -2
- package/src/validators/LionWebValidator.ts +1 -1
- package/src/validators/ValidationFunctions.ts +9 -15
- package/src/validators/generic/SyntaxValidator.ts +81 -87
- package/src/validators/generic/index.ts +1 -1
- package/src/validators/generic/schema/DefinitionSchema.ts +52 -0
- package/src/validators/generic/{ValidationTypes.ts → schema/ValidationTypes.ts} +65 -35
- package/src/validators/generic/schema/index.ts +2 -0
- package/dist/validators/generic/ValidationTypes.d.ts.map +0 -1
- package/dist/validators/generic/ValidationTypes.js.map +0 -1
- package/tsconfig.json +0 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.7.0
|
|
4
|
+
|
|
5
|
+
* Refactor validation schema to enable generation ot TypeScript types with discriminator.
|
|
6
|
+
|
|
7
|
+
|
|
3
8
|
## 0.6.3
|
|
4
9
|
|
|
5
|
-
*
|
|
10
|
+
* Make validation aware that the `value` field of a property serialization is allowed to be `null`.
|
|
6
11
|
|
|
7
12
|
|
|
8
13
|
## 0.6.2
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { JsonContext } from "@lionweb/json-utils";
|
|
2
2
|
export declare abstract class ValidationIssue {
|
|
3
3
|
abstract readonly issueType: string;
|
|
4
|
-
context: JsonContext;
|
|
5
|
-
constructor(context: JsonContext);
|
|
4
|
+
context: JsonContext | null;
|
|
5
|
+
constructor(context: JsonContext | null);
|
|
6
6
|
protected abstract msg(): string;
|
|
7
7
|
errorMsg(): string;
|
|
8
8
|
}
|
|
9
9
|
export declare class GenericIssue extends ValidationIssue {
|
|
10
10
|
text: string;
|
|
11
11
|
readonly issueType = "GenericIssue";
|
|
12
|
-
constructor(context: JsonContext, text: string);
|
|
12
|
+
constructor(context: JsonContext | null, text: string);
|
|
13
13
|
protected msg: () => string;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=ValidationIssue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationIssue.d.ts","sourceRoot":"","sources":["../../src/issues/ValidationIssue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,8BAAsB,eAAe;IACjC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IACnC,OAAO,EAAE,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"ValidationIssue.d.ts","sourceRoot":"","sources":["../../src/issues/ValidationIssue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,8BAAsB,eAAe;IACjC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IACnC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAA;gBAEf,OAAO,EAAE,WAAW,GAAG,IAAI;IAIvC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,MAAM;IAEzB,QAAQ,IAAI,MAAM;CAG5B;AAED,qBAAa,YAAa,SAAQ,eAAe;IAKlC,IAAI,EAAE,MAAM;IAJvB,QAAQ,CAAC,SAAS,kBAAiB;gBAG/B,OAAO,EAAE,WAAW,GAAG,IAAI,EACpB,IAAI,EAAE,MAAM;IAKvB,SAAS,CAAC,GAAG,eAAkB;CAClC"}
|
|
@@ -3,7 +3,7 @@ export class ValidationIssue {
|
|
|
3
3
|
this.context = context;
|
|
4
4
|
}
|
|
5
5
|
errorMsg() {
|
|
6
|
-
return `${this.issueType}: ${this.msg()} at ${this.context
|
|
6
|
+
return `${this.issueType}: ${this.msg()} at ${this.context?.toString()} `;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
export class GenericIssue extends ValidationIssue {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationIssue.js","sourceRoot":"","sources":["../../src/issues/ValidationIssue.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,eAAe;IAIjC,YAAY,
|
|
1
|
+
{"version":3,"file":"ValidationIssue.js","sourceRoot":"","sources":["../../src/issues/ValidationIssue.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,eAAe;IAIjC,YAAY,OAA2B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAIM,QAAQ;QACX,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAA;IAC7E,CAAC;CACJ;AAED,MAAM,OAAO,YAAa,SAAQ,eAAe;IAG7C,YACI,OAA2B,EACpB,IAAY;QAEnB,KAAK,CAAC,OAAO,CAAC,CAAA;QAFP,SAAI,GAAJ,IAAI,CAAQ;QAJd,cAAS,GAAG,cAAc,CAAA;QASzB,QAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAA;IAF/B,CAAC;CAGJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageUtils.d.ts","sourceRoot":"","sources":["../../src/languages/LanguageUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AASrF,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"LanguageUtils.d.ts","sourceRoot":"","sources":["../../src/languages/LanguageUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AASrF,eAAO,MAAM,gBAAgB,EAAkB,gBAAgB,CAAA;AAC/D,eAAO,MAAM,sBAAsB,EAAwB,gBAAgB,CAAA;AAE3E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,eAAe,WAEvD;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,eAAe,KAAG,OAEjD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,eAAe,KAAG,OAEpD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,eAAe,KAAG,OAEnD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,eAAe,KAAG,OAElD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,eAAe,KAAG,OAErD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,eAAe,KAAG,OAEnD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageWrapper.d.ts","sourceRoot":"","sources":["../../src/languages/LionWebLanguageWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC7E,OAAO,EAAE,uBAAuB,EAA2B,MAAM,qBAAqB,CAAA;AAItF,UAAU,+BAA+B;IACrC,gBAAgB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACpE,cAAc,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAClE,mBAAmB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACvE,aAAa,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACjE,oBAAoB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACxE,uBAAuB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAC3E,sBAAsB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAC1E,eAAe,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;CACtE;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,uBAAwB,YAAW,+BAA+B;IAC1G,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,UAAU,CAAA;gBAEH,KAAK,EAAE,gBAAgB;IAWnC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageWrapper.d.ts","sourceRoot":"","sources":["../../src/languages/LionWebLanguageWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC7E,OAAO,EAAE,uBAAuB,EAA2B,MAAM,qBAAqB,CAAA;AAItF,UAAU,+BAA+B;IACrC,gBAAgB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACpE,cAAc,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAClE,mBAAmB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACvE,aAAa,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACjE,oBAAoB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IACxE,uBAAuB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAC3E,sBAAsB,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;IAC1E,eAAe,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,eAAe,EAAE,CAAA;CACtE;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,uBAAwB,YAAW,+BAA+B;IAC1G,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,UAAU,CAAA;gBAEH,KAAK,EAAE,gBAAgB;IAWnC,gBAAgB,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAoBlE;IAED,cAAc,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAEhE;IAED,mBAAmB,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAIrE;IAED,aAAa,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAE/D;IAED,oBAAoB,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAItE;IAED,uBAAuB,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAEzE;IAED,sBAAsB,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAIxE;IAED,eAAe,GAAI,YAAY,eAAe,KAAG,eAAe,EAAE,CAEjE;CACJ"}
|
package/dist/runners/Utils.js
CHANGED
|
@@ -41,8 +41,8 @@ export function printIssues(result, file) {
|
|
|
41
41
|
result.issues.forEach(issue => console.log((file == undefined ? "" : `File ${file}: `) + issue.errorMsg()));
|
|
42
42
|
}
|
|
43
43
|
export function issuestoString(vresult, file) {
|
|
44
|
-
let result = "";
|
|
45
|
-
vresult.issues.forEach(issue => (result += (file
|
|
44
|
+
let result = "ISSUES: ";
|
|
45
|
+
vresult.issues.forEach(issue => (result += (file === undefined ? "NOFILE" : `File ${file}: `) + issue.errorMsg() + "\n"));
|
|
46
46
|
return result;
|
|
47
47
|
}
|
|
48
48
|
//# 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,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;QACxE,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,
|
|
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;QACxE,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,UAAU,CAAA;IACvB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IACzH,OAAO,MAAM,CAAA;AACjB,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DefinitionSchema } from "./generic/index.js";
|
|
2
2
|
/**
|
|
3
3
|
* The structure below defines the structure of a LionWeb Chunk by defining all the properties.
|
|
4
4
|
* It can
|
|
5
|
-
* - be
|
|
6
|
-
* - used to generate all the types for a LionWebChunk.
|
|
5
|
+
* - be used by the SyntaxValidator to validate an object sat runtime.
|
|
6
|
+
* - used to generate all the TypeScript types for a LionWebChunk.
|
|
7
7
|
*/
|
|
8
|
-
export declare const
|
|
8
|
+
export declare const LionWebSchema: DefinitionSchema;
|
|
9
9
|
//# sourceMappingURL=LionWebChunkDefinitions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebChunkDefinitions.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebChunkDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"LionWebChunkDefinitions.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebChunkDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA2C,MAAM,oBAAoB,CAAA;AAG9F;;;;;GAKG;AACH,eAAO,MAAM,aAAa,EAAE,gBA0F1B,CAAA"}
|
|
@@ -1,110 +1,100 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DefinitionSchema, MAY_BE_NULL, PropertyDef, PrimitiveDef } from "./generic/index.js";
|
|
2
2
|
import { validateId, validateKey, validateSerializationFormatVersion, validateVersion } from "./ValidationFunctions.js";
|
|
3
3
|
/**
|
|
4
4
|
* The structure below defines the structure of a LionWeb Chunk by defining all the properties.
|
|
5
5
|
* It can
|
|
6
|
-
* - be
|
|
7
|
-
* - used to generate all the types for a LionWebChunk.
|
|
6
|
+
* - be used by the SyntaxValidator to validate an object sat runtime.
|
|
7
|
+
* - used to generate all the TypeScript types for a LionWebChunk.
|
|
8
8
|
*/
|
|
9
|
-
export const
|
|
10
|
-
|
|
11
|
-
"
|
|
12
|
-
[
|
|
13
|
-
PropertyDef({
|
|
14
|
-
PropertyDef({
|
|
15
|
-
PropertyDef({
|
|
9
|
+
export const LionWebSchema = new DefinitionSchema([
|
|
10
|
+
{
|
|
11
|
+
name: "LionWebJsonMetaPointer",
|
|
12
|
+
properties: [
|
|
13
|
+
PropertyDef({ name: "key", type: "LionWebKey" }),
|
|
14
|
+
PropertyDef({ name: "version", type: "LionWebVersion" }),
|
|
15
|
+
PropertyDef({ name: "language", type: "LionWebKey" })
|
|
16
16
|
]
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
"
|
|
20
|
-
[
|
|
21
|
-
PropertyDef({
|
|
22
|
-
PropertyDef({
|
|
23
|
-
PropertyDef({
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
name: "LionWebJsonMetaPointer",
|
|
20
|
+
properties: [
|
|
21
|
+
PropertyDef({ name: "key", type: "LionWebKey" }),
|
|
22
|
+
PropertyDef({ name: "version", type: "LionWebVersion" }),
|
|
23
|
+
PropertyDef({ name: "language", type: "LionWebKey" }),
|
|
24
24
|
]
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
"
|
|
28
|
-
[
|
|
29
|
-
PropertyDef({
|
|
30
|
-
PropertyDef({
|
|
31
|
-
PropertyDef({
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
name: "ResponseMessage",
|
|
28
|
+
properties: [
|
|
29
|
+
PropertyDef({ name: "kind", type: "JSstring" }),
|
|
30
|
+
PropertyDef({ name: "message", type: "JSstring" }),
|
|
31
|
+
PropertyDef({ name: "data", type: "JSobject", mayBeNull: true, isOptional: true })
|
|
32
32
|
]
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
"
|
|
36
|
-
[
|
|
37
|
-
PropertyDef({
|
|
38
|
-
PropertyDef({
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
name: "LionWebJsonChunk",
|
|
36
|
+
properties: [
|
|
37
|
+
PropertyDef({ name: "serializationFormatVersion", type: "LionWebSerializationFormatVersion" }),
|
|
38
|
+
PropertyDef({ name: "languages", type: "LionWebJsonUsedLanguage", isList: true }),
|
|
39
|
+
PropertyDef({ name: "nodes", type: "LionWebJsonNode", isList: true })
|
|
39
40
|
]
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
"
|
|
43
|
-
[
|
|
44
|
-
PropertyDef({
|
|
45
|
-
PropertyDef({
|
|
46
|
-
PropertyDef({ property: "properties", expectedType: "LionWebProperty", isList: true }),
|
|
47
|
-
PropertyDef({ property: "containments", expectedType: "LionWebContainment", isList: true }),
|
|
48
|
-
PropertyDef({ property: "references", expectedType: "LionWebReference", isList: true }),
|
|
49
|
-
PropertyDef({ property: "annotations", expectedType: "LionWebId", isList: true }),
|
|
50
|
-
PropertyDef({ property: "parent", expectedType: "LionWebId", mayBeNull: MAY_BE_NULL }),
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
name: "LionWebJsonUsedLanguage",
|
|
44
|
+
properties: [
|
|
45
|
+
PropertyDef({ name: "key", type: "LionWebKey" }),
|
|
46
|
+
PropertyDef({ name: "version", type: "LionWebVersion" })
|
|
51
47
|
]
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
"
|
|
55
|
-
[
|
|
56
|
-
PropertyDef({
|
|
57
|
-
PropertyDef({
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
name: "LionWebJsonNode",
|
|
51
|
+
properties: [
|
|
52
|
+
PropertyDef({ name: "id", type: "LionWebId" }),
|
|
53
|
+
PropertyDef({ name: "classifier", type: "LionWebJsonMetaPointer" }),
|
|
54
|
+
PropertyDef({ name: "properties", type: "LionWebJsonProperty", isList: true }),
|
|
55
|
+
PropertyDef({ name: "containments", type: "LionWebJsonContainment", isList: true }),
|
|
56
|
+
PropertyDef({ name: "references", type: "LionWebJsonReference", isList: true }),
|
|
57
|
+
PropertyDef({ name: "annotations", type: "LionWebId", isList: true }),
|
|
58
|
+
PropertyDef({ name: "parent", type: "LionWebId", mayBeNull: MAY_BE_NULL }),
|
|
58
59
|
]
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
"
|
|
62
|
-
[
|
|
63
|
-
PropertyDef({
|
|
64
|
-
PropertyDef({
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
name: "LionWebJsonProperty",
|
|
63
|
+
properties: [
|
|
64
|
+
PropertyDef({ name: "property", type: "LionWebJsonMetaPointer" }),
|
|
65
|
+
PropertyDef({ name: "value", type: "JSstring", mayBeNull: MAY_BE_NULL }),
|
|
65
66
|
]
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
"
|
|
69
|
-
[
|
|
70
|
-
PropertyDef({
|
|
71
|
-
PropertyDef({
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
name: "LionWebJsonContainment",
|
|
70
|
+
properties: [
|
|
71
|
+
PropertyDef({ name: "containment", type: "LionWebJsonMetaPointer" }),
|
|
72
|
+
PropertyDef({ name: "children", type: "LionWebId", isList: true }),
|
|
72
73
|
]
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
"
|
|
76
|
-
[
|
|
77
|
-
PropertyDef({
|
|
78
|
-
PropertyDef({
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
name: "LionWebJsonReference",
|
|
77
|
+
properties: [
|
|
78
|
+
PropertyDef({ name: "reference", type: "LionWebJsonMetaPointer" }),
|
|
79
|
+
PropertyDef({ name: "targets", type: "LionWebJsonReferenceTarget", isList: true }),
|
|
79
80
|
]
|
|
80
|
-
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
name: "LionWebJsonReferenceTarget",
|
|
84
|
+
properties: [
|
|
85
|
+
PropertyDef({ name: "resolveInfo", type: "JSstring", mayBeNull: MAY_BE_NULL }),
|
|
86
|
+
PropertyDef({ name: "reference", type: "LionWebId", mayBeNull: MAY_BE_NULL }),
|
|
87
|
+
]
|
|
88
|
+
},
|
|
81
89
|
/**
|
|
82
90
|
* Elements without properties are assumed to be JSON/JS primitive values, and tested using `typeof`
|
|
83
91
|
* and the (optional) validate function.
|
|
84
92
|
*/
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
PrimitiveDef({ primitiveType: "string", validate: validateKey }),
|
|
92
|
-
],
|
|
93
|
-
[
|
|
94
|
-
"LionWebVersion",
|
|
95
|
-
PrimitiveDef({ primitiveType: "string", validate: validateVersion }),
|
|
96
|
-
],
|
|
97
|
-
[
|
|
98
|
-
"LionWebSerializationFormatVersion",
|
|
99
|
-
PrimitiveDef({ primitiveType: "string", validate: validateSerializationFormatVersion }),
|
|
100
|
-
],
|
|
101
|
-
[
|
|
102
|
-
"string",
|
|
103
|
-
PrimitiveDef({ primitiveType: "string" }),
|
|
104
|
-
],
|
|
105
|
-
[
|
|
106
|
-
"object",
|
|
107
|
-
PrimitiveDef({ primitiveType: "object" }),
|
|
108
|
-
]
|
|
93
|
+
PrimitiveDef({ name: "LionWebId", primitiveType: "string", validate: validateId }),
|
|
94
|
+
PrimitiveDef({ name: "LionWebKey", primitiveType: "string", validate: validateKey }),
|
|
95
|
+
PrimitiveDef({ name: "LionWebVersion", primitiveType: "string", validate: validateVersion }),
|
|
96
|
+
PrimitiveDef({ name: "LionWebSerializationFormatVersion", primitiveType: "string", validate: validateSerializationFormatVersion }),
|
|
97
|
+
PrimitiveDef({ name: "JSstring", primitiveType: "string" }),
|
|
98
|
+
PrimitiveDef({ name: "JSobject", primitiveType: "object" }),
|
|
109
99
|
]);
|
|
110
100
|
//# sourceMappingURL=LionWebChunkDefinitions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebChunkDefinitions.js","sourceRoot":"","sources":["../../src/validators/LionWebChunkDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"LionWebChunkDefinitions.js","sourceRoot":"","sources":["../../src/validators/LionWebChunkDefinitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,6 @@ export declare class LionWebLanguageReferenceValidator {
|
|
|
16
16
|
* Checks wwhether the value of `prop1` is correct in relation with its property definition in the referred language.
|
|
17
17
|
* @param prop
|
|
18
18
|
*/
|
|
19
|
-
validateProperty(
|
|
19
|
+
validateProperty(_node: LionWebJsonNode, nodeConcept: LionWebJsonNode | undefined, prop: LionWebJsonProperty, context: JsonContext): void;
|
|
20
20
|
}
|
|
21
21
|
//# sourceMappingURL=LionWebLanguageReferenceValidator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,eAAe,EAAE,mBAAmB,EAAwB,MAAM,eAAe,CAAA;AACtI,OAAO,EACH,WAAW,EAGX,uBAAuB,EAI1B,MAAM,qBAAqB,CAAA;AAmB5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAIhE;;GAEG;AACH,qBAAa,iCAAiC;IAGM,OAAO,CAAC,QAAQ;IAFhE,gBAAgB,EAAE,gBAAgB,CAAA;gBAEtB,gBAAgB,EAAE,gBAAgB,EAAU,QAAQ,EAAE,gBAAgB;IASlF,QAAQ,CAAC,GAAG,EAAE,uBAAuB,GAAG,IAAI;IAoB5C,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,iBAAiB;IAwBzB;;;OAGG;IACH,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageReferenceValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,eAAe,EAAE,mBAAmB,EAAwB,MAAM,eAAe,CAAA;AACtI,OAAO,EACH,WAAW,EAGX,uBAAuB,EAI1B,MAAM,qBAAqB,CAAA;AAmB5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAIhE;;GAEG;AACH,qBAAa,iCAAiC;IAGM,OAAO,CAAC,QAAQ;IAFhE,gBAAgB,EAAE,gBAAgB,CAAA;gBAEtB,gBAAgB,EAAE,gBAAgB,EAAU,QAAQ,EAAE,gBAAgB;IASlF,QAAQ,CAAC,GAAG,EAAE,uBAAuB,GAAG,IAAI;IAoB5C,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,iBAAiB;IAwBzB;;;OAGG;IACH,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,GAAG,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI;CAqF5I"}
|
|
@@ -34,7 +34,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
validateContainment(
|
|
37
|
+
validateContainment(_node, nodeConcept, containment, context) {
|
|
38
38
|
const metaConcept = this.registry.getNodeByMetaPointer(containment.containment);
|
|
39
39
|
if (metaConcept === null || metaConcept === undefined) {
|
|
40
40
|
this.validationResult.issue(new Language_UnknownContainment_Issue(context, containment.containment));
|
|
@@ -52,7 +52,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
52
52
|
}
|
|
53
53
|
// TODO check type of children
|
|
54
54
|
}
|
|
55
|
-
validateReference(
|
|
55
|
+
validateReference(_node, nodeConcept, ref, context) {
|
|
56
56
|
const referenceDefinition = this.registry.getNodeByMetaPointer(ref.reference);
|
|
57
57
|
if (referenceDefinition === null || referenceDefinition === undefined) {
|
|
58
58
|
this.validationResult.issue(new Language_UnknownReference_Issue(context, ref.reference));
|
|
@@ -77,7 +77,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
77
77
|
* Checks wwhether the value of `prop1` is correct in relation with its property definition in the referred language.
|
|
78
78
|
* @param prop
|
|
79
79
|
*/
|
|
80
|
-
validateProperty(
|
|
80
|
+
validateProperty(_node, nodeConcept, prop, context) {
|
|
81
81
|
if (prop.value === null) {
|
|
82
82
|
return;
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAsF,MAAM,eAAe,CAAA;AACtI,OAAO,EACH,WAAW,EACX,8BAA8B,EAC9B,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,mBAAmB,EAElF,OAAO,EACP,YAAY,EACZ,SAAS,EACZ,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,+CAA+C,EAC/C,2CAA2C,EAC3C,4CAA4C,EAC5C,4BAA4B,EAC5B,6CAA6C,EAC7C,6BAA6B,EAChC,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACH,8CAA8C,EAC9C,4CAA4C,EAC5C,iCAAiC,EACjC,8BAA8B,EAC9B,+BAA+B,EAClC,MAAM,6BAA6B,CAAA;AAMpC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGzF;;GAEG;AACH,MAAM,OAAO,iCAAiC;IAG1C,YAAY,gBAAkC,EAAU,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;QAC9E,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAC5C,CAAC;IAED,YAAY;IACZ,qCAAqC;IACrC,IAAI;IAEJ,kDAAkD;IAClD,QAAQ,CAAC,GAA4B;QACjC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;YAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACvE,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBACzD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;gBAC5F,OAAM;YACV,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;gBAC5C,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;YACnG,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;gBAClD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAA;YAC5G,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;gBAC5C,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;YACpG,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,mBAAmB,CAAC,
|
|
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":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AACrF,OAAO,EAAoC,uBAAuB,EAAgB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"LionWebLanguageValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AACrF,OAAO,EAAoC,uBAAuB,EAAgB,MAAM,qBAAqB,CAAA;AAI7G,OAAO,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAEhE;;GAEG;AACH,qBAAa,wBAAwB;IAKe,OAAO,CAAC,QAAQ;IAJhE,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,YAAY,EAAE,uBAAuB,GAAG,SAAS,CAAA;gBAGrC,gBAAgB,EAAE,gBAAgB,EAAU,QAAQ,EAAE,gBAAgB;IAKlF;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB;IAqBxC,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAS5C,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAWzC,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,GAAG,IAAI;CAW/E"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isEqualMetaPointer } from "@lionweb/json";
|
|
2
2
|
import { isLionWebM3Language, JsonContext, LionWebJsonChunkWrapper, MetaPointers } from "@lionweb/json-utils";
|
|
3
|
+
import { asMinimalJsonString } from "@lionweb/ts-utils";
|
|
3
4
|
import { GenericIssue } from "../issues/index.js";
|
|
4
5
|
import { MissingM3Language_Issue } from "../issues/LanguageIssues.js";
|
|
5
6
|
import { isConcept } from "../languages/index.js";
|
|
@@ -27,7 +28,7 @@ export class LionWebLanguageValidator {
|
|
|
27
28
|
const languageNodes = this.chunkWrapper.findNodesOfClassifier(MetaPointers.Language);
|
|
28
29
|
if (languageNodes.length !== 1) {
|
|
29
30
|
// TODO Better error handling.
|
|
30
|
-
console.error("Error: xpected exactly one Language node, found " + languageNodes.length + " => " +
|
|
31
|
+
console.error("Error: xpected exactly one Language node, found " + languageNodes.length + " => " + asMinimalJsonString(languageNodes));
|
|
31
32
|
}
|
|
32
33
|
chunk.nodes.forEach((node, index) => {
|
|
33
34
|
if (!isConcept(node)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqC,MAAM,eAAe,CAAA;AACrF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,EAAE,SAAS,EAAoB,MAAM,uBAAuB,CAAA;AAGnE;;GAEG;AACH,MAAM,OAAO,wBAAwB;IAGjC,uDAAuD;IAEvD,YAAY,gBAAkC,EAAU,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;QAC9E,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;IACjC,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,KAAuB;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACtD,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;QAC9E,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QAClG,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACpF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,8BAA8B;YAC9B,OAAO,CAAC,KAAK,CAAC,kDAAkD,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"LionWebLanguageValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { SyntaxValidator } from "./generic/SyntaxValidator.js";
|
|
2
|
-
import {
|
|
2
|
+
import { LionWebSchema } from "./LionWebChunkDefinitions.js";
|
|
3
3
|
/**
|
|
4
4
|
* LionWebSyntaxValidator can check whether objects are structurally LionWeb objects.
|
|
5
5
|
*/
|
|
6
6
|
export class LionWebSyntaxValidator extends SyntaxValidator {
|
|
7
7
|
constructor(validationResult) {
|
|
8
|
-
super(validationResult,
|
|
8
|
+
super(validationResult, LionWebSchema);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=LionWebSyntaxValidator.js.map
|
|
@@ -23,7 +23,7 @@ export class LionWebValidator {
|
|
|
23
23
|
this.validateForLanguage();
|
|
24
24
|
}
|
|
25
25
|
validateSyntax() {
|
|
26
|
-
this.syntaxValidator.validate(this.object, "
|
|
26
|
+
this.syntaxValidator.validate(this.object, "LionWebJsonChunk");
|
|
27
27
|
this.syntaxCorrect = !this.validationResult.hasErrors();
|
|
28
28
|
if (this.syntaxCorrect) {
|
|
29
29
|
this.chunk = new LionWebJsonChunkWrapper(this.object);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAA;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAUzB,YAAY,IAAa,EAAU,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;QAH7D,kBAAa,GAAY,KAAK,CAAA;QAC9B,sBAAiB,GAAY,KAAK,CAAA;QAG9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACxE,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAyB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAClF,CAAC;IAED,WAAW;QACP,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC9B,CAAC;IAED,cAAc;QACV,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"LionWebValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAA;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAUzB,YAAY,IAAa,EAAU,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;QAH7D,kBAAa,GAAY,KAAK,CAAA;QAC9B,sBAAiB,GAAY,KAAK,CAAA;QAG9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACxE,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAyB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAClF,CAAC;IAED,WAAW;QACP,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC9B,CAAC;IAED,cAAc;QACV,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;QAC9D,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAA;QACvD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,MAA0B,CAAC,CAAA;QAC7E,CAAC;IACL,CAAC;IAED,kBAAkB;QACd,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,kFAAkF;YAClF,OAAM;QACV,CAAC;QACD,gEAAgE;QAChE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAA;QACvE,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAA;IAC/D,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,mFAAmF;YACnF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC1B,sFAAsF;YACtF,OAAM;QACV,CAAC;QACD,MAAM,0BAA0B,GAAG,IAAI,iCAAiC,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC9G,gEAAgE;QAChE,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAA;IAC9E,CAAC;CAKJ"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { JsonContext } from "@lionweb/json-utils";
|
|
6
6
|
import { ValidationResult } from "./generic/ValidationResult.js";
|
|
7
|
-
import { PropertyDefinition } from "./generic/ValidationTypes.js";
|
|
7
|
+
import { PropertyDefinition } from "./generic/schema/ValidationTypes.js";
|
|
8
8
|
/**
|
|
9
9
|
* Check whether `id` is a valid LionWeb id.
|
|
10
10
|
* @param value The `value` to be checked.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationFunctions.d.ts","sourceRoot":"","sources":["../../src/validators/ValidationFunctions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"ValidationFunctions.d.ts","sourceRoot":"","sources":["../../src/validators/ValidationFunctions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAUjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AAExE;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAMtG;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAMvG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAK3G;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAYzI;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAMzI;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAUtI;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAS9H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { asMinimalJsonString } from "@lionweb/ts-utils";
|
|
1
2
|
import { Language_PropertyValue_Issue } from "../issues/LanguageIssues.js";
|
|
2
3
|
import { Syntax_IdFormat_Issue, Syntax_KeyFormat_Issue, Syntax_PropertyNullIssue, Syntax_SerializationFormatVersion_Issue, Syntax_VersionFormat_Issue } from "../issues/SyntaxIssues.js";
|
|
3
4
|
/**
|
|
@@ -6,7 +7,6 @@ import { Syntax_IdFormat_Issue, Syntax_KeyFormat_Issue, Syntax_PropertyNullIssue
|
|
|
6
7
|
* @param result Any validation issues found will be put into this object.
|
|
7
8
|
* @param context The context for the error message in errors.
|
|
8
9
|
*/
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
10
10
|
export function validateId(value, result, context) {
|
|
11
11
|
const idString = "" + value;
|
|
12
12
|
const regexp = /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*$/;
|
|
@@ -20,7 +20,6 @@ export function validateId(value, result, context) {
|
|
|
20
20
|
* @param result Any validation issues found will be put into this object.
|
|
21
21
|
* @param context The context for the error message in errors.
|
|
22
22
|
*/
|
|
23
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
24
23
|
export function validateKey(value, result, context) {
|
|
25
24
|
const keyString = "" + value;
|
|
26
25
|
const regexp = /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*$/;
|
|
@@ -34,7 +33,6 @@ export function validateKey(value, result, context) {
|
|
|
34
33
|
* @param result Any validation issues found will be put into this object.
|
|
35
34
|
* @param context The location in the overall JSON.
|
|
36
35
|
*/
|
|
37
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
38
36
|
export function validateVersion(value, result, context) {
|
|
39
37
|
const versionString = "" + value;
|
|
40
38
|
if (versionString.length === 0) {
|
|
@@ -48,11 +46,10 @@ export function validateVersion(value, result, context) {
|
|
|
48
46
|
* @param context The location in the overall JSON.
|
|
49
47
|
* @param propDef The PropertyDefinition for this value
|
|
50
48
|
*/
|
|
51
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
52
49
|
export function validateBoolean(value, result, context, propDef) {
|
|
53
50
|
const valueAsPrimitive = "" + value;
|
|
54
51
|
if (valueAsPrimitive !== "true" && valueAsPrimitive !== "false") {
|
|
55
|
-
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.
|
|
52
|
+
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.name : "unknown", valueAsPrimitive, "boolean " + asMinimalJsonString(value)));
|
|
56
53
|
}
|
|
57
54
|
}
|
|
58
55
|
/**
|
|
@@ -62,12 +59,11 @@ export function validateBoolean(value, result, context, propDef) {
|
|
|
62
59
|
* @param context The location in the overall JSON.
|
|
63
60
|
* @param propDef The PropertyDefinition for this value
|
|
64
61
|
*/
|
|
65
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
66
62
|
export function validateInteger(value, result, context, propDef) {
|
|
67
63
|
const valueAsPrimitive = "" + value;
|
|
68
64
|
const regexp = /^[+-]?(0|[1-9][0-9]*)$/;
|
|
69
65
|
if (valueAsPrimitive === null || !regexp.test(valueAsPrimitive)) {
|
|
70
|
-
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.
|
|
66
|
+
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.name : "unknown", valueAsPrimitive, "integer"));
|
|
71
67
|
}
|
|
72
68
|
}
|
|
73
69
|
/**
|
|
@@ -77,17 +73,16 @@ export function validateInteger(value, result, context, propDef) {
|
|
|
77
73
|
* @param context The location in the overall JSON.
|
|
78
74
|
* @param propDef The PropertyDefinition for this value
|
|
79
75
|
*/
|
|
80
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
81
76
|
export function validateJSON(value, result, context, propDef) {
|
|
82
77
|
const valueAsPrimitive = "" + value;
|
|
83
78
|
if (value === null) {
|
|
84
|
-
result.issue(new Syntax_PropertyNullIssue(context, propDef.
|
|
79
|
+
result.issue(new Syntax_PropertyNullIssue(context, propDef.name));
|
|
85
80
|
}
|
|
86
81
|
try {
|
|
87
82
|
JSON.parse(valueAsPrimitive);
|
|
88
83
|
}
|
|
89
|
-
catch (
|
|
90
|
-
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.
|
|
84
|
+
catch (_) {
|
|
85
|
+
result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.name : "unknown", valueAsPrimitive, "JSON"));
|
|
91
86
|
}
|
|
92
87
|
}
|
|
93
88
|
/**
|
|
@@ -96,10 +91,9 @@ export function validateJSON(value, result, context, propDef) {
|
|
|
96
91
|
* @param result
|
|
97
92
|
* @param context
|
|
98
93
|
*/
|
|
99
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
100
94
|
export function validateSerializationFormatVersion(value, result, context) {
|
|
101
95
|
if (typeof value !== "string") {
|
|
102
|
-
result.issue(new Syntax_SerializationFormatVersion_Issue(context,
|
|
96
|
+
result.issue(new Syntax_SerializationFormatVersion_Issue(context, asMinimalJsonString(value)));
|
|
103
97
|
return;
|
|
104
98
|
}
|
|
105
99
|
if (value.length === 0) {
|