@lionweb/validation 0.5.0 → 0.6.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/diff/DiffResult.d.ts +9 -0
- package/dist/diff/DiffResult.d.ts.map +1 -0
- package/dist/diff/DiffResult.js +18 -0
- package/dist/diff/DiffResult.js.map +1 -0
- package/dist/diff/LionWebJsonDiff.d.ts +25 -0
- package/dist/diff/LionWebJsonDiff.d.ts.map +1 -0
- package/dist/diff/LionWebJsonDiff.js +205 -0
- package/dist/diff/LionWebJsonDiff.js.map +1 -0
- package/dist/diff/changes/Change.d.ts +16 -0
- package/dist/diff/changes/Change.d.ts.map +1 -0
- package/dist/diff/changes/Change.js +19 -0
- package/dist/diff/changes/Change.js.map +1 -0
- package/dist/diff/changes/ChunkChange.d.ts +43 -0
- package/dist/diff/changes/ChunkChange.d.ts.map +1 -0
- package/dist/diff/changes/ChunkChange.js +57 -0
- package/dist/diff/changes/ChunkChange.js.map +1 -0
- package/dist/diff/changes/ContainmentChange.d.ts +26 -0
- package/dist/diff/changes/ContainmentChange.d.ts.map +1 -0
- package/dist/diff/changes/ContainmentChange.js +34 -0
- package/dist/diff/changes/ContainmentChange.js.map +1 -0
- package/dist/diff/changes/NodeChange.d.ts +22 -0
- package/dist/diff/changes/NodeChange.d.ts.map +1 -0
- package/dist/diff/changes/NodeChange.js +24 -0
- package/dist/diff/changes/NodeChange.js.map +1 -0
- package/dist/diff/changes/PropertyChange.d.ts +23 -0
- package/dist/diff/changes/PropertyChange.d.ts.map +1 -0
- package/dist/diff/changes/PropertyChange.js +28 -0
- package/dist/diff/changes/PropertyChange.js.map +1 -0
- package/dist/diff/changes/ReferenceChange.d.ts +19 -0
- package/dist/diff/changes/ReferenceChange.d.ts.map +1 -0
- package/dist/diff/changes/ReferenceChange.js +25 -0
- package/dist/diff/changes/ReferenceChange.js.map +1 -0
- package/dist/diff/changes/index.d.ts +7 -0
- package/dist/diff/changes/index.d.ts.map +1 -0
- package/dist/diff/changes/index.js +7 -0
- package/dist/diff/changes/index.js.map +1 -0
- package/dist/diff/index.d.ts +4 -0
- package/dist/diff/index.d.ts.map +1 -0
- package/dist/diff/index.js +4 -0
- package/dist/diff/index.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/issues/LanguageIssues.d.ts +1 -1
- package/dist/issues/LanguageIssues.d.ts.map +1 -1
- package/dist/issues/LanguageIssues.js.map +1 -1
- package/dist/issues/ReferenceIssues.d.ts +1 -1
- package/dist/issues/ReferenceIssues.d.ts.map +1 -1
- package/dist/issues/ReferenceIssues.js.map +1 -1
- package/dist/issues/SyntaxIssues.d.ts +1 -1
- package/dist/issues/SyntaxIssues.d.ts.map +1 -1
- package/dist/issues/SyntaxIssues.js +4 -4
- package/dist/issues/SyntaxIssues.js.map +1 -1
- package/dist/issues/ValidationIssue.d.ts +1 -1
- package/dist/issues/ValidationIssue.d.ts.map +1 -1
- package/dist/issues/ValidationIssue.js.map +1 -1
- package/dist/issues/index.d.ts +1 -1
- package/dist/issues/index.d.ts.map +1 -1
- package/dist/issues/index.js +1 -1
- package/dist/issues/index.js.map +1 -1
- package/dist/json/ChunkUtils.d.ts.map +1 -1
- package/dist/json/ChunkUtils.js.map +1 -1
- package/dist/json/JsonContext.d.ts.map +1 -0
- package/dist/json/JsonContext.js.map +1 -0
- package/dist/json/LanguageUtils.d.ts.map +1 -1
- package/dist/json/LanguageUtils.js.map +1 -1
- package/dist/json/LionWebJson.d.ts +10 -9
- package/dist/json/LionWebJson.d.ts.map +1 -1
- package/dist/json/LionWebJson.js +1 -0
- package/dist/json/LionWebJson.js.map +1 -1
- package/dist/json/LionWebJsonChunkWrapper.d.ts +7 -4
- package/dist/json/LionWebJsonChunkWrapper.d.ts.map +1 -1
- package/dist/json/LionWebJsonChunkWrapper.js +48 -10
- package/dist/json/LionWebJsonChunkWrapper.js.map +1 -1
- package/dist/json/LionWebLanguageDefinition.d.ts.map +1 -1
- package/dist/json/LionWebLanguageDefinition.js +3 -3
- package/dist/json/LionWebLanguageDefinition.js.map +1 -1
- package/dist/json/NodeUtils.d.ts +5 -4
- package/dist/json/NodeUtils.d.ts.map +1 -1
- package/dist/json/NodeUtils.js +5 -2
- package/dist/json/NodeUtils.js.map +1 -1
- package/dist/json/index.d.ts +1 -0
- package/dist/json/index.d.ts.map +1 -1
- package/dist/json/index.js +1 -0
- package/dist/json/index.js.map +1 -1
- package/dist/runners/FileUtils.d.ts.map +1 -1
- package/dist/runners/FileUtils.js.map +1 -1
- package/dist/runners/RunCheckFolder.js.map +1 -1
- package/dist/runners/RunCheckFolderWithLanguage.js.map +1 -1
- package/dist/runners/RunCheckOneFile.js.map +1 -1
- package/dist/runners/RunCheckOneFileWithLanguage.js.map +1 -1
- package/dist/runners/RunLioncoreDiff.js +5 -5
- package/dist/runners/RunLioncoreDiff.js.map +1 -1
- package/dist/runners/Utils.d.ts.map +1 -1
- package/dist/runners/Utils.js +1 -1
- package/dist/runners/Utils.js.map +1 -1
- package/dist/runners/index.d.ts.map +1 -1
- package/dist/runners/index.js.map +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.d.ts +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageReferenceValidator.js +6 -6
- package/dist/validators/LionWebLanguageReferenceValidator.js.map +1 -1
- package/dist/validators/LionWebLanguageValidator.d.ts.map +1 -1
- package/dist/validators/LionWebLanguageValidator.js +1 -1
- package/dist/validators/LionWebLanguageValidator.js.map +1 -1
- package/dist/validators/LionWebReferenceValidator.d.ts +1 -1
- package/dist/validators/LionWebReferenceValidator.d.ts.map +1 -1
- package/dist/validators/LionWebReferenceValidator.js +6 -6
- package/dist/validators/LionWebReferenceValidator.js.map +1 -1
- package/dist/validators/LionWebSyntaxValidator.d.ts +1 -1
- package/dist/validators/LionWebSyntaxValidator.d.ts.map +1 -1
- package/dist/validators/LionWebSyntaxValidator.js +21 -11
- package/dist/validators/LionWebSyntaxValidator.js.map +1 -1
- package/dist/validators/LionWebValidator.d.ts.map +1 -1
- package/dist/validators/LionWebValidator.js.map +1 -1
- package/dist/validators/SimpleFieldValidator.d.ts +1 -1
- package/dist/validators/SimpleFieldValidator.d.ts.map +1 -1
- package/dist/validators/SimpleFieldValidator.js +1 -1
- package/dist/validators/SimpleFieldValidator.js.map +1 -1
- package/dist/validators/ValidationResult.d.ts.map +1 -1
- package/dist/validators/ValidationResult.js.map +1 -1
- package/dist/validators/index.d.ts.map +1 -1
- package/dist/validators/index.js.map +1 -1
- package/package.json +5 -2
- package/src/diff/DiffResult.ts +21 -0
- package/src/diff/LionWebJsonDiff.ts +259 -0
- package/src/diff/changes/Change.ts +52 -0
- package/src/diff/changes/ChunkChange.ts +68 -0
- package/src/diff/changes/ContainmentChange.ts +34 -0
- package/src/diff/changes/NodeChange.ts +32 -0
- package/src/diff/changes/PropertyChange.ts +29 -0
- package/src/diff/changes/ReferenceChange.ts +24 -0
- package/src/diff/changes/index.ts +6 -0
- package/src/diff/index.ts +3 -0
- package/src/index.ts +5 -4
- package/src/issues/LanguageIssues.ts +61 -39
- package/src/issues/ReferenceIssues.ts +51 -29
- package/src/issues/SyntaxIssues.ts +38 -23
- package/src/issues/ValidationIssue.ts +7 -7
- package/src/issues/index.ts +5 -5
- package/src/json/ChunkUtils.ts +7 -11
- package/src/json/JsonContext.ts +31 -0
- package/src/json/LanguageUtils.ts +5 -6
- package/src/json/LionWebJson.ts +44 -43
- package/src/json/LionWebJsonChunkWrapper.ts +76 -29
- package/src/json/LionWebLanguageDefinition.ts +44 -49
- package/src/json/NodeUtils.ts +25 -19
- package/src/json/index.ts +7 -6
- package/src/json/std-builtins-copy.json +347 -349
- package/src/runners/FileUtils.ts +48 -49
- package/src/runners/RunCheckFolder.ts +3 -3
- package/src/runners/RunCheckFolderWithLanguage.ts +31 -30
- package/src/runners/RunCheckOneFile.ts +3 -3
- package/src/runners/RunCheckOneFileWithLanguage.ts +21 -19
- package/src/runners/RunLioncoreDiff.ts +15 -15
- package/src/runners/Utils.ts +24 -24
- package/src/runners/index.ts +2 -2
- package/src/validators/LionWebLanguageReferenceValidator.ts +63 -55
- package/src/validators/LionWebLanguageValidator.ts +11 -12
- package/src/validators/LionWebReferenceValidator.ts +90 -76
- package/src/validators/LionWebSyntaxValidator.ts +108 -99
- package/src/validators/LionWebValidator.ts +33 -33
- package/src/validators/SimpleFieldValidator.ts +33 -28
- package/src/validators/ValidationResult.ts +5 -6
- package/src/validators/index.ts +7 -7
- package/dist/diff/LionwebDiff.d.ts +0 -40
- package/dist/diff/LionwebDiff.d.ts.map +0 -1
- package/dist/diff/LionwebDiff.js +0 -158
- package/dist/diff/LionwebDiff.js.map +0 -1
- package/dist/issues/JsonContext.d.ts.map +0 -1
- package/dist/issues/JsonContext.js.map +0 -1
- package/src/diff/LionwebDiff.ts +0 -193
- package/src/issues/JsonContext.ts +0 -31
- /package/dist/{issues → json}/JsonContext.d.ts +0 -0
- /package/dist/{issues → json}/JsonContext.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,oCAAoC,EACpC,+BAA+B,EAC/B,+BAA+B,
|
|
1
|
+
{"version":3,"file":"LionWebReferenceValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebReferenceValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,oCAAoC,EACpC,+BAA+B,EAC/B,+BAA+B,EAC/B,+BAA+B,EAC/B,oCAAoC,GACvC,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EACH,sBAAsB,GAMzB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAGhE;;;GAGG;AACH,MAAM,OAAO,yBAAyB;IAKlC,YAAY,gBAAkC;QAH9C,eAAU,GAAiC,IAAI,GAAG,EAA2B,CAAA;QAIzE,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC/E,CAAC;IAED,eAAe,CAAC,GAAqB,EAAE,GAAgB;QACnD,iFAAiF;QACjF,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC9B,iIAAiI;YACjI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,+BAA+B,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YACzG,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QACtC,CAAC,CAAC,CAAA;IACN,CAAC;IAED,QAAQ,CAAC,GAA4B;QACjC,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QACjE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC5C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;YAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAA;YAC9B,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,CAAA;YAC9E,CAAC;YACD,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YAC7D,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YACvC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAA;YACvF,IAAI,CAAC,iCAAiC,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;YAC/E,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE;gBAC5C,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAA;YACpH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;gBAClD,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC3H,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAA;gBACxG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAC9C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;wBAC1B,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;4BAC9F,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,oCAAoC,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA;4BAC/F,qIAAqI;wBACzI,CAAC;wBACD,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;4BAC9D,0HAA0H;wBAC9H,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBACpC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;gBACpD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3B,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;wBACjG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,oCAAoC,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAA;wBAChG,0IAA0I;oBAC9I,CAAC;oBACD,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAChE,+HAA+H;oBACnI,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBACtC,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAC7G,oCAAoC;gBACpC,6FAA6F;YACjG,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,KAA8B,EAAE,WAAmC,EAAE,OAAoB;QAC/G,MAAM,IAAI,GAAG,UAAU,CAAC,6BAA6B,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;QACjH,IAAI,WAAW,CAAC,QAAQ,KAAK,sBAAsB,EAAE,CAAC;YAClD,cAAc;YACd,OAAM;QACV,CAAC;QACD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACtC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,+BAA+B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAA;QAC1F,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,OAAO,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;gBACvC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,+BAA+B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAA;YAC1F,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,OAAiB,EAAE,OAAoB;QAClD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC5C,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAA4B,EAAE,CAAA;QAC/C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClB,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YACnE,CAAC;iBAAM,CAAC;gBACJ,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;YAC3B,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,0BAA0B,CAAC,aAAmC,EAAE,OAAoB;QAChF,IAAI,aAAa,KAAK,IAAI,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACxD,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAA;QAC/C,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE;YAC1C,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;YAClD,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC9C,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC1C,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACzH,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;YAC7D,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,IAAqB,EAAE,OAAoB;QAC3D,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACtC,OAAM;QACV,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACpD,OAAM;QACV,CAAC;QACD,IAAI,OAAO,GAAgC,IAAI,CAAA;QAC/C,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC7B,OAAO,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1G,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAA;YACjC,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtF,IAAI,CAAC,gBAAgB,CAAC,KAAK,CACvB,IAAI,+BAA+B,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAC3G,CAAA;gBACD,OAAM;YACV,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5B,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC7C,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,OAAoB,EAAE,MAAmC,EAAE,KAAsB;QACnG,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAC1C,OAAM;QACV,CAAC;QACD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC1C,OAAM;YACV,CAAC;QACL,CAAC;QACD,IAAI,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACxC,OAAM;QACV,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,oCAAoC,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;IACjG,CAAC;IAED,iCAAiC,CAAC,IAAqB,EAAE,OAAoB;QACzE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,KAA6B,EAAE,EAAE;YACxD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,KAAa,EAAE,EAAE;gBACtD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC9C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC1B,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;wBAC/B,mFAAmF;oBACvF,CAAC;oBACD,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC9D,IAAI,CAAC,gBAAgB,CAAC,KAAK,CACvB,IAAI,oCAAoC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAClH,CAAA;oBACL,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,YAAoB,EAAE,eAAuB,EAAE,EAAE;YACvE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACnD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC9D,IAAI,CAAC,gBAAgB,CAAC,KAAK,CACvB,IAAI,oCAAoC,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAC5G,CAAA;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QACF,uDAAuD;QACvD,sDAAsD;QACtD,qCAAqC;QACrC,8CAA8C;QAC9C,iJAAiJ;QACjJ,YAAY;QACZ,QAAQ;QACR,IAAI;IACR,CAAC;CACJ"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SimpleFieldValidator, ValidatorFunction } from "./SimpleFieldValidator.js";
|
|
2
|
-
import { JsonContext } from "
|
|
2
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
3
3
|
import { ValidationResult } from "./ValidationResult.js";
|
|
4
4
|
export type UnknownObjectType = {
|
|
5
5
|
[key: string]: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebSyntaxValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebSyntaxValidator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,
|
|
1
|
+
{"version":3,"file":"LionWebSyntaxValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebSyntaxValidator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAE1D,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAA;AAEhI,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,YAAY,EAAE,YAAY,CAAA;IAC1B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;IAClB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,iBAAiB,CAAA;CACpC,CAAA;AAMD;;;GAGG;AACH,qBAAa,sBAAsB;IAC/B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAO;gBAEb,gBAAgB,EAAE,gBAAgB;IAK9C;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO;IAIrB,eAAe,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAYvD;IAED,sBAAsB,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAQ9D;IAED,cAAc,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAWtD;IAED,oBAAoB,QAAS,OAAO,WAAW,WAAW,UAIzD;IAED,kBAAkB,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAW1D;IAED,qBAAqB,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAY7D;IAED,eAAe,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAMvD;IAED,OAAO,CAAC,UAAU,CAIjB;IAED;OACG;IACH,OAAO,CAAC,SAAS,CAUhB;IAED,mBAAmB,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAM3D;IAED,yBAAyB,QAAS,OAAO,OAAO,WAAW,KAAG,IAAI,CAMjE;IAED;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI;IAsCxF;;;;;OAKG;IACH,oBAAoB,CAAC,GAAG,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IAcvF;;;;;;OAMG;IACH,iBAAiB,QACR,iBAAiB,QAChB,MAAM,gBACE,YAAY,aACf,OAAO,WACT,WAAW,KACrB,OAAO,CAqCT;CACJ;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,gBAAgB,CAKpE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Syntax_ArrayContainsNull_Issue, Syntax_PropertyMissingIssue, Syntax_PropertyNullIssue, Syntax_PropertyTypeIssue, Syntax_PropertyUnknownIssue } from "../issues/SyntaxIssues.js";
|
|
1
|
+
import { Syntax_ArrayContainsNull_Issue, Syntax_PropertyMissingIssue, Syntax_PropertyNullIssue, Syntax_PropertyTypeIssue, Syntax_PropertyUnknownIssue, } from "../issues/SyntaxIssues.js";
|
|
2
2
|
import { SimpleFieldValidator } from "./SimpleFieldValidator.js";
|
|
3
|
-
import { JsonContext } from "
|
|
3
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
4
4
|
import { ValidationResult } from "./ValidationResult.js";
|
|
5
5
|
// Make boolean argument more readable.
|
|
6
6
|
const MAY_BE_NULL = true;
|
|
@@ -19,7 +19,12 @@ export class LionWebSyntaxValidator {
|
|
|
19
19
|
this.recursive = true;
|
|
20
20
|
this.validateLwChunk = (obj, ctx) => {
|
|
21
21
|
const expected = [
|
|
22
|
-
{
|
|
22
|
+
{
|
|
23
|
+
property: "serializationFormatVersion",
|
|
24
|
+
expectedType: "string",
|
|
25
|
+
mayBeNull: NOT_NULL,
|
|
26
|
+
validateValue: this.simpleFieldValidator.validateSerializationFormatVersion,
|
|
27
|
+
},
|
|
23
28
|
{ property: "languages", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.validateLwUsedLanguage },
|
|
24
29
|
{ property: "nodes", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.validateLwNode },
|
|
25
30
|
];
|
|
@@ -28,7 +33,7 @@ export class LionWebSyntaxValidator {
|
|
|
28
33
|
this.validateLwUsedLanguage = (obj, ctx) => {
|
|
29
34
|
const expected = [
|
|
30
35
|
{ property: "key", expectedType: "string", mayBeNull: NOT_NULL, validateValue: this.simpleFieldValidator.validateKey },
|
|
31
|
-
{ property: "version", expectedType: "string", mayBeNull: NOT_NULL, validateValue: this.simpleFieldValidator.validateVersion }
|
|
36
|
+
{ property: "version", expectedType: "string", mayBeNull: NOT_NULL, validateValue: this.simpleFieldValidator.validateVersion },
|
|
32
37
|
];
|
|
33
38
|
// if (this.checkType(obj, "object", ctx)) {
|
|
34
39
|
this.propertyChecks(obj, expected, ctx);
|
|
@@ -66,7 +71,12 @@ export class LionWebSyntaxValidator {
|
|
|
66
71
|
this.validateLwMetaPointer = (obj, ctx) => {
|
|
67
72
|
const expected = [
|
|
68
73
|
{ property: "key", expectedType: "string", mayBeNull: NOT_NULL, validateValue: this.simpleFieldValidator.validateKey },
|
|
69
|
-
{
|
|
74
|
+
{
|
|
75
|
+
property: "version",
|
|
76
|
+
expectedType: "string",
|
|
77
|
+
mayBeNull: MAY_BE_NULL,
|
|
78
|
+
validateValue: this.simpleFieldValidator.validateVersion,
|
|
79
|
+
},
|
|
70
80
|
{ property: "language", expectedType: "string", mayBeNull: MAY_BE_NULL, validateValue: this.simpleFieldValidator.validateKey },
|
|
71
81
|
];
|
|
72
82
|
this.propertyChecks(obj, expected, ctx);
|
|
@@ -74,7 +84,7 @@ export class LionWebSyntaxValidator {
|
|
|
74
84
|
this.validateLwChild = (obj, ctx) => {
|
|
75
85
|
const expected = [
|
|
76
86
|
{ property: "containment", expectedType: "object", mayBeNull: NOT_NULL, validateValue: this.validateLwMetaPointer },
|
|
77
|
-
{ property: "children", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.checkChild }
|
|
87
|
+
{ property: "children", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.checkChild },
|
|
78
88
|
];
|
|
79
89
|
this.propertyChecks(obj, expected, ctx);
|
|
80
90
|
};
|
|
@@ -100,14 +110,14 @@ export class LionWebSyntaxValidator {
|
|
|
100
110
|
this.validateLwReference = (obj, ctx) => {
|
|
101
111
|
const expected = [
|
|
102
112
|
{ property: "reference", expectedType: "object", mayBeNull: NOT_NULL, validateValue: this.validateLwMetaPointer },
|
|
103
|
-
{ property: "targets", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.validateLwReferenceTarget }
|
|
113
|
+
{ property: "targets", expectedType: "array", mayBeNull: NOT_NULL, validateValue: this.validateLwReferenceTarget },
|
|
104
114
|
];
|
|
105
115
|
this.propertyChecks(obj, expected, ctx);
|
|
106
116
|
};
|
|
107
117
|
this.validateLwReferenceTarget = (obj, ctx) => {
|
|
108
118
|
const expected = [
|
|
109
119
|
{ property: "resolveInfo", expectedType: "string", mayBeNull: MAY_BE_NULL },
|
|
110
|
-
{ property: "reference", expectedType: "string", mayBeNull: MAY_BE_NULL, validateValue: this.simpleFieldValidator.validateId }
|
|
120
|
+
{ property: "reference", expectedType: "string", mayBeNull: MAY_BE_NULL, validateValue: this.simpleFieldValidator.validateId },
|
|
111
121
|
];
|
|
112
122
|
this.propertyChecks(obj, expected, ctx);
|
|
113
123
|
};
|
|
@@ -185,7 +195,7 @@ export class LionWebSyntaxValidator {
|
|
|
185
195
|
}
|
|
186
196
|
const object = obj;
|
|
187
197
|
const allProperties = [];
|
|
188
|
-
propDefs.forEach(
|
|
198
|
+
propDefs.forEach(propDef => {
|
|
189
199
|
if (propDef.property === "key") {
|
|
190
200
|
// console.log("CHECKING KEY of " + JSON.stringify(obj))
|
|
191
201
|
}
|
|
@@ -223,12 +233,12 @@ export class LionWebSyntaxValidator {
|
|
|
223
233
|
*/
|
|
224
234
|
checkStrayProperties(obj, properties, context) {
|
|
225
235
|
const own = Object.getOwnPropertyNames(obj);
|
|
226
|
-
own.forEach(
|
|
236
|
+
own.forEach(ownProp => {
|
|
227
237
|
if (!properties.includes(ownProp)) {
|
|
228
238
|
this.validationResult.issue(new Syntax_PropertyUnknownIssue(context, ownProp));
|
|
229
239
|
}
|
|
230
240
|
});
|
|
231
|
-
properties.forEach(
|
|
241
|
+
properties.forEach(prop => {
|
|
232
242
|
if (!own.includes(prop)) {
|
|
233
243
|
this.validationResult.issue(new Syntax_PropertyMissingIssue(context, prop));
|
|
234
244
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebSyntaxValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebSyntaxValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,8BAA8B,EAC9B,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"LionWebSyntaxValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebSyntaxValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,
|
|
1
|
+
{"version":3,"file":"LionWebValidator.d.ts","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAEhF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD;;;GAGG;AACH,qBAAa,gBAAgB;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,yBAAyB,GAAG,IAAI,CAAO;IAEjD,KAAK,EAAE,OAAO,CAAA;IACd,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,sBAAsB,CAAA;IACvC,kBAAkB,EAAE,yBAAyB,CAAA;IAC7C,aAAa,EAAE,OAAO,CAAQ;IAC9B,iBAAiB,EAAE,OAAO,CAAQ;gBAEtB,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAyB,GAAG,IAAI;IAQjE,WAAW;IAMX,cAAc;IASd,kBAAkB,IAAI,IAAI;IAU1B,mBAAmB,IAAI,IAAI;CAmB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LionWebValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,
|
|
1
|
+
{"version":3,"file":"LionWebValidator.js","sourceRoot":"","sources":["../../src/validators/LionWebValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAE5E,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAA;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAWzB,YAAY,IAAa,EAAE,IAAsC;QATjE,aAAQ,GAAqC,IAAI,CAAA;QAMjD,kBAAa,GAAY,KAAK,CAAA;QAC9B,sBAAiB,GAAY,KAAK,CAAA;QAG9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,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,SAAS,GAAG,IAAI,CAAA;QACrC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC1C,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,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACxD,MAAM,0BAA0B,GAAG,IAAI,iCAAiC,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC9G,gEAAgE;YAChE,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAA;QAC9E,CAAC;IACL,CAAC;CAKJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { JsonContext } from "
|
|
1
|
+
import { JsonContext } from "../json/JsonContext.js";
|
|
2
2
|
import { LionWebJsonProperty } from "../json/LionWebJson.js";
|
|
3
3
|
import { ValidationResult } from "./ValidationResult.js";
|
|
4
4
|
export type ValidatorFunction = <T>(obj: T, ctx: JsonContext) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleFieldValidator.d.ts","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"
|
|
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,CAM3F;IAED,kCAAkC,eAAgB,OAAO,WAAW,WAAW,KAAG,IAAI,CASrF;CACJ"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Language_PropertyValue_Issue } from "../issues/LanguageIssues.js";
|
|
2
|
-
import { Syntax_IdFormat_Issue, Syntax_KeyFormat_Issue, Syntax_SerializationFormatVersion_Issue, Syntax_VersionFormat_Issue } from "../issues/SyntaxIssues.js";
|
|
2
|
+
import { Syntax_IdFormat_Issue, Syntax_KeyFormat_Issue, Syntax_SerializationFormatVersion_Issue, Syntax_VersionFormat_Issue, } from "../issues/SyntaxIssues.js";
|
|
3
3
|
export class SimpleFieldValidator {
|
|
4
4
|
constructor(validationResult) {
|
|
5
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleFieldValidator.js","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"SimpleFieldValidator.js","sourceRoot":"","sources":["../../src/validators/SimpleFieldValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationResult.d.ts","sourceRoot":"","sources":["../../src/validators/ValidationResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,
|
|
1
|
+
{"version":3,"file":"ValidationResult.d.ts","sourceRoot":"","sources":["../../src/validators/ValidationResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE9D,qBAAa,gBAAgB;IACzB,MAAM,EAAE,eAAe,EAAE,CAAK;IAE9B,KAAK,CAAC,KAAK,EAAE,eAAe;IAI5B,KAAK;IAIL,SAAS,IAAI,OAAO;CAGvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationResult.js","sourceRoot":"","sources":["../../src/validators/ValidationResult.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAA7B;QACI,WAAM,GAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"ValidationResult.js","sourceRoot":"","sources":["../../src/validators/ValidationResult.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAA7B;QACI,WAAM,GAAsB,EAAE,CAAA;IAalC,CAAC;IAXG,KAAK,CAAC,KAAsB;QACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;IACnC,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/validation",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0-beta.2",
|
|
4
4
|
"license": "Apache 2.0",
|
|
5
5
|
"description": "LionWeb Serialization validation",
|
|
6
6
|
"author": "jos.warmer@openmodeling.nl",
|
|
@@ -19,7 +19,10 @@
|
|
|
19
19
|
"testInvalid": "node dist/runners/RunCheckFolder.js ../../../lionweb-integration-testing/testset/invalid",
|
|
20
20
|
"testInvalidWithLanguage": "node dist/runners/RunCheckFolderWithLanguage.js ../../../lionweb-integration-testing/testset/withLanguage/invalid/ ../../../lionweb-integration-testing/testset/withLanguage/myLang.language.json",
|
|
21
21
|
"testValidWithLanguage": "node dist/runners/RunCheckFolderWithLanguage.js ../../../lionweb-integration-testing/testset/withLanguage/valid/ ../../../lionweb-integration-testing/testset/withLanguage/myLang.language.json",
|
|
22
|
-
"test": "mocha"
|
|
22
|
+
"test": "mocha",
|
|
23
|
+
"publish-local": "npm publish --registry http://localhost:4873",
|
|
24
|
+
"unpublish-local": "npm unpublish --force --registry http://localhost:4873",
|
|
25
|
+
"republish-local": "yarn unpublish-local && yarn publish-local"
|
|
23
26
|
},
|
|
24
27
|
"devDependencies": {
|
|
25
28
|
"@types/node": "20.10.4",
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Change } from "./changes/Change.js"
|
|
2
|
+
|
|
3
|
+
export class DiffResult {
|
|
4
|
+
changes: Change[] = []
|
|
5
|
+
|
|
6
|
+
change(issue: Change) {
|
|
7
|
+
this.changes.push(issue)
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
reset() {
|
|
11
|
+
this.changes = []
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
hasChanges(): boolean {
|
|
15
|
+
return this.changes.length !== 0
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
asStringArray(): string[] {
|
|
19
|
+
return this.changes.map(ch => ch.changeMsg())
|
|
20
|
+
}
|
|
21
|
+
}
|
|
@@ -0,0 +1,259 @@
|
|
|
1
|
+
import { JsonContext } from "../issues/index.js"
|
|
2
|
+
import {
|
|
3
|
+
ChunkUtils,
|
|
4
|
+
isEqualMetaPointer,
|
|
5
|
+
LionWebJsonContainment,
|
|
6
|
+
LionWebJsonChunk,
|
|
7
|
+
LionWebJsonNode,
|
|
8
|
+
LionWebJsonProperty,
|
|
9
|
+
LionWebJsonReference,
|
|
10
|
+
LwJsonUsedLanguage,
|
|
11
|
+
NodeUtils, LionWebJsonReferenceTarget
|
|
12
|
+
} from "../json/index.js"
|
|
13
|
+
import { Change, GenericChange } from "./changes/Change.js"
|
|
14
|
+
import { LanguageAdded, LanguageRemoved, NodeAdded, NodeRemoved, SerializationFormatChange } from "./changes/ChunkChange.js"
|
|
15
|
+
import { ChildAdded, ChildRemoved } from "./changes/ContainmentChange.js"
|
|
16
|
+
import { TargetAdded, TargetRemoved } from "./changes/index.js"
|
|
17
|
+
import { DiffResult } from "./DiffResult.js"
|
|
18
|
+
import { NodeClassifierChanged, ParentChanged } from "./changes/NodeChange.js"
|
|
19
|
+
import { PropertyValueChanged } from "./changes/PropertyChange.js"
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Comparing LionWeb JSON chunks and find all differences
|
|
23
|
+
*/
|
|
24
|
+
export class LionWebJsonDiff {
|
|
25
|
+
diffResult = new DiffResult()
|
|
26
|
+
|
|
27
|
+
constructor() {}
|
|
28
|
+
|
|
29
|
+
change(change: Change): void {
|
|
30
|
+
this.diffResult.change(change)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
diff(ctx: JsonContext, msg: string) {
|
|
34
|
+
const change = new GenericChange(ctx, msg)
|
|
35
|
+
this.diffResult.change(change)
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Compare two LwNode objects and return their difference
|
|
40
|
+
* @param beforeNode
|
|
41
|
+
* @param afterNode
|
|
42
|
+
*/
|
|
43
|
+
diffLwNode(ctx: JsonContext, beforeNode: LionWebJsonNode, afterNode: LionWebJsonNode): void {
|
|
44
|
+
if (!isEqualMetaPointer(beforeNode.classifier, afterNode.classifier)) {
|
|
45
|
+
this.change(
|
|
46
|
+
new NodeClassifierChanged(ctx.concat("classifier"), beforeNode, beforeNode.classifier, afterNode.classifier),
|
|
47
|
+
)
|
|
48
|
+
}
|
|
49
|
+
if (beforeNode.parent !== afterNode.parent) {
|
|
50
|
+
this.change(new ParentChanged(ctx, beforeNode, beforeNode.parent, afterNode.parent))
|
|
51
|
+
}
|
|
52
|
+
// Find diff between previous and next properties
|
|
53
|
+
beforeNode.properties.forEach((beforeProperty: LionWebJsonProperty, index: number) => {
|
|
54
|
+
const key = beforeProperty.property.key
|
|
55
|
+
const afterProperty = NodeUtils.findLwProperty(afterNode, key)
|
|
56
|
+
if (afterProperty === null) {
|
|
57
|
+
this.change(
|
|
58
|
+
new PropertyValueChanged(
|
|
59
|
+
ctx.concat("properties", index),
|
|
60
|
+
beforeNode.id,
|
|
61
|
+
beforeProperty.property,
|
|
62
|
+
beforeProperty.value,
|
|
63
|
+
undefined,
|
|
64
|
+
),
|
|
65
|
+
)
|
|
66
|
+
} else {
|
|
67
|
+
this.diffLwProperty(ctx.concat("properties", index), beforeNode, beforeProperty, afterProperty)
|
|
68
|
+
}
|
|
69
|
+
})
|
|
70
|
+
afterNode.properties.forEach((afterProperty: LionWebJsonProperty, index: number) => {
|
|
71
|
+
const key = afterProperty.property.key
|
|
72
|
+
const beforeProperty = NodeUtils.findLwProperty(beforeNode, key)
|
|
73
|
+
if (beforeProperty === null) {
|
|
74
|
+
this.change(
|
|
75
|
+
new PropertyValueChanged(
|
|
76
|
+
ctx.concat("properties", index),
|
|
77
|
+
beforeNode.id,
|
|
78
|
+
afterProperty.property,
|
|
79
|
+
undefined,
|
|
80
|
+
afterProperty.value,
|
|
81
|
+
),
|
|
82
|
+
)
|
|
83
|
+
}
|
|
84
|
+
// no else, if the property exists in both nodes, the diff has been claculated in the loop before this one
|
|
85
|
+
})
|
|
86
|
+
beforeNode.containments.forEach((beforeContainment: LionWebJsonContainment, index: number) => {
|
|
87
|
+
const beforeKey = beforeContainment.containment.key
|
|
88
|
+
const afterContainment = NodeUtils.findLwChild(afterNode, beforeKey)
|
|
89
|
+
if (afterContainment === null) {
|
|
90
|
+
// NB No containment is considered equivalent to a containment with empty _children_
|
|
91
|
+
if (beforeContainment.children.length !== 0) {
|
|
92
|
+
beforeContainment.children.forEach(childId => {
|
|
93
|
+
this.change(new ChildRemoved(ctx.concat("containments", index), beforeNode, beforeContainment.containment, childId))
|
|
94
|
+
})
|
|
95
|
+
}
|
|
96
|
+
} else {
|
|
97
|
+
this.diffContainment(ctx.concat("containments", index), beforeNode, beforeContainment, afterContainment)
|
|
98
|
+
}
|
|
99
|
+
})
|
|
100
|
+
afterNode.containments.forEach((afterContainment: LionWebJsonContainment, index: number) => {
|
|
101
|
+
const afterKey = afterContainment.containment.key
|
|
102
|
+
const beforeContainment = NodeUtils.findLwChild(beforeNode, afterKey)
|
|
103
|
+
if (beforeContainment === null) {
|
|
104
|
+
if (afterContainment.children.length !== 0) {
|
|
105
|
+
afterContainment.children.forEach(childId => {
|
|
106
|
+
this.change(new ChildAdded(ctx.concat("containments", index), afterNode, afterContainment.containment, childId))
|
|
107
|
+
})
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
// No else, has already been done
|
|
111
|
+
})
|
|
112
|
+
beforeNode.references.forEach((beforeReference: LionWebJsonReference, index: number) => {
|
|
113
|
+
const key = beforeReference.reference.key
|
|
114
|
+
const afterReference = NodeUtils.findLwReference(afterNode, key)
|
|
115
|
+
if (afterReference === null) {
|
|
116
|
+
if (beforeReference.targets.length !== 0) {
|
|
117
|
+
beforeReference.targets.forEach(target => {
|
|
118
|
+
this.change(new TargetRemoved(ctx.concat("references", index), afterNode, beforeReference.reference, target.reference))
|
|
119
|
+
})
|
|
120
|
+
}
|
|
121
|
+
} else {
|
|
122
|
+
this.diffLwReference(ctx.concat("references", index), beforeNode, beforeReference, afterReference)
|
|
123
|
+
}
|
|
124
|
+
})
|
|
125
|
+
afterNode.references.forEach((afterReference: LionWebJsonReference, index: number) => {
|
|
126
|
+
const afterKey = afterReference.reference.key
|
|
127
|
+
const beforeReference = NodeUtils.findLwReference(afterNode, afterKey)
|
|
128
|
+
if (beforeReference === null) {
|
|
129
|
+
if (afterReference.targets.length !== 0) {
|
|
130
|
+
afterReference.targets.forEach(target => {
|
|
131
|
+
this.change(new TargetAdded(ctx.concat("references", index), afterNode, afterReference.reference, target.reference))
|
|
132
|
+
})
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
})
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
diffLwChunk(beforeChunk: LionWebJsonChunk, afterChunk: LionWebJsonChunk): void {
|
|
139
|
+
const ctx = new JsonContext(null, ["$"])
|
|
140
|
+
console.log("Comparing chunks")
|
|
141
|
+
if (beforeChunk.serializationFormatVersion !== afterChunk.serializationFormatVersion) {
|
|
142
|
+
this.change(
|
|
143
|
+
new SerializationFormatChange(
|
|
144
|
+
ctx.concat("serializationFormatVersion"),
|
|
145
|
+
beforeChunk.serializationFormatVersion,
|
|
146
|
+
afterChunk.serializationFormatVersion,
|
|
147
|
+
),
|
|
148
|
+
)
|
|
149
|
+
}
|
|
150
|
+
beforeChunk.languages.forEach((beforeLanguage: LwJsonUsedLanguage, index: number) => {
|
|
151
|
+
const afterLanguage = ChunkUtils.findLwUsedLanguage(afterChunk, beforeLanguage.key)
|
|
152
|
+
if (afterLanguage === null) {
|
|
153
|
+
this.change(new LanguageRemoved(ctx.concat("languages", index), beforeLanguage))
|
|
154
|
+
} else {
|
|
155
|
+
this.diffLwUsedLanguage(ctx.concat("languages", index), beforeLanguage, afterLanguage)
|
|
156
|
+
}
|
|
157
|
+
})
|
|
158
|
+
afterChunk.languages.forEach((afterLanguage: LwJsonUsedLanguage, index: number) => {
|
|
159
|
+
const beforeLanguage = ChunkUtils.findLwUsedLanguage(beforeChunk, afterLanguage.key)
|
|
160
|
+
if (beforeLanguage === null) {
|
|
161
|
+
this.change(new LanguageAdded(ctx.concat("languages", index), afterLanguage))
|
|
162
|
+
}
|
|
163
|
+
})
|
|
164
|
+
beforeChunk.nodes.forEach((beforeNode: LionWebJsonNode, index: number) => {
|
|
165
|
+
const beforeId = beforeNode.id
|
|
166
|
+
const afterNode = ChunkUtils.findNode(afterChunk, beforeId)
|
|
167
|
+
const newCtx = ctx.concat("nodes", index)
|
|
168
|
+
if (afterNode === null || afterNode === undefined) {
|
|
169
|
+
this.change(new NodeRemoved(ctx, beforeNode))
|
|
170
|
+
} else {
|
|
171
|
+
this.diffLwNode(newCtx, beforeNode, afterNode)
|
|
172
|
+
}
|
|
173
|
+
})
|
|
174
|
+
afterChunk.nodes.forEach((afterNode: LionWebJsonNode, index: number) => {
|
|
175
|
+
const afterId = afterNode.id
|
|
176
|
+
const beforeNode = ChunkUtils.findNode(beforeChunk, afterId)
|
|
177
|
+
if (beforeNode === null) {
|
|
178
|
+
this.change(new NodeAdded(ctx.concat("nodes", index), afterNode))
|
|
179
|
+
}
|
|
180
|
+
})
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
diffContainment(
|
|
184
|
+
ctx: JsonContext,
|
|
185
|
+
node: LionWebJsonNode,
|
|
186
|
+
beforeContainment: LionWebJsonContainment,
|
|
187
|
+
afterContainment: LionWebJsonContainment,
|
|
188
|
+
): void {
|
|
189
|
+
if (!isEqualMetaPointer(beforeContainment.containment, afterContainment.containment)) {
|
|
190
|
+
console.error("diffContainment: MetaPointers of containments should be identical")
|
|
191
|
+
this.diff(
|
|
192
|
+
ctx,
|
|
193
|
+
`Containment Object has concept ${JSON.stringify(beforeContainment.containment)} vs ${JSON.stringify(
|
|
194
|
+
afterContainment.containment,
|
|
195
|
+
)}`,
|
|
196
|
+
)
|
|
197
|
+
}
|
|
198
|
+
// Check whether children exist in both objects (two for loops)
|
|
199
|
+
// TODO Also check for the order that can be changed!!!
|
|
200
|
+
for (const childId1 of beforeContainment.children) {
|
|
201
|
+
if (!afterContainment.children.includes(childId1)) {
|
|
202
|
+
this.change(new ChildRemoved(ctx, node, beforeContainment.containment, childId1))
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
for (const childId2 of afterContainment.children) {
|
|
206
|
+
if (!beforeContainment.children.includes(childId2)) {
|
|
207
|
+
this.change(new ChildAdded(ctx, node, beforeContainment.containment, childId2))
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
diffLwReference(ctx: JsonContext, node: LionWebJsonNode, beforeRef: LionWebJsonReference, afterRef: LionWebJsonReference): void {
|
|
213
|
+
if (!isEqualMetaPointer(beforeRef.reference, afterRef.reference)) {
|
|
214
|
+
console.error("diffContainment: MetaPointers of containments should be identical")
|
|
215
|
+
this.diff(ctx, `Reference has concept ${JSON.stringify(beforeRef.reference)} vs ${JSON.stringify(afterRef.reference)}`)
|
|
216
|
+
}
|
|
217
|
+
beforeRef.targets.forEach((beforeTarget: LionWebJsonReferenceTarget, index: number) => {
|
|
218
|
+
const afterTarget = NodeUtils.findLwReferenceTarget(afterRef.targets, beforeTarget)
|
|
219
|
+
if (afterTarget === null) {
|
|
220
|
+
// this.change(new TargetRemoved(ctx.concat("targets", index), node, target))
|
|
221
|
+
// this.diff(ctx, `REFERENCE Target ${JSON.stringify(beforeTarget)} missing in second `)
|
|
222
|
+
this.change(new TargetRemoved(ctx.concat("targets", index), node, beforeRef.reference, beforeTarget.reference))
|
|
223
|
+
} else {
|
|
224
|
+
if (beforeTarget.reference !== afterTarget.reference || beforeTarget.resolveInfo !== afterTarget.resolveInfo) {
|
|
225
|
+
this.diff(ctx.concat("targets", index), `REFERENCE target ${JSON.stringify(beforeTarget)} vs ${JSON.stringify(afterTarget)}`)
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
})
|
|
229
|
+
for (const target of afterRef.targets) {
|
|
230
|
+
if (NodeUtils.findLwReferenceTarget(beforeRef.targets, target) === null) {
|
|
231
|
+
this.diff(ctx, `REFERENCE Target ${JSON.stringify(target)} missing in first `)
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
private diffLwUsedLanguage(ctx: JsonContext, obj1: LwJsonUsedLanguage, obj2: LwJsonUsedLanguage) {
|
|
237
|
+
if (obj1.key !== obj2.key || obj1.version !== obj2.version) {
|
|
238
|
+
this.diff(ctx, `Different used languages ${JSON.stringify(obj1)} vs ${JSON.stringify(obj2)}`)
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
private diffLwProperty(
|
|
243
|
+
ctx: JsonContext,
|
|
244
|
+
node: LionWebJsonNode,
|
|
245
|
+
beforeProperty: LionWebJsonProperty,
|
|
246
|
+
afterProperty: LionWebJsonProperty,
|
|
247
|
+
) {
|
|
248
|
+
if (!isEqualMetaPointer(beforeProperty.property, afterProperty.property)) {
|
|
249
|
+
console.error("diffContainment: MetaPointers of containments should be identical")
|
|
250
|
+
this.diff(
|
|
251
|
+
ctx,
|
|
252
|
+
`Property Object has concept ${JSON.stringify(beforeProperty.property)} vs ${JSON.stringify(afterProperty.property)}`,
|
|
253
|
+
)
|
|
254
|
+
}
|
|
255
|
+
if (beforeProperty.value !== afterProperty.value) {
|
|
256
|
+
this.change(new PropertyValueChanged(ctx, node.id, beforeProperty.property, beforeProperty.value, afterProperty.value))
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
}
|