@travetto/schema 4.0.0-rc.6 → 4.0.0-rc.7

package/README.md

@@ -220,20 +220,22 @@ Validation Failed {
   "category": "data",
   "type": "ValidationResultError",
   "at": "2029-03-14T04:00:00.618Z",
-  "errors": [
-    {
-      "kind": "type",
-      "type": "number",
-      "message": "age is not a valid number",
-      "path": "age"
-    },
-    {
-      "kind": "required",
-      "active": true,
-      "message": "address.street2 is required",
-      "path": "address.street2"
-    }
-  ]
+  "details": {
+    "errors": [
+      {
+        "kind": "type",
+        "type": "number",
+        "message": "age is not a valid number",
+        "path": "age"
+      },
+      {
+        "kind": "required",
+        "active": true,
+        "message": "address.street2 is required",
+        "path": "address.street2"
+      }
+    ]
+  }
 }
 ```
 
@@ -363,14 +365,16 @@ Validation Failed {
   "category": "data",
   "type": "ValidationResultError",
   "at": "2029-03-14T04:00:00.837Z",
-  "errors": [
-    {
-      "kind": "type",
-      "type": "PointImpl",
-      "message": "point is not a valid PointImpl",
-      "path": "point"
-    }
-  ]
+  "details": {
+    "errors": [
+      {
+        "kind": "type",
+        "type": "PointImpl",
+        "message": "point is not a valid PointImpl",
+        "path": "point"
+      }
+    ]
+  }
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "Data type registry for runtime validation, reflection and binding.",
   "keywords": [
     "schema",
@@ -27,10 +27,10 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^4.0.0-rc.6"
+    "@travetto/registry": "^4.0.0-rc.7"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^4.0.0-rc.5"
+    "@travetto/transformer": "^4.0.0-rc.6"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/validate/validator.ts

@@ -56,16 +56,7 @@ export class SchemaValidator {
    * @param relative The relative path of object traversal
    */
   static #validateFieldSchema(fieldSchema: FieldConfig, val: unknown, relative: string = ''): ValidationError[] {
-    return this.#validateFieldSchemaRaw(fieldSchema, val, `${relative}${relative ? '.' : ''}${fieldSchema.name}`);
-  }
-
-  /**
-   * Validate a single field config against a passed in value
-   * @param fieldSchema The field schema configuration
-   * @param val The raw value, could be an array or not
-   * @param path The current path of validation traversal
-   */
-  static #validateFieldSchemaRaw(fieldSchema: FieldConfig, val: unknown, path: string = ''): ValidationError[] {
+    const path = `${relative}${relative ? '.' : ''}${fieldSchema.name}`;
     const hasValue = !(val === undefined || val === null || (typeof val === 'string' && val === '') || (Array.isArray(val) && val.length === 0));
 
     if (!hasValue) {
@@ -242,27 +233,17 @@ export class SchemaValidator {
   }
 
   /**
-   * Validate an object against it's constructor's schema
-   * @param cls The class to validate the objects against
-   * @param o The object to validate
-   * @param view The optional view to limit the scope to
+   * Validate the class level validations
    */
-  static async validate<T>(cls: Class<T>, o: T, view?: string): Promise<T> {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    if (!ObjectUtil.isPlainObject(o) && !(o instanceof cls || cls.Ⲑid === (o as ClassInstance<T>).constructor.Ⲑid)) {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      throw new TypeMismatchError(cls.name, (o as ClassInstance).constructor.name);
+  static async #validateClassLevel<T>(cls: Class<T>, o: T, view?: string): Promise<ValidationError[]> {
+    const schema = SchemaRegistry.get(cls);
+    if (!schema) {
+      return [];
     }
-    cls = SchemaRegistry.resolveSubTypeForInstance(cls, o);
-
-    const config = SchemaRegistry.getViewSchema(cls, view);
-    const validators = SchemaRegistry.get(cls).validators;
-
-    // Validate using standard behaviors
-    const errors = this.#validateSchema(config.schema, o, '');
 
+    const errors: ValidationError[] = [];
     // Handle class level validators
-    for (const fn of validators) {
+    for (const fn of schema.validators) {
       try {
         const res = await fn(o, view);
         if (res) {
@@ -276,7 +257,30 @@ export class SchemaValidator {
         }
       }
     }
+    return errors;
+  }
 
+  /**
+   * Validate an object against it's constructor's schema
+   * @param cls The class to validate the objects against
+   * @param o The object to validate
+   * @param view The optional view to limit the scope to
+   */
+  static async validate<T>(cls: Class<T>, o: T, view?: string): Promise<T> {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    if (!ObjectUtil.isPlainObject(o) && !(o instanceof cls || cls.Ⲑid === (o as ClassInstance<T>).constructor.Ⲑid)) {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      throw new TypeMismatchError(cls.name, (o as ClassInstance).constructor.name);
+    }
+    cls = SchemaRegistry.resolveSubTypeForInstance(cls, o);
+
+    const config = SchemaRegistry.getViewSchema(cls, view);
+
+    // Validate using standard behaviors
+    const errors = [
+      ...this.#validateSchema(config.schema, o, ''),
+      ... await this.#validateClassLevel(cls, o, view)
+    ];
     if (errors.length) {
       throw new ValidationResultError(errors);
     }
@@ -327,7 +331,14 @@ export class SchemaValidator {
   static async validateMethod<T>(cls: Class<T>, method: string, params: unknown[], prefixes: (string | undefined)[] = []): Promise<void> {
     const errors: ValidationError[] = [];
     for (const field of SchemaRegistry.getMethodSchema(cls, method)) {
-      errors.push(...this.#validateFieldSchemaRaw(field, params[field.index!], prefixes[field.index!]));
+      const i = field.index!;
+      errors.push(...[
+        ... this.#validateFieldSchema(field, params[i]),
+        ... await this.#validateClassLevel(field.type, params[i])
+      ].map(x => {
+        x.path = !prefixes[i] ? x.path.replace(`${field.name}.`, '') : x.path.replace(field.name, prefixes[i]!);
+        return x;
+      }));
     }
     if (errors.length) {
       throw new ValidationResultError(errors);