5htp 0.4.6 → 0.5.9

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.6",
+	"version": "0.5.9",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
 	"bin": {
-		"5htp": "src/index.ts"
+		"5htp": "index.ts"
 	},
 	"engines": {
 		"node": ">=16.1.0",
@@ -18,6 +18,7 @@
 	"dependencies": {
 		"@babel/cli": "^7.15.4",
 		"@babel/plugin-proposal-class-properties": "^7.14.5",
+		"@babel/plugin-proposal-decorators": "^7.25.9",
 		"@babel/plugin-proposal-private-methods": "^7.14.5",
 		"@babel/plugin-proposal-private-property-in-object": "^7.15.4",
 		"@babel/plugin-transform-react-constant-elements": "^7.14.5",
@@ -39,6 +40,7 @@
 		"@types/universal-analytics": "^0.4.5",
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
+		"babel-loader": "^10.0.0",
 		"babel-plugin-glob-import": "^0.0.9-1",
 		"babel-plugin-transform-imports": "^2.0.0",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
@@ -50,7 +52,7 @@
 		"css-loader": "^6.2.0",
 		"css-minimizer-webpack-plugin": "^4.1.0",
 		"dayjs": "^1.11.5",
-		"favicons": "^6.2.2",
+		"favicons": "^7.2.0",
 		"filesize": "^8.0.3",
 		"image-minimizer-webpack-plugin": "^2.2.0",
 		"imagemin": "^8.0.1",
@@ -68,6 +70,7 @@
 		"prompts": "^2.4.2",
 		"react-dev-utils": "^11.0.4",
 		"replace-once": "^1.0.0",
+		"serialize-javascript": "^6.0.2",
 		"speed-measure-webpack-plugin": "^1.5.0",
 		"terser-webpack-plugin": "^5.2.4",
 		"ts-alias": "^0.0.7",
@@ -88,7 +91,6 @@
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2",
-		"babel-loader": "^10.0.0"
+		"@types/webpack-env": "^1.16.2"
 	}
 }

package/{src/paths.ts → paths.ts}

@@ -64,10 +64,9 @@ export default class Paths {
     }
 
     public core = {
-        cli: path.resolve(__dirname, '..'),
+        cli: path.resolve(__dirname, '.'),
         root: this.coreRoot,
-        src: this.coreRoot + '/src',
-        pages: this.coreRoot + '/src/client/pages',
+        pages: this.coreRoot + '/client/pages',
     }
 
     /*----------------------------------
@@ -149,7 +148,7 @@ export default class Paths {
             rootDir: this.core.cli
         });
 
-        //console.log('Applying Aliases ...', aliases);
+        console.log('Applying Aliases ...', aliases.forModuleAlias());
         moduleAlias.addAliases( aliases.forModuleAlias() );
 
     }

package/tsconfig.json

@@ -20,11 +20,12 @@
         "strictPropertyInitialization": true,
         "strictNullChecks": true,
         
-        "baseUrl": "./src",
+        "baseUrl": "./",
         "outDir": "./bin",
 
         "paths": {
             "@cli/*": [ "./*" ],
+            "@cli/app": [ "./app" ],
             "@cli": [ "./" ]
         },
     },
@@ -33,5 +34,5 @@
         "transpileOnly": true,
     },
 
-    "include": ["./src"]
+    "include": ["./"]
 }

package/src/app/index.ts

@@ -1,111 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// npm
-import path from 'path';
-import TsAlias from 'ts-alias';
-import fs from 'fs-extra';
-
-// Cre
-import cli from '..';
-
-// Specific
-import ConfigParser from './config';
-import type { TEnvConfig } from '../../../core/src/server/app/container/config';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-export type TAppSide = 'server' | 'client'
-
-/*----------------------------------
-- SERVICE
-----------------------------------*/
-export class App {
-
-    // config
-    // WARNING: High level config files (env and services) shouldn't be loaded from the CLI
-    //  The CLI will be run on CircleCI, and no env file should be sent to this service
-    public identity: Config.Identity;
-
-    public env: TEnvConfig;
-
-    public packageJson: {[key: string]: any};
-
-    public paths = {
-
-        root: cli.paths.appRoot,
-        src: path.join( cli.paths.appRoot, 'src'),
-        bin: path.join( cli.paths.appRoot, 'bin'),
-        data: path.join( cli.paths.appRoot, 'var', 'data'),
-        public: path.join( cli.paths.appRoot, 'public'),
-        pages: path.join( cli.paths.appRoot, 'src', 'client', 'pages'),
-        cache: path.join( cli.paths.appRoot, 'src', '.cache'),
-
-        client: {
-            generated: path.join( cli.paths.appRoot, 'src', 'client', '.generated')
-        },
-        server: {
-            generated: path.join( cli.paths.appRoot, 'src', 'server', '.generated'),
-            configs: path.join( cli.paths.appRoot, 'src', 'server', 'app')
-        },
-
-        withAlias: (filename: string, side: TAppSide) => 
-            this.aliases[side].apply(filename),
-
-        withoutAlias: (filename: string, side: TAppSide) => 
-            this.aliases[side].realpath(filename),
-    }
-
-    public containerServices = [
-        'Services',
-        'Environment',
-        'Identity',
-        /*'Application',
-        'Path',
-        'Event'*/
-    ]
-
-    public constructor() {
-        
-        cli.debug && console.log(`[cli] Loading app config ...`);
-        const configParser = new ConfigParser( cli.paths.appRoot );
-        this.identity = configParser.identity();
-        this.env = configParser.env();
-        this.packageJson = this.loadPkg();
-        
-    }
-
-    /*----------------------------------
-    - ALIAS
-    ----------------------------------*/
-
-    public aliases = {
-        client: new TsAlias({
-            rootDir: this.paths.root + '/src/client',
-            modulesDir: [ 
-                cli.paths.appRoot + '/node_modules',  
-                cli.paths.coreRoot + '/node_modules'
-            ],
-            debug: false
-        }),
-        server: new TsAlias({
-            rootDir: this.paths.root + '/src/server',
-            modulesDir: [ 
-                cli.paths.appRoot + '/node_modules',  
-                cli.paths.coreRoot + '/node_modules'
-            ],
-            debug: false
-        }),
-    }
-
-    private loadPkg() {
-        return fs.readJSONSync(this.paths.root + '/package.json');
-    }
-}
-
-export const app = new App
-
-export default app

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

@@ -1,209 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import * as types from '@babel/types'
-import type { PluginObj } from '@babel/core';
-
-// Core
-import cli from '@cli';
-import { App, TAppSide } from '../../../../app';
-
-/*----------------------------------
-- WEBPACK RULE
-----------------------------------*/
-
-type TOptions = {
-    side: TAppSide,
-    app: App,
-    debug?: boolean
-}
-
-type TImportSource = 'container' | 'application';
-
-module.exports = (options: TOptions) => (
-    [Plugin, options]
-)
-
-
-/*----------------------------------
-- PLUGIN
-----------------------------------*/
-function Plugin(babel, { app, side, debug }: TOptions) {
-
-    const t = babel.types as typeof types;
-
-    /*
-        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<{ 
-
-        debug: boolean,
-
-        filename: string,
-        processFile: boolean,
-
-        // Identifier => Name
-        importedServicesCount: number,
-        importedServices: {
-            [local: string]: {
-                imported: string,
-                bindings: any, // TODO: Scope.Binding[] type
-                source: TImportSource
-            }
-        },
-        bySource: {[importSource in TImportSource] : number}
-    }> = {
-        pre(state) {
-
-            this.filename = state.opts.filename as string;
-            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 = {
-                container: 0,
-                application: 0
-            }
-            this.importedServicesCount = 0
-            this.debug = debug || false;
-
-        },
-        visitor: {
-
-            // Find @app imports
-            // Test:            import { router } from '@app';
-            // Replace by:      nothing
-            ImportDeclaration(path) {
-
-                if (!this.processFile)
-                    return;
-                
-                if (path.node.source.value !== '@app')
-                    return;
-
-                for (const specifier of path.node.specifiers) {
-                    
-                    if (specifier.type !== 'ImportSpecifier')
-                        continue;
-
-                    if (specifier.imported.type !== 'Identifier')
-                        continue;
-
-                    this.importedServicesCount++;
-
-                    let importSource: TImportSource;
-                    if (app.containerServices.includes(specifier.imported.name))
-                        importSource = 'container';
-                    else
-                        importSource = 'application';
-
-                    this.importedServices[ specifier.local.name ] = {
-                        imported: specifier.imported.name,
-                        bindings: path.scope.bindings[ specifier.local.name ].referencePaths,
-                        source: importSource
-                    }
-
-                    this.bySource[ importSource ]++;
-                }
-
-                // Replace by simple import 
-                this.debug && console.log("[babel][services] Replace importation");
-                const replaceWith: any[] = []
-
-                if (this.bySource.container > 0)
-                    replaceWith.push(
-                        t.importDeclaration(
-                            [t.importDefaultSpecifier( t.identifier('container') )],
-                            t.stringLiteral( cli.paths.core.src + '/server/app/container')
-                        )
-                    );
-
-                // 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);
-            },
-
-            Identifier(path) {
-
-                if (!this.processFile || this.importedServicesCount === 0)
-                    return;
-
-                // Get service the identifier makes rfeerence to
-                const name = path.node.name;
-                const service = this.importedServices[ name ];
-                if (service === undefined)
-                    return;
-
-                // sometimes not iterable
-                if (!service.bindings)
-                    return;
-
-                // Replace by app.services.name
-                let serviceBinding: any;
-                for (const binding of service.bindings) {
-                    if (binding.replaced !== true && path.getPathLocation() === binding.getPathLocation()) {
-                        
-                        serviceBinding = binding;
-
-                        break;
-                    }
-                }
-
-                // This identifier is a binding to a service
-                if (serviceBinding === undefined)
-                    return;
-
-                // Replace to reference to app.services.serviceName
-                path.replaceWith(
-                    t.memberExpression(
-                        service.source === 'container'
-                            // container.Environment
-                            ? t.identifier( service.source )
-                            // application.services.Disks
-                            : t.memberExpression(
-                                t.identifier('this'),
-                                t.identifier('app'),
-                            ),
-                        path.node
-                    )
-                );
-
-                // Avoid circular loop
-                serviceBinding.replaced = true;
-            }
-        }
-    }
-
-    return plugin;
-}