5htp-core 0.4.9-9 → 0.4.9-91

package/package.json

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

package/src/client/app/component.tsx

@@ -12,7 +12,7 @@ import DialogManager from '@client/components/Dialog/Manager'
 
 // Core components
 import RouterComponent from '@client/services/router/components/router';
-import type { TClientOrServerContext } from '@common/router';
+import type { TClientOrServerContextForPage } from '@common/router';
 
 // Resources
 import '@client/assets/css/core.less';
@@ -21,7 +21,7 @@ import '@client/assets/css/core.less';
 - COMPOSANT
 ----------------------------------*/
 export default function App ({ context }: { 
-    context: TClientOrServerContext,
+    context: TClientOrServerContextForPage,
 }) {
 
     const curLayout = context.page?.layout;

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

@@ -16,7 +16,7 @@ import type { TBasicSSrData } from '@server/services/router/response';
 
 import BaseRouter, {
     defaultOptions, TRoute, TErrorRoute, 
-    TClientOrServerContext, TRouteModule,
+    TClientOrServerContextForPage, TRouteModule,
     matchRoute, buildUrl, TDomainsList
 } from '@common/router'
 import { getLayout } from '@common/router/layouts';
@@ -282,7 +282,7 @@ export default class ClientRouter<
                 ...defaultOptions,
                 ...options
             },
-            controller: (context: TClientOrServerContext) => new ClientPage(route, renderer, context, layout)
+            controller: (context: TClientOrServerContextForPage) => new ClientPage(route, renderer, context, layout)
         };
 
         this.routes.push(route);
@@ -301,7 +301,7 @@ export default class ClientRouter<
 
         const route: TErrorRoute = {
             code,
-            controller: (context: TClientOrServerContext) => new ClientPage(route, renderer, context, layout),
+            controller: (context: TClientOrServerContextForPage) => new ClientPage(route, renderer, context, layout),
             options
         };
 

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

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

package/src/common/router/index.ts

@@ -35,7 +35,7 @@ export type { default as Response } from './response';
 
 export type ClientOrServerRouter = ClientRouter | ServerRouter;
 
-export type TRoute<RouterContext extends TClientOrServerContext = TClientOrServerContext> = {
+export type TRoute<RouterContext extends TClientOrServerContextForPage = TClientOrServerContextForPage> = {
 
     // Match
     method: TRouteHttpMethod,
@@ -44,41 +44,24 @@ export type TRoute<RouterContext extends TClientOrServerContext = TClientOrServe
     keys: (number | string)[],
 
     // Execute
-    controller: TRouteController<RouterContext>,//TServerController<TRouter> | TFrontRenderer<TRouter>,
+    controller: TRouteController<RouterContext>,
     options: TRouteOptions
 }
 
-export type TErrorRoute<RouterContext extends TClientOrServerContext = TClientOrServerContext> = {
+export type TErrorRoute<RouterContext extends TClientOrServerContextForPage = TClientOrServerContextForPage> = {
     code,
     controller: TRouteController<RouterContext>,
     options: TRouteOptions
 }
 
-export type TAnyRoute<RouterContext extends TClientOrServerContext = TClientOrServerContext> =
+export type TAnyRoute<RouterContext extends TClientOrServerContextForPage = TClientOrServerContextForPage> =
     TRoute<RouterContext> | TErrorRoute<RouterContext>
 
-export type TClientOrServerContext = (
-    (
-        //{[serverContextKey in keyof ServerRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
-        //& 
-        ClientRouterContext
-    )
-    | 
-    (
-        // Tell that all the keys of client context are existing but undefined
-        //  This avoids errors: "Property 'page' is optional in type '{ app: Application; ..."
-        //  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} 
-        //& 
-
-        // Page is always available in client context
-        With<ServerRouterContext, 'page'>
-    )
-)
-
-export type TRouteController<RouterContext extends TClientOrServerContext = TClientOrServerContext> = 
+export type TClientOrServerContext = ClientRouterContext | ServerRouterContext;
+
+export type TClientOrServerContextForPage = With<TClientOrServerContext, 'page'>
+
+export type TRouteController<RouterContext extends TClientOrServerContextForPage = TClientOrServerContextForPage> = 
     (context: RouterContext) => /* Page to render */Page | /* Any data (html, json) */Promise<any>
 
 export type TRouteOptions = {

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

@@ -7,7 +7,7 @@ import type { VNode } from 'preact';
 import type { Thing } from 'schema-dts';
 
 // Core libs
-import { ClientOrServerRouter, TClientOrServerContext, TRoute, TErrorRoute } from '@common/router';
+import { ClientOrServerRouter, TClientOrServerContextForPage, TRoute, TErrorRoute } from '@common/router';
 import { TFetcherList, TDataReturnedByFetchers } from '@common/router/request/api';
 
 /*----------------------------------
@@ -16,7 +16,7 @@ import { TFetcherList, TDataReturnedByFetchers } from '@common/router/request/ap
 
 // The function that fetch data from the api before to pass them as context to the renderer
 export type TDataProvider<TProvidedData extends TFetcherList = TFetcherList> = (
-    context: TClientOrServerContext & {
+    context: TClientOrServerContextForPage & {
         // URL query parameters
         // TODO: typings
         data: {[key: string]: string | number}
@@ -30,12 +30,12 @@ export type TFrontRenderer<
     TRouter = ClientOrServerRouter,
 > = ( 
     context: (
-        TClientOrServerContext 
+        TClientOrServerContextForPage 
         &
         TAdditionnalData
         &
         {
-            context: TClientOrServerContext,
+            context: TClientOrServerContextForPage,
             data: {[key: string]: PrimitiveValue}
         }
     )
@@ -52,7 +52,11 @@ export type TPageResource = {
     preload?: boolean
     })
 
-type TMetasList = ({ $: string } & { [key: string]: string })[]
+type TMetasDict = {
+    [key: string]: string | Date | undefined | null
+}
+
+type TMetasList = ({ $: string } & TMetasDict)[]
 
 const debug = false;
 
@@ -71,7 +75,7 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
 
     // Resources
     public head: TMetasList = [];
-    public metas: { [name: string]: string } = {};
+    public metas: TMetasDict = {};
     public jsonld: Thing[] = [];
     public scripts: TPageResource[] = [];
     public style: TPageResource[] = [];
@@ -83,7 +87,7 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
     public constructor(
         public route: TRoute | TErrorRoute,
         public renderer: TFrontRenderer,
-        public context: TClientOrServerContext
+        public context: TClientOrServerContextForPage
     ) {
 
         this.chunkId = context.route.options["id"];

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

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

package/src/server/services/router/response/page/index.tsx

@@ -8,7 +8,7 @@ import renderToString from "preact-render-to-string";
 
 // Core
 import { default as Router, TRouterContext } from "@server/services/router";
-import type { Layout, TRoute, TErrorRoute } from '@common/router';
+import type { Layout, TRoute, TErrorRoute, TClientOrServerContext } from '@common/router';
 import PageResponse, { TFrontRenderer } from "@common/router/response/page";
 
 // Composants UI
@@ -30,7 +30,7 @@ const seoLimits = {
 - FONCTION
 ----------------------------------*/
 
-export default class Page<TRouter extends Router = Router> extends PageResponse<TRouter> {
+export default class ServerPage<TRouter extends Router = Router> extends PageResponse<TRouter> {
 
     public constructor(
         public route: TRoute | TErrorRoute,