5htp 0.3.0 → 0.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -41,6 +41,7 @@
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
 		"babel-loader": "^8.2.2",
+		"babel-plugin-glob-import": "^0.0.7",
 		"babel-plugin-transform-imports": "^2.0.0",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
 		"brotli-webpack-plugin": "^1.1.0",
@@ -87,7 +88,6 @@
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2",
-		"babel-plugin-glob-import": "^0.0.7"
+		"@types/webpack-env": "^1.16.2"
 	}
 }

package/src/app/index.ts

@@ -56,6 +56,15 @@ export class App {
             this.aliases[side].realpath(filename),
     }
 
+    public containerServices = [
+        'Services',
+        'Environment',
+        'Identity',
+        /*'Application',
+        'Path',
+        'Event'*/
+    ]
+
     public constructor() {
         
         cli.debug && console.log(`[cli] Loading app config ...`);

package/src/compiler/common/babel/plugins/services.ts

@@ -10,14 +10,6 @@ import type { PluginObj } from '@babel/core';
 import cli from '@cli';
 import { App, TAppSide } from '../../../../app';
 
-const containerServices = [
-    'Environment',
-    'Application',
-    'Path',
-    'Services',
-    'Event'
-]
-
 /*----------------------------------
 - WEBPACK RULE
 ----------------------------------*/
@@ -43,8 +35,23 @@ function Plugin(babel, { app, side, debug }: TOptions) {
     const t = babel.types as typeof types;
 
     /*
-        - Wrap route.get(...) with (app: Application) => { }
-        - Inject chunk ID into client route options
+        Transforms:
+            import { MyService, Environment } from '@app';
+            ...
+            MyService.method()
+            Environment.name
+
+        To:
+            import app from '@app';
+            import Container from '@server/app/container';
+            ...
+            app.services.MyService.method()
+            Container.Environment.name   
+            
+        Processed files:
+            @/server/config
+            @/server/routes
+            @/server/services
     */
 
     const plugin: PluginObj<{ 
@@ -68,7 +75,13 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         pre(state) {
 
             this.filename = state.opts.filename as string;
-            this.processFile = this.filename.startsWith( cli.paths.appRoot + '/src/server' );
+            this.processFile = (
+                this.filename.startsWith( cli.paths.appRoot + '/src/server/config' )
+                ||
+                this.filename.startsWith( cli.paths.appRoot + '/src/server/routes' )
+                ||
+                this.filename.startsWith( cli.paths.appRoot + '/src/server/services' )
+            )
 
             this.importedServices = {}
             this.bySource = {
@@ -103,7 +116,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                     this.importedServicesCount++;
 
                     let importSource: TImportSource;
-                    if (containerServices.includes(specifier.imported.name))
+                    if (app.containerServices.includes(specifier.imported.name))
                         importSource = 'container';
                     else
                         importSource = 'application';
@@ -129,13 +142,14 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                         )
                     );
 
-                if (this.bySource.application > 0)
+                // NOTE: Update 20/07: services should be accessed through current service instance
+                /*if (this.bySource.application > 0)
                     replaceWith.push(
                         t.importDeclaration(
                             [t.importDefaultSpecifier( t.identifier('application') )],
                             t.stringLiteral( cli.paths.core.src + '/server/app/instance')
                         )
-                    );
+                    );*/
 
                 path.replaceWithMultiple(replaceWith);
             },
@@ -178,8 +192,8 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                             ? t.identifier( service.source )
                             // application.services.Disks
                             : t.memberExpression(
-                                t.identifier( service.source ),
-                                t.identifier('services'),
+                                t.identifier('this'),
+                                t.identifier('app'),
                             ),
                         path.node
                     )

package/src/compiler/index.ts

@@ -6,8 +6,6 @@
 import path from 'path';
 import webpack from 'webpack';
 import fs from 'fs-extra';
-import micromatch from 'micromatch';
-import moduleAlias from 'module-alias';
 
 import SpeedMeasurePlugin from "speed-measure-webpack-plugin";
 const smp = new SpeedMeasurePlugin({ disable: true });
@@ -147,7 +145,23 @@ dependences: ${JSON.stringify(dependences)},
             }
         }
 
+        // Define the app class identifier
+        const appClassIdentifier = app.identity.identifier;
+        const containerServices = app.containerServices.map( s => "'" + s + "'").join('|');
+
         // Output the services index
+        fs.outputFileSync(
+            path.join( app.paths.client.generated, 'services.d.ts'),
+`declare module "@app" {
+
+    import { CrossPathClient } from '@/client/index';
+
+    const appClass: CrossPathClient;
+
+    export = appClass
+}`
+        );
+
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'services.ts'),
 `${imported.join('\n')}
@@ -161,12 +175,39 @@ export default {
 
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'services.d.ts'),
-`declare module "@app" {
-    type Services = import("./services").Services;
-    const ServerServices: Services & {
-        app: import('@server/app').Application<Services>
-    }
+`type InstalledServices = import('./services').Services;
+
+declare type ${appClassIdentifier} = import("@/server").default;
+
+declare module "@app" {
+
+    import { ApplicationContainer } from '@server/app/container';
+
+    const ServerServices: (
+        Pick< 
+            ApplicationContainer<InstalledServices>, 
+            ${containerServices}
+        >
+        & 
+        ${appClassIdentifier}
+    )
+
     export = ServerServices
+}
+
+declare module '@server/app' {
+
+    import { Application } from "@server/app/index";
+    import { ServicesContainer } from "@server/app/service/container";
+
+    export interface Exported {
+        Application: typeof Application,
+        Services: ServicesContainer<InstalledServices>,
+    }
+
+    const foo: Exported;
+
+    export = foo;
 }`
         );
     }

package/skeleton/src/server/config.ts

@@ -1,125 +0,0 @@
-import app from '@server/app'; // CLI or App
-app.configure({
-    
-    // Tracking
-    tracking: {
-        // https://analytics.google.com/analytics/web/@report-home/a114396550w244235024p227300451
-        ga: {
-            pub: 'G-198FW1K066',
-            // Client ID
-            prv: '',
-            // Secret code for GA4 measurement api
-            // https://analytics.google.com/analytics/web/#/a114396550p308927292/admin/streams/table/3375435279
-            secret: 'MJWpU7MqSZKth1LJvp2gag'
-        }
-    },
-    
-    // HTTP
-    http: {
-
-        port: 3010,
-        ssl: false,
-
-        upload: {
-            maxSize: '10mb'
-        },
-
-        // Protections against bots
-        security: {
-            // https://www.google.com/recaptcha/admin/site/346699952
-            recaptcha: {
-                pub: '6LewOKoUAAAAAKmaDqpcNaQz31z_AJarSs0sQvft',
-                prv: '6LewOKoUAAAAAOAj80m9vOJuP9YcR7PnYQ3E-y4o'
-            },
-            iphub: "Mzk3MzpLWE84eHhXQ0ZvUlNQODh0M3J0OXpDTGE2WGx5Szl6OA=="
-        }
-        /*session: {
-            duration: 604800, // 7 Jours
-            secret: 'secret',
-            name: 'sessionId',
-        }*/
-    },
-
-    // Database (SQL)
-    database: {
-        list: ['megacharger'],
-
-        dev: {
-            host: '127.0.0.1',
-            port: 3306,
-            login: 'gaetan',
-            password: "$mdp=MySQL!159753",
-        },
-
-        prod: {
-            host: 'mysqldb',
-            port: 3306,
-            login: 'gaetan',
-            password: "$mdp=MySQL!159753",
-        },
-
-    },
-
-    // Authentication
-    auth: {
-        jwt: {
-            // 2048 bits
-            key: "D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRfUjXn2r5u8x/A?D(G+KbPdSgVkYp3s6v9y$B&E)H@McQfThWmZq4t7w!z%C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w!z%C*F-JaNdRgUkXp2s5v8y/A?D(G+KbPeShVmYq3t6w9z$C&E)H@McQfTjWnZr4u7x!A%D*G-JaNdRgU",
-            expiration: "7 days",
-        },
-        google: {
-            web: {
-                clientId: "186669785739-e760eqsevhi7hd6nii6ha5pk0rip1s86.apps.googleusercontent.com",
-                secret: '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',
-            },
-            android: {
-                clientId: "186669785739-geqn7egdepda7aqgoob0ce7jot1ko2gh.apps.googleusercontent.com"
-            }
-        }
-    },
-
-    // Router
-    router: {
-        
-    },
-
-    // Socket
-    socket: {
-        port: 3011,
-    },
-
-    // Email
-    email: {
-        default: {
-            transporter: 'mailjet',
-            from: 'sites@gaetan-legac.fr',
-        },
-        transporters: {
-            local: {
-                // Réseau
-                host: 'localhost',
-                port: 25,
-                tls: false,
-                // Auth
-                login: 'contact',
-                password: '$mdp=VPS!159753',
-            },
-            sendgrid: {
-                api: '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',
-            },
-            mailjet: {
-                api: '2c24ad3fa9254fe1a50f4d707069d654'
-            }
-        }
-    },
-
-    // Redis
-    redis: {
-
-    },
-
-    // Cron
-    cron: {
-
-    }
-})