5htp-core 0.6.1 → 0.6.2-1

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/components/router.tsx

@@ -151,8 +151,8 @@ export default ({ service: clientRouter, loaderComponent }: TProps) => {
                 //  But when we call setLayout, the style of the previous layout are still oaded and applied
                 //  Find a way to unload the  previous layout / page resources before to load the new one
                 console.log(LogPrefix, `Changing layout. Before:`, curLayout, 'New layout:', newLayout);
-                window.location.replace( request ? request.url : window.location.href );
-                return page; // Don't spread since it's an instance
+                /*window.location.replace( request ? request.url : window.location.href );
+                return page; // Don't spread since it's an instance*/
 
                 context.app.setLayout(newLayout);
             }

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
@@ -118,16 +117,36 @@ export default class ApiClient implements ApiClientService {
             // For async calls: api.post(...).then((data) => ...)
             then: (callback: (data: any) => void) => this.fetchAsync<TData>(...args)
                 .then(callback)
-                .catch( e => this.app.handleError(e)),
+                .catch( e => {
+                    this.app.handleError(e);
+
+                    // Don't run what is next
+                    return {
+                        then: () => {},
+                        catch: () => {},
+                        finally: (callback: () => void) => {
+                            callback();
+                        },
+                    }
+                }),
 
             // Default error behavior only if not handled before by the app
-            catch: (callback: (data: any) => void) => this.fetchAsync<TData>(...args)
+            catch: (callback: (data: any) => false | void) => this.fetchAsync<TData>(...args)
                 .catch((e) => {
-                    try {
-                        callback(e);
-                    } catch (error) {
-                        this.app.handleError(e)
+
+                    const shouldThrow = callback(e);
+                    if (shouldThrow) 
+                        this.app.handleError(e);
+
+                    // Don't run what is next
+                    return {
+                        then: () => {},
+                        catch: () => {},
+                        finally: (callback: () => void) => {
+                            callback();
+                        },
                     }
+
                 }),
 
             finally: (callback: () => void) => this.fetchAsync<TData>(...args)
@@ -206,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/errors/index.tsx

@@ -43,6 +43,7 @@ export type ServerBug = {
 
     // Context
     hash: string,
+    isDuplicate: boolean,
     date: Date, // Timestamp
     channelType?: string, 
     channelId?: string,

package/common/router/index.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Npm
-import zod from 'zod';
+import type zod from 'zod';
 
 // types
 import type {
@@ -102,6 +102,7 @@ export type TRouteOptions = {
         refresh?: string, 
         urls: string[] 
     },
+    whenStatic?: boolean, // If true, the route is only executed even if the page is cached
     canonicalParams?: string[], // For SEO + unique ID for static cache
     layout?: false | string, // The nale of the layout
 

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
 ----------------------------------*/
@@ -18,6 +16,8 @@ export type TFetcher<TData extends any = unknown> = {
 
     // For async calls: api.post(...).then((data) => ...)
     then: (callback: (data: TData) => void) => Promise<TData>,
+    catch: (callback: (data: any) => false | void) => Promise<TData>,
+    finally: (callback: () => void) => Promise<TData>,
     run: () => Promise<TData>,
     
     method: HttpMethod,
@@ -42,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",
+	"version": "0.6.2-1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -67,8 +67,8 @@
 		"object-sizeof": "^1.6.3",
 		"path-to-regexp": "^6.2.0",
 		"picomatch": "^2.3.1",
-		"preact": "^10.22.1",
-		"preact-render-to-string": "^6.5.5",
+		"preact": "^10.27.1",
+		"preact-render-to-string": "^6.6.1",
 		"prettier": "^3.3.3",
 		"react-scrollbars-custom": "^4.0.27",
 		"react-slider": "^2.0.1",
@@ -88,7 +88,7 @@
 		"yargs-parser": "^21.1.1",
 		"youch": "^3.3.3",
 		"youch-terminal": "^2.2.3",
-		"zod": "^3.24.2"
+		"zod": "^4.1.5"
 	},
 	"devDependencies": {
 		"@types/cookie": "^0.4.1",

package/server/app/container/console/index.ts

@@ -5,6 +5,8 @@
 // Node
 import { serialize } from 'v8';
 import { formatWithOptions } from 'util';
+import md5 from 'md5';
+import dayjs from 'dayjs';
 import Youch from 'youch';
 import forTerminal from 'youch-terminal';
 
@@ -147,6 +149,12 @@ export default class Console {
     public logger!: Logger<ILogObj>;
     // Buffers
     public logs: TJsonLog[] = [];
+    private reported: { 
+        [hash: string]: {
+            times: number,
+            last: Date,
+        } 
+    } = {};
 
     /*----------------------------------
     - LIFECYCLE
@@ -282,35 +290,12 @@ export default class Console {
     // We don't prevent duplicates because we want to receive all variants of the same error
     public async createBugReport( error: TCatchedError, request?: ServerRequest ) {
 
-        /*const youchRes = new Youch(error, {});
-        const jsonResponse = await youchRes.toJSON()
-        console.log( forTerminal(jsonResponse, {
-            // Defaults to false
-            displayShortPath: false,
-
-            // Defaults to single whitspace
-            prefix: ' ',
-
-            // Defaults to false
-            hideErrorTitle: false,
-
-            // Defaults to false
-            hideMessage: false,
-
-            // Defaults to false
-            displayMainFrameOnly: false,
-
-            // Defaults to 3
-            framesMaxLimit: 3,
-        }) );*/
-
         const application = this.container.application;
         if (application === undefined) 
             return console.error(LogPrefix, "Can't send bug report because the application is not instanciated");
 
         // Get context
         const now = new Date();
-        const hash = uuid();
         const { channelType, channelId } = this.getChannel();
 
         // On envoi l'email avant l'insertion dans bla bdd
@@ -353,10 +338,35 @@ export default class Console {
                 : undefined
         }
 
+        // Genertae unique error hash
+        const hash = md5( stacktraces.join('\n') );
+
+        // Don't send the same error twice in a row (avoid email spamming)
+        const lastReport = this.reported[hash];
+        let isDuplicate = false;
+        if (lastReport === undefined) {
+
+            this.reported[hash] = {
+                times: 0,
+                last: new Date()
+            }
+
+        // If error older than 1 day
+        } else if (dayjs(now).diff( dayjs(lastReport.last), 'day' ) > 1) {
+
+            lastReport.times++;
+            lastReport.last = now;
+
+        } else {
+
+            isDuplicate = true;
+        }
+
         const bugReport: ServerBug = {
 
             // Context
             hash: hash,
+            isDuplicate,
             date: now,
             channelType, 
             channelId,

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/app/service/index.ts

@@ -9,7 +9,7 @@ import type { TServiceMetas } from './container';
 import type { TControllerDefinition, TRoute } from '../../services/router';
 import { Anomaly } from "@common/errors";
 
-export { default as schema } from 'zod';
+export { schema } from '../../services/router/request/validation/zod';
 
 /*----------------------------------
 - TYPES: OPTIONS

package/server/services/email/index.ts

@@ -171,7 +171,7 @@ export default abstract class Email<TConfig extends Config>
             
         });
 
-        console.info(LogPrefix, `Sending ${emailsToSend.length} emails via transporter`, emailsToSend[0].subject);
+        console.info(LogPrefix, `Sending ${emailsToSend.length} emails:`, emailsToSend[0].subject);
 
         // Pas d'envoi d'email quand local
         if (this.app.env.name === 'local' && this.config.simulateWhenLocal === true) {

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/index.ts

@@ -221,38 +221,37 @@ export default class ServerRouter
     - ACTIONS
     ----------------------------------*/
 
-    private async renderStatic( 
-        path: string, 
+    public async renderStatic( 
+        url: string, 
         options: TRouteOptions["static"],
         rendered?: any
     ) {
 
         // Wildcard: tell that the newly rendered pages should be cached
-        if (path === '*' || !path)
+        if (url === '*' || !url)
             return;
 
         if (!rendered) {
 
-            const fullUrl = this.url(path, {}, true);
-            console.log('[router] renderStatic', fullUrl);
-
+            const fullUrl = this.url(url, {}, true);
             const response = await got( fullUrl, {
                 method: 'GET',
                 headers: {
-                    'Accept': 'text/html'
+                    'Accept': 'text/html',
+                    'bypasscache': '1'
                 },
                 throwHttpErrors: false,
             });
 
             if (response.statusCode !== 200) {
-                console.error('renderStatic', response.statusCode, response.body);
+                console.error("[router] renderStatic: page returned code", response.statusCode, fullUrl);
                 return;
             }
 
             rendered = response.body;
         }
 
-        this.cache[path] = {
+        this.cache[url] = {
             rendered: rendered,
             options: options,
             expire: typeof options === 'object' 
@@ -266,11 +265,11 @@ export default class ServerRouter
 
         console.log('[router] refreshStaticPages');
         
-        for (const pageId in this.cache) {
-            const page = this.cache[pageId];
-            if (page.path && page.expire && page.expire < Date.now()) {
+        for (const pageUrl in this.cache) {
+            const page = this.cache[pageUrl];
+            if (page.expire && page.expire < Date.now()) {
 
-                this.renderStatic(page.path, page.options);
+                this.renderStatic(pageUrl, page.options);
 
             }
         }
@@ -499,15 +498,12 @@ export default class ServerRouter
             "no-store, no-cache, must-revalidate, proxy-revalidate"
         );
 
-        // Static pages
-        if (this.cache[req.path]) {
-            console.log('[router] Get static page from cache', req.path);
-            res.send( this.cache[req.path].rendered );
-            return;
-        }
-
         // Create request
         let requestId = uuid();
+        const cachedPage = req.headers['bypasscache']
+            ? undefined 
+            : this.cache[req.path];
+
         const request = new ServerRequest(
             requestId,
 
@@ -533,13 +529,25 @@ export default class ServerRouter
                 return await this.resolveApiBatch(request.data.fetchers, request);
 
             } else {
-                response = await this.resolve(request);
+                response = await this.resolve(
+                    request, 
+                    // If cached page, we only run routes with priority >= 10
+                    cachedPage ? true : false
+                );
             }
         } catch (e) {
             response = await this.handleError(e, request);
         }
 
         if (!res.headersSent) {
+
+            // Static pages
+            if (cachedPage) {
+                console.log('[router] Get static page from cache', req.path);
+                res.send( cachedPage.rendered );
+                return;
+            } 
+
             // Status
             res.status(response.statusCode);
             // Headers
@@ -572,7 +580,10 @@ export default class ServerRouter
         return contextServices;
     }
 
-    public resolve = (request: ServerRequest<this>) => new Promise<ServerResponse<this>>((resolve, reject) => {
+    public resolve = (
+        request: ServerRequest<this>, 
+        isStatic?: boolean
+    ) => new Promise<ServerResponse<this>>((resolve, reject) => {
 
         // Create request context so we can access request context across all the request-triggered libs
         context.run({ 
@@ -613,6 +624,9 @@ export default class ServerRouter
                 // Classic routes
                 for (route of this.routes) {
 
+                    if (isStatic && !route.options.whenStatic)
+                        continue;
+
                     // Match Method
                     if (request.method !== route.method && route.method !== '*')
                         continue;
@@ -710,11 +724,11 @@ export default class ServerRouter
         request.res.json(responseData);
     }
 
-    private async handleError( e: Error |CoreError | ZodError, request: ServerRequest<ServerRouter> ) {
+    private async handleError( e: Error | CoreError | ZodError, request: ServerRequest<ServerRouter> ) {
 
         if (e instanceof ZodError)
             e = new InputError( 
-                e.errors.map(e => e.path.join('.') + ': ' + e.message).join(', ') 
+                e.issues.map((e) => e.path.join('.') + ': ' + e.message).join(', ') 
             );
 
         const code = 'http' in e ? e.http : 500;

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/router/request/validation/zod.ts

@@ -0,0 +1,97 @@
+import { InputError } from '@common/errors';
+import zod from 'zod';
+
+export type TRichTextValidatorOptions = {
+    attachements?: boolean
+}
+
+// Recursive function to validate each node
+function validateLexicalNode(node: any, opts: TRichTextValidatorOptions ) {
+
+    // Each node should be an object with a `type` property
+    if (typeof node !== 'object' || !node.type || typeof node.type !== 'string')
+        throw new InputError("Invalid rich text value (3).");
+
+    // Validate text nodes
+    if (node.type === 'text') {
+
+        if (typeof node.text !== 'string')
+            throw new InputError("Invalid rich text value (4).");
+
+        // Validate paragraph, heading, or other structural nodes that may contain children
+    } else if (['paragraph', 'heading', 'list', 'listitem'].includes(node.type)) {
+
+        if (!Array.isArray(node.children) || !node.children.every(children => validateLexicalNode(children, opts))) {
+            throw new InputError("Invalid rich text value (5).");
+        }
+
+        // Files upload
+    } else if (node.type === 'image') {
+
+        // Check if allowed
+        /*if (opts.attachements === undefined)
+            throw new InputError("Image attachments not allowed in this rich text field.");*/
+
+        // TODO: check mime
+
+
+        // Upload file
+
+
+    }
+
+    return true;
+}
+
+export const schema = { 
+    ...zod,  
+
+    file: (builder: (file: zod.ZodType<File>) => any) => schema.custom(val => {
+
+        // 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 true;
+
+        // Default file validation
+        const fileInstance = zod.file();
+
+        return builder(fileInstance).parse(val);
+    }),
+
+    richText: (opts: TRichTextValidatorOptions = {}) => schema.custom(val => {
+
+        if (typeof val !== 'string') {
+            console.error("Invalid rich text format.", val);
+            return false;
+        }
+
+        // We get a stringified json as input since the editor workds with JSON string
+        try {
+            val = JSON.parse(val);
+        } catch (error) {
+            console.error("Failed to parse rich text json:", error, val);
+            return false;//throw new InputError("Invalid rich text format.");
+        }
+
+        // Check that the root exists and has a valid type
+        if (!val || typeof val !== 'object' || typeof val.root !== 'object' || val.root.type !== 'root') {
+            console.error("Invalid rich text value (1).", val);
+            return false;//throw new InputError("Invalid rich text value (1).");
+        }
+
+        // Check if root has children array
+        if (!Array.isArray(val.root.children)) {
+            console.error("Invalid rich text value (2).", val);
+            return false;
+        }
+
+        // Validate each child node in root
+        for (const child of val.root.children) {
+            if (!validateLexicalNode(child, opts))
+                return false;
+        }
+
+        return true;
+    })
+}

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"|"chart-bar"|"power-off"|"heart"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"key"|"exclamation"|"solid/download"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"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"|"paper-plane"|"check"|"angle-left"|"angle-right"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"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"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"angle-down"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"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"|"heart"|"lock"|"eye"|"credit-card"|"at"|"key"|"chart-bar"|"power-off"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"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"|"exclamation"|"solid/download"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"paper-plane"|"check"|"long-arrow-left"|"angle-left"|"angle-right"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"unlink"|"pen"|"link"|"file"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"plus"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"

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]
-}