@lionweb/validation 0.6.13-beta.7 → 0.7.0-beta.0

package/dist/validators/generic/SyntaxValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SyntaxValidator.js","sourceRoot":"","sources":["../../../src/validators/generic/SyntaxValidator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SyntaxValidator.js","sourceRoot":"","sources":["../../../src/validators/generic/SyntaxValidator.ts"],"names":[],"mappings":"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"}

package/dist/validators/generic/ValidationTypes.d.ts

@@ -1,4 +1,4 @@
-import { JsonContext } from "../../json/index.js";
+import { JsonContext } from "@lionweb/json-utils";
 import { ValidationResult } from "./ValidationResult.js";
 export type UnknownObjectType = {
     [key: string]: unknown;
@@ -28,6 +28,10 @@ export type PropertyDefinition = {
      * IS this a list property?
      */
     isList?: boolean;
+    /**
+     * Is this property optional?
+     */
+    isOptional?: boolean;
     /**
      * Additional validation function
      */
@@ -41,4 +45,24 @@ export declare const MAY_BE_NULL = true;
  * @constructor
  */
 export declare function PropertyDef(propDef: PropertyDefinition): PropertyDefinition;
+export type PrimitiveDefinition = {
+    /**
+     * The expected type of the property value
+     */
+    primitiveType: string;
+    /**
+     * Additional validation function
+     */
+    validate?: ValidatorFunction;
+};
+/**
+ * Easy way to create a PropertyDefinition typed object with default values.
+ * @param propDef
+ * @constructor
+ */
+export declare function PrimitiveDef(propDef: PrimitiveDefinition): PrimitiveDefinition;
+export type ObjectDefinition = PropertyDefinition[];
+export type TypeDefinition = ObjectDefinition | PrimitiveDefinition;
+export declare function isObjectDefinition(def: TypeDefinition): def is ObjectDefinition;
+export declare function isPrimitiveDefinition(def: TypeDefinition): def is PrimitiveDefinition;
 //# sourceMappingURL=ValidationTypes.d.ts.map

package/dist/validators/generic/ValidationTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationTypes.d.ts","sourceRoot":"","sources":["../../../src/validators/generic/ValidationTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAE1D;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAA;AAa1H,eAAO,MAAM,WAAW,OAAO,CAAA;AAE/B;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAS3E"}
+{"version":3,"file":"ValidationTypes.d.ts","sourceRoot":"","sources":["../../../src/validators/generic/ValidationTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAE1D;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAA;AAa1H,eAAO,MAAM,WAAW,OAAO,CAAA;AAE/B;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAU3E;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,mBAAmB,CAM9E;AACD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,EAAE,CAAA;AACnD,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,mBAAmB,CAAA;AAEnE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,GAAG,IAAI,gBAAgB,CAE/E;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,GAAG,IAAI,mBAAmB,CAErF"}

package/dist/validators/generic/ValidationTypes.js

@@ -15,13 +15,32 @@ export const MAY_BE_NULL = true;
  * @constructor
  */
 export function PropertyDef(propDef) {
-    const { property, expectedType, mayBeNull = false, isList = false, validate = emptyValidation } = propDef;
+    const { property, expectedType, mayBeNull = false, isList = false, isOptional = false, validate = emptyValidation } = propDef;
     return {
         property: property,
         expectedType: expectedType,
         isList: isList,
         mayBeNull: mayBeNull,
+        isOptional: isOptional,
         validate: validate
     };
 }
+/**
+ * Easy way to create a PropertyDefinition typed object with default values.
+ * @param propDef
+ * @constructor
+ */
+export function PrimitiveDef(propDef) {
+    const { primitiveType, validate = emptyValidation } = propDef;
+    return {
+        primitiveType: primitiveType,
+        validate: validate
+    };
+}
+export function isObjectDefinition(def) {
+    return Array.isArray(def);
+}
+export function isPrimitiveDefinition(def) {
+    return def?.primitiveType !== undefined;
+}
 //# sourceMappingURL=ValidationTypes.js.map

package/dist/validators/generic/ValidationTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationTypes.js","sourceRoot":"","sources":["../../../src/validators/generic/ValidationTypes.ts"],"names":[],"mappings":"AAsCA;;;;;;GAMG;AACH,6DAA6D;AAC7D,SAAS,eAAe,CAAI,MAAS,EAAE,MAAwB,EAAE,GAAgB,EAAG,IAAyB,IAAS,CAAC;AAEvH,uCAAuC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAA;AAE/B;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,OAA2B;IACnD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAA;IACzG,OAAO;QACH,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;KACrB,CAAA;AACL,CAAC"}
+{"version":3,"file":"ValidationTypes.js","sourceRoot":"","sources":["../../../src/validators/generic/ValidationTypes.ts"],"names":[],"mappings":"AA0CA;;;;;;GAMG;AACH,6DAA6D;AAC7D,SAAS,eAAe,CAAI,MAAS,EAAE,MAAwB,EAAE,GAAgB,EAAE,IAAyB,IAAS,CAAC;AAEtH,uCAAuC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAA;AAE/B;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,OAA2B;IACnD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAA;IAC7H,OAAO;QACH,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,UAAU;QACtB,QAAQ,EAAE,QAAQ;KACrB,CAAA;AACL,CAAC;AAYD;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,OAA4B;IACrD,MAAM,EAAE,aAAa,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAA;IAC7D,OAAO;QACH,aAAa,EAAE,aAAa;QAC5B,QAAQ,EAAE,QAAQ;KACrB,CAAA;AACL,CAAC;AAID,MAAM,UAAU,kBAAkB,CAAC,GAAmB;IAClD,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAmB;IACrD,OAAQ,GAA2B,EAAE,aAAa,KAAK,SAAS,CAAA;AACpE,CAAC"}

package/dist/validators/generic/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./ValidationTypes.js";
 export * from "./ValidationResult.js";
-export * from "../ValidationFunctions.js";
 export * from "./SyntaxValidator.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/validators/generic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}

package/dist/validators/generic/index.js

@@ -1,5 +1,4 @@
 export * from "./ValidationTypes.js";
 export * from "./ValidationResult.js";
-export * from "../ValidationFunctions.js";
 export * from "./SyntaxValidator.js";
 //# sourceMappingURL=index.js.map

package/dist/validators/generic/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}

package/dist/validators/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./generic/index.js";
-export * from "./generic/ValidationResult.js";
 export * from "./LionWebSyntaxValidator.js";
 export * from "./LionWebReferenceValidator.js";
 export * from "./LionWebLanguageValidator.js";

package/dist/validators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA"}

package/dist/validators/index.js

@@ -1,5 +1,4 @@
 export * from "./generic/index.js";
-export * from "./generic/ValidationResult.js";
 export * from "./LionWebSyntaxValidator.js";
 export * from "./LionWebReferenceValidator.js";
 export * from "./LionWebLanguageValidator.js";

package/dist/validators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionweb/validation",
-  "version": "0.6.13-beta.7",
+  "version": "0.7.0-beta.0",
   "license": "Apache 2.0",
   "description": "LionWeb Serialization validation",
   "author": "jos.warmer@openmodeling.nl",
@@ -14,14 +14,14 @@
     "testing"
   ],
   "scripts": {
-    "clean": "rm -rf dist/ lionweb-validation-*.tgz",
+    "clean": "rm -rf dist/ node_modules/ lionweb-validation-*.tgz",
     "build": "tsc && npm run copyM3 && npm run copyBuiltins",
     "copyM3": "node -e \"const fs = require('fs'); fs.copyFileSync('./src/languages/LionCore-M3.json', './dist/languages/LionCore-M3.json');\"",
     "copyBuiltins": "node -e \"const fs = require('fs'); fs.copyFileSync('./src/languages/LionCore-builtins.json', './dist/languages/LionCore-builtins.json');\"",
     "lint": "eslint src",
     "test-here": "cd ../test && find dist/validation -type d | sed '1!G;h;$!d' | xargs npx mocha",
-    "release": "npm publish",
-    "release-beta": "npm publish --tag beta",
+    "release": "npm publish --registry https://registry.npmjs.org",
+    "release-beta": "npm publish --registry https://registry.npmjs.org --tag beta",
     "testValid": "node dist/runners/RunCheckFolder.js ../test/testset/valid",
     "testInvalid": "node dist/runners/RunCheckFolder.js ../test/testset/invalid",
     "testInvalidWithLanguage": "node dist/runners/RunCheckFolderWithLanguage.js ../test/testset/withLanguage/invalid/ ../test/testset/withLanguage/myLang.language.json",
@@ -29,5 +29,10 @@
     "publish-local": "npm publish --registry http://localhost:4873",
     "unpublish-local": "npm unpublish --force --registry http://localhost:4873",
     "republish-local": "yarn unpublish-local && yarn publish-local"
+  },
+  "dependencies": {
+    "@lionweb/json": "0.7.0-beta.0",
+    "@lionweb/ts-utils": "0.7.0-beta.0",
+    "@lionweb/json-utils": "0.7.0-beta.0"
   }
 }

package/src/index.ts

@@ -1,7 +1,4 @@
 export * from "./issues/index.js"
-export * from "./json/index.js"
 export * from "./validators/index.js"
-export * from "./diff/index.js"
 export * from "./runners/index.js"
 export * from "./languages/index.js"
-export * from "./util/graphs.js"

package/src/issues/LanguageIssues.ts

@@ -1,5 +1,5 @@
-import { LionWebJsonMetaPointer, LionWebJsonNode } from "../json/LionWebJson.js"
-import { JsonContext } from "../json/JsonContext.js"
+import { LionWebJsonMetaPointer, LionWebJsonNode } from "@lionweb/json"
+import { JsonContext } from "@lionweb/json-utils"
 import { ValidationIssue } from "./ValidationIssue.js"
 
 export class Language_PropertyValue_Issue extends ValidationIssue {
@@ -8,13 +8,13 @@ export class Language_PropertyValue_Issue extends ValidationIssue {
     constructor(
         context: JsonContext,
         public property: string,
-        public value: (string | null),
-        public expectedType: string,
+        public value: string | null,
+        public expectedType: string
     ) {
         super(context)
     }
 
-    msg = (): string => `Property  "${this.property}" with value "${this.value}" is not of type "${this.expectedType}"`
+    msg = (): string => `Property "${this.property}" with value "${this.value}" is not of type "${this.expectedType}"`
 }
 
 // Incorrect Meta Pointers
@@ -24,7 +24,7 @@ export abstract class Language_IncorrectMetaPointerType_Issue extends Validation
     constructor(
         context: JsonContext,
         public metaPointer: LionWebJsonMetaPointer,
-        public incorrectType: string,
+        public incorrectType: string
     ) {
         super(context)
     }
@@ -43,7 +43,7 @@ export abstract class Language_FeatureMetaPointerNotInClassifier_Issue extends V
     constructor(
         context: JsonContext,
         public featureMetaPointer: LionWebJsonMetaPointer,
-        public classifierPointer: LionWebJsonNode,
+        public classifierPointer: LionWebJsonNode
     ) {
         super(context)
     }
@@ -82,7 +82,7 @@ export abstract class Language_UnknownMetaPointer_Issue extends ValidationIssue
 
     constructor(
         context: JsonContext,
-        public metaPointer: LionWebJsonMetaPointer,
+        public metaPointer: LionWebJsonMetaPointer
     ) {
         super(context)
     }
@@ -112,7 +112,7 @@ export class NumberOfLanguagesUsed_Issue extends ValidationIssue {
     readonly issueType = "NumberOfLanguagesUsed"
     constructor(
         context: JsonContext,
-        public nrOfLanguages: number,
+        public nrOfLanguages: number
     ) {
         super(context)
     }
@@ -120,9 +120,7 @@ export class NumberOfLanguagesUsed_Issue extends ValidationIssue {
 }
 export class MissingM3Language_Issue extends ValidationIssue {
     readonly issueType = "MissingM3Language"
-    constructor(
-        context: JsonContext
-    ) {
+    constructor(context: JsonContext) {
         super(context)
     }
     msg = () => `Missing used language LionCore-M3`
@@ -131,7 +129,7 @@ export class NotLionCoreLanguageKey_Issue extends ValidationIssue {
     readonly issueType = "NotLionCoreLanguageKey"
     constructor(
         context: JsonContext,
-        public incorrectKey: string,
+        public incorrectKey: string
     ) {
         super(context)
     }
@@ -141,7 +139,7 @@ export class IncorrectLionCoreVersion_Issue extends ValidationIssue {
     readonly issueType = "IncorrectLionCoreVersion"
     constructor(
         context: JsonContext,
-        public incorrectVersion: string,
+        public incorrectVersion: string
     ) {
         super(context)
     }

package/src/issues/ReferenceIssues.ts

@@ -1,5 +1,5 @@
-import { LionWebJsonMetaPointer, LionWebJsonNode } from "../json/LionWebJson.js"
-import { JsonContext } from "../json/JsonContext.js"
+import { LionWebId, LionWebJsonMetaPointer, LionWebJsonNode } from "@lionweb/json"
+import { JsonContext } from "@lionweb/json-utils"
 import { ValidationIssue } from "./ValidationIssue.js"
 
 export class Reference_DuplicateNodeId_Issue extends ValidationIssue {
@@ -7,7 +7,7 @@ export class Reference_DuplicateNodeId_Issue extends ValidationIssue {
 
     constructor(
         context: JsonContext,
-        public nodeId: string,
+        public nodeId: LionWebId
     ) {
         super(context)
     }
@@ -21,7 +21,7 @@ export class Reference_ChildMissingInParent_Issue extends ValidationIssue {
     constructor(
         context: JsonContext,
         public child: LionWebJsonNode,
-        public parent: LionWebJsonNode,
+        public parent: LionWebJsonNode
     ) {
         super(context)
     }
@@ -35,7 +35,7 @@ export class Reference_ParentMissingInChild_Issue extends ValidationIssue {
     constructor(
         context: JsonContext,
         public parent: LionWebJsonNode,
-        public child: LionWebJsonNode,
+        public child: LionWebJsonNode
     ) {
         super(context)
     }
@@ -49,7 +49,7 @@ export class Reference_CirculairParent_Issue extends ValidationIssue {
     constructor(
         context: JsonContext,
         public node: LionWebJsonNode | undefined,
-        public parentPath: string[],
+        public parentPath: string[]
     ) {
         super(context)
     }
@@ -62,7 +62,7 @@ export class Reference_LanguageUnknown_Issue extends ValidationIssue {
 
     constructor(
         context: JsonContext,
-        public languageRef: LionWebJsonMetaPointer,
+        public languageRef: LionWebJsonMetaPointer
     ) {
         super(context)
     }
@@ -75,9 +75,9 @@ export class Duplicates_Issue extends ValidationIssue {
 
     constructor(
         context: JsonContext,
-        public nodeid: string,
+        public nodeId: LionWebId
     ) {
         super(context)
     }
-    msg = () => `Duplicate value "${this.nodeid}"`
+    msg = () => `Duplicate value "${this.nodeId}"`
 }

package/src/issues/SyntaxIssues.ts

@@ -1,10 +1,10 @@
-import { JsonContext } from "../json/JsonContext.js"
+import { JsonContext } from "@lionweb/json-utils"
 import { ValidationIssue } from "./ValidationIssue.js"
 
 export abstract class Syntax_PropertyIssue extends ValidationIssue {
     constructor(
         public context: JsonContext,
-        protected property: string,
+        protected property: string
     ) {
         super(context)
     }
@@ -32,7 +32,7 @@ export class Syntax_PropertyTypeIssue extends Syntax_PropertyIssue {
         context: JsonContext,
         property: string,
         protected expectedType: string,
-        protected actualType: string,
+        protected actualType: string
     ) {
         super(context, property)
     }
@@ -46,7 +46,7 @@ export class Syntax_ArrayContainsNull_Issue extends Syntax_PropertyIssue {
     constructor(
         context: JsonContext,
         property: string,
-        public index: number,
+        public index: number
     ) {
         super(context, property)
     }
@@ -57,7 +57,7 @@ export class Syntax_ArrayContainsNull_Issue extends Syntax_PropertyIssue {
 export abstract class Syntax_IncorrectFormat_Issue extends ValidationIssue {
     constructor(
         context: JsonContext,
-        public value: string,
+        public value: string
     ) {
         super(context)
     }

package/src/issues/ValidationIssue.ts

@@ -1,4 +1,4 @@
-import { JsonContext } from "../json/JsonContext.js"
+import { JsonContext } from "@lionweb/json-utils"
 
 export abstract class ValidationIssue {
     abstract readonly issueType: string
@@ -17,10 +17,13 @@ export abstract class ValidationIssue {
 
 export class GenericIssue extends ValidationIssue {
     readonly issueType = "GenericIssue"
-    
-    constructor(context: JsonContext, public text: string) {
+
+    constructor(
+        context: JsonContext,
+        public text: string
+    ) {
         super(context)
     }
-    
+
     protected msg = () => this.text
 }

package/src/issues/index.ts

@@ -1,4 +1,3 @@
-export * from "../json/JsonContext.js"
 export * from "./ValidationIssue.js"
 export * from "./SyntaxIssues.js"
 export * from "./ReferenceIssues.js"

package/src/languages/CompositeLionWebLanguageWrapper.ts

@@ -1,4 +1,4 @@
-import { LionWebId, LionWebJsonMetaPointer, LionWebJsonNode } from "../json/LionWebJson.js"
+import { LionWebId, LionWebJsonMetaPointer, LionWebJsonNode } from "@lionweb/json"
 import { LionWebLanguageWrapper } from "./LionWebLanguageWrapper.js"
 import { MetaPointerMap } from "./MetaPointerMap.js"
 

package/src/languages/LanguageRegistry.ts

@@ -1,4 +1,4 @@
-import { LionWebId, LionWebJsonMetaPointer, LionWebJsonNode } from "../json/LionWebJson.js"
+import { LionWebId, LionWebJsonMetaPointer, LionWebJsonNode } from "@lionweb/json"
 import { CompositeLionWebLanguageWrapper } from "./CompositeLionWebLanguageWrapper.js"
 import { LionWebLanguageWrapper } from "./LionWebLanguageWrapper.js"
 

package/src/languages/LanguageUtils.ts

@@ -1,11 +1,11 @@
-import { isEqualMetaPointer, LionWebJsonNode, LionWebJsonChunk } from "../json/LionWebJson.js"
-import { LION_CORE_M3_KEY, MetaPointers } from "../json/M3definitions.js"
+import { isEqualMetaPointer, LionWebJsonChunk, LionWebJsonNode } from "@lionweb/json"
+import { LION_CORE_M3_KEY, MetaPointers } from "@lionweb/json-utils"
 
-import { createRequire } from 'module';
+import { createRequire } from "module"
 
-const require = createRequire(import.meta.url);
-const LionCore_M3 = require('./LionCore-M3.json');
-const LionCore_builtins = require('./LionCore-builtins.json');
+const require = createRequire(import.meta.url)
+const LionCore_M3 = require("./LionCore-M3.json")
+const LionCore_builtins = require("./LionCore-builtins.json")
 
 export const LionCore_M3_Json = LionCore_M3 as LionWebJsonChunk
 export const LionCore_builtins_Json = LionCore_builtins as LionWebJsonChunk

package/src/languages/LionWebLanguageWrapper.ts

@@ -1,10 +1,6 @@
-import {
-    LionWebJsonChunkWrapper,
-    MetaPointers,
-    NodeUtils
-} from "../json/index.js"
-import { LionWebJsonChunk, LionWebJsonNode } from "../json/LionWebJson.js"
-import { visitAndMap } from "../util/graphs.js"
+import { LionWebJsonChunk, LionWebJsonNode, LionWebKey } from "@lionweb/json"
+import { LionWebJsonChunkWrapper, MetaPointers, NodeUtils } from "@lionweb/json-utils"
+import { visitAndMap } from "@lionweb/ts-utils"
 import { isAnnotation, isConcept, isContainment, isInterface, isProperty, isReference } from "./LanguageUtils.js"
 
 interface LionWebLanguageWrapperInterface {
@@ -24,8 +20,8 @@ interface LionWebLanguageWrapperInterface {
 export class LionWebLanguageWrapper extends LionWebJsonChunkWrapper implements LionWebLanguageWrapperInterface {
     name: string
     version: string
-    key: string
-    
+    key: LionWebKey
+
     constructor(chunk: LionWebJsonChunk) {
         super(chunk)
         const languageNode: LionWebJsonNode = this.findNodesOfClassifier(MetaPointers.Language)[0]

package/src/languages/MetaPointerMap.ts

@@ -1,12 +1,13 @@
-import { LionWebJsonMetaPointer, LionWebJsonNode, MetaPointers, NodeUtils } from "../json/index.js"
+import { LionWebJsonMetaPointer, LionWebJsonNode, LionWebKey } from "@lionweb/json"
+import { MetaPointers, NodeUtils } from "@lionweb/json-utils"
 
 export class MetaPointerMap {
     /**
      * Map from languageKey => languageVersion => key => LionWebJsonNode
      */
     map: Map<string, Map<string, Map<string, LionWebJsonNode>>> = new Map<string, Map<string, Map<string, LionWebJsonNode>>>()
-    
-    add(languageKey: string, languageVersion: string, node: LionWebJsonNode): void {
+
+    add(languageKey: LionWebKey, languageVersion: string, node: LionWebJsonNode): void {
         const keyProperty = NodeUtils.findProperty(node, MetaPointers.IKeyedKey)
         if (keyProperty === undefined) {
             console.log("MetaPointerMap.add: trying to add node without key property.")
@@ -17,9 +18,9 @@ export class MetaPointerMap {
             console.log("MetaPointerMap.add: trying to add node without key property being empty or null.")
             return
         }
-        this.set({language: languageKey, version: languageVersion, key: key}, node)
+        this.set({ language: languageKey, version: languageVersion, key: key }, node)
     }
-    
+
     set(mp: LionWebJsonMetaPointer, node: LionWebJsonNode): void {
         let language = this.map.get(mp.language)
         if (language === undefined) {
@@ -33,7 +34,7 @@ export class MetaPointerMap {
         }
         version.set(mp.key, node)
     }
-    
+
     get(mp: LionWebJsonMetaPointer): LionWebJsonNode | undefined {
         return this.map.get(mp.language)?.get(mp.version)?.get(mp.key)
     }

package/src/runners/FileUtils.ts

@@ -1,7 +1,7 @@
 import fs from "fs"
 import { LanguageRegistry } from "../languages/index.js"
-import { LionWebValidator } from "../validators/LionWebValidator.js"
 import { ValidationResult } from "../validators/generic/ValidationResult.js"
+import { LionWebValidator } from "../validators/LionWebValidator.js"
 import { getFilesRecursive, printIssues } from "./Utils.js"
 
 export function validateFile(file: string, registry: LanguageRegistry): void {

package/src/runners/RunCheckFolderWithLanguage.ts

@@ -28,7 +28,7 @@ if (languageValidator.validationResult.hasErrors()) {
 for (const modelFile of getFilesRecursive(folder, [])) {
     const jsonString1 = fs.readFileSync(modelFile, "utf-8")
     const jsonModel = JSON.parse(jsonString1)
-    const modelValidator = new LionWebValidator(jsonModel, registry )
+    const modelValidator = new LionWebValidator(jsonModel, registry)
 
     modelValidator.validateAll()
     if (modelValidator.validationResult.hasErrors()) {

package/src/runners/RunLioncoreDiff.ts

@@ -1,6 +1,6 @@
+import { LionWebJsonChunk } from "@lionweb/json"
+import { LionWebJsonDiff } from "@lionweb/json-diff"
 import fs from "fs"
-import { LionWebJsonDiff } from "../diff/index.js"
-import { LionWebJsonChunk } from "../json/LionWebJson.js"
 
 const file1 = process.argv[2]
 const file2 = process.argv[3]