5htp-core 0.2.9 → 0.3.0-2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.2.9",
+	"version": "0.3.0-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -13,11 +13,12 @@
 		"framework"
 	],
 	"dependencies": {
-		"@wojtekmaj/react-daterange-picker": "^4.2.0",
+		"@wojtekmaj/react-daterange-picker": "^5.0.2",
 		"accepts": "^1.3.7",
 		"activity-detector": "^3.0.0",
 		"ansi-to-html": "^0.7.1",
 		"array-move": "^3.0.1",
+		"aws-sdk": "^2.1415.0",
 		"axios": "^1.2.1",
 		"bowser": "^2.11.0",
 		"chart.js": "^3.6.2",
@@ -60,10 +61,12 @@
 		"mysql2": "^2.3.0",
 		"nodemailer": "^6.6.3",
 		"object-sizeof": "^1.6.3",
+		"ololog": "^1.1.175",
 		"path-to-regexp": "^6.2.0",
 		"picomatch": "^2.3.1",
 		"preact": "^10.5.15",
 		"preact-render-to-string": "^5.1.19",
+		"react-datetime-picker": "^5.0.3",
 		"react-scrollbars-custom": "^4.0.27",
 		"react-slider": "^2.0.1",
 		"react-textarea-autosize": "^8.3.3",
@@ -72,7 +75,6 @@
 		"request": "^2.88.2",
 		"sharp": "^0.29.1",
 		"sql-formatter": "^4.0.2",
-		"tslog": "^3.2.2",
 		"uuid": "^8.3.2",
 		"uuid-by-string": "^3.0.4",
 		"validator": "^13.7.0",
@@ -92,9 +94,9 @@
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
 		"@types/yargs-parser": "^21.0.0",
-		"babel-plugin-glob-import": "^0.0.6-2"
+		"babel-plugin-glob-import": "^0.0.7"
 	},
 	"peerDependencies": {
-		"5htp": "0.2.3"
+		"5htp": "0.3.0-1"
 	}
 }

package/src/client/app/component.tsx

@@ -11,7 +11,7 @@ import { ReactClientContext } from '@/client/context';
 import DialogManager from '@client/components/Dialog/Manager'
 
 // Core components
-import Router from '@client/services/router/components/router';
+import RouterComponent from '@client/services/router/components/router';
 import type { TClientOrServerContext } from '@common/router';
 
 /*----------------------------------
@@ -35,7 +35,7 @@ export default function App ({ context }: {
             
             {!layout ? <>
                 {/* TODO: move to app, because here, we're not aware that the router service has been defined */}
-                <Router service={context.router} />
+                <RouterComponent service={context.Router} />
             </> : <>
                 <layout.Component context={context} />
             </>}

package/src/client/assets/css/text/titres.less

@@ -19,6 +19,10 @@ h3 {
     strong {
         color: var(--cAccent);
         font-weight: inherit;
+
+        .bg.img & {
+            color: var(--cTxtImportant);
+        }
     }
 }
 

package/src/client/components/Dialog/card.tsx

@@ -169,7 +169,7 @@ export default ({
                     ) : title}
 
                     {(!prison && close) && (
-                        <Button class="close" icon="solid/times" size="s" shape="pill" onClick={async () => {
+                        <Button class="close" icon="times" size="s" shape="pill" onClick={async () => {
                             if (typeof close === "function") {
 
                                 if (onClose !== undefined)

package/src/client/components/Dialog/index.less

@@ -1,6 +1,7 @@
 @toast-zindex: 999;
 
-#modals, #toasts {
+#modals, 
+#toasts {
 
     z-index: @toast-zindex;
 
@@ -60,7 +61,7 @@
         // Desktop = vertically center the modal
         @media (min-width: 900px) {
             justify-content: center;
-            padding: @spacing;
+            //padding: @spacing;
         }
 
         // Pour les animations (ex: conffetis
@@ -79,7 +80,6 @@
             min-width: 300px;
             max-height: 100vh;
             box-shadow: none;
-            padding: @spacing * 2;
             overflow-y: auto;
 
             // Pas d'anim quand pas card, 

package/src/client/components/inputv3/date/index.tsx

@@ -5,7 +5,7 @@
 // Npm
 import React from 'react';
 import type { StateUpdater } from 'preact/hooks';
-import DateRangePicker from '@wojtekmaj/react-daterange-picker/dist/entry.nostyle';
+import DateRangePicker from '@wojtekmaj/react-daterange-picker';
 
 // Core
 

package/src/client/components/inputv3/index.tsx

@@ -58,7 +58,7 @@ export default ({
     - INIT
     ----------------------------------*/
 
-    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '');
+    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '' );
 
     // Trigger onchange oly when finished typing
     const refCommit = React.useRef<NodeJS.Timeout | null>(null);
@@ -71,7 +71,17 @@ export default ({
         
     }, [value]);
 
-    const updateValue = v => setValue( type === 'number' ? parseFloat(v) : v );
+    const updateValue = v => {
+        if (type === 'number') {
+
+            // Fix on Safari: the browser allows to input text in input number
+            const numberValue = parseFloat(v);
+            if (!Number.isNaN( numberValue ))
+                setValue(numberValue);
+
+        } else
+            setValue(v);
+    }
 
     const refInput = inputRef || React.useRef<HTMLInputElement>();
     
@@ -154,12 +164,12 @@ export default ({
                         // @ts-ignore: Property 'ref' does not exist on type 'IntrinsicAttributes'
                         ref={refInput}
                         value={value}
-
                         onFocus={() => setState({ focus: true })}
                         onBlur={() => setState({ focus: false })}
                         onChange={(e) => updateValue(e.target.value)}
 
-                        onKeyDown={(e) => {
+                        onKeyDown={(e: KeyboardEvent) => {
+
                             if (onPressEnter && e.key === 'Enter' && value !== undefined) {
                                 commitValue();
                                 onPressEnter(value)

package/src/client/pages/_layout/index.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 import type { ComponentChild } from 'preact';
 
 // Core
-import Router from '@client/services/router/components/router';
+import RouterComponent from '@client/services/router/components/router';
 import { ClientContext } from '@/client/context';
 
 // Core components
@@ -28,14 +28,14 @@ export default function App ({ context, menu }: {
     menu: ComponentChild
 }) {
 
-    const { router, page, toast } = context;
+    const { Router, page, toast } = context;
 
     return (
         <div id="internaLlayout">
 
             <div class="center row al-fill">
 
-                <Router service={router} />
+                <RouterComponent service={Router} />
                 
             </div>
         </div>

package/src/client/pages/_messages/400.tsx

@@ -6,7 +6,7 @@
 import React from 'react';
 
 // Core
-import { router } from '@app';
+import { Router } from '@app';
 import { Button } from '@client/components';
 
 // App
@@ -15,7 +15,7 @@ import useHeader from '@client/pages/useHeader';
 /*----------------------------------
 - CONTROLEUR
 ----------------------------------*/
-router.error( 400, ({ message, modal }) => {
+Router.error( 400, ({ message, modal }) => {
 
     useHeader({
         title: 'Bad request',

package/src/client/pages/_messages/401.tsx

@@ -6,7 +6,7 @@
 import React from 'react';
 
 // Core
-import { router } from '@app';
+import { Router } from '@app';
 import { Button } from '@client/components';
 
 // App
@@ -19,7 +19,7 @@ import useHeader from '@client/pages/useHeader';
 /*----------------------------------
 - CONTROLEUR
 ----------------------------------*/
-router.error( 401, ({ message, request, page }) => {
+Router.error( 401, ({ message, request, page }) => {
 
     request.response?.redirect('/');
 

package/src/client/pages/_messages/403.tsx

@@ -6,7 +6,7 @@
 import React from 'react';
 
 // Core
-import { router } from '@app';
+import { Router } from '@app';
 import { Button } from '@client/components';
 
 // App
@@ -15,7 +15,7 @@ import useHeader from '@client/pages/useHeader';
 /*----------------------------------
 - CONTROLEUR
 ----------------------------------*/
-router.error( 403, ({ message, modal }) => {
+Router.error( 403, ({ message, modal }) => {
 
     useHeader({
         title: 'Access Denied.',

package/src/client/pages/_messages/404.tsx

@@ -6,7 +6,7 @@
 import React from 'react';
 
 // Core
-import { router } from '@app';
+import { Router } from '@app';
 import { Button } from '@client/components';
 
 // App
@@ -15,7 +15,7 @@ import useHeader from '@client/pages/useHeader';
 /*----------------------------------
 - CONTROLEUR
 ----------------------------------*/
-router.error( 404, ({ message, modal }) => {
+Router.error( 404, ({ message, modal }) => {
 
     useHeader({
         title: 'Page Not Found',

package/src/client/pages/_messages/500.tsx

@@ -6,7 +6,7 @@
 import React from 'react';
 
 // Core
-import { router } from '@app';
+import { Router } from '@app';
 import { Button } from '@client/components';
 
 // App
@@ -15,7 +15,7 @@ import useHeader from '@client/pages/useHeader';
 /*----------------------------------
 - CONTROLEUR
 ----------------------------------*/
-router.error( 500, ({ message }) => {
+Router.error( 500, ({ message }) => {
 
     useHeader({
         title: 'Technical Error',

package/src/client/pages/useHeader.tsx

@@ -15,7 +15,8 @@ export type Props = {
     error?: boolean,
 
     title: string,
-    subtitle: string,
+    subtitle?: string,
+    description?: string,
 }
 
 /*----------------------------------

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

@@ -127,7 +127,7 @@ export default ({ service: router }: { service: Router }) => {
         return history?.listen(async (locationUpdate) => {
 
             // Load the concerned route
-            const request = new ClientRequest(locationUpdate.location, context.router);
+            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

@@ -61,10 +61,16 @@ export type Response = ClientResponse<ClientRouter> | ServerResponse<ServerRoute
 - TYPES: ROUTES LOADING
 ----------------------------------*/
 
+// WARN: To be updated with the mplemenations list of Router.page
+//      (both server and client side)
 export type TRegisterPageArgs<TProvidedData extends TFetcherList = {}, TRouter extends Router = Router> = ([
     path: string,
     controller: TDataProvider<TProvidedData> | null,
     renderer: TFrontRenderer<TProvidedData>
+] | [
+    path: string,
+    options: Partial<TRoute["options"]>,
+    renderer: TFrontRenderer<TProvidedData>
 ] | [
     path: string,
     options: Partial<TRoute["options"]>,
@@ -119,7 +125,7 @@ type THookName = 'location.change' | 'page.changed'
 
 type Config<TAdditionnalContext extends {} = {}> = {
     preload: string[], // List of globs
-    context: () => TAdditionnalContext
+    context: (router: ClientRouter) => TAdditionnalContext
 }
 
 /*----------------------------------
@@ -215,6 +221,25 @@ export default class ClientRouter<
         return currentRoute;
     }
 
+    public page(
+        path: string,
+        controller: TDataProvider<{}> | null,
+        renderer: TFrontRenderer<{}>
+    ): TRoute;
+
+    public page(
+        path: string,
+        options: Partial<TRoute["options"]>,
+        renderer: TFrontRenderer<{}>
+    ): TRoute;
+
+    public page(
+        path: string,
+        options: Partial<TRoute["options"]>,
+        controller: TDataProvider<{}> | null,
+        renderer: TFrontRenderer<{}>
+    ): TRoute;
+
     public page(...args: TRegisterPageArgs): TRoute {
 
         const { path, options, controller, renderer, layout } = getRegisterPageArgs(...args);

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

@@ -27,13 +27,16 @@ export type TPageResponse<TRouter extends ClientRouter> = (
     ServerResponse<ServerRouter, ClientPage>
 );
 
-export type TRouterContext<TRouter extends ClientRouter = ClientRouter, TApplication extends ClientApplication = ClientApplication> = (
+export type TRouterContext<
+    TRouter extends ClientRouter = ClientRouter, 
+    TApplication extends ClientApplication = ClientApplication
+> = (
     // ClientPage context
     {
         app: TApplication,
         context: TRouterContext<TRouter, TApplication>,
         request: ClientRequest<TRouter>,
-        route: TRoute<TRouter>,
+        route: TRoute<TRouterContext>,
         api: ClientRequest<TRouter>["api"],
         page: ClientPage<TRouter>,
         user: User

package/src/common/data/objets.ts

@@ -117,29 +117,4 @@ export const chemin = {
         valA[ brancheVal ] = val;
         
     }
-}
-
-export const callableInstance = <TInstance extends object, TCallableName extends keyof TInstance>(
-    instance: TInstance, 
-    funcName: TCallableName
-): TInstance[TCallableName] & TInstance => {
-
-    const callableFunc = instance[funcName];
-    if (typeof callableFunc !== 'function')
-        throw new Error(`instance[funcName] isn't callable.`);
-
-    const callable = callableFunc.bind(instance);
-
-    const methods = [
-        ...Object.getOwnPropertyNames( Object.getPrototypeOf( instance )),
-        ...Object.getOwnPropertyNames( instance )
-    ];
-
-    for (const method of methods)
-        if (method !== 'constructor')
-            callable[ method ] = typeof instance[ method ] === 'function'
-                ? instance[ method ].bind( instance )
-                : instance[ method ];
-
-    return callable as TInstance[TCallableName] & TInstance;
 }

package/src/common/router/index.ts

@@ -2,8 +2,6 @@
 - DEPENDANCES
 ----------------------------------*/
 
-import { Layout } from './layouts';
-
 // types
 import type {
     default as ClientRouter,
@@ -22,9 +20,6 @@ import type { TUserRole } from '@server/services/users';
 import type { TAppArrowFunction } from '@common/app';
 
 // Specfic
-import type ApiClient from './request/api';
-import type Request from './request';
-import type Response from './response';
 import type { default as Page, TFrontRenderer } from './response/page';
 
 /*----------------------------------
@@ -57,12 +52,13 @@ export type TErrorRoute<RouterContext extends TClientOrServerContext = TClientOr
     options: TRouteOptions
 }
 
-export type TClientOrServerContext<
-    TClientOnlyContextKeys extends keyof ClientRouterContext = keyof (ClientRouterContext | ServerRouterContext)
-> = (
+export type TAnyRoute<RouterContext extends TClientOrServerContext = TClientOrServerContext> =
+    TRoute<RouterContext> | TErrorRoute<RouterContext>
+
+export type TClientOrServerContext = (
     (
-        {[serverContextKey in keyof ServerRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
-        & 
+        //{[serverContextKey in keyof ServerRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
+        //& 
         ClientRouterContext
     )
     | 
@@ -72,8 +68,8 @@ export type TClientOrServerContext<
         //  When we destructure the context from the page controller
         //  While making reference to a key only available in client context
         // So here, we put the
-        {[clientContextKey in keyof ClientRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
-        & 
+        //{[clientContextKey in keyof ClientRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
+        //& 
         ServerRouterContext
     )
 )

package/src/common/router/layouts.ts

@@ -42,8 +42,10 @@ export const getLayout = (routePath: string, routeOptions?: TRouteOptions): Layo
 
     // options.id has been injected via the babel plugon
     const chunkId = routeOptions["id"];
-    if (chunkId === undefined)
+    if (chunkId === undefined) {
+        console.error("Route informations where ID cas not injected:", routeOptions);
         throw new Error(`ID has not injected for the following page route: ${routePath}`);
+    }
     
     // Layout via name
     if (routeOptions.layout !== undefined) {

package/src/common/router/register.ts

@@ -24,10 +24,12 @@ export const getRegisterPageArgs = (...args: TRegisterPageArgs) => {
     let controller: TDataProvider|null;
     let renderer: TFrontRenderer;
 
-    if (args.length === 3)
-        ([path, controller, renderer] = args)
-    else
+    if (args.length === 4)
         ([path, options, controller, renderer] = args)
+    else if (typeof args[1] === 'object')
+        ([path, options, renderer] = args)
+    else
+        ([path, controller, renderer] = args)
 
     // Automatic layout form the nearest _layout folder
     const layout = getLayout(path, options);

package/src/common/router/response/index.ts

@@ -6,7 +6,7 @@
 import { FunctionalComponent } from "preact";
 
 // Core
-import { TRoute } from "..";
+import { TAnyRoute } from "..";
 import type ClientRequest from '@client/services/router';
 import Page from '@client/services/router/response/page'
 
@@ -26,7 +26,7 @@ export default abstract class BaseResponse<
 
     public data?: TData;
     public request: TRequest;
-    public route?: TRoute;
+    public route?: TAnyRoute;
 
     public constructor(
         request: TRequest,
@@ -36,7 +36,7 @@ export default abstract class BaseResponse<
         this.request = request as TRequest;
     }
 
-    public setRoute(route: TRoute) {
+    public setRoute(route: TAnyRoute) {
         this.route = route;
         return this;
     }

package/src/common/validation/validators.ts

@@ -10,6 +10,8 @@ import {
     isURL
 } from 'validator';
 
+import normalizeUrl, { Options as NormalizeUrlOptions } from 'normalize-url';
+
 // Core
 import { InputError } from '@common/errors';
 import FileToUpload from '@client/components/inputv3/file/FileToUpload';
@@ -157,16 +159,25 @@ export default class SchemaValidators {
             
         }, opts)
 
-    public url = (opts: TValidator<string> & {} = {}) => 
+    public url = (opts: TValidator<string> & {
+        normalize?: NormalizeUrlOptions
+    } = {}) => 
         new Validator<string>('url', (inputVal, input, output, corriger?) => {
 
             let val = this.string(opts).validate(inputVal, input, output, corriger);
 
+            // Check if URL
             if (!isURL(val, {
                 // https://www.npmjs.com/package/validator
             }))
                 throw new InputError(`Please provide a valid URL.`);
 
+            // Normalize
+            if (opts.normalize !== undefined)
+                val = normalizeUrl(val, opts.normalize);
+
+            console.log("@@@@@@@@@@@@@NORMALISZE URL", opts.normalize, val);
+
             return val;
         }, opts)
 

package/src/server/app/commands.ts

@@ -6,7 +6,8 @@
 import yargsParser from 'yargs-parser';
 
 // Core
-import Application, { Service } from '@server/app';
+import type { Application } from '@server/app';
+import Service from '@server/app/service';
 import { NotFound } from '@common/errors';
 
 /*----------------------------------
@@ -49,14 +50,20 @@ export default class CommandsManager extends Service<Config, Hooks, Application>
 
     public commandsIndex: CommandsList = {}
 
-    public async register() {
+    /*----------------------------------
+    - LIFECYCLE
+    ----------------------------------*/
 
+    protected async start() {
         
+    }
+
+    protected async ready() {
 
     }
 
-    public async start() {
-       
+    protected async shutdown() {
+
     }
 
     /*----------------------------------

package/src/server/app/{config.ts → container/config.ts}

@@ -35,6 +35,7 @@ export type TEnvConfig = {
 type AppIdentityConfig = {
 
     name: string,
+    identifier: string,
     description: string,
     author: {
         name: string,
@@ -63,6 +64,8 @@ export type AppConfig = {
     identity: Config.Identity,
 }
 
+const debug = false;
+
 /*----------------------------------
 - LOADE
 ----------------------------------*/
@@ -76,7 +79,7 @@ export default class ConfigParser {
     }
 
     private loadYaml( filepath: string ) {
-        console.info(`Loading config ${filepath}`);
+        debug && console.info(`Loading config ${filepath}`);
         const rawConfig = fs.readFileSync(filepath, 'utf-8');
         return yaml.parse(rawConfig);
     }
@@ -96,6 +99,7 @@ export default class ConfigParser {
 
     public identity() {
         const identityFile = this.appDir + '/identity.yaml';
+        debug && console.info(`Loading identity ${identityFile}`);
         return this.loadYaml( identityFile );
     }
 }