5htp 0.0.6 → 0.0.8

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

@@ -11,64 +11,72 @@ import defaultMetadataProvider from 'svgicons2svgfont/src/metadata';
 import Indexeur from '../indexeur';
 import cli from '@cli';
 
-// Configs
-const formats = ['woff2'];
-const dossierIcones = cli.paths.core.src + '/client/assets/icons/';
-const dossierSortie = cli.paths.app.bin + '/public/'; 
-
-const cacheTypes = cli.paths.core.src + '/types/icons.d.ts';
-const cacheIndex = dossierIcones + 'index.json';
-
 // Types
 import type { TIndexIcones } from '../../../babel/plugins/icones-svg';
+import type App from '@cli/app';
 
 /*----------------------------------
 - UTILS
 ----------------------------------*/
-const refExistant = (dir: string): string[] => {
-
-    let filelist: string[] = [];
-
-    let files = fs.readdirSync(dossierIcones + dir);
-    for (const file of files)
-        if (fs.statSync(dossierIcones + dir + file).isDirectory())
-            filelist = [
-                ...filelist,
-                ...refExistant(dir + file + '/')
-            ];
-        else if (file.endsWith('.svg'))
-            filelist.push(dir + file.substring(0, file.length - 4));
-
-    return filelist;
-};
 
 /*----------------------------------
 - PLUGIN
 ----------------------------------*/
-export default class SelecteursApi extends Indexeur {
+export default class IconesSVG extends Indexeur {
 
     private icones: TIndexIcones = {};
     private iconesExistantes: string[] = [];
 
-    public constructor() {
+    private formats = ['woff2'];
+    private dossierIcones: string;
+    private dossierSortie: string;
+    
+    private cacheTypes: string;
+    private cacheIndex: string;
+
+    public constructor( app: App ) {
         super();
 
-        if (fs.existsSync(cacheIndex)) {
+        this.formats = ['woff2'];
+        this.dossierIcones = cli.paths.core.src + '/client/assets/icons/';
+        this.dossierSortie = app.paths.bin + '/public/'; 
+        
+        this.cacheTypes = cli.paths.core.src + '/types/icons.d.ts';
+        this.cacheIndex = this.dossierIcones + 'index.json';
+
+        if (fs.existsSync(this.cacheIndex)) {
 
             console.log('[icones] Getting icons list from cache ...');
-            this.iconesExistantes = fs.readJSONSync(cacheIndex);
+            this.iconesExistantes = fs.readJSONSync(this.cacheIndex);
 
         } else {
 
             console.log('[icones] Référencement des icones existantes ...');
-            this.iconesExistantes = refExistant('');
-            fs.outputJSONSync(cacheIndex, this.iconesExistantes);
+            this.iconesExistantes = this.refExistant('');
+            fs.outputJSONSync(this.cacheIndex, this.iconesExistantes);
 
         }
 
         console.log('[icones] ' + this.iconesExistantes.length + ' icones référencées');
     }
 
+    private refExistant = (dir: string): string[] => {
+    
+        let filelist: string[] = [];
+    
+        let files = fs.readdirSync(this.dossierIcones + dir);
+        for (const file of files)
+            if (fs.statSync(this.dossierIcones + dir + file).isDirectory())
+                filelist = [
+                    ...filelist,
+                    ...this.refExistant(dir + file + '/')
+                ];
+            else if (file.endsWith('.svg'))
+                filelist.push(dir + file.substring(0, file.length - 4));
+    
+        return filelist;
+    };
+
     /*----------------------------------
     - EVENTS
     ----------------------------------*/
@@ -109,7 +117,7 @@ export default class SelecteursApi extends Indexeur {
         let typeIcones: string[] = [];
         for (const id in this.icones) {
             const icone = this.icones[id]
-            cheminIcones[ dossierIcones + icone.fichier ] = icone.id;
+            cheminIcones[ this.dossierIcones + icone.fichier ] = icone.id;
             typeIcones.push('"' + icone.nom + '"');
         }
 
@@ -128,9 +136,9 @@ export default class SelecteursApi extends Indexeur {
         const result = await webfont({
             files: Object.keys(cheminIcones),
             fontName: "icons",
-            template: dossierIcones + 'template.css',
+            template: this.dossierIcones + 'template.css',
             // @ts-ignore
-            formats,
+            formats: this.formats,
             templateClassName: 'svg',
             glyphTransformFn: (obj) => {
                 
@@ -171,11 +179,11 @@ export default class SelecteursApi extends Indexeur {
         console.log('[icones] Enregistrement de la police avec ' + typeIcones.length +' icones ...');
 
         // Enregistrement fichiers
-        for (const format of formats)
-            fs.outputFileSync(dossierSortie + 'icons.' + format, result[ format ]);
-        fs.outputFileSync(dossierSortie + 'icons.css', result.template);
+        for (const format of this.formats)
+            fs.outputFileSync(this.dossierSortie + 'icons.' + format, result[ format ]);
+        fs.outputFileSync(this.dossierSortie + 'icons.css', result.template);
 
-        fs.outputFileSync(cacheTypes, 'export type TIcones = ' + typeIcones.join('|') );
+        fs.outputFileSync(this.cacheTypes, 'export type TIcones = ' + typeIcones.join('|') );
 
         console.log("[icones] Police enregistrée.");
 

package/src/compiler/common/plugins/indexage/injection-dependances/index.ts

@@ -10,7 +10,7 @@ import Indexeur from '../indexeur';
 import Stringify from '../_utils/Stringify';
 import cli from '@cli';
 
-const fichierSortie = cli.paths.app.cache + '/serveur/services.ts';
+const fichierSortie = app.paths.cache + '/serveur/services.ts';
 
 /*----------------------------------
 - TYPES

package/src/compiler/index.ts

@@ -3,6 +3,7 @@
 ----------------------------------*/
 
 // Npm
+import path from 'path';
 import webpack from 'webpack';
 import fs from 'fs-extra';
 
@@ -15,6 +16,10 @@ import createClientConfig from './client';
 import { TCompileMode } from './common';
 import cli from '../';
 
+// types
+
+import type App from '../app';
+
 type TCompilerCallback = () => void
 
 /*----------------------------------
@@ -23,6 +28,7 @@ type TCompilerCallback = () => void
 export const compiling: { [compiler: string]: Promise<void> } = {};
 
 export default async function createCompilers( 
+    app: App,
     mode: TCompileMode,
     { before, after }: {
         before?: TCompilerCallback,
@@ -31,12 +37,27 @@ export default async function createCompilers(
 ) {
 
     // Cleanup
-    fs.emptyDirSync( cli.paths.app.bin );
+    fs.emptyDirSync( app.paths.bin );
+    fs.ensureDirSync( path.join(app.paths.bin, 'public') )
+    const publicFiles = fs.readdirSync(app.paths.public);
+    for (const publicFile of publicFiles)
+        fs.symlinkSync( 
+            path.join(app.paths.public, publicFile), 
+            path.join(app.paths.bin, 'public', publicFile) 
+        );
+
+    // When the 5htp package is installed from npm link,
+    // Modules are installed locally and not glbally as with with the 5htp package from NPM.
+    // So we need to symbilnk the http-core node_modules in one of the parents of server.js.
+    fs.symlinkSync( 
+        path.join(app.paths.root, '/node_modules/5htp-core/node_modules'), 
+        path.join(app.paths.bin, '/node_modules') 
+    );
 
     // Create compilers
     const multiCompiler = webpack([
-        smp.wrap( createServerConfig(mode) ),
-        smp.wrap( createClientConfig(mode) )
+        smp.wrap( createServerConfig(app, mode) ),
+        smp.wrap( createClientConfig(app, mode) )
     ]);
 
     for (const compiler of multiCompiler.compilers) {

package/src/compiler/server/index.ts

@@ -4,11 +4,6 @@
 
 // Npm
 import webpack from 'webpack';
-import TsAlias from 'ts-alias';
-import path from 'path';
-
-// Plugins
-var nodeExternals = require('webpack-node-externals');
 
 // Minimizers
 const TerserPlugin = require("terser-webpack-plugin");
@@ -18,17 +13,22 @@ const TerserPlugin = require("terser-webpack-plugin");
 import cli from '@cli';
 import createCommonConfig, { TCompileMode, regex } from '../common';
 
+// Type
+import type App from '../../app';
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
-export default function createCompiler( mode: TCompileMode ): webpack.Configuration {
+export default function createCompiler( app: App, mode: TCompileMode ): webpack.Configuration {
 
     console.info(`Creating compiler for server (${mode}).`);
     const dev = mode === 'dev';
 
-    const commonConfig = createCommonConfig('server', mode);
+    const commonConfig = createCommonConfig(app, 'server', mode);
+    const { aliases } = app.aliases.server.forWebpack(app.paths.root + '/node_modules');
 
-    const { aliases } = cli.paths.aliases.server.forWebpack(cli.paths.app.root + '/node_modules');
+    console.log(`[${mode}] node_modules dirs:`, commonConfig.resolveLoader?.modules,
+        '\nModule aliases:', aliases);
         
     const config: webpack.Configuration = {
 
@@ -38,7 +38,7 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
         target: 'node',
         entry: {
             server: [
-                cli.paths.app.root + '/src/server/index.ts',
+                app.paths.root + '/src/server/index.ts',
             ],
         },
 
@@ -48,7 +48,7 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
 
             libraryTarget: 'commonjs2',
 
-            path: cli.paths.app.bin,
+            path: app.paths.bin,
             filename: '[name].js',
             publicPath: '/',
             assetModuleFilename: 'public/[hash][ext]',
@@ -74,7 +74,7 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
                     ||
                     request[0] === '/'
                     ||
-                    cli.paths.aliases.server.containsAlias(request)
+                    app.aliases.server.containsAlias(request)
                 )
 
                 //console.log('isNodeModule', request, isNodeModule);
@@ -96,7 +96,7 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
 
             alias: {
                 ...aliases,
-                "@root": cli.paths.app.root,
+                "@root": app.paths.root,
             },
 
             extensions: ['.ts', '.tsx', ".json", ".sql"],
@@ -111,17 +111,17 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
                     test: regex.scripts,
                     include: [
 
-                        cli.paths.app.root + '/src/client',
+                        app.paths.root + '/src/client',
                         cli.paths.core.root + '/src/client',
 
-                        cli.paths.app.root + '/src/common',
+                        app.paths.root + '/src/common',
                         cli.paths.core.root + '/src/common',
 
                         // Dossiers server uniquement pour le bundle server
-                        cli.paths.app.root + '/src/server',
+                        app.paths.root + '/src/server',
                         cli.paths.core.root + '/src/server'
                     ],
-                    rules: require('../common/babel')('server', dev)
+                    rules: require('../common/babel')(app, 'server', dev)
                 }, 
 
                 // Les pages étan tà la fois compilées dans le bundle client et serveur
@@ -131,14 +131,14 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
                     loader: 'null-loader'
                 },
 
-                ...require('../common/files/images')(dev, false),
+                ...require('../common/files/images')(app, dev, false),
 
-                ...require('../common/files/autres')(dev, false),
+                ...require('../common/files/autres')(app, dev, false),
 
                 // Exclude dev modules from production build
                 /*...(dev ? [] : [
                     {
-                        test: cli.paths.app.root + '/node_modules/react-deep-force-update/lib/index.js'),
+                        test: app.paths.root + '/node_modules/react-deep-force-update/lib/index.js'),
                         loader: 'null-loader',
                     },
                 ]),*/

package/src/index.ts

@@ -10,7 +10,6 @@ import cp from 'child_process';
 
 // Libs
 import Paths from './paths';
-import ConfigParser from './utils/config';
 
 /*----------------------------------
 - TYPES
@@ -20,8 +19,6 @@ type TCliCommand = () => Promise<{
     run: () => Promise<void> 
 }>
 
-export type TAppSide = 'server' | 'client'
-
 /*----------------------------------
 - CLASSE
 ----------------------------------*/
@@ -32,28 +29,15 @@ export class CLI {
 
     // Context
     public args: TObjetDonnees = {};
-    public pkg = {
-        app: require(this.paths.app.root + '/package.json'),
-        core: require(this.paths.core.root + '/package.json'),
-    }
-    
-    // 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!: Core.Config.Identity;
 
     public constructor(
         public paths = new Paths( process.cwd() )
     ) {
         console.log(`[cli] Start debugger ...`);
         new Logger({ name: "cli", overwriteConsole: true });
-        
+
         console.log(`[cli] Apply aliases ...`);
         this.paths.applyAliases();
-        
-        console.log(`[cli] Loading app config ...`);
-        const configParser = new ConfigParser( paths.appRoot );
-        this.identity = configParser.identity();
 
         this.start();
     }
@@ -64,6 +48,7 @@ export class CLI {
     // Les importations asynchrones permettent d'accéder à l'instance de cli via un import
     // WARN: We load commands asynchonously, so the aliases are applied before the file is imported
     public commands: { [name: string]: TCliCommand } = {
+        "init": () => import('./commands/init'),
         "dev": () => import('./commands/dev'),
         "build": () => import('./commands/build'),
     }
@@ -162,7 +147,7 @@ export class CLI {
             /*const tempFile = this.paths.app.root + '/.exec.sh';
             fs.outputFileSync(tempFile, '#! /bin/bash\n' + fullCommand);
             const wrappedCommand =  `tilix --new-process -e bash -c 'chmod +x "${tempFile}"; "${tempFile}"; echo "Entrée pour continuer"; read a;'`;*/
-            const wrappedCommand =  `bash -c '${fullCommand}; echo "Entrée pour continuer"; read a;'`;
+            const wrappedCommand =  `bash -c '${fullCommand}'`;
             console.log("Running command: " + wrappedCommand)
             //await this.waitForInput('enter');
 
@@ -180,6 +165,7 @@ export class CLI {
 
                 //fs.removeSync(tempFile);
 
+                console.log("Command finished.");
                 resolve();
             })
 

package/src/paths.ts

@@ -4,23 +4,24 @@
 
 // Npm
 import path from 'path';
+import TsAlias from 'ts-alias';
 import moduleAlias from 'module-alias';
 
 // Core
-import TsAlias from 'ts-alias';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-import type { TAppSide } from '.';
+import type App from './app';
+import type { TAppSide } from './app';
 
 export type TPathInfos = {
 
     original: string,
     absolute: string,
     relative: string,
-    forImport: string,
+    //forImport: string,
 
     name: string,
     extension: string,
@@ -52,16 +53,6 @@ export default class Paths {
         pages: this.coreRoot + '/src/client/pages',
     }
 
-    public app = {
-        root: this.appRoot,
-        src: this.appRoot + '/src',
-        bin: this.appRoot + '/bin',
-        data: this.appRoot + '/var/data',
-        public: this.appRoot + '/bin/public',
-        pages: this.appRoot + '/src/client/pages',
-        cache: this.appRoot + '/src/.cache'
-    }
-
     /*----------------------------------
     - EXTRACTION
     ----------------------------------*/
@@ -100,7 +91,8 @@ export default class Paths {
             absolute: cheminAbsolu,
             relative,
 
-            forImport: this.withAlias(cheminAbsolu, side),
+            // Not used anymore, but can be useful in the future
+            //forImport: this.withAlias(cheminAbsolu, side),
 
             name: nomReel,
             extension,
@@ -110,10 +102,10 @@ export default class Paths {
         return retour;
     }
 
-    public getPageChunk( file: string ) {
+    public getPageChunk( app: App, file: string ) {
 
-        const infos = this.infos( file, file.startsWith( this.app.pages ) 
-            ? this.app.pages 
+        const infos = this.infos( file, file.startsWith( app.paths.pages ) 
+            ? app.paths.pages 
             : this.core.pages,
         );
 
@@ -131,24 +123,11 @@ export default class Paths {
 
     }
 
-    /*----------------------------------
-    - ALIAS
-    ----------------------------------*/
-
-    public aliases = {
-        client: new TsAlias(this.app.root + '/src/client'),
-        server: new TsAlias(this.app.root + '/src/server'),
-    }
-
-    public withAlias = (filename: string, side: TAppSide) => 
-        this.aliases[side].apply(filename);
-
-    public withoutAlias = (filename: string, side: TAppSide) => 
-        this.aliases[side].realpath(filename);
-
     public applyAliases() {
 
-        const aliases = new TsAlias( this.core.cli );
+        const aliases = new TsAlias({
+            rootDir: this.core.cli
+        });
 
         console.log('Applying Aliases ...', aliases);
 

package/tsconfig.json

@@ -25,8 +25,7 @@
 
         "paths": {
             "@cli/*": [ "./*" ],
-            "@cli": [ "./" ],
-            "@server_old/*": [ "../src/server/*" ]
+            "@cli": [ "./" ]
         },
     },