Added ability to pass arrays to other schemas

NoiseEmail · Jun 24, 2024 · 46bd73e · 46bd73e
1 parent bb0e97d
commit 46bd73e
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 11 deletions.
diff --git a/src/schema/types/array.ts b/src/schema/types/array.ts
@@ -1,6 +1,7 @@
 import GenericType from '../generic';
 import { GenericError } from 'noise_validator/src/error';
 import { SchemaNamespace } from '../types.d';
+import Schema from '../schema';
 
 
 
@@ -13,18 +14,42 @@ class OptionalClass<
 > { 
 
     _input_value: unknown;
-    _original_constructor: SchemaNamespace.GenericTypeConstructor<OriginalReturnType, OriginalInputShape>;
+    _original_constructor: 
+        SchemaNamespace.GenericTypeConstructor<OriginalReturnType, OriginalInputShape> |
+        SchemaNamespace.SchemaLike;
 
     constructor(
         input_value: unknown,
-        original_constructor: SchemaNamespace.GenericTypeConstructor<OriginalReturnType, OriginalInputShape>,
+        original_constructor: 
+            SchemaNamespace.GenericTypeConstructor<OriginalReturnType, OriginalInputShape> |
+            SchemaNamespace.SchemaLike
     ) {
         super(input_value);
         this._input_value = input_value;
         this._original_constructor = original_constructor;
     }
 
 
+
+    public async _validate_data(data: unknown): Promise<OriginalReturnType> {
+        switch (this._original_constructor instanceof Schema) {
+            case true: {
+                const schema = this._original_constructor as SchemaNamespace.SchemaLike<OriginalReturnType>;
+                const validated_data = await schema.validate(data);
+                return validated_data;
+            }
+
+            case false: {
+                const constructor = this._original_constructor as SchemaNamespace.GenericTypeConstructor<OriginalReturnType, OriginalInputShape>;
+                const instance = new constructor(data);
+                const result = await instance.execute();
+                if (result.success === true) return result.data;
+                else throw result.data;
+            }
+        }
+    };  
+
+
 
     public async handler(): Promise<Array<OriginalReturnType>> {
         try {
@@ -34,10 +59,20 @@ class OptionalClass<
 
             const results: Array<OriginalReturnType> = [];
             for (const value of this.value) {
-                const instance = new this._original_constructor(value);
-                const result = await instance.execute();
-                if (result.success === true) results.push(result.data);
-                else throw result.data;
+
+                // -- Validate the data
+                try {
+                    const validated_data = await this._validate_data(value);
+                    results.push(validated_data);
+                }
+
+                // -- Add a hint if it fails
+                catch (unkown_error) {
+                    const error = GenericError.from_unknown(unkown_error);
+                    error.hint = 'Error occurred while validating the schema';
+                    error.data = { expected: this.constructor.name, value: value };
+                    throw error;
+                }
             }
 
             // -- Return the results
@@ -68,10 +103,19 @@ const create_array = <
     constructor: SchemaNamespace.GenericTypeConstructor<
         OriginalReturnType, 
         OriginalInputShape
-    >,
-) => (class extends OptionalClass<OriginalReturnType, OriginalInputShape> {
+    > | OriginalReturnType,
+) => (class extends OptionalClass<
+    OriginalReturnType extends SchemaNamespace.SchemaLike ? 
+        SchemaNamespace.ReturnType<OriginalReturnType> : 
+        OriginalReturnType, 
+
+    OriginalInputShape
+> {
     constructor(input_value: unknown) {
-        super(input_value, constructor);
+        super(
+            input_value, 
+            constructor as SchemaNamespace.SchemaLike
+        );
     }
 });
 

diff --git a/tests.ts b/tests.ts
@@ -16,7 +16,7 @@ const testschema = new nv.Schema({
 
 const testschema2 = new nv.Schema({
     a: nv.String,
-    b: testschema
+    b: nv.Array(nv.Boolean)
 });
 
 
@@ -57,7 +57,7 @@ nv.Binder(route, 'GET', {
     url,
     body
 }) => {
-    console.log(body.b.b.z);
+    console.log(body.b[0]);
 });