5htp 0.6.2 → 0.6.3-2

package/compiler/common/files/style.ts

@@ -1,11 +1,7 @@
 // Plugons
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
-import lessToJs from 'less-vars-to-js';
 
-import fs from 'fs-extra';
-import cli from '@cli';
-
-import type App from '../../../app';
+import type { App } from '../../../app';
 
 module.exports = (app: App, dev: Boolean, client: boolean) => {
 
@@ -31,11 +27,32 @@ module.exports = (app: App, dev: Boolean, client: boolean) => {
             loader: 'css-loader',
             options: {
                 // CSS Loader https://github.com/webpack/css-loader
-                importLoaders: 1,
+                importLoaders: 1, // let postcss run on @imports
                 sourceMap: dev
             },
         },
 
+        // Postcss
+        {
+            loader: 'postcss-loader',
+            options: {
+                postcssOptions: {
+                    plugins: [
+                        /* Tailwind V4 */require('@tailwindcss/postcss')({
+                            // Ensure Tailwind scans the application sources even if the build
+                            // process is launched from another working directory (e.g. Docker).
+                            base: app.paths.root,
+
+                            // Avoid double-minifying: Webpack already runs CssMinimizerPlugin in prod.
+                            optimize: false,
+                        }),
+                        ///* Tailwind V3 */require('tailwindcss'),
+                        require('autoprefixer'),
+                    ],
+                },
+            },
+        },
+
         {
             test: /\.less$/,
             loader: 'less-loader',
@@ -58,4 +75,4 @@ module.exports = (app: App, dev: Boolean, client: boolean) => {
         }*/
     ]
 
-}
+}

package/compiler/common/index.ts

@@ -8,9 +8,6 @@ import dayjs from 'dayjs';
 
 // Plugins
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-import PluginIndexage from './plugins/indexage';
-import IconesSvg from './plugins/indexage/icones-svg';
-import InjectDeps from './plugins/indexage/injection-dependances';
 
 // Core
 import cli from '../..';
@@ -88,12 +85,6 @@ export default function createCommonConfig(
 
             }),
 
-            new PluginIndexage(side === 'client' ? {
-                'icones-svg': new IconesSvg(app),
-            } : {
-                //'injection-dependances': new InjectDeps,
-            }),
-
             ...(side === 'client' && cli.args.analyze ? [
 
                 new BundleAnalyzerPlugin({

package/compiler/index.ts

@@ -17,7 +17,6 @@ import cli from '..';
 import createServerConfig from './server';
 import createClientConfig from './client';
 import { TCompileMode } from './common';
-import { routerServices } from './common/babel/plugins/services';
 
 type TCompilerCallback = (compiler: webpack.Compiler) => void
 
@@ -34,7 +33,7 @@ type TRegisteredService = {
     id?: string,
     name: string,
     className: string,
-    instanciation: (parentRef: string) => string,
+    instanciation: (parentRef?: string) => string,
     priority: number,
 }
 
@@ -198,7 +197,7 @@ export default class Compiler {
                 const refTo = serviceConfig.refTo;
                 return {
                     name: serviceName,
-                    instanciation: (parentRef: string) => `this.${refTo}`,
+                    instanciation: () => `this.${refTo}`,
                     priority: 0
                 }
             }
@@ -228,7 +227,7 @@ export default class Compiler {
 
                     // Reference to a service
                     else if (value.type === 'service.setup' || value.type === 'service.ref') // TODO: more reliable way to detect a service reference
-                        propsStr += `${key}:`+ refService(key, value, level + 1).instanciation('instance') + ',\n'
+                        propsStr += `${key}:`+ refService(key, value, level + 1).instanciation() + ',\n'
                     
                     // Recursion
                     else if (level <= 4 && !Array.isArray(value))
@@ -244,10 +243,10 @@ export default class Compiler {
             const config = processConfig(serviceConfig.config || {});
 
             // Generate the service instance
-            const instanciation = (parentRef: string) => 
+            const instanciation = (parentRef?: string) => 
                 `new ${serviceMetas.name}( 
-                    ${parentRef}, 
-                    (instance: ${serviceMetas.name}) => (${config}),
+                    ${parentRef ? `${parentRef},` : ''}
+                    ${config},
                     this 
                 )`
 
@@ -267,7 +266,7 @@ export default class Compiler {
         const appClassIdentifier = app.identity.identifier;
         const containerServices = app.containerServices.map( s => "'" + s + "'").join('|');
 
-        // Output the services index
+        // @/client/.generated/services.d.ts
         fs.outputFileSync(
             path.join( app.paths.client.generated, 'services.d.ts'),
 `declare module "@app" {
@@ -303,6 +302,7 @@ declare namespace preact.JSX {
 `
         );
 
+        // @/client/.generated/context.ts
         fs.outputFileSync(
             path.join( app.paths.client.generated, 'context.ts'),
 `// TODO: move it into core (but how to make sure usecontext returns ${appClassIdentifier}'s context ?)
@@ -333,16 +333,28 @@ export type ClientContext = (
 export const ReactClientContext = React.createContext<ClientContext>({} as ClientContext);
 export default (): ClientContext => React.useContext<ClientContext>(ReactClientContext);`);
 
+        // @/common/.generated/services.d.ts
+        fs.outputFileSync(
+            path.join( app.paths.common.generated, 'services.d.ts'),
+`declare module '@models/types' {
+    export * from '@/var/prisma/index';
+}`
+        );
+
+        // @/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> {
 
+    // Make sure the services typigs are reflecting the config and referring to the app
     ${sortedServices.map(service => 
-        `public ${service.name}!: ${service.className};`
+        `public ${service.name}!: ReturnType<${appClassIdentifier}["registered"]["${service.id}"]["start"]>;`
     ).join('\n')}
 
     protected registered = {
@@ -359,6 +371,7 @@ export default class ${appClassIdentifier} extends Application {
 
 `);
 
+        // @/server/.generated/services.d.ts
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'services.d.ts'),
 `type InstalledServices = import('./services').Services;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.2",
+	"version": "0.6.3-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -27,6 +27,7 @@
 		"@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",
 		"@types/express": "^4.17.13",
@@ -40,6 +41,7 @@
 		"@types/universal-analytics": "^0.4.5",
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
+		"autoprefixer": "^10.4.21",
 		"babel-loader": "^10.0.0",
 		"babel-plugin-glob-import": "^0.0.9-1",
 		"babel-plugin-transform-imports": "^2.0.0",
@@ -50,7 +52,7 @@
 		"compression-webpack-plugin": "^8.0.1",
 		"console-table-printer": "^2.10.0",
 		"css-loader": "^6.2.0",
-		"css-minimizer-webpack-plugin": "^4.1.0",
+		"css-minimizer-webpack-plugin": "^7.0.4",
 		"dayjs": "^1.11.5",
 		"favicons": "^7.2.0",
 		"filesize": "^8.0.3",
@@ -67,6 +69,7 @@
 		"node-cmd": "^5.0.0",
 		"node-notifier": "^10.0.0",
 		"null-loader": "^4.0.1",
+		"postcss-loader": "^8.2.0",
 		"prompts": "^2.4.2",
 		"react-dev-utils": "^11.0.4",
 		"replace-once": "^1.0.0",
@@ -74,6 +77,7 @@
 		"serialize-javascript": "^6.0.2",
 		"sharp": "^0.34.3",
 		"speed-measure-webpack-plugin": "^1.5.0",
+		"tailwindcss": "^4.1.17",
 		"terser-webpack-plugin": "^5.2.4",
 		"ts-alias": "^0.0.7",
 		"ts-node": "^10.9.1",
@@ -84,7 +88,8 @@
 		"webpack-dev-middleware": "^5.1.0",
 		"webpack-hot-middleware": "^2.25.0",
 		"webpack-node-externals": "^3.0.0",
-		"webpack-virtual-modules": "^0.4.3"
+		"webpack-virtual-modules": "^0.4.3",
+		"yaml": "^2.8.2"
 	},
 	"devDependencies": {
 		"@types/babel__preset-env": "^7.9.6",

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;
-}