@lionweb/validation 0.6.2 → 0.6.3-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 +4 -0
- package/dist/issues/LanguageIssues.d.ts +2 -2
- package/dist/issues/LanguageIssues.d.ts.map +1 -1
- package/dist/issues/LanguageIssues.js.map +1 -1
- package/dist/json/LionWebJson.d.ts +3 -3
- package/dist/json/LionWebJson.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.js +3 -3
- package/dist/validators/LionWebLanguageReferenceValidator.js.map +1 -1
- package/dist/validators/SimpleFieldValidator.d.ts.map +1 -1
- package/dist/validators/SimpleFieldValidator.js +4 -1
- package/dist/validators/SimpleFieldValidator.js.map +1 -1
- package/package.json +4 -3
- package/src/issues/LanguageIssues.ts +1 -1
- package/src/json/LionWebJson.ts +3 -3
- package/src/validators/LionWebLanguageReferenceValidator.ts +3 -3
- package/src/validators/SimpleFieldValidator.ts +4 -1
package/README.md
CHANGED
|
@@ -35,6 +35,10 @@ These two should converge in the future.
|
|
|
35
35
|
|
|
36
36
|
## Changelog
|
|
37
37
|
|
|
38
|
+
### 0.6.3
|
|
39
|
+
|
|
40
|
+
* Made validation aware that the `value` field of a property serialization is allowed to be `null`.
|
|
41
|
+
|
|
38
42
|
### 0.6.2
|
|
39
43
|
|
|
40
44
|
* Don't rely on the JavaScript features – import assertions – that are still marked as experimental.
|
|
@@ -3,10 +3,10 @@ import { JsonContext } from "../json/JsonContext.js";
|
|
|
3
3
|
import { ValidationIssue } from "./ValidationIssue.js";
|
|
4
4
|
export declare class Language_PropertyValue_Issue extends ValidationIssue {
|
|
5
5
|
property: string;
|
|
6
|
-
value: string;
|
|
6
|
+
value: (string | null);
|
|
7
7
|
expectedType: string;
|
|
8
8
|
readonly issueType = "PropertyValueIncorrect";
|
|
9
|
-
constructor(context: JsonContext, property: string, value: string, expectedType: string);
|
|
9
|
+
constructor(context: JsonContext, property: string, value: (string | null), expectedType: string);
|
|
10
10
|
msg: () => string;
|
|
11
11
|
}
|
|
12
12
|
export declare abstract class Language_IncorrectMetaPointerType_Issue extends ValidationIssue {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageIssues.d.ts","sourceRoot":"","sources":["../../src/issues/LanguageIssues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,qBAAa,4BAA6B,SAAQ,eAAe;IAKlD,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"LanguageIssues.d.ts","sourceRoot":"","sources":["../../src/issues/LanguageIssues.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageIssues.js","sourceRoot":"","sources":["../../src/issues/LanguageIssues.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,OAAO,4BAA6B,SAAQ,eAAe;IAG7D,YACI,OAAoB,EACb,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"LanguageIssues.js","sourceRoot":"","sources":["../../src/issues/LanguageIssues.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,OAAO,4BAA6B,SAAQ,eAAe;IAG7D,YACI,OAAoB,EACb,QAAgB,EAChB,KAAsB,EACtB,YAAoB;QAE3B,KAAK,CAAC,OAAO,CAAC,CAAA;QAJP,aAAQ,GAAR,QAAQ,CAAQ;QAChB,UAAK,GAAL,KAAK,CAAiB;QACtB,iBAAY,GAAZ,YAAY,CAAQ;QANtB,cAAS,GAAG,wBAAwB,CAAA;QAW7C,QAAG,GAAG,GAAW,EAAE,CAAC,cAAc,IAAI,CAAC,QAAQ,iBAAiB,IAAI,CAAC,KAAK,qBAAqB,IAAI,CAAC,YAAY,GAAG,CAAA;IAFnH,CAAC;CAGJ;AAED,0BAA0B;AAC1B,MAAM,OAAgB,uCAAwC,SAAQ,eAAe;IAGjF,YACI,OAAoB,EACb,WAAmC,EACnC,aAAqB;QAE5B,KAAK,CAAC,OAAO,CAAC,CAAA;QAHP,gBAAW,GAAX,WAAW,CAAwB;QACnC,kBAAa,GAAb,aAAa,CAAQ;QAKhC,QAAG,GAAG,GAAW,EAAE,CACf,GAAG,IAAI,CAAC,QAAQ,cAAc,IAAI,CAAC,WAAW,CAAC,GAAG,0BAA0B,IAAI,CAAC,QAAQ,gBAAgB,IAAI,CAAC,aAAa,GAAG,CAAA;IAHlI,CAAC;CAIJ;AAED,MAAM,OAAO,2CAA4C,SAAQ,uCAAuC;IAAxG;;QACa,cAAS,GAAG,8BAA8B,CAAA;QAC1C,aAAQ,GAAG,UAAU,CAAA;IAClC,CAAC;CAAA;AAED,MAAM,OAAgB,gDAAiD,SAAQ,eAAe;IAE1F,YACI,OAAoB,EACb,kBAA0C,EAC1C,iBAAkC;QAEzC,KAAK,CAAC,OAAO,CAAC,CAAA;QAHP,uBAAkB,GAAlB,kBAAkB,CAAwB;QAC1C,sBAAiB,GAAjB,iBAAiB,CAAiB;QAK7C,QAAG,GAAG,GAAW,EAAE,CACf,GAAG,IAAI,CAAC,QAAQ,cAAc,IAAI,CAAC,kBAAkB,CAAC,GAAG,gCAAgC,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAA;IAHzH,CAAC;CAIJ;AACD,MAAM,OAAO,4CAA6C,SAAQ,gDAAgD;IAAlH;;QACa,cAAS,GAAG,+BAA+B,CAAA;QAC3C,aAAQ,GAAG,UAAU,CAAA;IAClC,CAAC;CAAA;AACD,MAAM,OAAO,6CAA8C,SAAQ,gDAAgD;IAAnH;;QACa,cAAS,GAAG,gCAAgC,CAAA;QAC5C,aAAQ,GAAG,WAAW,CAAA;IACnC,CAAC;CAAA;AACD,MAAM,OAAO,+CAAgD,SAAQ,gDAAgD;IAArH;;QACa,cAAS,GAAG,kCAAkC,CAAA;QAC9C,aAAQ,GAAG,aAAa,CAAA;IACrC,CAAC;CAAA;AACD,MAAM,OAAO,0CAA2C,SAAQ,uCAAuC;IAAvG;;QACa,cAAS,GAAG,6BAA6B,CAAA;QACzC,aAAQ,GAAG,SAAS,CAAA;IACjC,CAAC;CAAA;AACD,MAAM,OAAO,4CAA6C,SAAQ,uCAAuC;IAAzG;;QACa,cAAS,GAAG,+BAA+B,CAAA;QAC3C,aAAQ,GAAG,WAAW,CAAA;IACnC,CAAC;CAAA;AACD,MAAM,OAAO,8CAA+C,SAAQ,uCAAuC;IAA3G;;QACa,cAAS,GAAG,iCAAiC,CAAA;QAC7C,aAAQ,GAAG,aAAa,CAAA;IACrC,CAAC;CAAA;AAED,wBAAwB;AACxB,MAAM,OAAgB,iCAAkC,SAAQ,eAAe;IAG3E,YACI,OAAoB,EACb,WAAmC;QAE1C,KAAK,CAAC,OAAO,CAAC,CAAA;QAFP,gBAAW,GAAX,WAAW,CAAwB;QAK9C,QAAG,GAAG,GAAW,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,aAAa,IAAI,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAA;IAFlG,CAAC;CAGJ;AAED,MAAM,OAAO,+BAAgC,SAAQ,iCAAiC;IAAtF;;QACa,cAAS,GAAG,kBAAkB,CAAA;QAC9B,aAAQ,GAAG,WAAW,CAAA;IACnC,CAAC;CAAA;AACD,MAAM,OAAO,iCAAkC,SAAQ,iCAAiC;IAAxF;;QACa,cAAS,GAAG,oBAAoB,CAAA;QAChC,aAAQ,GAAG,aAAa,CAAA;IACrC,CAAC;CAAA;AACD,MAAM,OAAO,8BAA+B,SAAQ,iCAAiC;IAArF;;QACa,cAAS,GAAG,iBAAiB,CAAA;QAC7B,aAAQ,GAAG,UAAU,CAAA;IAClC,CAAC;CAAA;AACD,MAAM,OAAO,6BAA8B,SAAQ,iCAAiC;IAApF;;QACa,cAAS,GAAG,gBAAgB,CAAA;QAC5B,aAAQ,GAAG,SAAS,CAAA;IACjC,CAAC;CAAA;AAED,+BAA+B;AAC/B,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAE5D,YACI,OAAoB,EACb,aAAqB;QAE5B,KAAK,CAAC,OAAO,CAAC,CAAA;QAFP,kBAAa,GAAb,aAAa,CAAQ;QAHvB,cAAS,GAAG,uBAAuB,CAAA;QAO5C,QAAG,GAAG,GAAG,EAAE,CAAC,+DAA+D,IAAI,CAAC,aAAa,EAAE,CAAA;IAD/F,CAAC;CAEJ;AACD,MAAM,OAAO,uBAAwB,SAAQ,eAAe;IAExD,YACI,OAAoB;QAEpB,KAAK,CAAC,OAAO,CAAC,CAAA;QAJT,cAAS,GAAG,mBAAmB,CAAA;QAMxC,QAAG,GAAG,GAAG,EAAE,CAAC,mCAAmC,CAAA;IAD/C,CAAC;CAEJ;AACD,MAAM,OAAO,4BAA6B,SAAQ,eAAe;IAE7D,YACI,OAAoB,EACb,YAAoB;QAE3B,KAAK,CAAC,OAAO,CAAC,CAAA;QAFP,iBAAY,GAAZ,YAAY,CAAQ;QAHtB,cAAS,GAAG,wBAAwB,CAAA;QAO7C,QAAG,GAAG,GAAG,EAAE,CAAC,oEAAoE,IAAI,CAAC,YAAY,EAAE,CAAA;IADnG,CAAC;CAEJ;AACD,MAAM,OAAO,8BAA+B,SAAQ,eAAe;IAE/D,YACI,OAAoB,EACb,gBAAwB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAA;QAFP,qBAAgB,GAAhB,gBAAgB,CAAQ;QAH1B,cAAS,GAAG,0BAA0B,CAAA;QAO/C,QAAG,GAAG,GAAG,EAAE,CAAC,8DAA8D,IAAI,CAAC,gBAAgB,EAAE,CAAA;IADjG,CAAC;CAEJ"}
|
|
@@ -28,12 +28,12 @@ export type LionWebJsonNode = {
|
|
|
28
28
|
containments: LionWebJsonContainment[];
|
|
29
29
|
references: LionWebJsonReference[];
|
|
30
30
|
annotations: LionWebId[];
|
|
31
|
-
parent: LionWebId | null;
|
|
31
|
+
parent: (LionWebId | null);
|
|
32
32
|
};
|
|
33
33
|
export declare function createLwNode(): LionWebJsonNode;
|
|
34
34
|
export type LionWebJsonProperty = {
|
|
35
35
|
property: LionWebJsonMetaPointer;
|
|
36
|
-
value: string;
|
|
36
|
+
value: (string | null);
|
|
37
37
|
};
|
|
38
38
|
export type LionWebJsonContainment = {
|
|
39
39
|
containment: LionWebJsonMetaPointer;
|
|
@@ -44,7 +44,7 @@ export type LionWebJsonReference = {
|
|
|
44
44
|
targets: LionWebJsonReferenceTarget[];
|
|
45
45
|
};
|
|
46
46
|
export type LionWebJsonReferenceTarget = {
|
|
47
|
-
resolveInfo
|
|
47
|
+
resolveInfo: (string | null);
|
|
48
48
|
reference: LionWebId;
|
|
49
49
|
};
|
|
50
50
|
//# sourceMappingURL=LionWebJson.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebJson.d.ts","sourceRoot":"","sources":["../../src/json/LionWebJson.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAGH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAEzE;AACD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAA;AAE9B,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAElG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAErH;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,0BAA0B,EAAE,MAAM,CAAA;IAClC,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,KAAK,EAAE,eAAe,EAAE,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,EAAE,EAAE,SAAS,CAAA;IACb,UAAU,EAAE,sBAAsB,CAAA;IAClC,UAAU,EAAE,mBAAmB,EAAE,CAAA;IACjC,YAAY,EAAE,sBAAsB,EAAE,CAAA;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,WAAW,EAAE,SAAS,EAAE,CAAA;IACxB,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"LionWebJson.d.ts","sourceRoot":"","sources":["../../src/json/LionWebJson.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAGH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAEzE;AACD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAA;AAE9B,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAElG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAErH;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,0BAA0B,EAAE,MAAM,CAAA;IAClC,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,KAAK,EAAE,eAAe,EAAE,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,EAAE,EAAE,SAAS,CAAA;IACb,UAAU,EAAE,sBAAsB,CAAA;IAClC,UAAU,EAAE,mBAAmB,EAAE,CAAA;IACjC,YAAY,EAAE,sBAAsB,EAAE,CAAA;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,WAAW,EAAE,SAAS,EAAE,CAAA;IACxB,MAAM,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;CAC7B,CAAA;AAED,wBAAgB,YAAY,IAAI,eAAe,CAU9C;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,QAAQ,EAAE,sBAAsB,CAAA;IAChC,KAAK,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,WAAW,EAAE,sBAAsB,CAAA;IACnC,QAAQ,EAAE,SAAS,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,SAAS,EAAE,sBAAsB,CAAA;IACjC,OAAO,EAAE,0BAA0B,EAAE,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,WAAW,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACvB,CAAA"}
|
|
@@ -105,8 +105,8 @@ export class LionWebLanguageReferenceValidator {
|
|
|
105
105
|
const refType = NodeUtils.findReference(propertyDefinition, MetaPointers.PropertyType);
|
|
106
106
|
// const refType = propertyDefinition.references.find(ref => isEqualMetaPointer(ref.reference, MetaPointers.PropertyType))
|
|
107
107
|
const propertyName = propertyDefinition.properties.find(p => p.property.key === LION_CORE_BUILTINS_INAMED_NAME)?.value;
|
|
108
|
-
// console.log("
|
|
109
|
-
if (propertyName !== undefined) {
|
|
108
|
+
// console.log("Found type should be " + refType.targets[0].reference);
|
|
109
|
+
if (propertyName !== null && propertyName !== undefined) {
|
|
110
110
|
if (refType !== null && refType !== undefined) {
|
|
111
111
|
const typeReferenceId = refType.targets[0].reference;
|
|
112
112
|
switch (typeReferenceId) {
|
|
@@ -117,7 +117,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
117
117
|
this.simpleFieldValidator.validateInteger(prop, propertyName, context);
|
|
118
118
|
break;
|
|
119
119
|
case LIONWEB_STRING_TYPE:
|
|
120
|
-
// Each string is correct and having another
|
|
120
|
+
// Each string is correct and having another JSON type is already captured
|
|
121
121
|
break;
|
|
122
122
|
case LIONWEB_JSON_TYPE:
|
|
123
123
|
this.simpleFieldValidator.validateJSON(prop, propertyName, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebLanguageReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LionWebLanguageReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebLanguageReferenceValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleFieldValidator.d.ts","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,KAAK,IAAI,CAAA;AAErE,qBAAa,oBAAoB;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;gBAEtB,gBAAgB,EAAE,gBAAgB;IAI9C;;;;OAIG;IAEH,UAAU,EAAE,iBAAiB,CAS5B;IAED;;;;;OAKG;IAEH,WAAW,EAAE,iBAAiB,CAS7B;IAGD,eAAe,EAAE,iBAAiB,CAKjC;IAED,eAAe,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,CAI9F;IAED,eAAe,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,CAK9F;IAED,YAAY,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"SimpleFieldValidator.d.ts","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,KAAK,IAAI,CAAA;AAErE,qBAAa,oBAAoB;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;gBAEtB,gBAAgB,EAAE,gBAAgB;IAI9C;;;;OAIG;IAEH,UAAU,EAAE,iBAAiB,CAS5B;IAED;;;;;OAKG;IAEH,WAAW,EAAE,iBAAiB,CAS7B;IAGD,eAAe,EAAE,iBAAiB,CAKjC;IAED,eAAe,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,CAI9F;IAED,eAAe,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,CAK9F;IAED,YAAY,aAAc,mBAAmB,YAAY,MAAM,WAAW,WAAW,KAAG,IAAI,CAS3F;IAED,kCAAkC,eAAgB,OAAO,WAAW,WAAW,KAAG,IAAI,CASrF;CACJ"}
|
|
@@ -49,12 +49,15 @@ export class SimpleFieldValidator {
|
|
|
49
49
|
};
|
|
50
50
|
this.validateInteger = (property, propName, context) => {
|
|
51
51
|
const regexp = /^[+-]?(0|[1-9][0-9]*)$/;
|
|
52
|
-
if (!regexp.test(property.value)) {
|
|
52
|
+
if (property.value === null || !regexp.test(property.value)) {
|
|
53
53
|
this.validationResult.issue(new Language_PropertyValue_Issue(context, propName, property.value, "integer"));
|
|
54
54
|
}
|
|
55
55
|
};
|
|
56
56
|
this.validateJSON = (property, propName, context) => {
|
|
57
57
|
try {
|
|
58
|
+
if (property.value === null) {
|
|
59
|
+
throw Error();
|
|
60
|
+
}
|
|
58
61
|
JSON.parse(property.value);
|
|
59
62
|
}
|
|
60
63
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleFieldValidator.js","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAA;AAC1E,OAAO,EACH,qBAAqB,EACrB,sBAAsB,EACtB,uCAAuC,EACvC,0BAA0B,GAC7B,MAAM,2BAA2B,CAAA;AAOlC,MAAM,OAAO,oBAAoB;IAG7B,YAAY,gBAAkC;QAI9C;;;;WAIG;QACH,wDAAwD;QACxD,eAAU,GAAsB,CAAS,EAAU,EAAE,OAAoB,EAAQ,EAAE;YAC/E,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAM;YACV,CAAC;YACD,MAAM,QAAQ,GAAW,EAAE,CAAC,QAAQ,EAAE,CAAA;YACtC,MAAM,KAAK,GAAG,iCAAiC,CAAA;YAC/C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC7E,CAAC;QACL,CAAC,CAAA;QAED;;;;;WAKG;QACH,wDAAwD;QACxD,gBAAW,GAAsB,CAAS,GAAW,EAAE,OAAoB,EAAQ,EAAE;YACjF,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACpC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAA;YACzF,CAAC;YACD,MAAM,SAAS,GAAW,EAAE,GAAG,GAAG,CAAA;YAClC,MAAM,KAAK,GAAG,iCAAiC,CAAA;YAC/C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;YAC/E,CAAC;QACL,CAAC,CAAA;QAED,wDAAwD;QACxD,oBAAe,GAAsB,CAAS,OAAe,EAAE,OAAoB,EAAQ,EAAE;YACzF,MAAM,aAAa,GAAW,EAAE,GAAG,OAAO,CAAA;YAC1C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,0BAA0B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAA;YACvF,CAAC;QACL,CAAC,CAAA;QAED,oBAAe,GAAG,CAAC,QAA6B,EAAE,QAAgB,EAAE,OAAoB,EAAQ,EAAE;YAC9F,IAAI,QAAQ,CAAC,KAAK,KAAK,MAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC1D,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAA;YAC/G,CAAC;QACL,CAAC,CAAA;QAED,oBAAe,GAAG,CAAC,QAA6B,EAAE,QAAgB,EAAE,OAAoB,EAAQ,EAAE;YAC9F,MAAM,MAAM,GAAG,wBAAwB,CAAA;YACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SimpleFieldValidator.js","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/validation",
|
|
3
|
-
"version": "0.6.2",
|
|
4
|
-
"license":
|
|
3
|
+
"version": "0.6.3-beta.2",
|
|
4
|
+
"license": "Apache 2.0",
|
|
5
5
|
"description": "LionWeb Serialization validation",
|
|
6
6
|
"author": "jos.warmer@openmodeling.nl",
|
|
7
7
|
"main": "dist/index.js",
|
|
8
8
|
"types": "dist/index.d.ts",
|
|
9
9
|
"typings": "dist/index.d.ts",
|
|
10
|
-
"type":"module",
|
|
10
|
+
"type": "module",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"lionweb",
|
|
13
13
|
"serialization",
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
"lint": "eslint src",
|
|
22
22
|
"test-here": "cd ../test && find dist/validation -type d | sed '1!G;h;$!d' | xargs npx mocha",
|
|
23
23
|
"release": "npm publish",
|
|
24
|
+
"release-beta": "npm publish --tag beta",
|
|
24
25
|
"testValid": "node dist/runners/RunCheckFolder.js ../test/testset/valid",
|
|
25
26
|
"testInvalid": "node dist/runners/RunCheckFolder.js ../test/testset/invalid",
|
|
26
27
|
"testInvalidWithLanguage": "node dist/runners/RunCheckFolderWithLanguage.js ../test/testset/withLanguage/invalid/ ../test/testset/withLanguage/myLang.language.json",
|
package/src/json/LionWebJson.ts
CHANGED
|
@@ -44,7 +44,7 @@ export type LionWebJsonNode = {
|
|
|
44
44
|
containments: LionWebJsonContainment[]
|
|
45
45
|
references: LionWebJsonReference[]
|
|
46
46
|
annotations: LionWebId[]
|
|
47
|
-
parent: LionWebId | null
|
|
47
|
+
parent: (LionWebId | null)
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
export function createLwNode(): LionWebJsonNode {
|
|
@@ -61,7 +61,7 @@ export function createLwNode(): LionWebJsonNode {
|
|
|
61
61
|
|
|
62
62
|
export type LionWebJsonProperty = {
|
|
63
63
|
property: LionWebJsonMetaPointer
|
|
64
|
-
value: string
|
|
64
|
+
value: (string | null)
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
export type LionWebJsonContainment = {
|
|
@@ -75,6 +75,6 @@ export type LionWebJsonReference = {
|
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
export type LionWebJsonReferenceTarget = {
|
|
78
|
-
resolveInfo
|
|
78
|
+
resolveInfo: (string | null)
|
|
79
79
|
reference: LionWebId
|
|
80
80
|
}
|
|
@@ -141,8 +141,8 @@ export class LionWebLanguageReferenceValidator {
|
|
|
141
141
|
const refType = NodeUtils.findReference(propertyDefinition, MetaPointers.PropertyType)
|
|
142
142
|
// const refType = propertyDefinition.references.find(ref => isEqualMetaPointer(ref.reference, MetaPointers.PropertyType))
|
|
143
143
|
const propertyName = propertyDefinition.properties.find(p => p.property.key === LION_CORE_BUILTINS_INAMED_NAME)?.value
|
|
144
|
-
// console.log("
|
|
145
|
-
if (propertyName !== undefined) {
|
|
144
|
+
// console.log("Found type should be " + refType.targets[0].reference);
|
|
145
|
+
if (propertyName !== null && propertyName !== undefined) {
|
|
146
146
|
if (refType !== null && refType !== undefined) {
|
|
147
147
|
const typeReferenceId = refType.targets[0].reference
|
|
148
148
|
switch (typeReferenceId) {
|
|
@@ -153,7 +153,7 @@ export class LionWebLanguageReferenceValidator {
|
|
|
153
153
|
this.simpleFieldValidator.validateInteger(prop, propertyName, context)
|
|
154
154
|
break
|
|
155
155
|
case LIONWEB_STRING_TYPE:
|
|
156
|
-
// Each string is correct and having another
|
|
156
|
+
// Each string is correct and having another JSON type is already captured
|
|
157
157
|
break
|
|
158
158
|
case LIONWEB_JSON_TYPE:
|
|
159
159
|
this.simpleFieldValidator.validateJSON(prop, propertyName, context)
|
|
@@ -69,13 +69,16 @@ export class SimpleFieldValidator {
|
|
|
69
69
|
|
|
70
70
|
validateInteger = (property: LionWebJsonProperty, propName: string, context: JsonContext): void => {
|
|
71
71
|
const regexp = /^[+-]?(0|[1-9][0-9]*)$/
|
|
72
|
-
if (!regexp.test(property.value)) {
|
|
72
|
+
if (property.value === null || !regexp.test(property.value)) {
|
|
73
73
|
this.validationResult.issue(new Language_PropertyValue_Issue(context, propName, property.value, "integer"))
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
validateJSON = (property: LionWebJsonProperty, propName: string, context: JsonContext): void => {
|
|
78
78
|
try {
|
|
79
|
+
if (property.value === null) {
|
|
80
|
+
throw Error()
|
|
81
|
+
}
|
|
79
82
|
JSON.parse(property.value)
|
|
80
83
|
} catch (e) {
|
|
81
84
|
this.validationResult.issue(new Language_PropertyValue_Issue(context, propName, property.value, "JSON"))
|