5htp 0.6.3 → 0.6.4

package/compiler/index.ts

@@ -273,17 +273,14 @@ export default class Compiler {
 
     import { ${appClassIdentifier} as ${appClassIdentifier}Client } from "@/client";
     import ${appClassIdentifier}Server from "@/server/.generated/app";
-    
-    import { ApplicationProperties as ClientApplicationProperties } from "@client/app";
-    import { ApplicationProperties as ServerApplicationProperties } from "@server/app";
-
-    type ClientServices = Omit<${appClassIdentifier}Client, ClientApplicationProperties>;
-    type ServerServices = Omit<${appClassIdentifier}Server, ServerApplicationProperties | keyof ClientServices>;
   
-    type CombinedServices = ClientServices & ServerServices;
-  
-    const appClass: CombinedServices;
-    export = appClass;
+    export const Router: ${appClassIdentifier}Client['Router'];
+
+    ${sortedServices.map(service => service.name !== 'Router'
+        ? `export const ${service.name}: ${appClassIdentifier}Server["${service.name}"];`
+        : ''
+    ).join('\n')}
+
 }
     
 declare module '@models/types' {
@@ -344,13 +341,15 @@ export default (): ClientContext => React.useContext<ClientContext>(ReactClientC
         // @/server/.generated/app.ts
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'app.ts'),
-`import { Application } from '@server/app/index';
+`
+import { Application } from '@server/app/index';
+import { ServicesContainer } from '@server/app/service/container';
 
 ${imported.join('\n')}
 
-export default class ${appClassIdentifier} extends Application {
+export default class ${appClassIdentifier} extends Application<ServicesContainer, CurrentUser> {
 
-    // Makke sure the services typigs are reflecting the config and referring to the app
+    // Make sure the services typigs are reflecting the config and referring to the app
     ${sortedServices.map(service => 
         `public ${service.name}!: ReturnType<${appClassIdentifier}["registered"]["${service.id}"]["start"]>;`
     ).join('\n')}
@@ -461,15 +460,31 @@ declare module '@models/types' {
         );
     }
 
-    public async create() {
+    public async refreshGeneratedTypings({
+        cleanup = false,
+        fixNpmLinkIssues = false,
+    }: {
+        cleanup?: boolean,
+        fixNpmLinkIssues?: boolean,
+    } = {}) {
 
         await app.warmup();
 
-        this.cleanup();
+        if (cleanup)
+            this.cleanup();
 
-        this.fixNpmLinkIssues();
+        if (fixNpmLinkIssues)
+            this.fixNpmLinkIssues();
 
         this.indexServices();
+    }
+
+    public async create() {
+
+        await this.refreshGeneratedTypings({
+            cleanup: true,
+            fixNpmLinkIssues: true,
+        });
 
         // Create compilers
         const multiCompiler = webpack([
@@ -530,4 +545,4 @@ declare module '@models/types' {
 
     }
 
-}
+}

package/compiler/server/index.ts

@@ -43,6 +43,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
     debug && console.info(`Creating compiler for server (${mode}).`);
     const dev = mode === 'dev';
+    const buildCheck = dev && cli.commandName === 'build';
 
     const commonConfig = createCommonConfig(app, 'server', mode);
     const { aliases } = app.aliases.server.forWebpack({
@@ -69,7 +70,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
         output: {
 
-            pathinfo: dev,
+            pathinfo: dev && !buildCheck,
 
             libraryTarget: 'commonjs2',
 
@@ -198,7 +199,9 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
         },
 
         // https://webpack.js.org/configuration/devtool/#devtool
-        devtool: dev 
+        devtool: buildCheck
+            ? false
+            : dev 
             ? 'eval-source-map' // Recommended choice for development builds with high quality SourceMaps.
             : 'source-map', // Recommended choice for production builds with high quality SourceMaps.
 
@@ -209,4 +212,4 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
     };
 
     return config;
-};
+};

package/index.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env -S npx ts-node
-
 process.traceDeprecation = true;
 
 /*----------------------------------
@@ -35,6 +33,8 @@ export class CLI {
 
     // Context
     public args: TArgsObject = {};
+
+    public commandName: string | null = null;
     
     public debug: boolean = false;
 
@@ -61,6 +61,7 @@ export class CLI {
     public commands: { [name: string]: TCliCommand } = {
         "init": () => import('./commands/init'),
         "dev": () => import('./commands/dev'),
+        "refresh": () => import('./commands/refresh'),
         "build": () => import('./commands/build'),
     }
 
@@ -113,6 +114,7 @@ export class CLI {
 
     public async runCommand(command: string) {
 
+        this.commandName = command;
         this.debug && console.info(`Running command ${command}`, this.args);
 
         // Check existance
@@ -186,4 +188,4 @@ export class CLI {
 
 }
 
-export default new CLI()
+export default new CLI()

package/package.json

@@ -1,15 +1,15 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.3",
+	"version": "0.6.4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
 	"bin": {
-		"5htp": "index.ts"
+		"5htp": "cli.js"
 	},
 	"engines": {
-		"node": ">=16.1.0",
+		"node": ">=18.20.0",
 		"npm": ">=3.10.10"
 	},
 	"keywords": [
@@ -26,7 +26,6 @@
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.15.0",
 		"@prefresh/webpack": "^3.3.2",
-		"@squoosh/lib": "^0.4.0",
 		"@tailwindcss/postcss": "^4.1.17",
 		"@types/babel__core": "^7.1.16",
 		"@types/cookie": "^0.4.1",

package/readme.md

@@ -22,6 +22,8 @@ Full Stack Typescript framework designed for **developers and users experience**
 
 ## Get Started
 
+Requires Node.js `18.20+` or any compatible `20.x` release.
+
 1. Install:
 
 `npm i -g 5htp`
@@ -34,10 +36,20 @@ Full Stack Typescript framework designed for **developers and users experience**
 
 `5htp dev`
 
-4. Build for production:
+Dev compilation output is written to `bin-dev`.
+
+4. Build output files with the development config:
 
 `5htp build`
 
+`5htp build dev`
+
+5. Build for production:
+
+`5htp build prod`
+
+Build output is written to `bin`.
+
 ## To be done:
 
 - [ ] Update templates & documentation
@@ -57,4 +69,4 @@ Full Stack Typescript framework designed for **developers and users experience**
 - [ ] Improve ORM: make definition based on code instead of database structure
 - [ ] Automatically generates types that associate api routes urls to their return types
 - [ ] Allow to create CLI apps
-- [ ] Fix Typescript errors
+- [ ] Fix Typescript errors

package/compiler/common/babel/plugins/form.ts

@@ -1,191 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-import { PluginObj } from '@babel/core'; 
-
-import * as types from '@babel/types'
-import generate from '@babel/generator';
-
-/*----------------------------------
-- WEBPACK RULE
-----------------------------------*/
-module.exports = {
-    test: "**/client/**/*.tsx",
-    plugins: [
-        [Plugin]
-    ]
-}
-
-const debug = false
-
-/*----------------------------------
-- PLUGIN
-----------------------------------*/
-function Plugin (babel) {
-
-    const t = babel.types as typeof types;
-
-    const plugin: PluginObj<{
-        fichier: string,
-        cancel: boolean
-    }> = {
-        pre(state) {
-
-            this.fichier = state.opts.filename as string;
-
-            if (!('useForm' in state.scope.bindings))
-                this.cancel = true;
-
-        },
-        visitor: {
-            JSXElement(instruction) {
-
-                if (this.cancel === true)
-                    return;
-
-                const balise = instruction.node.openingElement;
-
-                /*
-                    <Champs.metas.titre className="full" attrsChamp={{ className: "h1" }} />
-                */
-
-                if (!(
-                    balise.selfClosing === true
-                    &&
-                    balise.name.type === 'JSXMemberExpression'
-                    &&
-                    balise.name.property.type === 'JSXIdentifier'
-                ))
-                    return;
-
-                debug && console.log(`[compilation][babel][form] Original: `, generate(instruction.node).code);
-
-                // Si le premier element du memberexpression est Champ
-                let nomA: types.JSXMemberExpression | types.JSXIdentifier = balise.name;
-                while (nomA.type === 'JSXMemberExpression')
-                    nomA = nomA.object;
-                if (!nomA.name.startsWith('Champs'))
-                    return;
-
-                // Ne pas parcourir les élements enfant
-                // Avec .stop, babel arrête d'itérer les élements voisins à partir du 6ème - 7ème
-                //instruction.stop();
-                instruction.skip();
-
-                // Transformation de la lste des attributs en un objet
-                /*
-                    className="full" attrsChamp={{ className: "h1" }}
-
-                    =>
-
-                    { className: "full", attrsChamp: { className: "h1" } }
-                */
-                let objAttributs: types.ObjectProperty[] = [];
-                for (const attribut of balise.attributes)
-                    if (
-                        attribut.type === 'JSXAttribute' && 
-                        attribut.value !== undefined && 
-                        typeof attribut.name.name === "string"
-                    ) {
-
-                        let propValue: types.ObjectProperty["value"];
-                        if (attribut.value === null) // <Champ.titre autoFocus />
-                            propValue = t.booleanLiteral(true);
-                        else if (attribut.value.type !== 'JSXExpressionContainer')
-                            propValue = attribut.value;
-                        else if (attribut.value.expression.type !== 'JSXEmptyExpression')
-                            propValue = attribut.value.expression;
-                        else
-                            propValue = t.nullLiteral();
-
-                        objAttributs.push(
-                            t.objectProperty(
-                                t.identifier( attribut.name.name ),
-                                propValue
-                            )
-                        )
-                    }
-
-                // Traverse chaque branche du chemin du champ, dans l'ordre inverse
-                // NOTE: on aurai pu reconstituer le chemin et créer les memberexpressions en une seule itération
-                //      Mais le fait d ele faire en deux itérations rend le code plus claire et maintenable
-                let cheminComposant: string[] = []
-                let brancheA: types.JSXMemberExpression | types.JSXIdentifier = balise.name;
-                while (brancheA.type === 'JSXMemberExpression') {
-
-                    const { property } = brancheA;
-                    
-                    cheminComposant.unshift(property.name)
-                    brancheA = brancheA.object;
-                }
-
-                let cheminSchema: types.MemberExpression | types.OptionalMemberExpression = t.memberExpression( 
-                    t.identifier('Champs'), 
-                    t.identifier('schema') 
-                );
-                let cheminDonnees: types.MemberExpression | types.OptionalMemberExpression = t.memberExpression( 
-                    t.identifier('Champs'), 
-                    t.identifier('data') 
-                );
-                const iDerniereBranche = cheminComposant.length - 1
-                for (let iBranche = iDerniereBranche; iBranche >= 0; iBranche--) {
-
-                    const branche = cheminComposant[ iBranche ];
-
-                    cheminSchema = t.optionalMemberExpression(
-                        cheminSchema,
-                        t.identifier( branche ),
-                        undefined,
-                        true
-                    )
-
-                    if (iBranche !== iDerniereBranche)
-                        cheminDonnees = t.optionalMemberExpression(
-                            cheminDonnees,
-                            t.identifier(branche),
-                            undefined,
-                            true
-                        )
-
-                }
-
-                // Remplacement
-                /*
-                    {Champs._render( Champs.metas?.titre, Champs._data.metas?.titre, 'metas.titre', {
-                        className: "full",
-                        attrsChamp: { className: "h1" }
-                    })}
-                */
-                const remplacement = t.callExpression(
-
-                    // Champs.render
-                    t.memberExpression(
-                        t.identifier('Champs'),
-                        t.identifier('render')
-                    ),
-                    [
-                        // Champs.<chemin>
-                        cheminSchema,
-
-                        // Champs._data.<chemin>
-                        cheminDonnees,
-
-                        // Chemin
-                        t.stringLiteral( cheminComposant.join('.') ),
-
-                        // { <attrs> }
-                        t.objectExpression(objAttributs)
-                    ]
-                )
-
-                debug && console.log(`[compilation][babel][form] Remplacement: `, generate(remplacement).code );
-
-                instruction.replaceWith(remplacement);
-                
-            }
-        },
-    };
-
-    return plugin;
-}