5htp-core 0.2.2 → 0.2.4-1

package/src/client/services/router/components/Page.tsx

@@ -34,26 +34,24 @@ export default ({ page, isCurrent }: { page: Page, isCurrent?: boolean }) => {
 
     }, [page]);
 
-    return (
+    /*
         <div 
             class={"page" + (isCurrent ? ' current' : '')} 
             id={page.chunkId === undefined ? undefined : 'page_' + page.chunkId}
         >
-
-            {/* Make request parameters and api data accessible from the page component */}
-            {page.renderer ? (
-
-                <page.renderer 
-                    // Services
-                    {...context} 
-                    // URL params
-                    {...context.request.data} 
-                    // API data
-                    {...apiData} 
-                />
-                
-            ) : null}
-
-        </div>
-    )
+    */
+
+    //  Make request parameters and api data accessible from the page component
+    return page.renderer ? (
+
+        <page.renderer 
+            // Services
+            {...context} 
+            // URL params
+            {...context.request.data} 
+            // API data
+            {...apiData} 
+        />
+        
+    ) : null
 }

package/src/client/services/router/components/router.tsx

@@ -77,8 +77,8 @@ export default ({ service: router }: { service: Router }) => {
             }
 
             // If if the layout changed
-            const curLayout = currentRoute?.options.layout;
-            const newLayout = newpage?.route.options.layout;
+            const curLayout = pages.current?.layout;
+            const newLayout = newpage?.layout;
             if (newLayout && curLayout && newLayout.path !== curLayout.path) {
 
                 // TEMPORARY FIX: reload everything when we change layout
@@ -126,7 +126,7 @@ export default ({ service: router }: { service: Router }) => {
         return history?.listen(async (locationUpdate) => {
 
             // Load the concerned route
-            const request = new ClientRequest(locationUpdate.location, context);
+            const request = new ClientRequest(locationUpdate.location, context.router);
             await resolvePage(request);
             
             // Scroll to the selected content via url hash

package/src/client/services/router/index.tsx

@@ -116,21 +116,24 @@ export type THookCallback<TRouter extends ClientRouter> = (request: ClientReques
 
 type THookName = 'location.change' | 'page.changed'
 
-type Config = {
+type Config<TAdditionnalContext extends {} = {}> = {
     preload: string[], // List of globs
+    context: () => TAdditionnalContext
 }
 
 /*----------------------------------
 - ROUTER
 ----------------------------------*/
 export default class ClientRouter<
-    TApplication extends ClientApplication = ClientApplication
-> extends Service<Config, ClientApplication> implements BaseRouter {
+    TApplication extends ClientApplication = ClientApplication,
+    TAdditionnalContext extends {} = {}
+> extends Service<Config<TAdditionnalContext>, ClientApplication> implements BaseRouter {
 
-    public ssrData = window["ssr"] as (TBasicSSrData | undefined);
+    // Context data
+    public context = window["ssr"] as (TBasicSSrData | undefined);
     public ssrRoutes = window["routes"] as TSsrUnresolvedRoute[];
 
-    public constructor(app: TApplication, config: Config) {
+    public constructor(app: TApplication, config: Config<TAdditionnalContext>) {
 
         super(app, config);
     }
@@ -157,7 +160,7 @@ export default class ClientRouter<
 
         const loaders: TRoutesLoaders = { ...coreRoutes, ...appRoutes }
         let currentRoute: TUnresolvedRoute | undefined;
-        debug && console.log(LogPrefix, `Indexing routes and finding the current route from ssr data:`, this.ssrData);
+        debug && console.log(LogPrefix, `Indexing routes and finding the current route from ssr data:`, this.context);
 
         // Associe la liste des routes (obtenue via ssr) à leur loader
         for (let routeIndex = 0; routeIndex < this.ssrRoutes.length; routeIndex++) {
@@ -195,9 +198,9 @@ export default class ClientRouter<
             if (currentRoute === undefined) {
 
                 const isCurrentRoute = (
-                    this.ssrData !== undefined
+                    this.context !== undefined
                     &&
-                    route.chunk === this.ssrData.page.chunkId
+                    route.chunk === this.context.page.chunkId
                 );
 
                 if (isCurrentRoute) {
@@ -212,7 +215,7 @@ export default class ClientRouter<
 
     public page(...args: TRegisterPageArgs): TRoute {
 
-        const { path, options, controller, renderer } = getRegisterPageArgs(...args);
+        const { path, options, controller, renderer, layout } = getRegisterPageArgs(...args);
 
         // S'il s'agit d'une page, son id doit avoir été injecté via le plugin babel
         const id = options["id"];
@@ -230,7 +233,7 @@ export default class ClientRouter<
                 ...defaultOptions,
                 ...options
             },
-            controller: (context: TClientOrServerContext) => new ClientPage(controller, renderer, context)
+            controller: (context: TClientOrServerContext) => new ClientPage(controller, renderer, context, layout)
         };
 
         this.routes.push(route);
@@ -343,15 +346,15 @@ export default class ClientRouter<
 
         // Restituate SSR response
         let apiData: {} = {}
-        if (this.ssrData) {
+        if (this.context) {
 
             console.log("SSR Response restitution ...");
 
-            request.user = this.ssrData.user || null;
+            request.user = this.context.user || null;
 
-            request.data = this.ssrData.request.data;
+            request.data = this.context.request.data;
 
-            apiData = this.ssrData.page.data || {};
+            apiData = this.context.page.data || {};
         }
 
         // Replacer api data par ssr data

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

@@ -127,7 +127,7 @@ export default class ApiClient implements ApiClientService {
 
         return await this.fetch<TData>(method, path, data, options).catch((e) => {
             this.app.handleError(e);
-            throw e;
+            throw e; // Throw to break the loop
         })
     }
 
@@ -136,8 +136,9 @@ export default class ApiClient implements ApiClientService {
         // Pick the fetchers where the data is needed
         const fetchersToRun: TFetcherList = {};
         let fetchersCount: number = 0;
-        for (const fetcherId in fetchers)
-            if (!( fetcherId in alreadyLoadedData )) {
+        for (const fetcherId in fetchers) 
+            // The fetcher can be undefined
+            if (!( fetcherId in alreadyLoadedData ) && fetchers[ fetcherId ]) {
                 fetchersToRun[ fetcherId ] = fetchers[ fetcherId ]
                 fetchersCount++;
             }
@@ -157,6 +158,8 @@ export default class ApiClient implements ApiClientService {
 
             });
 
+        // Errors will be catched in the caller
+
         return { ...alreadyLoadedData, ...fetchedData }
     }
 

package/src/client/services/router/response/index.tsx

@@ -42,6 +42,8 @@ export type TRouterContext<TRouter extends ClientRouter = ClientRouter, TApplica
     // Expose client application services (api, socket, ...)
     //TRouter["app"] 
     TApplication
+    &
+    ReturnType<TRouter["config"]["context"]>
 )
 
 /*----------------------------------
@@ -80,6 +82,8 @@ export default class ClientPageResponse<
             request: this.request,
             route: this.route,
             api: this.request.api,
+
+            ...this.request.router.config.context()
         }
 
         context.context = context;

package/src/client/services/router/response/page.ts

@@ -6,7 +6,7 @@
 import type { ComponentChild } from 'preact';
 
 // Core
-import type { TClientOrServerContext } from '@common/router';
+import type { TClientOrServerContext, Layout } from '@common/router';
 import PageResponse, { TDataProvider, TFrontRenderer } from "@common/router/response/page";
 
 // Specific
@@ -32,6 +32,7 @@ export default class ClientPage<TRouter = ClientRouter> extends PageResponse<TRo
         public dataProvider: TDataProvider | null,
         public component: TFrontRenderer,
         public context: TClientOrServerContext,
+        public layout?: Layout,
 
         public route = context.route
     ) {

package/src/common/router/index.ts

@@ -98,7 +98,7 @@ export type TRouteOptions = {
     // Access Restriction
     auth?: TUserRole | boolean,
     //form?: TSchema,
-    layout?: false | Layout,
+    layout?: false | string, // The nale of the layout
 
     TESTING?: boolean,
     logging?: boolean,

package/src/common/router/layouts.ts

@@ -6,6 +6,7 @@
 import type { ComponentChild } from 'preact';
 // Core
 import type { ClientContext } from '@/client/context';
+import type { TRouteOptions } from '.';
 // App
 import layouts from '@/client/pages/**/_layout/index.tsx';
 
@@ -30,20 +31,51 @@ export type ImportedLayouts = {
 - UTILS
 ----------------------------------*/
 // TODO: getLayot only on server side, and pass the layout chunk id
-export const getLayout = (routePath: string | undefined): Layout | undefined => {
+export const getLayout = (routePath: string, routeOptions?: TRouteOptions): Layout | undefined => {
+
+    if (routeOptions === undefined)
+        return undefined;
+    // W don't want a layout on this page
+    if (routeOptions.layout === false)
+        return undefined;
+
+    // options.id has been injected via the babel plugon
+    const chunkId = routeOptions["id"];
+    if (chunkId === undefined)
+        throw new Error(`ID has not injected for the following page route: ${routePath}`);
 
-    //console.log(`[router][layouts] Get layout for "${routePath}".`);
-    
     let layout: Layout | undefined;
-    if (routePath) {
+    
+    // Layout via name
+    if (routeOptions.layout !== undefined) {
+
+        const LayoutComponent = layouts[routeOptions.layout];
+        if (LayoutComponent === undefined)
+            throw new Error(`No layout found with ID: ${routeOptions.layout}. registered layouts: ${Object.keys(layouts)}`);
+
+        layout = { 
+            path: routeOptions.layout, 
+            Component: layouts[routeOptions.layout] 
+        }
+
+    } else {
+            
+        // Automatic layout via the nearest _layout folder
         for (const layoutPath in layouts)
-            if (routePath === layoutPath || routePath.startsWith( layoutPath + '_' ))
+            if (
+                // The layout is nammed index when it's at the root (@/client/pages/_layout)
+                layoutPath === 'index' 
+                // Exact match
+                || chunkId === layoutPath 
+                // Parent
+                || chunkId.startsWith( layoutPath + '_' )
+            )
                 layout = { 
                     path: layoutPath, 
                     Component: layouts[layoutPath] 
                 };
     }
-
+    
     //console.log(`[router][layouts] Get layout for "${routePath}". Found:`, layout);
 
     return layout;

package/src/common/router/register.ts

@@ -29,16 +29,10 @@ export const getRegisterPageArgs = (...args: TRegisterPageArgs) => {
     else
         ([path, options, controller, renderer] = args)
 
-    // S'il s'agit d'une page, son id doit avoir été injecté via le plugin babel
-    const chunkId = options["id"];
-    if (chunkId === undefined)
-        throw new Error(`ID has not injected for the following page route: ${path}`);
+    // Automatic layout form the nearest _layout folder
+    const layout = getLayout(path, options);
 
-    // Bind layout
-    if (options.layout !== false)
-        options.layout = getLayout(chunkId);
-
-    return { path, options, controller, renderer }
+    return { path, options, controller, renderer, layout }
 
 }
 

package/src/common/router/request/api.ts

@@ -10,7 +10,9 @@ import type { FileToUpload } from '@client/components/inputv3/file';
 - TYPES
 ----------------------------------*/
 
-export type TFetcherList = { [id: string]: TFetcher }
+// The fetcher can be undefined if we put a condition on it
+// By example if we want to fetch an api endpoint only if the url contains a certain url parameter
+export type TFetcherList = { [id: string]: TFetcher | undefined }
 
 export type TPostData = {[key: string]: PrimitiveValue}
 

package/src/common/validation/index.ts

@@ -1,3 +1,4 @@
 export { default as Schema } from './schema';
+export type { TSchemaFields } from './schema';
 export { default as Validators } from './validators';
 export { default as Validator } from './validator';

package/src/common/validation/schema.ts

@@ -14,6 +14,10 @@ import { default as Validator, EXCLUDE_VALUE } from './validator';
 
 export type TSchemaFields = { [fieldName: string]: Schema<{}> | Validator<any> }
 
+type TSchemaOptions = {
+    opt?: boolean
+}
+
 type TOptsValider = {
     debug?: boolean,
     throwError?: boolean,
@@ -46,7 +50,8 @@ const LogPrefix = '[schema][validator]';
 export default class Schema<TFields extends TSchemaFields> {
 
     public constructor(
-        public fields: TFields
+        public fields: TFields,
+        public options: TSchemaOptions = {}
     ) {
 
     }
@@ -88,7 +93,7 @@ export default class Schema<TFields extends TSchemaFields> {
                 opts.debug && console.warn(LogPrefix, '[' + champ + ']', 'Exclusion (pas présent dans le schéma)');
                 continue;
             }
-    
+
             const cheminA = [...chemin, champ]
             const cheminAstr = cheminA.join('.')
     
@@ -173,7 +178,7 @@ export default class Schema<TFields extends TSchemaFields> {
         if (nbErreurs !== 0 && opts.throwError === true) {
             throw new InputErrorSchema(erreurs);
         }
-    
+        
         opts.debug && console.log(LogPrefix, '', dataToValidate, '=>', output);
     
         return { 

package/src/common/validation/validators.ts

@@ -63,8 +63,10 @@ export default class SchemaValidator {
             return val;
         }, opts)
 
-    public array = (subtype?: Validator<any[]>, { choice, ...opts }: TValidator<any[]> & {
-        choice?: any[]
+    public array = (subtype?: Validator<any>, { choice, min, max, ...opts }: TValidator<any[]> & {
+        choice?: any[],
+        min?: number, 
+        max?: number
     } = {}) => {
 
         if (subtype !== undefined)
@@ -72,12 +74,17 @@ export default class SchemaValidator {
 
         return new Validator<any[]>('array', (items, input, output, corriger) => {
 
-            //console.log('VALIDER ARRAY', items, input);
-
+            // Type
             if (!Array.isArray(items))
-                throw new InputError("This value must be an array.");
+                throw new InputError("This value must be a list.");
+
+            // Items number
+            if ((min !== undefined && items.length < min))
+                throw new InputError(`Please select at least ${min} items.`);
+            if ((max !== undefined && items.length > max))
+                throw new InputError(`Please select maximum ${max} items.`);
 
-            // Verif items
+            // Verif each item
             if (subtype !== undefined) {
                 if (false/*subtype instanceof Schema*/) {
 
@@ -85,9 +92,9 @@ export default class SchemaValidator {
 
                 } else {
 
-                    for (let i = 0; i < items.length; i++)
-                        items[i] = subtype.validate( items[i], items, items, corriger );
-
+                    items = items.map( item =>
+                        subtype.validate( item, items, items, corriger )
+                    )
                 }
             }
 
@@ -101,7 +108,7 @@ export default class SchemaValidator {
     }
 
     public choice = (values: any[], opts: TValidator<any> & {} = {}) => 
-        new Validator<any>('object', (val, input, output) => {
+        new Validator<any>('choice', (val, input, output) => {
 
             if (!values.includes(val))
                 throw new InputError("Invalid value. Must be: " + values.join(', '));
@@ -116,6 +123,10 @@ export default class SchemaValidator {
     public string = ({ min, max, ...opts }: TValidator<string> & { min?: number, max?: number } = {}) => 
         new Validator<string>('string', (val, input, output, corriger?: boolean) => {
 
+            // Choice value from Select component
+            if (typeof val === 'object' && val.value)
+                val = val.value;
+
             if (val === '')
                 return undefined;
             else if (typeof val === 'number')

package/src/server/app/index.ts

@@ -87,7 +87,7 @@ export default abstract class Application extends Service<Config, Hooks, /* TODO
     ----------------------------------*/
 
     public env: TEnvConfig;
-    public abstract identity: Config.Identity;
+    public identity: Config.Identity;
 
     public constructor() {
 
@@ -103,6 +103,9 @@ export default abstract class Application extends Service<Config, Hooks, /* TODO
         // Load config files
         const configParser = new ConfigParser( this.path.root );
         this.env = configParser.env();
+        this.identity = configParser.identity();
+
+        console.log(`[boot] Environment:`, this.env);
     }
 
     /*----------------------------------

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

@@ -170,7 +170,7 @@ export default class BugReporter {
             channelType, 
             channelId,
             // User
-            user: request?.user?.name,
+            user: request?.user?.email,
             ip: request?.ip,
             // Error
             error,
@@ -180,25 +180,8 @@ export default class BugReporter {
 
         await this.sendToTransporters(bugReport);
 
-        // TODO: Move on App side
-        /*if (app.isLoaded('sql'))
-            // Memorize
-            $.sql.insert('BugServer', {
-                // Context
-                hash: hash,
-                date: now,
-                channelType, 
-                channelId,
-                // User
-                user: request?.user?.name,
-                ip: request?.ip,
-                // Error
-                stacktrace: error.stack || error.message,
-                logs: logsHtml
-            });*/
-
         // Update error message
-        error.message = "A bug report has been sent to my personal mailbox. Sorry for the inconvenience.";
+        error.message = "We encountered an internal error, and our team has just been notified. Sorry for the inconvenience.";
     }
 
     public async application( report: AppBugInfos ) {

package/src/server/services/database/connection.ts

@@ -28,18 +28,10 @@ const LogPrefix = '[database][connection]';
 
 export type DatabaseServiceConfig = {
     list: string[],
-    dev: {
-        host: string,
-        port: number,
-        login: string,
-        password: string,
-    },
-    prod: {
-        host: string,
-        port: number,
-        login: string,
-        password: string,
-    }
+    host: string,
+    port: number,
+    login: string,
+    password: string,
 }
 
 export type THooks = {
@@ -113,15 +105,13 @@ export default class DatabaseConnection extends Service<DatabaseServiceConfig, T
 
         console.info(LogPrefix, `Connecting to databases ...`);
 
-        const creds = this.config[ this.app.env.profile ];
-
         return await mysql.createPool({
 
             // Identification
-            host: creds.host,
-            port: creds.port,
-            user: creds.login,
-            password: creds.password,
+            host: this.config.host,
+            port: this.config.port,
+            user: this.config.login,
+            password: this.config.password,
             database: this.config.list[0],
 
             // Pool

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

@@ -279,7 +279,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
     public update<TData extends TObjetDonnees>(
         tableName: string, 
         data: TData[], 
-        where: (keyof TData)[], 
+        where?: (keyof TData)[], 
         opts?: TUpdateQueryOptions<TData>
     );
 
@@ -287,30 +287,42 @@ export default class SQL extends Service<Config, Hooks, Application> {
     public update<TData extends TObjetDonnees>(
         tableName: string, 
         data: TData, 
-        where: (keyof TData)[] | TObjetDonnees, 
+        where?: (keyof TData)[] | TObjetDonnees, 
         opts?: TUpdateQueryOptions<TData>
     );
 
     public update<TData extends TObjetDonnees>(...args: [
         tableName: string, 
         data: TData[], 
-        where: (keyof TData)[], 
+        where?: (keyof TData)[], 
         opts?: TUpdateQueryOptions<TData>
     ] | [
         tableName: string, 
         data: TData, 
-        where: (keyof TData)[] | TObjetDonnees, 
+        where?: (keyof TData)[] | TObjetDonnees, 
         opts?: TUpdateQueryOptions<TData>
-    ]) {
+    ]): Promise<ResultSetHeader> {
 
         let [tableName, data, where, opts] = args;
 
         // Multiple updates in one
         if (Array.isArray( data ))
             return this.database.query(
-                data.map(record => this.update(tableName, record, where, opts)).join(';\n')
+                data.map( record => 
+                    this.update(tableName, record, where, { ...opts, returnQuery: true })
+                ).join(';\n')
             )
 
+        // Automatic where based on pks
+        if (where === undefined) {
+
+            const tableMetas = this.database.getTable(tableName);
+            if (tableMetas.pk.length === 0)
+                throw new Error(`Tried to build the where condition based on the pks list, but no pk is attached to this table ${tableMetas.chemin}`);
+
+            where = tableMetas.pk;
+        }
+
         // No condition specified = use the pks
         if (Array.isArray(where)) {
             const whereColNames = where;
@@ -380,14 +392,9 @@ export default class SQL extends Service<Config, Hooks, Application> {
         let querySuffix: string = '';
 
         // Upsert
-        if (opts.upsert !== undefined) {
-            const upsertStatement = this.buildUpsertStatement<TData>(table, opts as With<TInsertQueryOptions<TData>, 'upsert'>);
-            if (upsertStatement === null)
-                opts.try = true;
-            else
-                querySuffix += ' ' + upsertStatement;
-        }
-
+        if (opts.upsert !== undefined)
+            querySuffix += ' ' + this.buildUpsertStatement<TData>(table, opts as With<TInsertQueryOptions<TData>, 'upsert'>);
+        
         // Create basic insert query
         const query = this.buildInsertStatement(table, data, opts) + querySuffix;
 
@@ -436,15 +443,14 @@ export default class SQL extends Service<Config, Hooks, Application> {
     private buildUpsertStatement<TData extends TObjetDonnees>( 
         table: TMetasTable, 
         opts: With<TInsertQueryOptions<TData>, 'upsert'> 
-    ): string | null {
+    ): string {
 
         const valuesToUpdate = this.getValuesToUpdate(table, opts.upsert);
 
         // All columns are ps
         const valuesToUpdatesEntries = Object.entries(valuesToUpdate);
         if (valuesToUpdatesEntries.length === 0)
-            // Replace by insert ignore
-            return null;
+            throw new Error(`You should provide at least one column to update in case of the record already exists.`);
 
         return 'ON DUPLICATE KEY UPDATE ' + valuesToUpdatesEntries.map(([ colName, value ]) => 
             '`' + colName + '` = ' + value
@@ -465,7 +471,9 @@ export default class SQL extends Service<Config, Hooks, Application> {
         if (colsToUpdate === '*') {
 
             console.log(LogPrefix, `Automatic upsert into ${table.chemin} using ${table.pk.join(', ')} as pk`);
-            valuesNamesToUpdate = table.columnNamesButPk;
+            valuesNamesToUpdate = Object.keys(table.colonnes);// table.columnNamesButPk;
+            // We don't take columnNamesButPk, because if all the columns are pks, we don't have yny value for the ON DUPLICATE KEY
+            //  Meaning
 
         } else if (Array.isArray( colsToUpdate )) {
 
@@ -479,7 +487,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
                 valuesToUpdate[ colKey ] = this.esc(customValuesToUpdate[ colKey ]);
 
             if (updateAll)
-                valuesNamesToUpdate = table.columnNamesButPk;
+                valuesNamesToUpdate = Object.keys(table.colonnes);//table.columnNamesButPk;
 
         }