5htp-core 0.4.9-1 → 0.4.9

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.9-1",
+	"version": "0.4.9",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/components/Form.ts

@@ -135,7 +135,11 @@ export default function useForm<TFormData extends {}>(
         // Validation
         const validated = validate(allData);
         if (validated.errorsCount !== 0) {
-            throw new InputErrorSchema(validated.erreurs);
+            context.app.handleError(
+                new InputErrorSchema(validated.erreurs)
+            );
+            console.log("validated", validated.erreurs);
+            return;
         }
 
         // Callback

package/src/client/components/inputv3/index.tsx

@@ -10,7 +10,7 @@ import TextareaAutosize from 'react-textarea-autosize';
 // Core libs
 import { useInput, InputBaseProps, InputWrapper } from './base';
 import { default as Validator } from '../../../common/validation/validator';
-import type { SchemaValidators } from '@common/validation/validators';
+import type SchemaValidators from '@common/validation/validators';
 
 /*----------------------------------
 - TYPES

package/src/common/validation/index.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 import type { TValidatorDefinition } from './validator';
-import type { SchemaValidators } from './validators';
+import type Validators from './validators';
 
 /*----------------------------------
 - EXPORT
@@ -12,12 +12,12 @@ import type { SchemaValidators } from './validators';
 export { default as Schema } from './schema';
 export type { TSchemaFields, TValidatedData } from './schema';
 
-export const field = new Proxy<SchemaValidators>({} as SchemaValidators, {
+export const field = new Proxy<Validators>({} as Validators, {
     get: (target, propKey) => {
         return (...args: any[]) => ([ propKey, args ]);
     }
 }) as unknown as {
-    [K in keyof SchemaValidators]: SchemaValidators[K] extends (...args: any[]) => any
-    ? (...args: Parameters<SchemaValidators[K]>) => TValidatorDefinition<K>
-    : SchemaValidators[K];
+    [K in keyof Validators]: Validators[K] extends (...args: any[]) => any
+    ? (...args: Parameters<Validators[K]>) => TValidatorDefinition<K>
+    : Validators[K];
 };

package/src/common/validation/schema.ts

@@ -7,7 +7,8 @@ import { CoreError, TListeErreursSaisie, InputErrorSchema } from '@common/errors
 
 // Specific
 import { default as Validator, EXCLUDE_VALUE, TValidatorDefinition } from './validator';
-import defaultValidators, { SchemaValidators, getFieldValidator } from './validators';
+import DefaultValidators from './validators';
+const defaultValidators = new DefaultValidators;
 
 /*----------------------------------
 - TYPES
@@ -28,7 +29,7 @@ export type TValidateOptions<TFields extends TSchemaFields = {}> = {
     only?: (keyof TFields)[],
     validateDeps?: boolean,
     autoCorrect?: boolean,
-    validators?: SchemaValidators
+    validators?: DefaultValidators
 }
 
 export type TValidationResult<TFields extends TSchemaFields> = {
@@ -65,7 +66,7 @@ export default class Schema<TFields extends TSchemaFields> {
 
     public getFieldValidator(
         fieldName: string,
-        validators: SchemaValidators = defaultValidators
+        validators: DefaultValidators = defaultValidators
     ): null | Validator<any> | Schema<{}> {
 
         let field = this.fields[fieldName];
@@ -74,8 +75,23 @@ export default class Schema<TFields extends TSchemaFields> {
             return null;
 
         // TValidatorDefinition
+        } else if (Array.isArray(field)) {
+
+            const [validatorName, validatorArgs] = field;
+            const getValidator = validators[validatorName];
+            if (getValidator === undefined)
+                throw new Error('Unknown validator: ' + validatorName);
+
+            return getValidator(...validatorArgs);
+
+            // TSchemaFields
+        } else if (field.constructor === Object) {
+
+            return new Schema(field as TSchemaFields);
+
+            // Schema
         } else
-            return getFieldValidator(field);
+            return field as Validator<any>;
     }
 
     public validate<TDonnees extends TObjetDonnees>(
@@ -156,7 +172,6 @@ export default class Schema<TFields extends TSchemaFields> {
 
                 } else {
 
-                    console.error(LogPrefix, '[' + cheminA + ']', error);
                     erreurs[cheminAstr] = ["Technical error while validating data"];
                     errorsCount++;
                 }

package/src/common/validation/validator.ts

@@ -10,17 +10,17 @@ import { InputError } from '@common/errors';
 
 // Specific
 import type { TValidateOptions } from './schema';
-import type { SchemaValidators } from './validators';
+import type Validators from './validators';
 import type { InputBaseProps } from '@client/components/inputv3/base';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-export type TValidatorDefinition<K extends keyof SchemaValidators = keyof SchemaValidators> = [
+export type TValidatorDefinition<K extends keyof Validators = keyof Validators> = [
     type: K, 
-    args: Parameters<SchemaValidators[K]>, 
-    returnType: ReturnType<SchemaValidators[K]> 
+    args: Parameters<Validators[K]>, 
+    returnType: ReturnType<Validators[K]> 
 ]
 
 // TODO: remove

package/src/common/validation/validators.ts

@@ -17,7 +17,7 @@ import FileToUpload from '@client/components/inputv3/file/FileToUpload';
 
 // Speciific
 import Schema, { TSchemaFields } from './schema'
-import Validator, { TValidatorOptions, EXCLUDE_VALUE, TValidatorDefinition } from './validator'
+import Validator, { TValidatorOptions, EXCLUDE_VALUE } from './validator'
 
 /*----------------------------------
 - TYPES
@@ -29,9 +29,9 @@ export type TFileValidator = TValidatorOptions<FileToUpload> & {
     disk?: string, // Disk to upload files to
 }
 
-type TSchemaSubtype = Schema<{}> | TSchemaFields | TValidatorDefinition;
+type TSchemaSubtype = Schema<{}> | TSchemaFields;
 
-type TSubtype = TSchemaSubtype | Validator<any> | TValidatorDefinition;
+type TSubtype = TSchemaSubtype | Validator<any>;
 
 /*----------------------------------
 - CONST
@@ -41,27 +41,6 @@ export type TRichTextValidatorOptions = {
     attachements?: TFileValidator
 }
 
-export const getFieldValidator = (field: TValidatorDefinition) => {
-
-    if (Array.isArray(field)) {
-
-        const [validatorName, validatorArgs] = field;
-        const getValidator = validators[validatorName];
-        if (getValidator === undefined)
-            throw new Error('Unknown validator: ' + validatorName);
-
-        return getValidator(...validatorArgs);
-
-        // TSchemaFields
-    } else if (field.constructor === Object) {
-
-        return new Schema(field as TSchemaFields);
-
-        // Schema
-    } else
-        return field as Validator<any>
-}
-
 // Recursive function to validate each node
 function validateLexicalNode(node: any, opts: TRichTextValidatorOptions ) {
 
@@ -103,7 +82,7 @@ function validateLexicalNode(node: any, opts: TRichTextValidatorOptions ) {
 /*----------------------------------
 - CLASS
 ----------------------------------*/
-export class SchemaValidators {
+export default class SchemaValidators {
 
     /*----------------------------------
     - UTILITIES
@@ -150,7 +129,9 @@ export class SchemaValidators {
                 return val;
 
             // If subtype is a schema
-            const schema = getFieldValidator(subtype) as Schema<{}>;
+            const schema = subtype.constructor === Object 
+                ? new Schema(subtype as TSchemaFields) 
+                : subtype as Schema<{}>;
 
             // Validate schema
             const value = schema.validate(val, options, path);
@@ -178,7 +159,9 @@ export class SchemaValidators {
         if (subtype === undefined)
             return items;
 
-        const validator = getFieldValidator(subtype);
+        const validator = subtype.constructor === Object
+            ? new Schema(subtype as TSchemaFields)
+            : subtype as Schema<{}> | Validator<any>;
 
         items = items.map( item =>
             validator.validate( item, options, path )
@@ -478,8 +461,5 @@ export class SchemaValidators {
         //defaut: new Date,
         ...opts,
     })
-}
-
-const validators = new SchemaValidators();
 
-export default validators;
+}

package/src/server/services/schema/index.ts

@@ -6,7 +6,7 @@
 import type { Application } from '@server/app';
 
 // Specific
-import { SchemaValidators, TFileValidator } from '@common/validation/validators';
+import SchemaValidator, { TFileValidator } from '@common/validation/validators';
 import Validator, { TValidatorOptions } from '@common/validation/validator';
 
 import type FileToUpload from '@client/components/inputv3/file/FileToUpload';
@@ -19,9 +19,9 @@ import type FileToUpload from '@client/components/inputv3/file/FileToUpload';
 /*----------------------------------
 - SERVICE
 ----------------------------------*/
-export default class ServerSchemaValidator extends SchemaValidators {
+export default class ServerSchemaValidator extends SchemaValidator {
 
-    public constructor( public app: Application ) {
+    public constructor( private app: Application ) {
         super();
     }