5htp-core 0.4.9-7 → 0.4.9-9

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.9-7",
+	"version": "0.4.9-9",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -13,7 +13,6 @@
 		"framework"
 	],
 	"dependencies": {
-		"@excalidraw/excalidraw": "^0.17.6",
 		"@lexical/file": "^0.19.0",
 		"@lexical/headless": "^0.18.0",
 		"@lexical/html": "^0.18.0",

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

@@ -39,12 +39,10 @@ export type TRouterContext<
         page: ClientPage<TRouter>,
         data: TObjetDonnees
     }
-    &
     // Expose client application services (api, socket, ...)
     //TRouter["app"] 
-    TApplication
-    &
-    ReturnType<TRouter["config"]["context"]>
+    & TApplication
+    & ReturnType<TRouter["config"]["context"]>
 )
 
 /*----------------------------------

package/src/common/router/index.ts

@@ -72,7 +72,9 @@ export type TClientOrServerContext = (
         // So here, we put the
         //{[clientContextKey in keyof ClientRouterContext/*Omit<ClientRouterContext, TClientOnlyContextKeys>*/]: undefined} 
         //& 
-        ServerRouterContext
+
+        // Page is always available in client context
+        With<ServerRouterContext, 'page'>
     )
 )
 

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

@@ -4,11 +4,11 @@
 
 // Npm
 import type { VNode } from 'preact';
+import type { Thing } from 'schema-dts';
 
 // Core libs
 import { ClientOrServerRouter, TClientOrServerContext, TRoute, TErrorRoute } from '@common/router';
 import { TFetcherList, TDataReturnedByFetchers } from '@common/router/request/api';
-import { history } from '@client/services/router/request/history';
 
 /*----------------------------------
 - TYPES
@@ -50,7 +50,9 @@ export type TPageResource = {
 } | {
     url: string,
     preload?: boolean
-})
+    })
+
+type TMetasList = ({ $: string } & { [key: string]: string })[]
 
 const debug = false;
 
@@ -68,6 +70,9 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
     public url: string;
 
     // Resources
+    public head: TMetasList = [];
+    public metas: { [name: string]: string } = {};
+    public jsonld: Thing[] = [];
     public scripts: TPageResource[] = [];
     public style: TPageResource[] = [];
 

package/src/server/app/container/config.ts

@@ -58,7 +58,9 @@ type AppIdentityConfig = {
         titleSuffix: string,
         fullTitle: string,
         description: string,
-        version: string
+        version: string,
+        metas?: {[name: string]: string},
+        jsonld?: {[name: string]: string},
     }                         
 }
 

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

@@ -87,7 +87,7 @@ export default class ServerRequest<
         this.router = router;
         this.api = new ApiClient(this);
 
-        this.url = this.req.url;
+        this.url = this.req.protocol + '://' + this.req.get('host') + this.req.originalUrl;
         this.host = this.req.get('host') as string;
         this.method = method;
         this.headers = headers || {};

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

@@ -5,7 +5,6 @@
 // Npm
 import React from 'react';
 import renderToString from "preact-render-to-string"; 
-import type { Thing } from 'schema-dts';
 
 // Core
 import { default as Router, TRouterContext } from "@server/services/router";
@@ -27,18 +26,12 @@ const seoLimits = {
     description: 255
 }
 
-type TMetasList = ({ $: string } & { [key: string]: string })[]
-
 /*----------------------------------
 - FONCTION
 ----------------------------------*/
 
 export default class Page<TRouter extends Router = Router> extends PageResponse<TRouter> {
 
-    public head: TMetasList = [];
-    public metas: {[name: string]: string} = {};
-    public jsonld: Thing[] = [];
-
     public constructor(
         public route: TRoute | TErrorRoute,
         public renderer: TFrontRenderer,
@@ -132,17 +125,18 @@ export default class Page<TRouter extends Router = Router> extends PageResponse<
             'og:type': 'website',
             'og:locale': this.app.identity.locale,
             'og:site_name': this.app.identity.web.title,
-            'og:url': this.context.request.req.url,
+            'og:url': this.url,
 
             'og:title': this.title,
             'og:description': this.description,
 
-            'twitter:url': this.context.request.req.url,
+            'twitter:url': this.url,
             'twitter:card': 'summary_large_image',
             'twitter:title': this.title,
-            'twitter:text:title': this.title,
             'twitter:description': this.description,
 
+            ...(this.app.identity.web.metas || {}),
+
             ...this.metas
         };
 
@@ -162,10 +156,10 @@ export default class Page<TRouter extends Router = Router> extends PageResponse<
             logo: {
                 '@type': 'ImageObject',
                 '@id': this.router.url('/#logo'),
-                url: this.router.url('/public/app/android-chrome-512x512.png'),
-                width: "512px",
-                height: "512px",
-                caption: this.app.identity.author.name
+                url: this.router.url('/public/brand/1024.png'),
+                width: "1024px",
+                height: "1024px",
+                caption: this.app.identity.name
             },
             sameAs: []
         }, {
@@ -178,7 +172,9 @@ export default class Page<TRouter extends Router = Router> extends PageResponse<
                 "@id": this.router.url('/#organization'),
             },
             inLanguage: this.app.identity.locale,
-            potentialAction: [], 
+            potentialAction: [],
+
+            ...(this.app.identity.web.jsonld || {}),
         }, {
             '@type': "WebPage",
             '@id': this.url,