proteum 1.0.0 → 1.0.2

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/tsconfig.common.json

@@ -40,5 +40,6 @@
             "react/jsx-runtime": ["preact/jsx-runtime"]
         },
     },
-    "include": ["."]
+    "include": ["."],
+    "exclude": ["cli"]
 }

package/changelog.md

@@ -1,5 +0,0 @@
-# 01/01/2023:
-
-* Redesigned systems service. Pass app instance servces list through constructor attribute instead of importing instance
-* Update babel-plugn-glob-import
-* 

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

package/client/data/input.ts

@@ -1,32 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Libs métier
-import buildValidators, { champ } from '@common/data/input/validators/build';
-import { validateurFichier, TOptsValidateurFichier } from '@common/data/input/validators/basic';
-
-/*----------------------------------
-- VALIDATEURS
-----------------------------------*/
-
-export default buildValidators({
-
-    file: ({ ...opts }: TOptsValidateurFichier & {}) => champ<object>('fichier', {
-        ...opts,
-        valider: async (val: any, donneesSaisie: TObjetDonnees, donneesRetour: TObjetDonnees) => {
-
-            console.log('VALIDER FICHIER COTÉ CLIENT', val);
-
-            // Chaine = url ancien fichier = conservation = sera ignoré coté serveur
-            if (typeof val === 'string')
-                return val;
-
-            // Validation universelle
-            val = await validateurFichier(opts, val, donneesSaisie, donneesRetour);
-
-            return opts.valider ? await opts.valider(val, donneesSaisie, donneesRetour) : val;
-        }
-    })
-
-});