fix: array validation

izatop · Mar 8, 2020 · 8ba0dda · 8ba0dda
1 parent 282715f
commit 8ba0dda
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/packages/unit/src/Validation/ValidationRule.ts b/packages/unit/src/Validation/ValidationRule.ts
@@ -1,5 +1,5 @@
 import {assert, fails, isFunction, isNull, isUndefined} from "@typesafeunit/util";
-import {ValidationAttributes, ValidationFunction, ValidationResult} from "./interfaces";
+import {ValidationAttributes, ValidationFails, ValidationFunction, ValidationResult} from "./interfaces";
 import {ValidationSchema} from "./ValidationSchema";
 
 export class ValidationRule<T, K extends keyof T> {
@@ -61,10 +61,7 @@ export class ValidationRule<T, K extends keyof T> {
         for (const [validator, message] of [...validators, ...this.validators]) {
             try {
                 if (isFunction(validator)) {
-                    const returns = validator(value);
-                    if (!isUndefined(returns)) {
-                        returns;
-                    }
+                    validator(value);
                     continue;
                 }
 
@@ -75,7 +72,7 @@ export class ValidationRule<T, K extends keyof T> {
 
                 const validation = await validator.validate(value);
                 if (!validation.valid) {
-                    return {value, message, validation, valid: false, ...attributes};
+                    return {value, message, validation, valid: false, ...attributes} as ValidationFails<any, any>;
                 }
             } catch (error) {
                 return {value, error, message, valid: false, ...attributes};

diff --git a/packages/unit/src/Validation/ValidationSchema.ts b/packages/unit/src/Validation/ValidationSchema.ts
@@ -1,12 +1,8 @@
 import {entriesReverse, isFunction, isObject, isUndefined} from "@typesafeunit/util";
-import {ValidationAttributes, ValidationDescription, ValidationFunction, ValidationResult} from "./interfaces";
+import {ValidationAttributes, ValidationDescription, ValidationResult, ValidatorArg} from "./interfaces";
 import {ValidationError} from "./ValidationError";
 import {ValidationRule} from "./ValidationRule";
 
-type ValidatorArg<T, K extends keyof T> = ValidationFunction<T, K>
-    | [ValidationFunction<T, K>, string]
-    | ValidationAttributes & { validator: ValidationFunction<T, K>; message?: string };
-
 export class ValidationSchema<T> {
     protected readonly attributes: ValidationAttributes = {
         required: true,

diff --git a/packages/unit/src/Validation/interfaces.ts b/packages/unit/src/Validation/interfaces.ts
@@ -1,18 +1,27 @@
 import {ValidationSchema} from "./ValidationSchema";
 
-export type ValidationFunction<T, K extends keyof T> = ((value: T[K]) => void) | ValidationSchema<T[K]>;
+export type ValidationValue<T> = T extends Array<infer V> ? V : T;
+
+export type ValidationFunction<T, K extends keyof T> = |
+    ((value: T[K]) => void) | ValidationSchema<ValidationValue<T[K]>>;
+
 export type ValidationAttributes = {
     required?: boolean;
     nullable?: boolean;
 };
 
+export type ValidatorArg<T, K extends keyof T> = ValidationFunction<T, K>
+    | [ValidationFunction<T, K>, string]
+    | ValidationAttributes & { validator: ValidationFunction<T, K>; message?: string };
+
+
 export type ValidationSuccess<T, K extends keyof T> = {
     value: T[K];
     valid: true;
 };
 
 export type ValidationFails<T, K extends keyof T> = {
-    value?: unknown;
+    value?: any;
     valid: false;
     message?: string;
     error?: Error;
@@ -23,7 +32,6 @@ export type ValidationResult<T, K extends keyof T> = { valid: true } |
     ValidationSuccess<T, K> |
     ValidationFails<T, K>;
 
-
 export type ValidationDescription<T> = {
     valid: boolean;
     message?: string;