@lionweb/validation 0.7.0-beta.7 → 0.7.0-beta.9

package/dist/validators/generic/SyntaxValidator.js

@@ -1,24 +1,24 @@
 import { JsonContext } from "@lionweb/json-utils";
-import { Syntax_ArrayContainsNull_Issue, Syntax_PropertyMissingIssue, Syntax_PropertyNullIssue, Syntax_PropertyTypeIssue, Syntax_PropertyUnknownIssue } from "../../issues/index.js";
-import { isObjectDefinition, isPrimitiveDefinition } from "./ValidationTypes.js";
+import { GenericIssue, Syntax_ArrayContainsNull_Issue, Syntax_PropertyMissingIssue, Syntax_PropertyNullIssue, Syntax_PropertyTypeIssue, Syntax_PropertyUnknownIssue } from "../../issues/index.js";
+import { isObjectDefinition, isPrimitiveDefinition } from "./schema/index.js";
 /**
- * Syntax Validator can check whether objects are structurally conforming to the
- * definitions given in `typeDefinitions`.
+ * Syntax Validator checks whether objects are structurally conforming to the
+ * definitions given in `schema`.
  */
 export class SyntaxValidator {
-    constructor(validationResult, expectedTypes) {
+    constructor(validationResult, schema) {
         this.validationResult = validationResult;
-        this.typeDefinitions = expectedTypes;
+        this.schema = schema;
     }
     /**
      * Check whether `obj` is a JSON object that conforms to the definition of `expectedType`.
-     * All errors found will be pushed into the `errors` array, if its length is not 0, the check has failed.
+     * All errors found will be added to the `validationResult` object.
      * @param obj           The object to validate.
      * @param expectedType  The expected type of the object.
      */
     validate(obj, expectedType) {
         const object = obj;
-        const typeDef = this.typeDefinitions.get(expectedType);
+        const typeDef = this.schema.getDefinition(expectedType);
         if (typeDef === undefined) {
             throw new Error(`SyntaxValidator.validate: cannot find definition for ${expectedType}`);
         }
@@ -32,7 +32,7 @@ export class SyntaxValidator {
     /**
      * Validate whether `object` is structured conform the properties in `propertyDef`
      * @param originalProperty  The property of which `object` it the value
-     * @param typeDef       The property definitions that are being validated
+     * @param typeDef           The property definitions that are being validated
      * @param object            The object being validated
      * @param jsonContext       The location in the JSON
      * @private
@@ -41,22 +41,27 @@ export class SyntaxValidator {
         if (typeDef === null || typeDef === undefined) {
             return;
         }
-        if ((typeof object) !== "object") {
+        if (typeof object !== "object") {
             this.validationResult.issue(new Syntax_PropertyTypeIssue(jsonContext, originalProperty, "object", typeof object));
             return;
         }
-        for (const propertyDef of typeDef) {
-            const expectedTypeDef = this.typeDefinitions.get(propertyDef.expectedType);
+        for (const propertyDef of typeDef.properties) {
+            const taggedUnion = this.schema.getTaggedUnionDefinition(propertyDef.type);
+            if (taggedUnion !== undefined) {
+                this.validateTaggedUnion(propertyDef, typeDef, object, jsonContext.concat(propertyDef.name));
+                continue;
+            }
+            const expectedTypeDef = this.schema.getDefinition(propertyDef.type);
             const validator = propertyDef.validate;
-            const propertyValue = object[propertyDef.property];
+            const propertyValue = object[propertyDef.name];
             if (propertyValue === undefined) {
                 if (!propertyDef.isOptional) {
-                    this.validationResult.issue(new Syntax_PropertyMissingIssue(jsonContext, propertyDef.property));
+                    this.validationResult.issue(new Syntax_PropertyMissingIssue(jsonContext, propertyDef.name));
                 }
                 continue;
             }
             if (!propertyDef.mayBeNull && propertyValue === null) {
-                this.validationResult.issue(new Syntax_PropertyNullIssue(jsonContext, propertyDef.property));
+                this.validationResult.issue(new Syntax_PropertyNullIssue(jsonContext, propertyDef.name));
                 continue;
             }
             if (propertyDef.mayBeNull && propertyValue === null) {
@@ -66,53 +71,52 @@ export class SyntaxValidator {
             if (propertyDef.isList) {
                 // Check whether value is an array
                 if (!Array.isArray(propertyValue)) {
-                    const newContext = jsonContext.concat(propertyDef.property);
-                    this.validationResult.issue(new Syntax_PropertyTypeIssue(newContext, propertyDef.property, "array", typeof propertyValue));
+                    const newContext = jsonContext.concat(propertyDef.name);
+                    this.validationResult.issue(new Syntax_PropertyTypeIssue(newContext, propertyDef.name, "array", typeof propertyValue));
                     return;
                 }
                 // If an array, validate every item in the array
                 propertyValue.forEach((item, index) => {
-                    const newContext = jsonContext.concat(propertyDef.property, index);
+                    const newContext = jsonContext.concat(propertyDef.name, index);
                     if (item === null) {
-                        this.validationResult.issue(new Syntax_ArrayContainsNull_Issue(newContext, propertyDef.property, index));
+                        this.validationResult.issue(new Syntax_ArrayContainsNull_Issue(newContext, propertyDef.name, index));
                     }
                     else {
                         if (expectedTypeDef !== undefined) {
                             if (isPrimitiveDefinition(expectedTypeDef)) {
-                                // propertyValue should be a primitive as it has no property definitions
-                                if (this.validatePrimitiveValue(propertyDef.property, expectedTypeDef, item, jsonContext)) {
+                                if (this.validatePrimitiveValue(propertyDef.name, expectedTypeDef, item, jsonContext)) {
                                     validator.apply(null, [item, this.validationResult, newContext, propertyDef]);
                                 }
                             }
                             else {
                                 // propertyValue should be an object, validate its properties
-                                this.validateObjectProperties(propertyDef.property, expectedTypeDef, item, newContext);
+                                this.validateObjectProperties(propertyDef.name, expectedTypeDef, item, newContext);
                                 validator.apply(null, [item, this.validationResult, newContext, propertyDef]);
                             }
                         }
                         else {
-                            throw new Error(`Expected type '${propertyDef.expectedType} has neither property defs, nor a validator.`);
+                            throw new Error(`Expected type '${propertyDef.type} has neither property defs, nor a validator.`);
                         }
                     }
                 });
             }
             else {
-                const newContext = jsonContext.concat(propertyDef.property);
+                const newContext = jsonContext.concat(propertyDef.name);
                 if (Array.isArray(propertyValue)) {
-                    this.validationResult.issue(new Syntax_PropertyTypeIssue(newContext, propertyDef.property, propertyDef.expectedType, "array"));
+                    this.validationResult.issue(new Syntax_PropertyTypeIssue(newContext, propertyDef.name, propertyDef.type, "array"));
                     return;
                 }
                 // Single valued property, validate it
                 if (expectedTypeDef !== undefined) {
                     if (isPrimitiveDefinition(expectedTypeDef)) {
                         // propertyValue should be a primitive as it has no property definitions
-                        if (this.validatePrimitiveValue(propertyDef.property, expectedTypeDef, propertyValue, jsonContext)) {
+                        if (this.validatePrimitiveValue(propertyDef.name, expectedTypeDef, propertyValue, jsonContext)) {
                             validator.apply(null, [propertyValue, this.validationResult, newContext, propertyDef]);
                         }
                     }
                     else if (isObjectDefinition(expectedTypeDef)) {
                         // propertyValue should be an object, validate its properties
-                        this.validateObjectProperties(propertyDef.property, expectedTypeDef, propertyValue, newContext);
+                        this.validateObjectProperties(propertyDef.name, expectedTypeDef, propertyValue, newContext);
                         validator.apply(null, [propertyValue, this.validationResult, newContext, propertyDef]);
                     }
                     else {
@@ -120,17 +124,13 @@ export class SyntaxValidator {
                     }
                 }
                 else {
-                    throw new Error(`Expected single type '${propertyDef.expectedType}' for '${propertyDef.property}'  at ${newContext.toString()} has neither property defs, nor a validator.`);
+                    throw new Error(`Expected single type '${propertyDef.type}' for '${propertyDef.name}'  at ${newContext.toString()} has neither property defs, nor a validator.`);
                 }
             }
         }
         this.checkStrayProperties(object, typeDef, jsonContext);
     }
     validatePrimitiveValue(propertyName, propDef, object, jsonContext) {
-        // if (!propDef.mayBeNull && (object === null || object === undefined)) {
-        //     this.validationResult.issue(new Syntax_PropertyNullIssue(jsonContext, propDef.property))
-        //     return false
-        // }
         if (typeof object !== propDef.primitiveType) {
             this.validationResult.issue(new Syntax_PropertyTypeIssue(jsonContext, propertyName, propDef.primitiveType, typeof object));
             return false;
@@ -138,6 +138,50 @@ export class SyntaxValidator {
         propDef.validate(object, this.validationResult, jsonContext);
         return true;
     }
+    /**
+     *
+     * @param propertyDef the definition of the property that has the TaggedUnionType as its type
+     * @param typeDef The object definition containing the `propertyDef`
+     * @param object The object of type `typeDef` that should have the property described by `propertyDef`
+     * @param jsonContext
+     */
+    validateTaggedUnion(propertyDef, typeDef, object, jsonContext) {
+        // console.log(`validateTaggedUnion ${JSON.stringify(propertyDef)}, typedef ${typeDef.name}  object: ${JSON.stringify(object, null, 3)}`)
+        const taggedObject = object[propertyDef.name];
+        if (propertyDef.isList) {
+            if (!Array.isArray(taggedObject)) {
+                this.validationResult.issue(new GenericIssue(jsonContext, `Property value '${propertyDef.name}' expects an array, found '${typeof taggedObject}'`));
+            }
+            else {
+                taggedObject.forEach((taggedObjectSingle, index) => {
+                    this.validateTaggedObject(taggedObjectSingle, jsonContext.concat(index));
+                });
+            }
+        }
+        else {
+            if (!(typeof taggedObject === "object")) {
+                this.validationResult.issue(new GenericIssue(jsonContext, `Property value '${propertyDef.name}' expects an object, found '${typeof taggedObject}'`));
+            }
+            else {
+                this.validateTaggedObject(taggedObject, jsonContext);
+            }
+        }
+    }
+    /**
+     * Validate a single tagged object
+     * @param taggedObject
+     * @param jsonContext
+     */
+    validateTaggedObject(taggedObject, jsonContext) {
+        const actualTypeName = taggedObject["messageKind"];
+        const actualType = this.schema.getDefinition(actualTypeName);
+        if (actualType === undefined || !isObjectDefinition(actualType)) {
+            this.validationResult.issue(new GenericIssue(jsonContext, `Expected object type is ${typeof taggedObject}, should be object`));
+        }
+        else {
+            this.validateObjectProperties(actualTypeName, actualType, taggedObject, jsonContext);
+        }
+    }
     /**
      * Check whether there are extra properties that should not be there.
      * @param obj           Object to be validated
@@ -146,8 +190,8 @@ export class SyntaxValidator {
      */
     checkStrayProperties(obj, def, context) {
         const own = Object.getOwnPropertyNames(obj);
-        const defined = def.map(pdef => pdef.property);
-        own.forEach((ownProp) => {
+        const defined = def.properties.map(pdef => pdef.name);
+        own.forEach(ownProp => {
             if (!defined.includes(ownProp)) {
                 this.validationResult.issue(new Syntax_PropertyUnknownIssue(context, ownProp));
             }

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/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./ValidationTypes.js";
+export * from "./schema/index.js";
 export * from "./ValidationResult.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,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}

package/dist/validators/generic/index.js

@@ -1,4 +1,4 @@
-export * from "./ValidationTypes.js";
+export * from "./schema/index.js";
 export * from "./ValidationResult.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,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validators/generic/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}

package/dist/validators/generic/schema/DefinitionSchema.d.ts

@@ -0,0 +1,26 @@
+import { Definition, PrimitiveDefinition, TaggedUnionDefinition } from "./ValidationTypes.js";
+/**
+ * A collection of object and primitive definitions describing JSON objects.
+ * Used to
+ * - validate an incoming JSON object
+ * - generate the corresponding TypeScript type definitions.
+ */
+export declare class DefinitionSchema {
+    unionDefinitions: TaggedUnionDefinition[];
+    /**
+     * Mapping from extenden object type name to list of extending Object Definitions
+     */
+    taggedUnions: Map<string, Definition[]>;
+    definitionsMap: Map<string, Definition>;
+    constructor(taggedUnions: TaggedUnionDefinition[], definitions: Definition[]);
+    getDefinition(name: string): Definition | undefined;
+    addTaggedUnion(defs: TaggedUnionDefinition[]): void;
+    add(definitions: Definition[] | Definition): void;
+    isTagProperty(propertyName: string): boolean;
+    definitions(): Definition[];
+    getTaggedUnionDefinition(name: string): TaggedUnionDefinition | undefined;
+    isUnionDiscriminator(propDef: PrimitiveDefinition): boolean;
+    extending(name: string): Definition[];
+    static join(...schema: DefinitionSchema[]): DefinitionSchema;
+}
+//# sourceMappingURL=DefinitionSchema.d.ts.map

package/dist/validators/generic/schema/DefinitionSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DefinitionSchema.d.ts","sourceRoot":"","sources":["../../../../src/validators/generic/schema/DefinitionSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAEjH;;;;;GAKG;AACH,qBAAa,gBAAgB;IACzB,gBAAgB,EAAE,qBAAqB,EAAE,CAAK;IAC9C;;OAEG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAkC;IACzE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAgC;gBAE3D,YAAY,EAAE,qBAAqB,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;IAK5E,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAInD,cAAc,CAAC,IAAI,EAAE,qBAAqB,EAAE;IAI5C,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,UAAU;IAmB1C,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAI5C,WAAW,IAAI,UAAU,EAAE;IAI3B,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS;IAIzE,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO;IAI3D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE;IASrC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,gBAAgB,EAAE,GAAG,gBAAgB;CAU/D"}

package/dist/validators/generic/schema/DefinitionSchema.js

@@ -0,0 +1,75 @@
+import { isObjectDefinition } from "./ValidationTypes.js";
+/**
+ * A collection of object and primitive definitions describing JSON objects.
+ * Used to
+ * - validate an incoming JSON object
+ * - generate the corresponding TypeScript type definitions.
+ */
+export class DefinitionSchema {
+    constructor(taggedUnions, definitions) {
+        this.unionDefinitions = [];
+        /**
+         * Mapping from extenden object type name to list of extending Object Definitions
+         */
+        this.taggedUnions = new Map();
+        this.definitionsMap = new Map();
+        this.add(definitions);
+        this.addTaggedUnion(taggedUnions);
+    }
+    getDefinition(name) {
+        return this.definitionsMap.get(name);
+    }
+    addTaggedUnion(defs) {
+        this.unionDefinitions.push(...defs);
+    }
+    add(definitions) {
+        if (!Array.isArray(definitions)) {
+            definitions = [definitions];
+        }
+        for (const def of definitions) {
+            if (isObjectDefinition(def)) {
+                if (def.taggedUnionType !== "") {
+                    let existingExtends = this.taggedUnions.get(def.taggedUnionType);
+                    if (existingExtends === undefined) {
+                        existingExtends = [];
+                        this.taggedUnions.set(def.taggedUnionType, existingExtends);
+                    }
+                    existingExtends.push(def);
+                }
+            }
+            this.definitionsMap.set(def.name, def);
+        }
+    }
+    isTagProperty(propertyName) {
+        return this.unionDefinitions.find(def => def.unionProperty === propertyName) !== undefined;
+    }
+    definitions() {
+        return Array.from(this.definitionsMap.values());
+    }
+    getTaggedUnionDefinition(name) {
+        return this.unionDefinitions.find(def => def.unionType === name);
+    }
+    isUnionDiscriminator(propDef) {
+        return this.unionDefinitions.find(def => def.unionDiscriminator === propDef.name) !== undefined;
+    }
+    extending(name) {
+        const result = this.taggedUnions.get(name);
+        if (result === undefined) {
+            return [];
+        }
+        else {
+            return Array.from(result.values());
+        }
+    }
+    static join(...schema) {
+        const result = new DefinitionSchema([], []);
+        schema.forEach(sch => {
+            sch.definitions().forEach(value => {
+                result.add([value]);
+            });
+            result.addTaggedUnion(sch.unionDefinitions);
+        });
+        return result;
+    }
+}
+//# sourceMappingURL=DefinitionSchema.js.map

package/dist/validators/generic/schema/DefinitionSchema.js.map

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

package/dist/validators/generic/{ValidationTypes.d.ts → schema/ValidationTypes.d.ts}

@@ -1,5 +1,5 @@
 import { JsonContext } from "@lionweb/json-utils";
-import { ValidationResult } from "./ValidationResult.js";
+import { ValidationResult } from "../ValidationResult.js";
 export type UnknownObjectType = {
     [key: string]: unknown;
 };
@@ -15,11 +15,11 @@ export type PropertyDefinition = {
     /**
      * The property name
      */
-    property: string;
+    name: string;
     /**
      * The expected type of the property value
      */
-    expectedType: string;
+    type: string;
     /**
      * Whether the property value is allowed to be null
      */
@@ -38,14 +38,13 @@ export type PropertyDefinition = {
     validate?: ValidatorFunction;
 };
 export type ValidatorFunction = <T>(obj: T, result: ValidationResult, ctx: JsonContext, pdef?: PropertyDefinition) => void;
+export declare function emptyValidation<T>(object: T, result: ValidationResult, ctx: JsonContext, pdef?: PropertyDefinition): void;
 export declare const MAY_BE_NULL = true;
 /**
- * Easy way to create a PropertyDefinition typed object with default values.
- * @param propDef
- * @constructor
+ * Definition of a primitive type.
  */
-export declare function PropertyDef(propDef: PropertyDefinition): PropertyDefinition;
 export type PrimitiveDefinition = {
+    name: string;
     /**
      * The expected type of the property value
      */
@@ -56,13 +55,47 @@ export type PrimitiveDefinition = {
     validate?: ValidatorFunction;
 };
 /**
- * Easy way to create a PropertyDefinition typed object with default values.
+ * Definition of an object type.
+ */
+export type ObjectDefinition = {
+    name: string;
+    properties: PropertyDefinition[];
+    /**
+     * The name of the tagged union that this type belongs to
+     */
+    taggedUnionType?: string;
+};
+export type Definition = ObjectDefinition | PrimitiveDefinition;
+/**
+ * Defionition of tagged union.
+ */
+export type TaggedUnionDefinition = {
+    /**
+     * The tagged union "super" type
+     */
+    unionType: string;
+    /**
+     * The primitive property type that is the discriminator or tag
+     */
+    unionDiscriminator: string;
+    /**
+     * The name of the property in an object that contains the discriminator value
+     */
+    unionProperty: string;
+};
+/**
+ * Easy way to create a PrimitiveDefinition 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;
+/**
+ * Easy way to create a PropertyDefinition typed object with default values.
+ * @param propDef
+ * @constructor
+ */
+export declare function PropertyDef(propDef: PropertyDefinition): PropertyDefinition;
+export declare function isObjectDefinition(def: Definition | undefined): def is ObjectDefinition;
+export declare function isPrimitiveDefinition(def: Definition | undefined): def is PrimitiveDefinition;
+export declare function isJavaScriptPrimitive(type: string): boolean;
 //# sourceMappingURL=ValidationTypes.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ValidationTypes.d.ts","sourceRoot":"","sources":["../../../../src/validators/generic/schema/ValidationTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAE1D;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;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;AAE1H,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAG;AAG7H,eAAO,MAAM,WAAW,OAAO,CAAA;AAE/B;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,mBAAmB,CAAA;AAC/D;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAChC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;CACxB,CAAA;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,mBAAmB,CAO9E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAU3E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG,GAAG,IAAI,gBAAgB,CAEvF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG,GAAG,IAAI,mBAAmB,CAE7F;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE3D"}

package/dist/validators/generic/{ValidationTypes.js → schema/ValidationTypes.js}

@@ -1,27 +1,17 @@
-/**
- * Default for the `validation` property, does nothing.
- * @param object
- * @param result
- * @param ctx
- * @param pdef
- */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function emptyValidation(object, result, ctx, pdef) { }
+export function emptyValidation(object, result, ctx, pdef) { }
 // Make boolean argument more readable.
 export const MAY_BE_NULL = true;
 /**
- * Easy way to create a PropertyDefinition typed object with default values.
+ * Easy way to create a PrimitiveDefinition typed object with default values.
  * @param propDef
  * @constructor
  */
-export function PropertyDef(propDef) {
-    const { property, expectedType, mayBeNull = false, isList = false, isOptional = false, validate = emptyValidation } = propDef;
+export function PrimitiveDef(propDef) {
+    const { name, primitiveType, validate = emptyValidation } = propDef;
     return {
-        property: property,
-        expectedType: expectedType,
-        isList: isList,
-        mayBeNull: mayBeNull,
-        isOptional: isOptional,
+        name: name,
+        primitiveType: primitiveType,
         validate: validate
     };
 }
@@ -30,17 +20,24 @@ export function PropertyDef(propDef) {
  * @param propDef
  * @constructor
  */
-export function PrimitiveDef(propDef) {
-    const { primitiveType, validate = emptyValidation } = propDef;
+export function PropertyDef(propDef) {
+    const { name, type, mayBeNull = false, isList = false, isOptional = false, validate = emptyValidation } = propDef;
     return {
-        primitiveType: primitiveType,
+        name: name,
+        type: type,
+        isList: isList,
+        mayBeNull: mayBeNull,
+        isOptional: isOptional,
         validate: validate
     };
 }
 export function isObjectDefinition(def) {
-    return Array.isArray(def);
+    return (def !== undefined) && Array.isArray(def?.properties);
 }
 export function isPrimitiveDefinition(def) {
-    return def?.primitiveType !== undefined;
+    return (def !== undefined) && def?.primitiveType !== undefined;
+}
+export function isJavaScriptPrimitive(type) {
+    return ["number", "string", "boolean"].includes(type);
 }
 //# sourceMappingURL=ValidationTypes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ValidationTypes.js","sourceRoot":"","sources":["../../../../src/validators/generic/schema/ValidationTypes.ts"],"names":[],"mappings":"AAyCA,6DAA6D;AAC7D,MAAM,UAAU,eAAe,CAAI,MAAS,EAAE,MAAwB,EAAE,GAAgB,EAAE,IAAyB,IAAS,CAAC;AAE7H,uCAAuC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAA;AA+C/B;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,OAA4B;IACrD,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAA;IACnE,OAAO;QACH,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,aAAa;QAC5B,QAAQ,EAAE,QAAQ;KACrB,CAAA;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,OAA2B;IACnD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAA;IACjH,OAAO;QACH,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,UAAU;QACtB,QAAQ,EAAE,QAAQ;KACrB,CAAA;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAA2B;IAC1D,OAAQ,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,KAAK,CAAC,OAAO,CAAE,GAAwB,EAAE,UAAU,CAAC,CAAA;AACvF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAA2B;IAC7D,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,IAAK,GAA2B,EAAE,aAAa,KAAK,SAAS,CAAA;AAC3F,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAC9C,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AACzD,CAAC"}

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

@@ -0,0 +1,3 @@
+export * from "./ValidationTypes.js";
+export * from "./DefinitionSchema.js";
+//# sourceMappingURL=index.d.ts.map

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

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

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

@@ -0,0 +1,3 @@
+export * from "./ValidationTypes.js";
+export * from "./DefinitionSchema.js";
+//# sourceMappingURL=index.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionweb/validation",
-  "version": "0.7.0-beta.7",
+  "version": "0.7.0-beta.9",
   "license": "Apache 2.0",
   "description": "LionWeb Serialization validation",
   "author": "jos.warmer@openmodeling.nl",
@@ -32,8 +32,8 @@
     "republish-local": "yarn unpublish-local && yarn publish-local"
   },
   "dependencies": {
-    "@lionweb/json": "0.7.0-beta.7",
-    "@lionweb/ts-utils": "0.7.0-beta.7",
-    "@lionweb/json-utils": "0.7.0-beta.7"
+    "@lionweb/json": "0.7.0-beta.9",
+    "@lionweb/ts-utils": "0.7.0-beta.9",
+    "@lionweb/json-utils": "0.7.0-beta.9"
   }
 }

package/src/runners/Utils.ts

@@ -48,7 +48,7 @@ export function printIssues(result: ValidationResult, file?: string): void {
 }
 
 export function issuestoString(vresult: ValidationResult, file?: string): string {
-    let result = ""
-    vresult.issues.forEach(issue => (result += (file == undefined ? "" : `File ${file}: `) + issue.errorMsg() + "\n"))
+    let result = "ISSUES: "
+    vresult.issues.forEach(issue => (result += (file === undefined ? "NOFILE" : `File ${file}: `) + issue.errorMsg() + "\n"))
     return result
 }