5htp-core 0.3.3-4 → 0.3.4-2

package/package.json

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

package/src/client/components/Form.ts

@@ -181,15 +181,16 @@ export default function useForm<TFormData extends {}>(
 
                 // Submit on press enter
                 onKeyDown: e => {
-                    if (e.key === 'Enter') {
+                    if (e.key === 'Enter' || (e.keyCode || e.which) === 13) {
                         submit({ [fieldName]: e.target.value } as Partial<TFormData>);
                     }
                 },
 
                 // Error
                 errors: state.errors[fieldName],
-                required: validator.options?.opt !== true,
-                validator: validator,
+
+                // Component attributes
+                ...validator.componentAttributes
             }
         }
     }

package/src/common/validation/validator.ts

@@ -10,6 +10,7 @@ import { InputError } from '@common/errors';
 
 // Specific
 import type { TValidateOptions } from './schema';
+import type { InputBaseProps } from '@client/components/inputv3/base';
 
 /*----------------------------------
 - TYPES
@@ -64,14 +65,23 @@ export const EXCLUDE_VALUE = "action:exclure" as const;
 /*----------------------------------
 - CLASS
 ----------------------------------*/
-export default class Validator<TValue, TOptions extends TValidator<TValue> = TValidator<TValue>> {
+export default class Validator<
+    TValue, 
+    TOptions extends TValidator<TValue> = TValidator<TValue>,
+    TComponent = React.FunctionComponent< InputBaseProps< TValue > >
+> {
 
     public constructor( 
         public type: string,
         public validateType: TValidationFunction<TValue>, 
-        public options: TOptions
+        public options: TOptions,
+        public componentAttributes: Partial<InputBaseProps<TValue>> = {}
     ) {
 
+        // Basic component attriutes
+        this.componentAttributes.required = options?.opt !== true;
+        //this.componentAttributes.validator = this;
+
     }
 
     public isEmpty = (val: any) => val === undefined || val === '' || val === null

package/src/common/validation/validators.ts

@@ -111,22 +111,22 @@ export default class SchemaValidators {
         })
     }
 
-    public choice = (values?: any[], opts: TValidator<any> & {} = {}) => 
+    public choice = (choices?: any[], opts: TValidator<any> & {} = {}) => 
         new Validator<any>('choice', (val, input, output) => {
 
             // Choice object
             if (typeof val === 'object' && ('value' in val) && typeof val.value !== 'object')
                 val = val.value;
 
-            if (values !== undefined) {
-                const isValid = values.some(v => v.value === val);
+            if (choices !== undefined) {
+                const isValid = choices.some(v => v.value === val);
                 if (!isValid)
-                    throw new InputError("Invalid value. Must be: " + values.map(v => v.value).join(', '));
+                    throw new InputError("Invalid value. Must be: " + choices.map(v => v.value).join(', '));
             }
 
             return val;
 
-        }, opts)
+        }, opts, { choices })
 
     /*----------------------------------
     - CHAINES

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

@@ -137,8 +137,6 @@ export default class Console extends Service<Config, Hooks, Application, Service
 
     protected async start() {
 
-        return;
-
         const origLog = console.log
 
         this.logger = new Logger({
@@ -352,10 +350,10 @@ export default class Console extends Service<Config, Hooks, Application, Service
  
     public printHtml( logs: TJsonLog[], full: boolean = false ): string {
 
-        let html = logs.map( logEntry => logToHTML( logEntry, this )).join('\n');
+        let html = logs.map( logEntry => logToHTML( logEntry, this )).join('<br />');
 
         if (full) {
-            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;`
+            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;color: #aaa;`
             html = '<div style="' + consoleCss + '">' + html + '</div>';
         }