proteum 1.0.0-5 → 1.0.2

package/cli/compiler/client/index.ts

@@ -228,8 +228,9 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
             ]),
         ],
 
+        // CSP-safe in development: avoid any `eval`-based source map mode.
         // https://webpack.js.org/configuration/devtool/#devtool
-        devtool: dev ? 'eval-cheap-module-source-map' : 'source-map',
+        devtool: dev ? 'cheap-module-source-map' : 'source-map',
         /*devServer: {
             hot: true,
         },*/

package/cli/compiler/common/babel/plugins/services.ts

@@ -242,10 +242,10 @@ function Plugin(babel, { app, side, debug }: TOptions) {
 
         // Count how many total imports we transform
         importedCount: number,
-        routeMethods: string[],
         routePaths: Set<string>,
         routesIndex: TRoutesIndex,
         contextGuardedClassMethods: WeakSet<types.ClassMethod>,
+        routeDecoratedClassMethods: WeakSet<types.ClassMethod>,
 
         // For every local identifier, store info about how it should be rewritten
         imported: {
@@ -262,11 +262,11 @@ function Plugin(babel, { app, side, debug }: TOptions) {
             this.importedCount = 0;
             this.debug = debug || false;
 
-            this.routeMethods = [];
             this.routePaths = new Set();
 
             this.routesIndex = getRoutesIndex(app.paths.root);
             this.contextGuardedClassMethods = new WeakSet();
+            this.routeDecoratedClassMethods = new WeakSet();
         },
 
         visitor: {
@@ -288,8 +288,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
 
                             if (!isRoute) continue;
 
-                            const methodName = node.key.name;
-                            this.routeMethods.push( methodName );
+                            this.routeDecoratedClassMethods.add(node);
 
                             const routePath = getRoutePathFromDecoratorExpression(decorator.expression);
                             if (routePath)
@@ -462,8 +461,9 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                 // Must have a method name
                 if (path.node.key.type !== 'Identifier') return;
 
-                // Init context
+                // Track whether this exact method is decorated with @Route.
                 const methodName = path.node.key.name;
+                const isRouteMethod = this.routeDecoratedClassMethods.has(path.node);
                 let params = path.node.params;
 
                 // Prefix references
@@ -531,6 +531,13 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                         );
                     }
                     else if (ref.source === 'request') {
+                        // Only route handlers receive the `context` parameter.
+                        if (!isRouteMethod) {
+                            throw subPath.buildCodeFrameError(
+                                `@request import "${ref.local}" can only be used inside @Route methods (found in "${methodName}").`
+                            );
+                        }
+
                         // this.app.Models.client.[identifier]
                         // e.g. this.app.Models.client.MyModel
                         subPath.replaceWith(
@@ -544,7 +551,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                 } });
 
                 if (
-                    this.routeMethods.includes(methodName) 
+                    isRouteMethod
                     && 
                     path.node.params.length < 2
                 ) {

package/cli/compiler/common/index.ts

@@ -54,11 +54,11 @@ export default function createCommonConfig(
         mode: dev ? 'development' : 'production',
 
         resolveLoader: {
-            // Recherche des loaders dans framework/node_modules (psinon, webpack cherche dans le projet)
+            // Support both install modes:
+            // - npm i: loaders are often hoisted in app/node_modules
+            // - npm link: loaders often live in framework/node_modules
             modules: [
-                // The line below is not necessary
-                // By default, webpack is supposed to search in the project directory at first
-                //cli.paths.appRoot + '/node_modules',
+                app.paths.root + '/node_modules',
                 cli.paths.core.root + '/node_modules',
                 cli.paths.core.cli + '/node_modules',
             ],
@@ -125,14 +125,14 @@ export default function createCommonConfig(
         bail: !dev,
 
         // Persistent cache speeds up cold starts and incremental rebuilds.
-        cache: (dev || cli.args.cache === true) ? {
+        cache: /*(dev || cli.args.cache === true) ? {
             type: 'filesystem',
             cacheDirectory: path.join(app.paths.cache, 'webpack', side),
             compression: false,
             buildDependencies: {
                 config: [__filename],
             },
-        } : false,
+        } : */false,
 
         // Increase compilation performance
         profile: false,

package/cli/compiler/index.ts

@@ -287,6 +287,18 @@ declare module '@models/types' {
     export * from '@/var/prisma/index';
 }
 
+declare module '@common/errors' {
+            
+    export * from '@common/errors/index';
+    export { default } from '@common/errors/index';
+
+    export const AuthRequired: typeof import('@common/errors/index').AuthRequired<FeatureKeys>;
+    export type AuthRequired = import('@common/errors/index').AuthRequired<FeatureKeys>;
+
+    export const UpgradeRequired: typeof import('@common/errors/index').UpgradeRequired<FeatureKeys>;
+    export type UpgradeRequired = import('@common/errors/index').UpgradeRequired<FeatureKeys>;
+}
+
 declare module '@request' {
     
 }
@@ -377,6 +389,14 @@ declare type ${appClassIdentifier} = import("@/server/.generated/app").default;
 
 declare module '@cli/app' {
 
+    type TSetupConfig<TConfig> =
+        TConfig extends (...args: any[]) => any ? TConfig
+        : TConfig extends Array<infer TItem> ? Array<TSetupConfig<TItem>>
+        : TConfig extends object ? {
+            [K in keyof TConfig]: TSetupConfig<TConfig[K]> | TServiceSetup | TServiceRef
+        }
+        : TConfig;
+
     type App = {
 
         env: TEnvConfig;
@@ -391,7 +411,7 @@ declare module '@cli/app' {
             // app.setup('User', 'Core/User')
             serviceName: TServiceName, 
             servicePath: string,
-            serviceConfig?: ${appClassIdentifier}[TServiceName]["config"]
+            serviceConfig?: TSetupConfig<${appClassIdentifier}[TServiceName]["config"]>
         ]) => TServiceSetup;
     }
     const app: App;
@@ -436,7 +456,7 @@ declare module '@server/app' {
 
 declare module '@request' {
     import type { TRouterContext } from '@server/services/router/response';
-    const routerContext: TRouterContext<CrossPath["Router"]>;
+    const routerContext: TRouterContext<${appClassIdentifier}["Router"]>;
     export = routerContext;
 }
     
@@ -453,6 +473,18 @@ declare module '@models' {
   
     export = models;
 }
+
+declare module '@common/errors' {
+        
+    export * from '@common/errors/index';
+    export { default } from '@common/errors/index';
+
+    export const AuthRequired: typeof import('@common/errors/index').AuthRequired<FeatureKeys>;
+    export type AuthRequired = import('@common/errors/index').AuthRequired<FeatureKeys>;
+
+    export const UpgradeRequired: typeof import('@common/errors/index').UpgradeRequired<FeatureKeys>;
+    export type UpgradeRequired = import('@common/errors/index').UpgradeRequired<FeatureKeys>;
+}
     
 declare module '@models/types' {
     export * from '@/var/prisma/index';
@@ -529,4 +561,4 @@ declare module '@models/types' {
 
     }
 
-}
+}

package/client/app/index.ts

@@ -120,6 +120,8 @@ export default abstract class Application {
     }
 
     public abstract handleError( error: CoreError | Error );
+    
+    public abstract handleUpdate(): void;
 
     // TODO: move on app side
     public reportBug = (infos: TBugReportInfos) => fetch('/feedback/bug/ui', {

package/client/components/Dialog/Manager.tsx

@@ -12,8 +12,6 @@ import { blurable, deepContains, focusContent } from '@client/utils/dom';
 
 // Specific
 import type Application from '../../app';
-import Card, { Props as CardInfos } from './card';
-import Button from '../Button';
 
 /*----------------------------------
 - TYPES: IMPORTATIONS
@@ -67,8 +65,6 @@ type DialogActions = {
 
     show: (...args: TDialogShowArgs ) => TDialogControls,
 
-    confirm: (title: string, content: string | ComponentChild, defaultBtn: 'Yes'|'No') => TDialogControls,
-
     loading: (title: string) => TDialogControls,
 
     info: (...[title, content, boutons, options]: TToastShortcutArgs) => TDialogControls,
@@ -137,34 +133,11 @@ export const createDialog = (app: Application, isToast: boolean): DialogActions
                     content: Content
                 }
             }
-
-            // modal.show({ title: 'supprimer', content: <>...</> })
-            if (Content.constructor === Object) {
-
-                const { content: CardContent, data = {}, ...propsToast } = Content as TOptsToast;
-                
-                let cardContent: ComponentChild;
-                if (typeof CardContent === 'function') {
-                    cardContent = <CardContent {...propsRendu} {...data} />
-                    propsToast.boutons = null; // Component content = advanced content = should include buttons
-                } else {
-                    cardContent = CardContent;
-                }
-                
-                render = (
-                    <Card {...propsRendu} {...propsToast} isToast={isToast}>
-                        {cardContent}
-                    </Card>
-                )
-
             // modal.show( ToastSupprimer )
             //  -> Content is a component rendering a Card
-            } else {
-
-                render = (
-                    <Content {...propsRendu} isToast={isToast} />
-                )
-            }
+            render = (
+                <Content {...propsRendu} isToast={isToast} />
+            )
 
             // Chargeur de données
             /*if (('data' in ComposantCharge) && typeof ComposantCharge.data === 'function') {
@@ -202,25 +175,6 @@ export const createDialog = (app: Application, isToast: boolean): DialogActions
         setToasts: undefined as unknown as DialogActions["setToasts"],
         setModals: undefined as unknown as DialogActions["setModals"],
 
-        confirm: (title: string, content: string | ComponentChild, defaultBtn: 'Yes'|'No' = 'No') => show<boolean>(({ close }) => (
-            <div class="card col">
-                <header>
-                    <h2>{title}</h2>
-                </header>
-                {typeof content === 'string' ? <p>{content}</p> : content}
-                <footer class="row fill">
-                    <Button type={defaultBtn === 'Yes' ? 'primary' : undefined}
-                        onClick={() => close(true)}>
-                        Yes
-                    </Button>
-                    <Button type={defaultBtn === 'No' ? 'primary' : undefined}
-                        onClick={() => close(false)}>
-                        No
-                    </Button>
-                </footer>
-            </div>
-        )),
-
         loading: (title: string) => show({
             title: title,
             type: 'loading'

package/client/components/index.ts

@@ -1,2 +1 @@
-export { Link } from '../services/router/components/Link';
-export { default as Button } from './Button';
+export { Link } from '../services/router/components/Link';

package/client/services/router/index.tsx

@@ -10,7 +10,8 @@ import ReactDOM from 'react-dom';
 import type {
     default as ServerRouter,
     Request as ServerRequest,
-    Response as ServerResponse
+    Response as ServerResponse,
+    TAnyRouter
 } from '@server/services/router';
 import type { TBasicSSrData } from '@server/services/router/response';
 
@@ -23,7 +24,6 @@ import { getLayout } from '@common/router/layouts';
 import { getRegisterPageArgs, buildRegex } from '@common/router/register';
 import { TFetcherList } from '@common/router/request/api';
 import type { TFrontRenderer } from '@common/router/response/page';
-import Button from '../../components/Button';
 
 import App from '@client/app/component';
 import type ClientApplication from '@client/app';
@@ -56,11 +56,11 @@ const LogPrefix = '[router]'
 // Client router can handle Client requests AND Server requests (for pages only)
 export type { default as ClientResponse, TRouterContext } from "./response";
 
-export type Router = ClientRouter | ServerRouter;
+export type Router = ClientRouter | TAnyRouter;
 
-export type Request = ClientRequest<ClientRouter> | ServerRequest<ServerRouter>;
+export type Request = ClientRequest<ClientRouter> | ServerRequest<TAnyRouter>;
 
-export type Response = ClientResponse<ClientRouter> | ServerResponse<ServerRouter>;
+export type Response = ClientResponse<ClientRouter> | ServerResponse<TAnyRouter>;
 
 /*----------------------------------
 - TYPES: ROUTES LOADING
@@ -360,17 +360,7 @@ export default class ClientRouter<
             } catch (e) {
                 console.error(`Failed to fetch the route ${route.chunk}`, e);
                 try {
-                    this.context.modal.show(() => (
-                        <div class="card col bg white w-3">
-                            <h2>New Update Available!</h2>
-                            <p>
-                                A new version of the website is available. Please refresh the page to continue.
-                            </p>
-                            <Button type="primary" onClick={() => window.location.reload()}>
-                                Reload
-                            </Button>
-                        </div>
-                    ));
+                    this.app.handleUpdate();
                 } catch (error) {}
                 throw new Error("A new version of the website is available. Please refresh the page.");
             }

package/common/errors/index.tsx

@@ -35,27 +35,6 @@ type TErrorDetails = {
     origin?: string,
 }
 
-/*----------------------------------
-- TYPES: AUTH REQUIRED FEATURE
-----------------------------------*/
-
-/**
- * Global, augmentable feature catalog used to constrain the `feature` argument
- * of `AuthRequired`.
- *
- * Default behavior (no augmentation): `feature` stays a free-form string.
- * App behavior (augmentation provided by the host app): `feature` becomes a
- * curated union of feature keys.
- */
-declare global {
-    interface TAuthRequiredFeatureCatalog {}
-}
-
-type TAuthRequiredFeatureKey = Extract<keyof TAuthRequiredFeatureCatalog, string>;
-type TAuthRequiredFeature = [TAuthRequiredFeatureKey] extends [never]
-    ? string
-    : TAuthRequiredFeatureKey;
-
 /*----------------------------------
 - TYPES: BUG REPORT
 ----------------------------------*/
@@ -179,46 +158,48 @@ export class InputErrorSchema extends CoreError {
     }
 }
 
-export class AuthRequired extends CoreError {
+export class AuthRequired<FeatureKeys extends string> extends CoreError {
     public http = 401;
     public title = "Authentication Required";
     public static msgDefaut = "Please Login to Continue.";
 
-    public constructor(message: string, feature?: TAuthRequiredFeature);
-    public constructor(message: string, motivation: string | undefined, details: TErrorDetails | undefined);
     public constructor( 
         message: string, 
-        public feature?: string,
+        public feature: FeatureKeys,
+        public action: string,
         details?: TErrorDetails
     ) {
         super(message, details);
     }
 
-    public json(): TJsonError & { feature?: string } {
+    public json(): TJsonError & { feature: string, action: string } {
         return {
             ...super.json(),
             feature: this.feature,
+            action: this.action,
         }
     }
 }
 
-export class UpgradeRequired extends CoreError {
+export class UpgradeRequired<FeatureKeys extends string> extends CoreError {
     public http = 402;
     public title = "Upgrade Required";
     public static msgDefaut = "Please Upgrade to Continue.";
 
     public constructor( 
         message: string, 
-        public feature: string,
+        public feature: FeatureKeys,
+        public action: string,
         details?: TErrorDetails
     ) {
         super(message, details);
     }
 
-    public json(): TJsonError & { feature: string } {
+    public json(): TJsonError & { feature: string, action: string } {
         return {
             ...super.json(),
             feature: this.feature,
+            action: this.action,
         }
     }
 }
@@ -308,9 +289,9 @@ export const fromJson = ({ code, message, ...details }: TJsonError) => {
             else
                 return new InputError( message, details );
 
-        case 401: return new AuthRequired( message, (details as any).feature, details );
+        case 401: return new AuthRequired( message, details["feature"], details["action"], details );
 
-        case 402: return new UpgradeRequired( message, details.feature, details );
+        case 402: return new UpgradeRequired( message, details["feature"], details["action"], details );
 
         case 403: return new Forbidden( message, details );
 

package/doc/TODO.md

@@ -34,7 +34,7 @@ abstract class Controller<
 
 ```typescript
 //? /headhunter/missions/suggested'
-class Missions extends Controller<CrossPath["router"]> {
+class Missions extends Controller<UniqueDomains["router"]> {
 
     auth = 'USER';
 

package/package.json

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

package/server/services/auth/index.ts

@@ -20,10 +20,47 @@ import { InputError, AuthRequired, Forbidden } from '@common/errors';
 - TYPES
 ----------------------------------*/
 
-export type TUserRole = typeof UserRoles[number]
+declare global {
+    /**
+     * Optional app-level role registry.
+     *
+     * Apps can add their own roles (keys are role ids):
+     * `interface ProteumAuthRoleCatalog { GOD: true }`
+     */
+    interface ProteumAuthRoleCatalog {}
+
+    /**
+     * App-level feature catalog consumed by auth permission checks.
+     *
+     * Apps can augment this interface with their own feature map:
+     * `interface ProteumAuthFeatureCatalog extends MyFeatures {}`
+     */
+    interface ProteumAuthFeatureCatalog {}
+
+    /**
+     * Canonical feature keys union used across app + framework.
+     *
+     * Notes:
+     * - If the app does not define a feature catalog, this defaults to `string`.
+     * - Otherwise it becomes the string keys of `ProteumAuthFeatureCatalog`.
+     */
+    type FeatureKeys = (
+        keyof ProteumAuthFeatureCatalog extends never
+            ? string
+            : Extract<keyof ProteumAuthFeatureCatalog, string>
+    );
+}
+
+export type TUserRole = (
+    typeof UserRoles[number]
+    |
+    Extract<keyof ProteumAuthRoleCatalog, string>
+);
 
 export type THttpRequest = express.Request | http.IncomingMessage;
 
+export type TFeatureKey = FeatureKeys;
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
@@ -167,7 +204,7 @@ export default abstract class AuthService<
         return session;
     }
 
-    public createSession( session: TJwtSession, request: TRequest ): string {
+    public createSession( session: TJwtSession, request2: TRequest ): string {
 
         this.config.debug && console.info(LogPrefix, `Creating new session:`, session);
 
@@ -175,7 +212,7 @@ export default abstract class AuthService<
 
         this.config.debug && console.info(LogPrefix, `Generated JWT token for session:` + token);
 
-        request.res.cookie('authorization', token, {
+        request2.res.cookie('authorization', token, {
             maxAge: this.config.jwt.expiration,
         });
 
@@ -191,30 +228,28 @@ export default abstract class AuthService<
         request.res.clearCookie('authorization');
     }
 
-    public check( 
-        request: TRequest, 
-        role: TUserRole, 
-        motivation?: string, 
-        dataForDebug?: { [key: string]: any }
-    ): TUser;
-
-    public check( 
-        request: TRequest, 
-        role: false, 
-        motivation?: string, 
-        dataForDebug?: { [key: string]: any }
-    ): null;
-
-    public check( 
-        request: TRequest, 
-        role: TUserRole | false = 'USER', 
-        motivation?: string, 
-        dataForDebug?: { [key: string]: any }
+    public check(
+        request: TRequest,
+        role?: TUserRole | false,
+    ): TUser | null;
+
+    public check(
+        request: TRequest,
+        role: TUserRole | false,
+        feature: FeatureKeys,
+        action?: string,
+    ): TUser | null;
+
+    public check(
+        request: TRequest,
+        role: TUserRole | false = 'USER',
+        feature?: FeatureKeys,
+        action?: string,
     ): TUser | null {
 
         const user = request.user;
 
-        this.config.debug && console.warn(LogPrefix, `Check auth, role = ${role}. Current user =`, user?.name, motivation);
+        this.config.debug && console.warn(LogPrefix, `Check auth, role = ${role}. Current user =`, user?.name, feature);
 
         if (user === undefined) {
 
@@ -223,13 +258,13 @@ export default abstract class AuthService<
         // Shoudln't be logged
         } else if (role === false) {
 
-            return user;
+            return user as TUser;
 
         // Not connected
         } else if (user === null) {
 
             console.warn(LogPrefix, "Refusé pour anonyme (" + request.ip + ")");
-            throw new AuthRequired('Please login to continue', motivation, dataForDebug);
+            throw new AuthRequired('Please login to continue', feature as any, action as any);
             
         // Insufficient permissions
         } else if (!user.roles.includes(role)) {
@@ -244,7 +279,7 @@ export default abstract class AuthService<
 
         }
 
-        return user;
+        return user as TUser;
     }
 
-}
+}

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

@@ -8,7 +8,6 @@ import jwt from 'jsonwebtoken';
 // Core
 import type { default as Router, Request as ServerRequest, TAnyRouter } from '@server/services/router';
 import RequestService from '@server/services/router/request/service';
-import { InputError, AuthRequired, Forbidden } from '@common/errors';
 
 // Specific
 import type AuthenticationRouterService from '.';
@@ -45,10 +44,22 @@ export default class UsersRequestService<
         return this.users.logout( this.request );
     }
 
+    public check(): TUser;
+
     // TODO: return user type according to entity
-    public check(role: TUserRole, motivation?: string, dataForDebug?: {}): TUser;
-    public check(role: false, motivation?: string, dataForDebug?: {}): null;
-    public check(role: TUserRole | boolean = 'USER', motivation?: string, dataForDebug?: {}): TUser | null {
-        return this.users.check( this.request, role, motivation, dataForDebug );
+    public check(role: TUserRole, feature: null): TUser;
+
+    public check(role: false): null;
+
+    public check(role: TUserRole, feature: FeatureKeys, action?: string): TUser;
+
+    public check(role: false, feature: FeatureKeys, action?: string): null;
+
+    public check(
+        role: TUserRole | false = 'USER',
+        feature?: FeatureKeys | null,
+        action?: string
+    ) {
+        return this.users.check( this.request, role, feature, action ) as any;
     }
-}
+}

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

@@ -193,7 +193,7 @@ export default class HttpServer {
 
         routes.use( csp.expressCspHeader({
             directives: {
-                'script-src': [csp.INLINE, csp.SELF, 
+                'script-src': [csp.INLINE, csp.SELF, csp.UNSAFE_EVAL,
                    ...this.config.csp.scripts
                 ]
             }

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

@@ -52,7 +52,7 @@ export type TRouterContext<TRouter extends TServerRouter> = (
         Router: TRouter,
     }
     & TRouterContextServices<TRouter>
-    //& TRouterRequestContext<TRouter>
+    & TRouterRequestContext<TRouter>
 )
 
 export type TRouterContextServices< 

package/server/services/schema/request.ts

@@ -4,7 +4,6 @@
 
 // Npm
 import zod from 'zod';
-import { SomeType } from 'zod/v4/core';
  
 // Core
 import { 
@@ -24,6 +23,18 @@ export type TConfig = {
     debug?: boolean
 }
 
+type TValidationSchema = zod.ZodTypeAny;
+type TValidationShape = zod.ZodRawShape;
+
+const isZodSchema = (fields: unknown): fields is TValidationSchema => {
+    return (
+        typeof fields === 'object'
+        && fields !== null
+        && 'safeParse' in fields
+        && typeof (fields as TValidationSchema).safeParse === 'function'
+    );
+}
+
 /*----------------------------------
 - SERVICE
 ----------------------------------*/
@@ -32,18 +43,25 @@ export default(
     config: TConfig,
     router = request.router,
     app = router.app
-) => ({
-
-    ...schema,
+) => {
 
-    validate( fields: zod.ZodSchema | { [key: string]: zod.ZodSchema } ) {
+    function validate<TSchema extends TValidationSchema>( fields: TSchema ): zod.output<TSchema>;
+    function validate<TShape extends TValidationShape>( fields: TShape ): zod.output<zod.ZodObject<TShape>>;
+    function validate( fields: TValidationSchema | TValidationShape ) {
 
         config.debug && console.log(LogPrefix, "Validate request data:", request.data);
 
-        const schema = typeof fields === 'object' ? zod.object(fields) : fields;
+        const validationSchema = isZodSchema(fields) ? fields : zod.object(fields);
 
-        const preprocessedSchema = preprocessSchema(schema);
+        //const preprocessedSchema = preprocessSchema(validationSchema);
 
-        return preprocessedSchema.parse(request.data);
-    },
-})
+        return validationSchema.parse(request.data);
+    }
+
+    return {
+
+        ...schema,
+
+        validate,
+    }
+}

package/client/components/Button.tsx

@@ -1,298 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import React from 'react';
-import { VNode, RefObject,ComponentChild } from 'preact';
-
-// Core
-import { shouldOpenNewTab } from '@client/services/router/components/Link';
-import { history } from '@client/services/router/request/history';
-import useContext from '@/client/context';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-export type Props = {
-
-    id?: string,
-    refElem?: RefObject<HTMLElement>,
-
-    icon?: ComponentChild,
-    iconR?: ComponentChild,
-
-    prefix?: ComponentChild,
-    suffix?: ComponentChild,
-    
-    tag?: "a" | "button",
-    type?: 'guide' | 'primary' | 'secondary' | 'link',
-    shape?: 'default' | 'icon' | 'tile' | 'pill' | 'custom',
-    size?: TComponentSize,
-    class?: string,
-
-    state?: [string, React.StateUpdater<string>],
-    active?: boolean,
-    selected?: boolean,
-    disabled?: boolean,
-    loading?: boolean,
-    autoFocus?: boolean,
-    onClick?: (e: MouseEvent) => any,
-    async?: boolean,
-
-    submenu?: ComponentChild,
-    nav?: boolean | 'exact'
-
-// SEO: if icon only, should provinde a hint (aria-label)
-} & ({ 
-    hint: string,
-    children?: ComponentChild | ComponentChild[],
-} | { 
-    children: ComponentChild | ComponentChild[],
-    hint?: string,
-}) & (TButtonProps | TLinkProps)
-
-export type TButtonProps = React.JSX.HTMLAttributes<HTMLButtonElement>
-
-export type TLinkProps = React.JSX.HTMLAttributes<HTMLAnchorElement>
-
-/*----------------------------------
-- HELPERS
-----------------------------------*/
-const trimSlash = (str: string): string => {
-    return str.endsWith('/') ? str.slice(0, -1) : str;
-}
-
-const isCurrentUrl = (currentUrl: string, url: string, exact?: boolean) => {
-    return (
-        (exact && (url === currentUrl || trimSlash(url) === currentUrl))
-        ||
-        (!exact && currentUrl.startsWith(url))
-    )
-}
-
-/*----------------------------------
-- CONTROLEUR
-----------------------------------*/
-export default ({
-
-    id,
-
-    // Content
-    icon, prefix, 
-    children, 
-    iconR, suffix,
-    submenu,
-    nav,
-    hint,
-
-    // Style
-    class: className,
-    shape,
-    size,
-    type,
-
-    // Interactions
-    active,
-    selected,
-    state: stateUpdater,
-    disabled,
-    loading,
-    //autoFocus,
-    async,
-
-    // HTML attributes
-    tag: Tag,
-    refElem,
-    ...props
-
-}: Props) => {
-
-    const ctx = useContext();
-    let [isSelected, setIsSelected] = React.useState(false);
-    let [isActive, setIsActive] = React.useState(false);
-    const [isLoading, setLoading] = React.useState(false);
-
-    if (isLoading || loading) {
-        icon = <i src="spin" />
-        iconR = undefined;
-        disabled = true;
-    }
-
-    if (stateUpdater && id !== undefined) {
-        const [active, setActive] = stateUpdater;
-        if (id === active)
-            isSelected = true;
-        props.onClick = () => setActive(id);
-    }
-
-    // Hint
-    if (hint !== undefined) {
-        props['aria-label'] = hint;
-        props.title = hint;
-    }
-
-    // Shape classes
-    const classNames: string[] = ['btn'];
-    if (className)
-        classNames.push(className);
-
-    if (shape !== undefined) {
-        if (shape === 'tile')
-            classNames.push('col');
-        else
-            classNames.push(shape);
-    }
-
-    if (size !== undefined)
-        classNames.push(size);
-
-    if (icon) {
-        if (children === undefined)
-            classNames.push('icon');
-    }
-
-    // state classes
-    const [isMouseDown, setMouseDown] = React.useState(false);
-    props.onMouseDown = () => setMouseDown(true);
-    props.onMouseUp = () => setMouseDown(false);
-    props.onMouseLeave = () => setMouseDown(false);
-
-    // Theming & state
-    if (isMouseDown)
-        classNames.push('pressed');
-    else if (selected || isSelected === true)
-        classNames.push('bg accent');
-    else if (type !== undefined)
-        classNames.push(type === 'link' ? type : (' bg ' + type));
-    
-    if (active || isActive === true)
-        classNames.push('active');
-
-    // Icon
-    if (prefix === undefined && icon !== undefined)
-        prefix = typeof icon === "string" ? <i class={"svg-" + icon} /> : icon;
-    if (suffix === undefined && iconR !== undefined)
-        suffix = typeof iconR === "string" ? <i class={"svg-" + iconR} /> : iconR;
-
-    // Render
-    if ('link' in props || Tag === "a") {
-
-        // Link (only if enabled)
-        if (!disabled) {
-
-            props.href = props.link;
-            
-            // External = open in new tab by default
-            if (shouldOpenNewTab( props.href, props.target ))
-                props.target = '_blank';
-        }
-
-        // Nav
-        if (nav && props.target === undefined) {
-
-            const checkIfCurrentUrl = (url: string) => 
-                isCurrentUrl(url, props.link, nav === 'exact');
-
-            React.useEffect(() => {
-
-                // Init
-                if (checkIfCurrentUrl(ctx.request.path))
-                    setIsActive(true);
-
-                // On location change
-                return history?.listen(({ location }) => {
-
-                    setIsActive( checkIfCurrentUrl(location.pathname) );
-
-                })
-
-            }, []);
-        }
-
-        Tag = 'a';
-
-    } else {
-        Tag = 'button';
-
-        // Avoid to trigget onclick when presing enter
-        if (type !== 'primary')
-            props.type = 'button';
-        else
-            props.type = 'submit';
-    }
-
-    let render: VNode = (
-        <Tag {...props} id={id} class={classNames.join(' ')} disabled={disabled} ref={refElem} onClick={(e: MouseEvent) => {
-
-            // annulation si:
-            // - Pas clic gauche
-            // - Event annulé
-            if (e.button !== 0)
-                return;
-
-            // Disabled
-            if (disabled)
-                return false;
-
-            // Custom event
-            if (props.onClick !== undefined) {
-
-                const returned = props.onClick(e);
-                if (async && returned?.then) {
-                    setLoading(true);
-                    returned.finally(() => setLoading(false));
-                }
-            }
-
-            // Link
-            let nativeEvent: boolean = false;
-            if (('link' in props) && !e.defaultPrevented) {
-
-                // Nouvelle fenetre = event par defaut
-                if (props.target === '_blank') {
-
-                    nativeEvent = true;
-
-                // Page change = loading indicator
-                } else if (props.target === "_self") {
-
-                    setLoading(true);
-                    window.location.href = props.link;
-
-                } else {
-
-                    history?.push(props.link);
-                }
-            }
-
-            if (!nativeEvent) {
-                e.preventDefault();
-                return false;
-            }       
-        }}>
-            {prefix}
-            {children === undefined 
-                ? null 
-                : shape === 'custom' 
-                ? children : (
-                    <span class={"label"}>
-                        {children}
-                    </span>
-                )}
-            {suffix}
-        </Tag>
-    )
-
-    if (Tag === "li" || submenu) {
-        render = (
-            <li>
-                {render}
-                {submenu}
-            </li>
-        )
-    }
-
-    return render;
-}

package/client/components/Dialog/card.tsx

@@ -1,208 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import React from 'react';
-
-// Composants globaux
-import Button from '@client/components/Button';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-import { ComponentChild } from 'preact';
-
-type funcBtns = () => void
-
-type Boutons = { [label: string]: funcBtns }
-
-/*----------------------------------
-- CONTENU
-----------------------------------*/
-export type Props = {
-
-    // Informations modale
-    type?: 'primary' | 'success' | 'warning' | 'error' | 'loading' | 'info',
-    cover?: string,
-    icon?: ComponentChild,
-    title?: string | ComponentChild,
-    className?: string,
-
-    children?: ComponentChild,
-    isToast?: boolean,
-    width?: number,
-
-    footer?: ComponentChild,
-    boutons?: Boutons | null, // nul = pas de footer
-    defaultBtn?: string,
-
-    prison?: boolean,
-    /* Hide after x seconds */autohide?: number | false,
-    close?: funcBtns,
-    onClose?: () => Promise<any>,
-}
-
-export default ({
-
-    // Content
-    type,
-    cover,
-    icon, 
-    title, 
-    className = '',
-
-    children, 
-    isToast,
-    width,
-
-    footer,
-    boutons,
-    defaultBtn,
-
-    onClose, 
-    close,
-    autohide,
-    prison,
-
-}: Props) => {
-
-    // Boutons
-    if (footer === undefined && boutons !== null) {
-
-        // Default buttons
-        if (boutons === undefined || !Object.keys(boutons).length) {
-
-            // Toast: by default, if no buttons, we autohide after 3 seconds
-            if (autohide === undefined)
-                autohide = 3;
-
-            // If isToast, we show a default OK button
-            if (close && !isToast)
-                boutons = { 'Ok': () => close(true) };
-            else
-                boutons = null;
-
-        }
-
-        if (boutons !== null) {
-
-            const nbBtns = Object.keys(boutons).length;
-
-            footer = Object.entries(boutons).map(([texte, action]: [string, Function], index: number) => {
-                const dernier = nbBtns > 1 && index === nbBtns - 1;
-                return (
-                    <Button
-                        async
-                        onClick={() => action()}
-                        type={(defaultBtn === undefined ? dernier : (defaultBtn === texte)) ? 'primary' : undefined}
-                    >
-                        {texte}
-                    </Button>
-                )
-            });
-        }
-    }
-
-    if (typeof icon === 'string')
-        icon = <i class={"svg-" + icon} />
-    else if (icon === undefined)
-        switch (type) {
-            case 'info':
-                icon = <i src="info-circle" />
-                break;
-            case 'success':
-                icon = <i src="check-circle" />
-                break;
-            case 'warning':
-                icon = <i src="exclamation-circle" />
-                break;
-            case 'error':
-                icon = <i src="times-circle" />
-                break;
-            case 'loading':
-                icon = <i src="spin" />
-                break;
-        }
-        
-    // Autohide
-    if (isToast)
-        React.useEffect(() => {
-            if (autohide) {
-                const timeout = setTimeout(() => close(true), autohide * 1000);
-                return () => clearTimeout(timeout);
-            }
-        }, []);
-
-    let render = isToast ? (
-        <div class="card row bg dark" onClick={() => isToast && !prison && close(true)}>
-
-            {icon}
-
-            <div>
-
-                {typeof title === "string" ? (
-                    <strong>{title}</strong>
-                ) : title}
-
-                {children}
-
-            </div>
-            
-        </div>
-    ) : (
-        <div class={"card pd-2 col al-top " + className} style={width === undefined 
-            ? {}
-            : { minWidth: width + "px", maxWidth: width + "px" }
-        }>
-
-            {(title || icon) && (
-                <header {...{
-                    class: ('col ' + type),
-                    style: cover ? {
-                        backgroundImage: 'url(' + cover + ')'
-                    } : undefined
-                }}>
-
-                    {icon}
-
-                    {typeof title === "string" ? (
-                        <strong>{title}</strong>
-                    ) : title}
-
-                    {(!prison && close) && (
-                        <Button class="close" icon="times" size="s" shape="pill" onClick={async () => {
-                            if (typeof close === "function") {
-
-                                if (onClose !== undefined)
-                                    onClose(false);
-                                else
-                                    close(false);
-                            }
-                        }} />
-                    )}
-
-                </header>
-            )}
-
-            {children && (
-                <div class="col content">
-
-                    {children}
-
-                </div>
-            )}
-
-            {footer && (
-                <footer class="row fill actions">
-
-                    {footer}
-
-                </footer>
-            )}
-
-        </div>
-    )
-
-    return render;
-}