@lionweb/validation 0.5.0 → 0.6.0-beta.2

package/dist/diff/LionwebDiff.d.ts

@@ -1,40 +0,0 @@
-import { LionWebSyntaxValidator } from "../validators/LionWebSyntaxValidator.js";
-import { LionWebJsonChild, LionWebJsonChunk, LionWebJsonNode, LionWebJsonReference } from "../json/LionWebJson.js";
-export type ChangedType = {
-    path: string;
-    oldValue: unknown;
-    newValue: unknown;
-};
-export type AddedOrDeletedType = {
-    path: string;
-    value: unknown;
-};
-export type MatchedType = {
-    path: string;
-    value: unknown;
-};
-export type ResultType = {
-    matched: MatchedType[];
-    changed: ChangedType[];
-    added: AddedOrDeletedType[];
-    deleted: AddedOrDeletedType[];
-};
-export declare class LwDiff {
-    errors: string[];
-    lwChecker: LionWebSyntaxValidator;
-    constructor();
-    error(msg: string): void;
-    check(b: boolean, message: string): void;
-    /**
-     * Compare two LwNode objects and return their difference
-     * @param obj1
-     * @param obj2
-     */
-    diffLwNode(obj1: LionWebJsonNode, obj2: LionWebJsonNode): void;
-    diffLwChunk(chunk1: LionWebJsonChunk, chunk2: LionWebJsonChunk): void;
-    diffLwChild(obj1: LionWebJsonChild, obj2: LionWebJsonChild): void;
-    diffLwReference(ref1: LionWebJsonReference, ref2: LionWebJsonReference): void;
-    private diffLwUsedLanguage;
-    private diffLwProperty;
-}
-//# sourceMappingURL=LionwebDiff.d.ts.map

package/dist/diff/LionwebDiff.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LionwebDiff.d.ts","sourceRoot":"","sources":["../../src/diff/LionwebDiff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAEH,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACvB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACrB,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IACrB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,OAAO,EAAE,kBAAkB,EAAE,CAAC;CACjC,CAAC;AAEF,qBAAa,MAAM;IACf,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,SAAS,yBAAsD;;IAM/D,KAAK,CAAC,GAAG,EAAE,MAAM;IAIjB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAMxC;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI;IAuC9D,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI;IA0CrE,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAkBjE,eAAe,CAAC,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,GAAG,IAAI;IAsB7E,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,cAAc;CAQzB"}

package/dist/diff/LionwebDiff.js

@@ -1,158 +0,0 @@
-// TODO The diff is outdated and need work to become fully functional again.
-import { LionWebSyntaxValidator } from "../validators/LionWebSyntaxValidator.js";
-import { isEqualMetaPointer, } from "../json/LionWebJson.js";
-import { NodeUtils } from "../json/NodeUtils.js";
-import { ChunkUtils } from "../json/ChunkUtils.js";
-import { ValidationResult } from "../validators/ValidationResult.js";
-export class LwDiff {
-    constructor() {
-        this.errors = [];
-        this.lwChecker = new LionWebSyntaxValidator(new ValidationResult());
-        this.lwChecker.recursive = false;
-    }
-    error(msg) {
-        this.errors.push(msg + "\n");
-    }
-    check(b, message) {
-        if (!b) {
-            this.error("Check error: " + message);
-        }
-    }
-    /**
-     * Compare two LwNode objects and return their difference
-     * @param obj1
-     * @param obj2
-     */
-    diffLwNode(obj1, obj2) {
-        // console.log("Comparing nodes")
-        if (!isEqualMetaPointer(obj1.classifier, obj2.classifier)) {
-            this.error(`Object ${obj1.id} has classifier ${JSON.stringify(obj1.classifier)} vs. ${JSON.stringify(obj2.classifier)}`);
-        }
-        if (obj1.parent !== obj2.parent) {
-            this.error(`Object ${obj1.id} has parent ${obj1.parent} vs. ${obj2.parent}`);
-        }
-        for (const property of obj1.properties) {
-            const key = property.property.key;
-            // console.log(`    property ${key} of node ${obj1.id}`)
-            const otherProp = NodeUtils.findLwProperty(obj2, key);
-            if (otherProp === null) {
-                this.error(`Property with concept key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwProperty(prop, otherProp);
-        }
-        for (const containment of obj1.containments) {
-            const key = containment.containment.key;
-            // console.log(`    property ${key} of node ${obj1.id}`)
-            const otherChild = NodeUtils.findLwChild(obj2, key);
-            if (otherChild === null) {
-                this.error(`Child with containment key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwChild(child, otherChild);
-        }
-        for (const reference of obj1.references) {
-            const key = reference.reference.key;
-            const otherref = NodeUtils.findLwReference(obj2, key);
-            if (otherref === null) {
-                this.error(`Child with containment key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwReference(ref, otherref);
-        }
-    }
-    diffLwChunk(chunk1, chunk2) {
-        console.log("Comparing chuncks");
-        if (chunk1.serializationFormatVersion !== chunk2.serializationFormatVersion) {
-            this.error(`Serialization versions do not match: ${chunk1.serializationFormatVersion} vs ${chunk2.serializationFormatVersion}`);
-        }
-        for (const language of chunk1.languages) {
-            const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk2, language.key);
-            if (otherLanguage === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Language with  key ${language.key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwUsedLanguage(language, otherLanguage);
-        }
-        for (const language of chunk2.languages) {
-            console.log("Comparing languages");
-            const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk1, language.key);
-            if (otherLanguage === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Language with  key ${language.key} does not exist in first object`);
-            }
-        }
-        for (const node of chunk1.nodes) {
-            const id = node.id;
-            const otherNode = ChunkUtils.findNode(chunk2, id);
-            if (otherNode === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Node with concept key ${id} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwNode(node, otherNode);
-        }
-        for (const node of chunk2.nodes) {
-            const id = node.id;
-            const otherNode = ChunkUtils.findNode(chunk1, id);
-            if (otherNode === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Node with concept key ${id} does not exist in first object`);
-            }
-        }
-    }
-    diffLwChild(obj1, obj2) {
-        if (!isEqualMetaPointer(obj1.containment, obj2.containment)) {
-            // return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
-            this.error(`Child Object has concept ${JSON.stringify(obj1.containment)} vs ${JSON.stringify(obj2.containment)}`);
-        }
-        // Check whether children exist in both objects (two for loops)
-        for (const childId1 of obj1.children) {
-            if (!obj2.children.includes(childId1)) {
-                this.error(`Child ${childId1} is missing in other object`);
-            }
-        }
-        for (const childId2 of obj2.children) {
-            if (!obj1.children.includes(childId2)) {
-                console.error(`Child ${childId2} is missing in first object`);
-            }
-        }
-    }
-    diffLwReference(ref1, ref2) {
-        if (!isEqualMetaPointer(ref1.reference, ref2.reference)) {
-            // return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
-            this.error(`Reference has concept ${JSON.stringify(ref1.reference)} vs ${JSON.stringify(ref2.reference)}`);
-        }
-        for (const target of ref1.targets) {
-            const otherTarget = NodeUtils.findLwReferenceTarget(ref2.targets, target);
-            if (otherTarget === null) {
-                console.error(`REFERENCE Target ${JSON.stringify(target)} missing in second `);
-            }
-            else {
-                if (target.reference !== otherTarget.reference || target.resolveInfo !== otherTarget.resolveInfo) {
-                    this.error(`REFERENCE target ${JSON.stringify(target)} vs ${JSON.stringify(otherTarget)}`);
-                }
-            }
-        }
-        for (const target of ref2.targets) {
-            if (NodeUtils.findLwReferenceTarget(ref1.targets, target) === null) {
-                this.error(`REFERENCE Target ${JSON.stringify(target)} missing in first `);
-            }
-        }
-    }
-    diffLwUsedLanguage(obj1, obj2) {
-        if (obj1.key !== obj2.key || obj1.version !== obj2.version) {
-            this.error(`Different used languages ${JSON.stringify(obj1)} vs ${JSON.stringify(obj2)}`);
-        }
-    }
-    diffLwProperty(obj1, obj2) {
-        if (!isEqualMetaPointer(obj1.property, obj2.property)) {
-            this.error(`Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`);
-        }
-        if (obj1.value !== obj2.value) {
-            this.error(`Property ${obj1.property.key} has value ${obj1.value} vs ${obj2.value}`);
-        }
-    }
-}
-//# sourceMappingURL=LionwebDiff.js.map

package/dist/diff/LionwebDiff.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LionwebDiff.js","sourceRoot":"","sources":["../../src/diff/LionwebDiff.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EACH,kBAAkB,GAKrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAsBrE,MAAM,OAAO,MAAM;IAIf;QAHA,WAAM,GAAa,EAAE,CAAC;QACtB,cAAS,GAAG,IAAI,sBAAsB,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QAG3D,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,CAAU,EAAE,OAAe;QAC7B,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,IAAqB,EAAE,IAAqB;QACnD,iCAAiC;QACjC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,mBAAmB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7H,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,eAAe,IAAI,CAAC,MAAM,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;YAClC,wDAAwD;YACxD,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACtD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACrB,IAAI,CAAC,KAAK,CAAC,6BAA6B,GAAG,kCAAkC,CAAC,CAAC;gBAC/E,SAAS;YACb,CAAC;YACD,oDAAoD;QACxD,CAAC;QACD,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC;YACxC,wDAAwD;YACxD,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACpD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,KAAK,CAAC,8BAA8B,GAAG,kCAAkC,CAAC,CAAC;gBAChF,SAAS;YACb,CAAC;YACD,mDAAmD;QACvD,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC;YACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACtD,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,8BAA8B,GAAG,kCAAkC,CAAC,CAAC;gBAChF,SAAS;YACb,CAAC;YACD,mDAAmD;QACvD,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAwB,EAAE,MAAwB;QAC1D,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,MAAM,CAAC,0BAA0B,KAAK,MAAM,CAAC,0BAA0B,EAAE,CAAC;YAC1E,IAAI,CAAC,KAAK,CAAC,wCAAwC,MAAM,CAAC,0BAA0B,OAAO,MAAM,CAAC,0BAA0B,EAAE,CAAC,CAAC;QACpI,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACtC,MAAM,aAAa,GAAG,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC1E,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBACzB,wGAAwG;gBACxG,IAAI,CAAC,KAAK,CAAC,sBAAsB,QAAQ,CAAC,GAAG,kCAAkC,CAAC,CAAC;gBACjF,SAAS;YACb,CAAC;YACD,gEAAgE;QACpE,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC1E,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBACzB,wGAAwG;gBACxG,IAAI,CAAC,KAAK,CAAC,sBAAsB,QAAQ,CAAC,GAAG,iCAAiC,CAAC,CAAC;YACpF,CAAC;QACL,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACrB,wGAAwG;gBACxG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,kCAAkC,CAAC,CAAC;gBAC1E,SAAS;YACb,CAAC;YACD,gDAAgD;QACpD,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACrB,wGAAwG;gBACxG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,iCAAiC,CAAC,CAAC;YAC7E,CAAC;QACL,CAAC;IACL,CAAC;IAED,WAAW,CAAC,IAAsB,EAAE,IAAsB;QACtD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,4IAA4I;YAC5I,IAAI,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACtH,CAAC;QACD,+DAA+D;QAC/D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,SAAS,QAAQ,6BAA6B,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,6BAA6B,CAAC,CAAC;YAClE,CAAC;QACL,CAAC;IACL,CAAC;IAED,eAAe,CAAC,IAA0B,EAAE,IAA0B;QAClE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,4IAA4I;YAC5I,IAAI,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,WAAW,GAAG,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1E,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACJ,IAAI,MAAM,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC,WAAW,EAAE,CAAC;oBAC/F,IAAI,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC/F,CAAC;YACL,CAAC;QACL,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;gBACjE,IAAI,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;IACL,CAAC;IAEO,kBAAkB,CAAC,IAAwB,EAAE,IAAwB;QACzE,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;YACzD,IAAI,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,IAAyB,EAAE,IAAyB;QACvE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACnH,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,GAAG,cAAc,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACzF,CAAC;IACL,CAAC;CACJ"}

package/dist/issues/JsonContext.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JsonContext.d.ts","sourceRoot":"","sources":["../../src/issues/JsonContext.ts"],"names":[],"mappings":"AAAA,KAAK,QAAQ,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAEpC,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,UAAU,CAAW;IAE7B,MAAM,CAAC,GAAI,KAAK,EAAE,QAAQ,GAAI,WAAW;IAIzC,IAAI,IAAI,QAAQ;gBAIJ,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ;IAKtD,QAAQ,IAAI,MAAM;CAWrB"}

package/dist/issues/JsonContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"JsonContext.js","sourceRoot":"","sources":["../../src/issues/JsonContext.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IAIpB,MAAM,CAAC,GAAI,KAAe;QACtB,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/F,CAAC;IAED,YAAY,MAA0B,EAAE,IAAc;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,QAAQ;QACJ,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YAC9C,CAAC;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,IAAI,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}

package/src/diff/LionwebDiff.ts

@@ -1,193 +0,0 @@
-// TODO The diff is outdated and need work to become fully functional again.
-
-import { LionWebSyntaxValidator } from "../validators/LionWebSyntaxValidator.js";
-import {
-    isEqualMetaPointer,
-    LionWebJsonChild,
-    LionWebJsonChunk,
-    LionWebJsonNode, LionWebJsonProperty,
-    LionWebJsonReference, LwJsonUsedLanguage,
-} from "../json/LionWebJson.js";
-import { NodeUtils } from "../json/NodeUtils.js";
-import { ChunkUtils } from "../json/ChunkUtils.js";
-import { ValidationResult } from "../validators/ValidationResult.js";
-
-export type ChangedType = {
-    path: string;
-    oldValue: unknown;
-    newValue: unknown;
-};
-export type AddedOrDeletedType = {
-    path: string;
-    value: unknown;
-};
-export type MatchedType = {
-    path: string;
-    value: unknown;
-};
-export type ResultType = {
-    matched: MatchedType[];
-    changed: ChangedType[];
-    added: AddedOrDeletedType[];
-    deleted: AddedOrDeletedType[];
-};
-
-export class LwDiff {
-    errors: string[] = [];
-    lwChecker = new LionWebSyntaxValidator(new ValidationResult());
-
-    constructor() {
-        this.lwChecker.recursive = false;
-    }
-
-    error(msg: string) {
-        this.errors.push(msg + "\n");
-    }
-
-    check(b: boolean, message: string): void {
-        if (!b) {
-            this.error("Check error: " + message);
-        }
-    }
-
-    /**
-     * Compare two LwNode objects and return their difference
-     * @param obj1
-     * @param obj2
-     */
-    diffLwNode(obj1: LionWebJsonNode, obj2: LionWebJsonNode): void {
-        // console.log("Comparing nodes")
-        if (!isEqualMetaPointer(obj1.classifier, obj2.classifier)) {
-            this.error(`Object ${obj1.id} has classifier ${JSON.stringify(obj1.classifier)} vs. ${JSON.stringify(obj2.classifier)}`);
-        }
-        if (obj1.parent !== obj2.parent) {
-            this.error(`Object ${obj1.id} has parent ${obj1.parent} vs. ${obj2.parent}`);
-        }
-        for (const property of obj1.properties) {
-            const key = property.property.key;
-            // console.log(`    property ${key} of node ${obj1.id}`)
-            const otherProp = NodeUtils.findLwProperty(obj2, key);
-            if (otherProp === null) {
-                this.error(`Property with concept key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwProperty(prop, otherProp);
-        }
-        for (const containment of obj1.containments) {
-            const key = containment.containment.key;
-            // console.log(`    property ${key} of node ${obj1.id}`)
-            const otherChild = NodeUtils.findLwChild(obj2, key);
-            if (otherChild === null) {
-                this.error(`Child with containment key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwChild(child, otherChild);
-        }
-        for (const reference of obj1.references) {
-            const key = reference.reference.key;
-            const otherref = NodeUtils.findLwReference(obj2, key);
-            if (otherref === null) {
-                this.error(`Child with containment key ${key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwReference(ref, otherref);
-        }
-    }
-
-    diffLwChunk(chunk1: LionWebJsonChunk, chunk2: LionWebJsonChunk): void {
-        console.log("Comparing chuncks");
-        if (chunk1.serializationFormatVersion !== chunk2.serializationFormatVersion) {
-            this.error(`Serialization versions do not match: ${chunk1.serializationFormatVersion} vs ${chunk2.serializationFormatVersion}`);
-        }
-        for (const language of chunk1.languages) {
-            const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk2, language.key);
-            if (otherLanguage === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Language with  key ${language.key} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwUsedLanguage(language, otherLanguage);
-        }
-        for (const language of chunk2.languages) {
-            console.log("Comparing languages");
-            const otherLanguage = ChunkUtils.findLwUsedLanguage(chunk1, language.key);
-            if (otherLanguage === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Language with  key ${language.key} does not exist in first object`);
-            }
-        }
-        for (const node of chunk1.nodes) {
-            const id = node.id;
-            const otherNode = ChunkUtils.findNode(chunk2, id);
-            if (otherNode === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Node with concept key ${id} does not exist in second object`);
-                continue;
-            }
-            // const tmp = this.diffLwNode(node, otherNode);
-        }
-        for (const node of chunk2.nodes) {
-            const id = node.id;
-            const otherNode = ChunkUtils.findNode(chunk1, id);
-            if (otherNode === null) {
-                // return { isEqual: false, diffMessage: `Node with concept key ${id} does not exist in second object`};
-                this.error(`Node with concept key ${id} does not exist in first object`);
-            }
-        }
-    }
-
-    diffLwChild(obj1: LionWebJsonChild, obj2: LionWebJsonChild): void {
-        if (!isEqualMetaPointer(obj1.containment, obj2.containment)) {
-            // return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
-            this.error(`Child Object has concept ${JSON.stringify(obj1.containment)} vs ${JSON.stringify(obj2.containment)}`);
-        }
-        // Check whether children exist in both objects (two for loops)
-        for (const childId1 of obj1.children) {
-            if (!obj2.children.includes(childId1)) {
-                this.error(`Child ${childId1} is missing in other object`);
-            }
-        }
-        for (const childId2 of obj2.children) {
-            if (!obj1.children.includes(childId2)) {
-                console.error(`Child ${childId2} is missing in first object`);
-            }
-        }
-    }
-
-    diffLwReference(ref1: LionWebJsonReference, ref2: LionWebJsonReference): void {
-        if (!isEqualMetaPointer(ref1.reference, ref2.reference)) {
-            // return { isEqual: false, diffMessage: `Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`}
-            this.error(`Reference has concept ${JSON.stringify(ref1.reference)} vs ${JSON.stringify(ref2.reference)}`);
-        }
-        for (const target of ref1.targets) {
-            const otherTarget = NodeUtils.findLwReferenceTarget(ref2.targets, target);
-            if (otherTarget === null) {
-                console.error(`REFERENCE Target ${JSON.stringify(target)} missing in second `);
-            } else {
-                if (target.reference !== otherTarget.reference || target.resolveInfo !== otherTarget.resolveInfo) {
-                    this.error(`REFERENCE target ${JSON.stringify(target)} vs ${JSON.stringify(otherTarget)}`);
-                }
-            }
-        }
-        for (const target of ref2.targets) {
-            if (NodeUtils.findLwReferenceTarget(ref1.targets, target) === null) {
-                this.error(`REFERENCE Target ${JSON.stringify(target)} missing in first `);
-            }
-        }
-    }
-
-    private diffLwUsedLanguage(obj1: LwJsonUsedLanguage, obj2: LwJsonUsedLanguage) {
-        if (obj1.key !== obj2.key || obj1.version !== obj2.version) {
-            this.error(`Different used languages ${JSON.stringify(obj1)} vs ${JSON.stringify(obj2)}`);
-        }
-    }
-
-    private diffLwProperty(obj1: LionWebJsonProperty, obj2: LionWebJsonProperty) {
-        if (!isEqualMetaPointer(obj1.property, obj2.property)) {
-            this.error(`Property Object has concept ${JSON.stringify(obj1.property)} vs ${JSON.stringify(obj2.property)}`);
-        }
-        if (obj1.value !== obj2.value) {
-            this.error(`Property ${obj1.property.key} has value ${obj1.value} vs ${obj2.value}`);
-        }
-    }
-}

package/src/issues/JsonContext.ts

@@ -1,31 +0,0 @@
-type JsonPath = (string | number)[];
-
-export class JsonContext {
-    private parent: JsonContext | null;
-    private local_path: JsonPath;
-
-    concat(... items: JsonPath) : JsonContext {
-        return new JsonContext(this, items);
-    }
-
-    path(): JsonPath {
-        return this.parent === null ? this.local_path : this.parent.path().concat(this.local_path);
-    }
-
-    constructor(parent: JsonContext | null, path: JsonPath) {
-        this.parent = parent;
-        this.local_path = path;
-    }
-
-    toString(): string {
-        let result = "";
-        this.path().forEach((part, index) => {
-            if (typeof part === "string") {
-                result += (index === 0 ? "" : ".") + part;
-            } else if (typeof part === "number") {
-                result += "[" + part + "]";
-            }
-        });
-        return result;
-    }
-}