5htp 0.3.8 → 0.4.0

package/package.json

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

package/src/compiler/common/babel/routes/routes.ts

@@ -49,7 +49,18 @@ function Plugin(babel, { app, side, debug }: TOptions) {
     /*
         - Wrap route.get(...) with (app: Application) => { }
         - Inject chunk ID into client route options
-        - Transform api.fetch calls
+        - Transform aoi.fetch:
+        
+        Input:
+        const { stats } = api.fetch({
+            stats: api.get(...)
+        }):
+
+        Output:
+
+        Route.page('/', { data: { stats: api.get(...) } });
+        ...
+        const stats = page.data.stats;
     */
 
     const plugin: PluginObj<{ 
@@ -257,7 +268,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         // Add data fetchers
         if (routeDef.dataFetchers.length !== 0) {
 
-            // (contollerParams) => fetchers
+            // (contollerParams) => { stats: api.get(...) }
             const dataFetchersFunc = t.arrowFunctionExpression(
                 renderer.params.map( param => t.cloneNode( param )),
                 t.objectExpression(

package/src/compiler/common/index.ts

@@ -44,6 +44,7 @@ export type TCompileMode = 'dev' | 'prod'
 export default function createCommonConfig( app: App, side: TAppSide, mode: TCompileMode ): webpack.Configuration {
 
     const dev = mode === 'dev';
+    const buildId = Date.now();
     const config: webpack.Configuration = {
 
         // Project root
@@ -78,13 +79,14 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
 
                 // Application
                 BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
+                BUILD_ID: JSON.stringify(buildId),
                 APP_PATH: JSON.stringify(app.paths.root),
                 APP_NAME: JSON.stringify(app.identity.web.title),
 
             }),
 
             new PluginIndexage(side === 'client' ? {
-                'icones-svg': new IconesSvg(app),
+                'icones-svg': new IconesSvg(app, buildId),
             } : {
                 //'injection-dependances': new InjectDeps,
             }),

package/src/compiler/common/plugins/indexage/icones-svg/index.ts

@@ -34,7 +34,7 @@ export default class IconesSVG extends Indexeur {
     private cacheTypes: string;
     private cacheIndex: string;
 
-    public constructor( app: App, private debug?: boolean ) {
+    public constructor( app: App, private buildId: number, private debug?: boolean ) {
         super();
 
         this.formats = ['woff2'];
@@ -137,7 +137,7 @@ export default class IconesSVG extends Indexeur {
 
         const result = await webfont({
             files: Object.keys(cheminIcones),
-            fontName: "icons",
+            fontName: "icons", // Force efresh icons woff on app update
             template: this.dossierIcones + 'template.css',
             // @ts-ignore
             formats: this.formats,
@@ -182,7 +182,7 @@ export default class IconesSVG extends Indexeur {
         // Enregistrement fichiers
         for (const format of this.formats)
             fs.outputFileSync(this.dossierSortie + 'icons.' + format, result[ format ]);
-        fs.outputFileSync(this.dossierSortie + 'icons.css', result.template);
+        fs.outputFileSync(this.dossierSortie + 'icons.css', result.template?.replace('icons.woff2', 'icons.woff2?' + this.buildId));
 
         fs.outputFileSync(this.cacheTypes, 'export type TIcones = ' + typeIcones.join('|') );
 

package/src/compiler/index.ts

@@ -19,6 +19,14 @@ import { TCompileMode } from './common';
 
 type TCompilerCallback = (compiler: webpack.Compiler) => void
 
+type TServiceMetas = {
+    id: string, 
+    name: string, 
+    parent: string, 
+    dependences: string, 
+    importationPath: string
+}
+
 /*----------------------------------
 - FONCTION
 ----------------------------------*/
@@ -93,7 +101,7 @@ export default class Compiler {
 
     private findServices( dir: string ) {
 
-        const blacklist = ['node_modules', '5htp-core']
+        const blacklist = ['node_modules', '5htp-core', '5htp']
         const files: string[] = [];
         const dirents = fs.readdirSync(dir, { withFileTypes: true });
 
@@ -135,37 +143,51 @@ export default class Compiler {
 
         // Index services
         const searchDirs = {
+            // The less priority is the first
+            // The last override the first if there are duplicates
             '@server/services/': path.join(cli.paths.core.src, 'server', 'services'),
             '@/server/services/': path.join(app.paths.src, 'server', 'services'),
             '': path.join(app.paths.root, 'node_modules'),
         }
 
+        const servicesIndex: {[id: string]: TServiceMetas} = {};
         for (const importationPrefix in searchDirs) {
 
             const searchDir = searchDirs[ importationPrefix ];
             const services = this.findServices(searchDir);
 
             for (const serviceDir of services) {
-
                 const metasFile = path.join( serviceDir, 'service.json');
-                const { id, name, parent, dependences } = require(metasFile);
 
                 // The +1 is to remove the slash
                 const importationPath = importationPrefix + serviceDir.substring( searchDir.length + 1 );
-                
-                // Generate index & typings
-                imported.push(`import type ${name} from "${importationPath}";`);
-                exportedType.push(`'${id}': ${name},`);
-                // NOTE: only import enabled packages to optimize memory
-                // TODO: don't index non-setuped packages in the exported metas
-                exportedMetas.push(`'${id}': {
+
+                const serviceMetas = require(metasFile);
+
+                servicesIndex[ metasFile ] = {
+                    ...serviceMetas,
+                    importationPath
+                };
+            }
+        }
+
+        // Create importation directives
+        for (const serviceId in servicesIndex) {
+
+            const { id, name, parent, dependences, importationPath } = servicesIndex[ serviceId ];
+            
+            // Generate index & typings
+            imported.push(`import type ${name} from "${importationPath}";`);
+            exportedType.push(`'${id}': ${name},`);
+            // NOTE: only import enabled packages to optimize memory
+            // TODO: don't index non-setuped packages in the exported metas
+            exportedMetas.push(`'${id}': {
 class: () => require("${importationPath}"),
 id: "${id}",
 name: "${name}",
 parent: "${parent}",
 dependences: ${JSON.stringify(dependences)},
-                },`);
-            }
+            },`);
         }
 
         // Define the app class identifier

package/skeleton/Dockerfile

@@ -1,20 +0,0 @@
-# NOTE: Executed locally, **AND** from the github repo
-#   Run after happy build
-
-# Image config
-FROM node:18-bullseye
-WORKDIR /app
-
-# Install deps
-COPY package.json .
-COPY package-lock.json .
-RUN npm ci
-
-# Config
-COPY identity.yaml .
-COPY ./public ./public
-# Source files
-COPY bin ./bin
-
-# Run
-CMD ["npm", "start"]

package/skeleton/docker-compose.yml

@@ -1,37 +0,0 @@
-version: '3'
-services:
-    crosspath:
-        # Launch
-        image: crosspath
-        container_name: crosspath
-        build: 
-            context: .
-            dockerfile: Dockerfile
-        # Container config
-        ports:
-            - 3014:3014
-        expose:
-            - 3014
-        depends_on:
-            - mysqldb
-        networks: 
-            - internalnet
-        tty: true
-
-    mysqldb:
-        # Launch
-        image: mysql:8.0
-        container_name: mysqlcontainer
-        command: --default-authentication-plugin=mysql_native_password
-        restart: unless-stopped
-        # Container config
-        ports:
-            - 3366:3306
-        expose:
-            - 3366
-        networks: 
-            - internalnet
-
-networks:
-  internalnet:
-    driver: bridge

package/skeleton/identity.yaml

@@ -1,21 +0,0 @@
-name: CrossPath CSM
-identifier: CrossPathCSM
-description: "Cross Path is a marketplace to match candidates with companies via freelance headhunters. We open the door for all people to become headhunters on Cross Path and help the company clients source the best candidates from Cross Path’s own talent pool or external resources. "
-
-author:
-    name: CrossPath
-    url: csm.becrosspath.com
-    email: team@becrosspath.com
-
-social:
-
-language: en
-maincolor: white
-
-web:
-    title: "CrossPath"
-    titleSuffix: CrossPath
-    fullTitle: "The premier hiring platform for top-tier recruitment."
-    description: "Revolutionise your recruitment process with CrossPath - the ultimate headhunter marketplace (hiring platform) for finding exceptional talent. Join us today and see the results!"
-    version: 0.0.1
-    

package/skeleton/package.json

@@ -1,48 +0,0 @@
-{
-    "name": "crosspath",
-    "version": "0.0.3",
-    "private": true,
-    "engines": {
-        "node": ">=16.1.0",
-        "npm": ">=3.10.10"
-    },
-    "browserslist": [
-        ">0.2%",
-        "not dead",
-        "not op_mini all",
-        "safari >= 10"
-    ],
-    "scripts": {
-        "dev": "export NODE_ENV=development && 5htp dev",
-        "build": "5htp build",
-        "deploy": "docker compose up --build",
-        "start": "export NODE_ENV=production && node ./bin/server.js",
-        "update-ecs-tasks": "aws ecs describe-task-definition --profile crosspath --task-definition CrossPathCSM --query taskDefinition > .github/workflows/ecs-task.json"
-    },
-    "dependencies": {
-        "@sendgrid/mail": "^7.7.0",
-        "@slack/web-api": "^6.8.0",
-        "5htp": "^0.3.1",
-        "5htp-airtable": "^0.0.5-1",
-        "5htp-core": "^0.3.6-9",
-        "aws-sdk": "^2.1334.0",
-        "core-js": "^3.18.1",
-        "dayjs": "^1.11.6",
-        "fs-extra": "^11.1.1",
-        "got": "^11.8.3",
-        "ngrok": "^5.0.0-beta.2",
-        "number-abbreviate": "^2.0.0",
-        "sha1": "^1.1.1",
-        "sharp": "^0.31.3",
-        "short-unique-id": "^5.0.3",
-        "tslog": "^4.9.1"
-    },
-    "devDependencies": {
-        "@types/fs-extra": "^11.0.1",
-        "@types/node-fetch": "^2.6.2",
-        "@types/request": "^2.48.8",
-        "@types/sharp": "^0.31.1",
-        "csv-parser": "^3.0.0",
-        "ts-node": "^10.9.1"
-    }
-}

package/skeleton/src/client/assets/identity/logo.svg

@@ -1,14 +0,0 @@
-<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_b_1913_3113)">
-<rect width="108.683" height="108.683" rx="30" transform="matrix(-1 0 0 1 109.373 0.727417)" fill="black"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.0412 58.6903L81.5064 58.6903C80.499 72.8905 73.8148 80.1099 57.114 80.4878V69.5095C64.8638 69.1714 67.4794 65.2534 68.0412 58.7102V58.6903ZM42.5242 53.9604C42.5242 62.2446 45.0938 67.219 50.8854 68.8445V79.9685C34.7955 78.0884 28.569 66.2398 28.569 53.9604C28.569 41.681 34.7559 29.852 50.8854 28.0698L50.8854 39.0762C44.995 40.6234 42.5242 45.6566 42.5242 53.9604ZM68.2987 49.8673L82.0254 49.8673C80.8522 34.9367 74.3213 28.4034 57.114 28.0698L57.114 38.841C64.916 39.2531 67.8099 43.0004 68.2987 49.8673Z" fill="white"/>
-<defs>
-<filter id="filter0_b_1913_3113" x="-63.3101" y="-63.2726" width="236.683" height="236.683" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feGaussianBlur in="BackgroundImageFix" stdDeviation="32"/>
-<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_1913_3113"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_1913_3113" result="shape"/>
-</filter>
-</defs>
-</svg>

package/skeleton/src/client/assets/identity/logoAndText.svg

@@ -1,10 +0,0 @@
-<svg width="181" height="26" viewBox="0 0 181 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1739_5023)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M181 14.3282V24.9451H174.939V15.3472C174.939 13.0455 173.984 11.79 171.872 11.79C169.438 11.79 168.033 13.3275 168.033 16.7482V24.9541H161.973V0.5H168.033V10.7256C169.2 8.42394 171.238 6.92285 174.379 6.92285C178.998 6.92285 181 9.75218 181 14.3282ZM116.24 17.3668C121.631 17.3668 123.78 13.9097 123.78 9.40645L123.789 9.39735C123.789 5.1761 121.64 1.71904 116.25 1.71904H103.136V24.945H109.408V17.3668H116.24ZM114.229 6.44065C116.452 6.44065 117.297 7.65972 117.297 9.44284C117.297 11.2532 116.415 12.6179 114.156 12.6179H109.399V6.44065H114.229ZM41.7191 16.2115C41.7191 11.5354 44.3271 6.92291 51.8022 6.92291C59.2773 6.92291 61.9129 11.5354 61.9129 16.2115C61.9129 20.8876 59.2681 25.5001 51.8022 25.5001C44.3363 25.5001 41.7191 20.924 41.7191 16.2115ZM51.8022 20.8239C54.6949 20.8239 55.8245 19.7049 55.8245 16.2115C55.8245 12.718 54.6949 11.599 51.8022 11.599C48.9095 11.599 47.78 12.718 47.78 16.2115C47.78 19.7049 48.9095 20.8239 51.8022 20.8239ZM40.0661 7.20487V13.0364H37.9173C34.997 13.0364 33.7573 14.4374 33.7573 17.9581V24.936H27.6964V7.4869H33.5828V11.044C34.2899 8.5695 35.7317 7.20487 38.5877 7.20487H40.0661ZM72.7582 21.8974C70.5083 21.8974 69.3053 20.7421 69.1676 19.3137H69.1492H63.6485C63.7954 22.5252 66.082 25.491 72.6388 25.491C79.1956 25.491 81.271 22.9164 81.271 19.5594C81.271 16.2024 79.5445 14.5284 75.3846 14.11L71.7572 13.7642C70.1043 13.5914 69.6818 12.9273 69.6818 12.1904C69.6818 11.2169 70.4532 10.48 72.5011 10.48C74.4387 10.48 75.3938 11.2806 75.5682 12.6453H81.069C80.72 8.56046 77.2028 6.92291 72.4735 6.92291C67.7442 6.92291 64.1536 8.59685 64.1536 12.7544C64.1536 15.793 65.9902 17.6125 69.4063 17.9946L73.1439 18.4131C75.1917 18.6587 75.504 19.3865 75.504 20.2599C75.504 21.2697 74.7326 21.8974 72.7582 21.8974ZM88.3328 19.3137C88.4706 20.7421 89.6736 21.8974 91.9234 21.8974C93.8978 21.8974 94.6692 21.2697 94.6692 20.2599C94.6692 19.3865 94.357 18.6587 92.3091 18.4131L88.5716 17.9946C85.1555 17.6125 83.3188 15.793 83.3188 12.7544C83.3188 8.59685 86.9094 6.92291 91.6388 6.92291C96.3681 6.92291 99.8852 8.56046 100.234 12.6453H94.7335C94.559 11.2806 93.604 10.48 91.6663 10.48C89.6185 10.48 88.8471 11.2169 88.8471 12.1904C88.8471 12.9273 89.2695 13.5914 90.9225 13.7642L94.5498 14.11C98.7098 14.5284 100.436 16.2024 100.436 19.5594C100.436 22.9164 98.3608 25.491 91.8041 25.491C85.2473 25.491 82.9607 22.5252 82.8138 19.3137H88.3145H88.3328ZM125.855 20.3327C125.855 17.5397 127.021 15.6929 131.879 14.8832L135.865 14.1827C137.481 13.9007 137.913 13.4822 137.913 12.5725C137.913 11.5263 137.279 10.8985 135.268 10.8985C133.156 10.8985 132.127 11.7355 132.1 13.273H126.213C126.388 9.57029 129.629 6.92291 135.204 6.92291C140.778 6.92291 143.524 9.18819 143.524 13.1729V20.1234C143.524 21.9702 143.634 23.5077 143.845 24.9451H138.629C138.454 23.9353 138.344 22.7435 138.344 21.3152C137.463 23.8625 135.277 25.4 131.723 25.4C128.169 25.4 125.874 23.4076 125.874 20.3418L125.855 20.3327ZM137.903 16.7391V16.075C137.059 16.7027 136.251 16.912 135.158 17.194L134.138 17.4396C132.449 17.8581 131.815 18.4495 131.815 19.6412C131.815 20.833 132.77 21.488 134.001 21.488C136.287 21.488 137.913 19.8778 137.913 16.7391H137.903ZM148.547 11.9811V18.0491C148.547 22.5524 150.236 24.9269 155.627 24.9269H158.832V20.178H154.608V11.972H159.401V7.46872H154.608V3.24747H151.54L149.043 7.61428L145.443 9.18816V11.9811H148.547ZM24.6752 11.1168H18.2929V11.1077C18.0266 8.11459 16.7868 6.32238 13.1136 6.16772V1.14589C21.0295 1.31874 24.1976 4.62114 24.6752 11.1168ZM6.48331 13.3457C6.48331 9.49742 7.67712 7.18665 10.3678 6.43156V1.26416C2.89269 2.13752 0 7.64153 0 13.3457C0 19.0498 2.87433 24.5447 10.3678 25.3726V20.2598C7.6312 19.5411 6.48331 17.203 6.48331 13.3457ZM18.3663 15.3744H24.8129C24.2619 22.2976 21.1947 25.3271 13.1136 25.4818V20.4872C16.7777 20.2962 18.1368 18.5586 18.3663 15.3744Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_1739_5023">
-<rect width="181" height="25" fill="white" transform="translate(0 0.5)"/>
-</clipPath>
-</defs>
-</svg>

package/skeleton/src/client/assets/identity/logoAndTextBlack.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg fill="none" version="1.1" viewBox="0 0 181 26" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#a)" fill="#000">
-<path d="m181 14.328v10.617h-6.061v-9.5979c0-2.3017-0.955-3.5572-3.067-3.5572-2.434 0-3.839 1.5375-3.839 4.9582v8.2059h-6.06v-24.454h6.06v10.226c1.167-2.3017 3.205-3.8028 6.346-3.8028 4.619 0 6.621 2.8293 6.621 7.4054zm-64.76 3.0386c5.391 0 7.54-3.4571 7.54-7.9604l9e-3 -0.0091c0-4.2212-2.149-7.6783-7.539-7.6783h-13.114v23.226h6.272v-7.5782h6.832zm-2.011-10.926c2.223 0 3.068 1.2191 3.068 3.0022 0 1.8104-0.882 3.1751-3.141 3.1751h-4.757v-6.1772h4.83zm-72.51 9.7708c0-4.6761 2.608-9.2886 10.083-9.2886s10.111 4.6125 10.111 9.2886-2.6448 9.2886-10.111 9.2886-10.083-4.5761-10.083-9.2886zm10.083 4.6124c2.8927 0 4.0223-1.119 4.0223-4.6124 0-3.4935-1.1296-4.6125-4.0223-4.6125s-4.0222 1.119-4.0222 4.6125c0 3.4934 1.1295 4.6124 4.0222 4.6124zm-11.736-13.619v5.8315h-2.1488c-2.9203 0-4.16 1.401-4.16 4.9217v6.9779h-6.0609v-17.449h5.8864v3.5571c0.7071-2.4745 2.1489-3.8391 5.0049-3.8391h1.4784zm32.692 14.693c-2.2499 0-3.4529-1.1553-3.5906-2.5837h-5.5191c0.1469 3.2115 2.4335 6.1773 8.9903 6.1773s8.6322-2.5746 8.6322-5.9316-1.7265-5.031-5.8864-5.4494l-3.6274-0.3458c-1.6529-0.1728-2.0754-0.8369-2.0754-1.5738 0-0.9735 0.7714-1.7104 2.8193-1.7104 1.9376 0 2.8927 0.8006 3.0671 2.1653h5.5008c-0.349-4.0848-3.8662-5.7224-8.5955-5.7224s-8.3199 1.6739-8.3199 5.8315c0 3.0386 1.8366 4.8581 5.2527 5.2402l3.7376 0.4185c2.0478 0.2456 2.3601 0.9734 2.3601 1.8468 0 1.0098-0.7714 1.6375-2.7458 1.6375zm15.575-2.5837c0.1378 1.4284 1.3408 2.5837 3.5906 2.5837 1.9744 0 2.7458-0.6277 2.7458-1.6375 0-0.8734-0.3122-1.6012-2.3601-1.8468l-3.7375-0.4185c-3.4161-0.3821-5.2528-2.2016-5.2528-5.2402 0-4.1576 3.5906-5.8315 8.32-5.8315 4.7293 0 8.2464 1.6376 8.5952 5.7224h-5.5005c-0.1745-1.3647-1.1295-2.1653-3.0672-2.1653-2.0478 0-2.8192 0.7369-2.8192 1.7104 0 0.7369 0.4224 1.401 2.0754 1.5738l3.6273 0.3458c4.16 0.4184 5.8862 2.0924 5.8862 5.4494s-2.0752 5.9316-8.6319 5.9316c-6.5568 0-8.8434-2.9658-8.9903-6.1773h5.519zm37.522 1.019c0-2.793 1.166-4.6398 6.024-5.4495l3.986-0.7005c1.616-0.282 2.048-0.7005 2.048-1.6102 0-1.0462-0.634-1.674-2.645-1.674-2.112 0-3.141 0.837-3.168 2.3745h-5.887c0.175-3.7027 3.416-6.3501 8.991-6.3501 5.574 0 8.32 2.2653 8.32 6.25v6.9505c0 1.8468 0.11 3.3843 0.321 4.8217h-5.216c-0.175-1.0098-0.285-2.2016-0.285-3.6299-0.881 2.5473-3.067 4.0848-6.621 4.0848s-5.849-1.9924-5.849-5.0582l-0.019-0.0091zm12.048-3.5936v-0.6641c-0.844 0.6277-1.652 0.837-2.745 1.119l-1.02 0.2456c-1.689 0.4185-2.323 1.0099-2.323 2.2016 0 1.1918 0.955 1.8468 2.186 1.8468 2.286 0 3.912-1.6102 3.912-4.7489h-0.01zm10.644-4.758v6.068c0 4.5033 1.689 6.8778 7.08 6.8778h3.205v-4.7489h-4.224v-8.206h4.793v-4.5033h-4.793v-4.2212h-3.068l-2.497 4.3668-3.6 1.5739v2.7929h3.104zm-123.87-0.8643h-6.3823v-0.0091c-0.2663-2.9931-1.5061-4.7853-5.1793-4.94v-5.0218c7.9159 0.17285 11.084 3.4752 11.562 9.9709zm-18.192 2.2289c0-3.8483 1.1938-6.159 3.8845-6.9141v-5.1674c-7.4751 0.87336-10.368 6.3774-10.368 12.082 0 5.7041 2.8743 11.199 10.368 12.027v-5.1128c-2.7366-0.7187-3.8845-3.0568-3.8845-6.9141zm11.883 2.0287h6.4466c-0.551 6.9232-3.6182 9.9527-11.699 10.107v-4.9946c3.6641-0.191 5.0232-1.9286 5.2527-5.1128z" clip-rule="evenodd" fill="#000" fill-rule="evenodd"/>
-</g>
-<defs>
-<clipPath id="a">
-<rect transform="translate(0 .5)" width="181" height="25" fill="#fff"/>
-</clipPath>
-</defs>
-</svg>