5htp-core 0.6.1-6 → 0.6.2

package/client/components/File/index.tsx

@@ -12,16 +12,12 @@ import Button, { Props as BtnProps } from '@client/components/Button';
 import { InputWrapper } from '../utils';
 import useContext from '@/client/context';
 
-// specific
-import FileToUpload from './FileToUpload';
-
 // Ressources
 import './index.less';
 
 /*----------------------------------
 - OUTILS
 ----------------------------------*/
-export { default as FileToUpload } from './FileToUpload';
 
 export const createImagePreview = (file: Blob) => new Promise((resolve, reject) => {
 
@@ -44,15 +40,6 @@ export const createImagePreview = (file: Blob) => new Promise((resolve, reject)
     reader.readAsDataURL(file);
 });
 
-// Instanciate FileToUpload from browser side File
-const normalizeFile = (file: File) => new FileToUpload({
-    name: file.name,
-    type: file.type,
-    size: file.size,
-    data: file,
-    //original: file
-})
-
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -61,7 +48,7 @@ export type Props = {
 
     // Input
     title: string,
-    value?: string | FileToUpload, // string = already registered 
+    value?: string | File, // string = already registered 
 
     // Display
     emptyText?: ComponentChild,
@@ -70,7 +57,7 @@ export type Props = {
     button?: boolean | BtnProps,
 
     // Actions
-    onChange: (file: FileToUpload | undefined) => void
+    onChange: (file: File | undefined) => void
     remove?: () => Promise<void>,
 }
 
@@ -115,9 +102,7 @@ export default (props: Props) => {
         const selectedfile = fileSelectEvent.target.files[0] as File;
         if (selectedfile) {
 
-            const fileToUpload = normalizeFile(selectedfile);
-
-            onChange(fileToUpload);
+            onChange(selectedfile);
         }
     }
 
@@ -125,7 +110,7 @@ export default (props: Props) => {
 
         // Image = decode & display preview
         if (file !== undefined && typeof file === 'object' && file.type.startsWith('image/'))
-            createImagePreview(file.data).then(setPreviewUrl);
+            createImagePreview(file).then(setPreviewUrl);
         else 
             setPreviewUrl(undefined);
 

package/client/components/Input.tsx

@@ -13,8 +13,8 @@ import {
 
 // Core libs
 import { InputBaseProps, useMantineInput } from './utils';
-import { default as Validator } from '../../common/validation/validator';
-import type { SchemaValidators } from '@common/validation/validators';
+import { default as Validator } from '../../server/services/router/request/validation/validator';
+import type { SchemaValidators } from '@server/services/router/request/validation/validators';
 
 /*----------------------------------
 - TYPES

package/client/services/router/request/api.ts

@@ -15,7 +15,6 @@ import ApiClientService, {
 // Specific
 import type { default as Router, Request } from '..';
 import { toMultipart } from './multipart';
-import FileToUpload from '@client/components/File/FileToUpload';
 
 /*----------------------------------
 - TYPES
@@ -226,7 +225,7 @@ export default class ApiClient implements ApiClientService {
 
             // If file included in data, need to use multipart
             // TODO: deep check
-            const hasFile = Object.values(data).some((value) => value instanceof FileToUpload);
+            const hasFile = Object.values(data).some((value) => value instanceof File);
             if (hasFile) {
                 // GET request = Can't send files
                 if (method === "GET")

package/client/services/router/request/multipart.ts

@@ -4,7 +4,6 @@
 
 // Core
 import { TPostData } from '@common/router/request/api';
-import { FileToUpload } from '@client/components/File';
 
 /*----------------------------------
 - TYPES
@@ -75,10 +74,6 @@ function convertRecursively(
                 }
             }
 
-            // Exract the file object from value
-            if (typeof value === 'object' && value instanceof FileToUpload)
-                value = value.data;
-
             if (isArray(value) || isJsonObject(value)) {
 
                 convertRecursively(value, options, formData, propName);

package/common/router/index.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Npm
-import zod from 'zod';
+import type zod from 'zod';
 
 // types
 import type {

package/common/router/request/api.ts

@@ -4,8 +4,6 @@
 
 import type { HttpMethod } from '@server/services/router';
 
-import type { FileToUpload } from '@client/components/File';
-
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -44,7 +42,7 @@ export type TApiFetchOptions = {
 
 export type TPostData = TPostDataWithFile
 
-export type TPostDataWithFile = { [key: string]: PrimitiveValue | FileToUpload }
+export type TPostDataWithFile = { [key: string]: PrimitiveValue }
 
 export type TPostDataWithoutFile = { [key: string]: PrimitiveValue }
 

package/package.json

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

package/server/app/index.ts

@@ -208,6 +208,8 @@ export abstract class Application<
                         ? route.schema.parse( context.request.data )
                         : {};
 
+                    console.log('-----data', data);
+
                     // Run controller
                     return origController.bind( service )(
                         data, 

package/server/services/router/http/multipart.ts

@@ -6,7 +6,6 @@
 import mime from 'mime-types';
 
 // Core
-import FileToUpload from '@client/components/File/FileToUpload';
 import { InputError } from '@common/errors';
 
 /*----------------------------------
@@ -82,7 +81,11 @@ export const traiterMultipart = (...canaux: any[]) => {
                     && 
                     donnee.data instanceof Buffer
                 ){
-                    donnee = normalizeFile(donnee);
+                    donnee = new File(donnee.data, donnee.name, { 
+                        type: donnee.mimetype,
+                        lastModified: Date.now(),
+                        //size: donnee.size,
+                    });
                 }
                 
                 brancheA[ cle ] = donnee;
@@ -91,24 +94,4 @@ export const traiterMultipart = (...canaux: any[]) => {
     }
 
     return sortie;
-}
-
-const normalizeFile = (file: UploadedFile) => {
-
-    const ext = mime.extension(file.mimetype);
-
-    if (ext === false)
-        throw new InputError(`We couldn't determine the type of the CV file you sent. Please encure it's not corrupted and try again.`);
-
-    return new FileToUpload({
-
-        name: file.name,
-        type: file.mimetype,
-        size: file.size,
-    
-        data: file.data,
-    
-        md5: file.md5,
-        ext: ext
-    })
 }

package/server/services/router/request/index.ts

@@ -10,7 +10,6 @@ import Bowser from "bowser";
 
 // Core
 import BaseRequest from '@common/router/request';
-import type FileToUpload from '@client/components/File/FileToUpload';
 
 // Specific
 import type { 
@@ -40,7 +39,7 @@ const localeFilter = (input: any) => {
     return lang.toUpperCase();
 }
 
-export type UploadedFile = With<FileToUpload, 'md5'|'ext'>
+export type UploadedFile = File
 
 /*----------------------------------
 - CONTEXTE

package/{common → server/services/router/request}/validation/validators.ts

@@ -13,7 +13,6 @@ import normalizeUrl, { Options as NormalizeUrlOptions } from 'normalize-url';
 
 // Core
 import { InputError } from '@common/errors';
-import FileToUpload from '@client/components/File/FileToUpload';
 
 // Speciific
 import Schema, { TSchemaFields } from './schema'
@@ -23,7 +22,7 @@ import Validator, { TValidatorOptions, EXCLUDE_VALUE, TValidatorDefinition } fro
 - TYPES
 ----------------------------------*/
 
-export type TFileValidator = TValidatorOptions<FileToUpload> & {
+export type TFileValidator = TValidatorOptions<File> & {
     type?: string[], // Raccourci, ou liste de mimetype
     taille?: number,
     disk?: string, // Disk to upload files to
@@ -447,14 +446,14 @@ export class SchemaValidators {
     ----------------------------------*/
     public file = ({ type, taille, ...opts }: TFileValidator & {
 
-    } = {}) => new Validator<FileToUpload>('file', (val, options, path) => {
+    } = {}) => new Validator<File>('file', (val, options, path) => {
 
         // Chaine = url ancien fichier = exclusion de la valeur pour conserver l'ancien fichier
         // NOTE: Si la valeur est présente mais undefined, alors on supprimera le fichier
         if (typeof val === 'string')
             return EXCLUDE_VALUE;
 
-        if (!(val instanceof FileToUpload))
+        if (!(val instanceof File))
             throw new InputError(`Must be a File (${typeof val} received)`);
 
         // MIME

package/server/services/schema/index.ts

@@ -6,10 +6,8 @@
 import type { Application } from '@server/app';
 
 // Specific
-import { SchemaValidators, TFileValidator } from '@common/validation/validators';
-import Validator, { TValidatorOptions } from '@common/validation/validator';
-
-import type FileToUpload from '@client/components/File/FileToUpload';
+import { SchemaValidators, TFileValidator } from '@server/services/router/request/validation/validators';
+import Validator, { TValidatorOptions } from '@server/services/router/request/validation/validator';
 
 /*----------------------------------
 - TYPES

package/server/services/schema/request.ts

@@ -7,7 +7,7 @@ import {
     default as Router, RequestService, Request as ServerRequest
 } from '@server/services/router';
 
-import Schema, { TSchemaFields, TValidatedData } from '@common/validation/schema';
+import Schema, { TSchemaFields, TValidatedData } from '@server/services/router/request/validation/schema';
 
 // Specific
 import ServerSchemaValidator from '.';

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"angle-down"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"home"|"user-circle"|"newspaper"|"plus-circle"|"brands/linkedin"|"brands/twitter"|"brands/facebook"|"comment-alt"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"chart-bar"|"power-off"|"heart"|"lock"|"eye"|"credit-card"|"at"|"key"|"seedling"|"palette"|"car"|"plane"|"university"|"hard-hat"|"graduation-cap"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"pills"|"medal"|"capsules"|"balance-scale"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"exclamation"|"solid/download"|"angle-left"|"angle-right"|"check"|"paper-plane"|"long-arrow-left"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"bold"|"italic"|"underline"|"link"|"strikethrough"|"subscript"|"superscript"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"file"|"unlink"|"pen"|"plus"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"angle-down"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"chart-bar"|"power-off"|"heart"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"key"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"exclamation"|"solid/download"|"seedling"|"palette"|"car"|"plane"|"university"|"hard-hat"|"graduation-cap"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"home"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"user-circle"|"plus-circle"|"brands/twitter"|"brands/facebook"|"comment-alt"|"check"|"angle-left"|"angle-right"|"paper-plane"|"long-arrow-left"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"trash"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"unlink"|"pen"|"file"|"plus"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"

package/client/components/File/FileToUpload.ts

@@ -1,34 +0,0 @@
-// Normalize file between browser and nodejs side
-export default class FileToUpload {
-
-    public name: string;
-    public size: number;
-    public type: string;
-
-    public data: File;
-
-    // Retrieved on backend only
-    public md5?: string;
-    public ext?: string;
-
-    public constructor(opts: {
-        name: string,
-        size: number,
-        type: string,
-
-        data: File,
-        
-        md5?: string,
-        ext?: string,
-    }) {
-
-        this.name = opts.name;
-        this.size = opts.size;
-        this.type = opts.type;
-
-        this.data = opts.data;
-
-        this.md5 = opts.md5;
-        this.ext = opts.ext;
-    }
-}

package/client/components/Form.ts

@@ -1,275 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// npm
-import React from 'react';
-
-// Core
-import { InputErrorSchema } from '@common/errors';
-import type { Schema } from '@common/validation';
-import type { TValidationResult, TValidateOptions } from '@common/validation/schema';
-import useContext from '@/client/context';
-
-// Exports
-export type { TValidationResult, TSchemaData } from '@common/validation/schema';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-export type TFormOptions<TFormData extends {}> = {
-    data?: Partial<TFormData>,
-    submit?: (data: TFormData) => Promise<void>,
-    autoValidateOnly?: (keyof TFormData)[],
-    autoSave?: {
-        id: string
-    }
-}
-
-export type FieldsAttrs<TFormData extends {}> = {
-    [fieldName in keyof TFormData]: {}
-}
-
-export type Form<TFormData extends {} = {}> = {
-    
-    // Data
-    fields: FieldsAttrs<TFormData>,
-    data: TFormData,
-    options: TFormOptions<TFormData>,
-    backup?: Partial<TFormData>,
-
-    // Actions
-    setBackup: (backup: Partial<TFormData>) => void,
-    validate: (data: Partial<TFormData>, validateAll?: boolean) => TValidationResult<{}>,
-    set: (data: Partial<TFormData>, merge?: boolean) => void,
-    submit: (additionnalData?: Partial<TFormData>) => Promise<any>,
-    
-} & FormState
-
-type FormState<TFormData extends {} = {}> = {
-    isLoading: boolean,
-    hasChanged: boolean,
-    errorsCount: number,
-    errors: { [fieldName: string]: string[] },
-    backup?: Partial<TFormData>,
-}
-
-/*----------------------------------
-- HOOK
-----------------------------------*/
-export default function useForm<TFormData extends {}>(
-    schema: Schema<TFormData>,
-    options: TFormOptions<TFormData> = {}
-): [ Form<TFormData>, FieldsAttrs<TFormData> ] {
-
-    const context = useContext();
-
-    /*----------------------------------
-    - INIT
-    ----------------------------------*/
-
-    const [state, setState] = React.useState<FormState<TFormData>>({
-        hasChanged: false,//options.data !== undefined,
-        isLoading: false,
-        errorsCount: 0,
-        errors: {},
-        backup: undefined
-    });
-
-    const initialData: Partial<TFormData> = options.data || {};
-
-    // States
-    const fields = React.useRef<FieldsAttrs<TFormData> | null>(null);
-    const [data, setData] = React.useState< Partial<TFormData> >(initialData);
-
-    // When typed data changes
-    React.useEffect(() => {
-
-        // Validate
-        validate(data, { ignoreMissing: true });
-
-        // Autosave
-        if (options.autoSave !== undefined && state.hasChanged) {
-            saveLocally(data, options.autoSave.id);
-        }
-
-    }, [data]);
-
-    // On start
-    React.useEffect(() => {
-
-        // Restore backup
-        if (options.autoSave !== undefined && !state.hasChanged) {
-
-            const autosaved = localStorage.getItem('form.' + options.autoSave.id);
-            if (autosaved !== null) {
-                try {
-                    console.log('[form] Parse autosaved from json:', autosaved);
-                    setState(c => ({
-                        ...c,
-                        backup: JSON.parse(autosaved)
-                    }));
-                } catch (error) {
-                    console.error('[form] Failed to decode autosaved data from json:', autosaved);
-                }
-            }
-        }
-
-    }, []);
-
-    /*----------------------------------
-    - ACTIONS
-    ----------------------------------*/
-    const validate = (allData: Partial<TFormData> = data, opts: TValidateOptions<TFormData> = {}) => {
-
-        const validated = schema.validateWithDetails(allData, allData, {}, {
-            // Ignore the fields where the vlaue has not been changed
-            //  if the validation was triggered via onChange
-            ignoreMissing: false,
-            // The list of fields we should only validate
-            only: options.autoValidateOnly,
-            // Custom options
-            ...opts
-        });
-
-        // Update errors
-        if (validated.errorsCount !== state.errorsCount) {
-            rebuildFieldsAttrs({
-                errorsCount: validated.errorsCount,
-                errors: validated.erreurs,
-            });
-        }
-
-        return validated;
-    }
-
-    const submit = (additionnalData: Partial<TFormData> = {}) => {
-
-        const allData = { ...data, ...additionnalData }
-
-        // Validation
-        const validated = validate(allData);
-        if (validated.errorsCount !== 0) {
-            throw new InputErrorSchema(validated.erreurs);
-        }
-
-        const afterSubmit = (responseData?: any) => {
-
-            // Reset autosaved data
-            if (options.autoSave)
-                localStorage.removeItem('form.' + options.autoSave.id);
-    
-            // Update state
-            setState( current => ({
-                ...current,
-                hasChanged: false
-            }));
-
-            return responseData;
-        }
-
-        // Callback
-        if (options.submit)
-            return options.submit(allData as TFormData).then(afterSubmit);
-        else {
-            afterSubmit();
-            return undefined;
-        }
-    }
-
-    const rebuildFieldsAttrs = (newState: Partial<FormState> = {}) => {
-        // Force rebuilding the fields definition on the next state change
-        fields.current = null;
-        // Force state change
-        setState(old => ({
-            ...old,
-            ...newState
-        }));
-    }
-
-    const saveLocally = (data: Partial<TFormData>, id: string) => {
-        console.log('[form] Autosave data for form:', id, ':', data);
-        localStorage.setItem('form.' + id, JSON.stringify(data));
-    }
-
-    // Rebuild the fields attrs when the schema changes
-    if (fields.current === null || Object.keys(schema).join(',') !== Object.keys(fields.current).join(',')) {
-        fields.current = {} as FieldsAttrs<TFormData>
-        for (const fieldName in schema.fields) {
-
-            const validator = schema.getFieldValidator(fieldName);
-
-            fields.current[fieldName] = {
-
-                // Value control
-                value: data[fieldName],
-                onChange: (val) => {
-                    setData(old => {
-                        return {
-                            ...old,
-                            [fieldName]: typeof val === 'function'
-                                ? val(old[fieldName])
-                                : val
-                        }
-                    })
-
-                    setState(current => ({
-                        ...current,
-                        hasChanged: true
-                    }));
-                },
-
-                // Submit on press enter
-                onKeyDown: e => {
-                    if (e.key === 'Enter' || (e.keyCode || e.which) === 13) {
-                        submit({ [fieldName]: e.target.value } as Partial<TFormData>);
-                    }
-                },
-
-                // Error
-                errors: state.errors[fieldName],
-
-                // Component attributes
-                ...validator.componentAttributes
-            }
-        }
-    }
-
-    /*----------------------------------
-    - EXPOSE
-    ----------------------------------*/
-
-    const form: Form<TFormData> = {
-
-        fields: fields.current,
-        data,
-        set: (data, merge = true) => {
-
-            setState( current => ({
-                ...current,
-                hasChanged: true
-            }));
-
-            setData( merge 
-                ? c => ({ ...c, ...data }) 
-                : data
-            );
-        },
-
-        validate,
-        submit,
-        options,
-
-        setBackup: (backup: Partial<TFormData>) => {
-            
-            setState(c => ({ ...c, backup }));
-
-            if (options.autoSave)
-                localStorage.setItem('form.' + options.autoSave.id, JSON.stringify(backup));
-        },
-
-        ...state
-    }
-
-    return [form, fields.current]
-}