@cleverbrush/schema 0.0.10 → 0.0.11

package/dist/index.d.ts

@@ -56,6 +56,7 @@ export declare type StringSchemaDefinition<TObj> = Omit<SchemaDefintion<TObj>, '
 };
 export declare type ArraySchemaDefinition<TObj> = Omit<SchemaDefintion<TObj>, 'type'> & {
     type: 'array';
+    preprocessor?: ((value: unknown) => unknown | Promise<unknown>) | string;
     ofType?: Schema<any>;
     minLength?: number;
     maxLength?: number;

package/dist/validators/validateArray.js

@@ -14,6 +14,17 @@ const validateArray = async (obj, schema, validator) => {
             valid: false,
             errors: ['expected type array']
         };
+    if (schema.preprocessor) {
+        const preprocessor = typeof schema.preprocessor === 'function'
+            ? schema.preprocessor
+            : validator.preprocessors.get(schema.preprocessor);
+        if (typeof preprocessor !== 'function') {
+            throw new Error(`unknown preprocessor '${schema.preprocessor}'`);
+        }
+        for (let i = 0; i < obj.length; i++) {
+            obj[i] = await Promise.resolve(preprocessor(obj[i]));
+        }
+    }
     if (typeof schema.minLength === 'number' && obj.length < schema.minLength) {
         return {
             valid: false,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cleverbrush/schema",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "keywords": [
         "object schema validator",
         "schema",
@@ -19,7 +19,7 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@cleverbrush/deep": "0.0.10"
+        "@cleverbrush/deep": "0.0.11"
     },
     "types": "./dist/index.d.ts"
 }

package/src/index.ts

@@ -96,6 +96,7 @@ export type ArraySchemaDefinition<TObj> = Omit<
     'type'
 > & {
     type: 'array';
+    preprocessor?: ((value: unknown) => unknown | Promise<unknown>) | string;
     ofType?: Schema<any>;
     minLength?: number;
     maxLength?: number;

package/src/schemaValidator.test.ts

@@ -1299,3 +1299,67 @@ test('Preprocessors - 2', async () => {
         });
     }).rejects.toBeInstanceOf(Error);
 });
+
+test('Preprocessors - 3', async () => {
+    const validator = new SchemaValidator().addSchemaType('Date', {
+        validators: [
+            (value) =>
+                value instanceof Date && !Number.isNaN(value)
+                    ? {
+                          valid: true
+                      }
+                    : {
+                          valid: false,
+                          errors: ['should be a valid Date object']
+                      }
+        ]
+    });
+
+    validator.addPreprocessor('StringToDate', (value: unknown): Date => {
+        const time = Date.parse(value.toString());
+        if (Number.isNaN(time)) return undefined;
+        return new Date(time);
+    });
+
+    let obj = [new Date().toJSON()];
+
+    let result = await validator.validate(
+        {
+            preprocessor: 'StringToDate',
+            type: 'array',
+            ofType: 'Date'
+        },
+        obj
+    );
+    expect(result).toHaveProperty('valid', true);
+
+    obj = [new Date().toJSON()];
+    result = await validator.validate(
+        {
+            preprocessor: (value: unknown): Date => {
+                const time = Date.parse(value.toString());
+                if (Number.isNaN(time)) return undefined;
+                return new Date(time);
+            },
+            type: 'array',
+            ofType: 'Date'
+        },
+        obj
+    );
+    expect(result).toHaveProperty('valid', true);
+
+    obj = ['sdfsdf12', new Date().toJSON()];
+    result = await validator.validate(
+        {
+            preprocessor: (value: unknown): Date => {
+                const time = Date.parse(value.toString());
+                if (Number.isNaN(time)) return undefined;
+                return new Date(time);
+            },
+            type: 'array',
+            ofType: 'Date'
+        },
+        obj
+    );
+    expect(result).toHaveProperty('valid', false);
+});

package/src/validators/validateArray.ts

@@ -24,6 +24,19 @@ export const validateArray = async (
             errors: ['expected type array']
         };
 
+    if (schema.preprocessor) {
+        const preprocessor =
+            typeof schema.preprocessor === 'function'
+                ? schema.preprocessor
+                : validator.preprocessors.get(schema.preprocessor);
+        if (typeof preprocessor !== 'function') {
+            throw new Error(`unknown preprocessor '${schema.preprocessor}'`);
+        }
+        for (let i = 0; i < obj.length; i++) {
+            obj[i] = await Promise.resolve(preprocessor(obj[i]));
+        }
+    }
+
     if (typeof schema.minLength === 'number' && obj.length < schema.minLength) {
         return {
             valid: false,