@travetto/schema 5.0.10 → 5.0.11

package/package.json

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

package/src/validate/error.ts

@@ -8,7 +8,7 @@ import { ValidationError } from './types';
  */
 export class ValidationResultError extends AppError<{ errors: ValidationError[] }> {
   constructor(errors: ValidationError[]) {
-    super('Validation errors have occurred', 'data', { errors });
+    super('Validation errors have occurred', { category: 'data', details: { errors } });
   }
 }
 
@@ -18,7 +18,7 @@ export class ValidationResultError extends AppError<{ errors: ValidationError[]
  */
 export class TypeMismatchError extends AppError {
   constructor(cls: Class | string, type: string) {
-    super(`Expected ${typeof cls === 'string' ? cls : cls.name} but found ${type}`, 'data');
+    super(`Expected ${typeof cls === 'string' ? cls : cls.name} but found ${type}`, { category: 'data' });
   }
 }
 

package/src/validate/messages.ts

@@ -8,8 +8,8 @@ export const Messages = new Map<string, string>(Object.entries({
   minlength: '{path} is not long enough ({n})',
   maxlength: '{path} is too long ({n})',
   match: '{path} should match {re}',
-  min: '{path} is not greater than ({n})',
-  max: '{path} is bigger than ({n})',
+  min: '{path} is less than ({n})',
+  max: '{path} is greater than ({n})',
   telephone: '{path} is not a valid phone number',
   url: '{path} is not a valid url',
   simpleName: '{path} is not a proper name',

package/src/validate/validator.ts

@@ -112,32 +112,13 @@ export class SchemaValidator {
    * @param value The value to validate
    */
   static #validateRange(field: FieldConfig, key: 'min' | 'max', value: string | number | Date): boolean {
-
     const f = field[key]!;
-    const fn = f.n;
-    if (typeof fn === 'number') {
-      if (typeof value === 'string') {
-        value = parseInt(value, 10);
-      }
-      if (field.type === Date) {
-        value = new Date(value);
-      }
-      const valN = typeof value === 'number' ? value : value.getTime();
-      if (key === 'min' && valN < fn || key === 'max' && valN > fn) {
-        return true;
-      }
-    } else {
-      const date = fn.getTime();
-      if (typeof value === 'string') {
-        value = Date.parse(value);
-      } else if (value instanceof Date) {
-        value = value.getTime();
-      }
-      if (key === 'min' && value < date || key === 'max' && value > date) {
-        return true;
-      }
-    }
-    return false;
+    const valueNum = (typeof value === 'string') ?
+      (field.type === Date ? Date.parse(value) : parseInt(value, 10)) :
+      (value instanceof Date ? value.getTime() : value);
+
+    const boundary = (typeof f.n === 'number' ? f.n : f.n.getTime());
+    return key === 'min' ? valueNum < boundary : valueNum > boundary;
   }
 
   /**
@@ -314,9 +295,9 @@ export class SchemaValidator {
       await this.validate(cls, o, view);
     } catch (err) {
       if (err instanceof ValidationResultError) { // Don't check required fields
-        const errs = err.details!.errors.filter(x => x.kind !== 'required');
+        const errs = err.details.errors.filter(x => x.kind !== 'required');
         if (errs.length) {
-          err.details!.errors = errs;
+          err.details.errors = errs;
           throw err;
         }
       }