5htp 0.3.2-1 → 0.3.3-1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.2-1",
+	"version": "0.3.3-1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",

package/src/app/index.ts

@@ -5,6 +5,7 @@
 // npm
 import path from 'path';
 import TsAlias from 'ts-alias';
+import fs from 'fs-extra';
 
 // Cre
 import cli from '..';
@@ -31,6 +32,8 @@ export class App {
 
     public env: TEnvConfig;
 
+    public packageJson: {[key: string]: any};
+
     public paths = {
 
         root: cli.paths.appRoot,
@@ -71,6 +74,8 @@ export class App {
         const configParser = new ConfigParser( cli.paths.appRoot );
         this.identity = configParser.identity();
         this.env = configParser.env();
+        this.packageJson = this.loadPkg();
+        
     }
 
     /*----------------------------------
@@ -95,6 +100,10 @@ export class App {
             debug: false
         }),
     }
+
+    private loadPkg() {
+        return fs.readJSONSync(this.paths.root + '/package.json');
+    }
 }
 
 export const app = new App

package/src/commands/deploy/web.ts

@@ -42,11 +42,9 @@ export async function run() {
     fs.emptyDirSync(temp);
 
     // Merge package.json: framework + app
-    const appPkg = fs.readJSONSync(app.paths.root + '/package.json');
-    const corePkg = fs.readJSONSync(cli.paths.core.root + '/package.json');
     fs.outputJSONSync(temp + '/package.json', {
         ...appPkg,
-        dependencies: mergeDeps(corePkg, appPkg),
+        dependencies: mergeDeps(cli.packageJson, appPkg),
         devDependencies: {}
     }, { spaces: 4 });
 

package/src/compiler/common/babel/index.ts

@@ -18,12 +18,6 @@ import type { TAppSide, App } from '@cli/app';
 - REGLES
 ----------------------------------*/
 module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[] => {
-
-    const pkg = {
-        app: require(app.paths.root + '/package.json'),
-        core: require(cli.paths.core.root + '/package.json'),
-    }
-    
     return [{
         loader: 'babel-loader',
         options: { 
@@ -54,7 +48,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
                     "corejs": 3, // default would be 2
 
                     targets: {
-                        browsers: pkg.app.browserslist,
+                        browsers: app.packageJson.browserslist,
                     },
                     forceAllTransforms: !dev, // for UglifyJS
                     modules: false,

package/src/compiler/common/babel/plugins/icones-svg.ts

@@ -33,6 +33,8 @@ function Plugin (babel) {
 
     const plugin: PluginObj<{
         referencerIcone: (nomBrut: string) => string | null,
+        setNodeAsProcessed: (node: types.Node) => types.Node;
+        hasBeenProcessed: (node: types.Node) => boolean | undefined,
         fichier: string,
         traiter: boolean,
         iconeTrouvee: boolean,
@@ -85,6 +87,14 @@ function Plugin (babel) {
                 return this.icones[ cheminIconeBrut ].id;
             }
 
+            this.setNodeAsProcessed = (node: types.Node) => {
+                node.innerComments = [{ type: 'CommentBlock', 'value': '@iconId' }]
+                return node;
+            }
+
+            this.hasBeenProcessed = (node: types.Node) =>
+                node.innerComments?.some( c => c.value === '@iconId' )
+
         },
         visitor: {
             Program: {
@@ -106,6 +116,8 @@ function Plugin (babel) {
                     path.node.leadingComments.length !== 0
                     &&
                     path.node.leadingComments[0].value === ' @icon '
+                    &&
+                    !this.hasBeenProcessed( path.node )
                 ) {
 
                     // Remplacement par id
@@ -114,7 +126,9 @@ function Plugin (babel) {
                         return;
                         
                     path.replaceWith(
-                        t.stringLiteral(idIcone)
+                        this.setNodeAsProcessed(
+                            t.stringLiteral(idIcone)
+                        )
                     );
 
                     path.skip();
@@ -130,17 +144,24 @@ function Plugin (babel) {
                     path.node.key.name === 'icon'
                     &&
                     path.node.value?.type === 'StringLiteral'
+                    &&
+                    !this.hasBeenProcessed( path.node )
                 ) {
 
+                    if (this.fichier.includes("award"))
+                        console.log( path.node.value.value, path.node.innerComments,path.node.leadingComments, path.node.trailingComments );
+
                     // Remplacement par id
                     const idIcone = this.referencerIcone(path.node.value.value);
                     if (idIcone === null)
                         return;
 
                     path.replaceWith(
-                        t.objectProperty(
-                            t.identifier('icon'),
-                            t.stringLiteral( idIcone )
+                        this.setNodeAsProcessed(
+                            t.objectProperty(
+                                t.identifier('icon'),
+                                t.stringLiteral( idIcone ),
+                            )
                         )
                     );
 
@@ -158,6 +179,8 @@ function Plugin (babel) {
                     path.node.name.name.startsWith("icon")
                     &&
                     path.node.value
+                    &&
+                    !this.hasBeenProcessed( path.node )
                 ) {
 
                     const nomAttr = path.node.name.name;
@@ -199,10 +222,12 @@ function Plugin (babel) {
                     } else
                         return;
 
-                    path.replaceWith(
-                        t.jsxAttribute(
-                            t.jsxIdentifier( nomAttr ),
-                            remplacement
+                    path.replaceWith( 
+                        this.setNodeAsProcessed(
+                            t.jsxAttribute(
+                                t.jsxIdentifier( nomAttr ),
+                                remplacement
+                            )
                         )
                     );
 
@@ -224,6 +249,8 @@ function Plugin (babel) {
                     path.node.openingElement.name.type === 'JSXIdentifier'
                     &&
                     path.node.openingElement.name.name === 'i'
+                    &&
+                    !this.hasBeenProcessed( path.node )
                 ) {
 
                     // Extraction des attributs src et class
@@ -291,7 +318,7 @@ function Plugin (babel) {
                             ? attrs.class.expression
                             : null
 
-                    path.replaceWith(
+                    path.replaceWith( this.setNodeAsProcessed(
 
                         // Balise <i>
                         t.jsxElement(
@@ -330,7 +357,7 @@ function Plugin (babel) {
                             path.node.children,
                             path.node.selfClosing
                         )
-                    );
+                    ));
                 }
             }
         },

package/src/compiler/common/index.ts

@@ -16,7 +16,7 @@ import InjectDeps from './plugins/indexage/injection-dependances';
 import cli from '../..';
 
 // Type
-import type App from '../../app';
+import type { App } from '../../app';
 import type { TAppSide } from '../../app';
 
 /*----------------------------------
@@ -68,11 +68,16 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
             // https://webpack.js.org/plugins/define-plugin/
             new webpack.DefinePlugin({
 
+                // Flags
                 __DEV__: dev,
                 SERVER: side === 'server',
-                BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
 
+                // Core
+                CORE_VERSION: JSON.stringify( cli.packageJson.version ),
                 CORE_PATH: JSON.stringify(cli.paths.core.root),
+
+                // Application
+                BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
                 APP_PATH: JSON.stringify(app.paths.root),
                 APP_NAME: JSON.stringify(app.identity.web.title),
 

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

@@ -90,12 +90,14 @@ export default class IconesSVG extends Indexeur {
 
         let maj = false;
 
+        //console.log('======maj', Object.keys( donneesMeta ));
+
         // Pour chacune d'entre elles
         for (const cheminIcone in donneesMeta) {
 
             // Verif si existante
             if (!this.iconesExistantes.includes( cheminIcone ))
-                console.error(`L'icone ${donneesMeta[cheminIcone].nom} (${cheminIcone}) utilisée dans le fichier ${fichier} n'existe pas.`);
+                console.error(`The icon you made reference to "${donneesMeta[cheminIcone].nom}" (${cheminIcone}) in the file ${fichier} doesn't exists.`);
             // Verif si déjà référencée
             else if (this.icones[ cheminIcone ] === undefined) {
                 // Sinon, référencement

package/src/index.ts

@@ -7,6 +7,7 @@ process.traceDeprecation = true;
 ----------------------------------*/
 
 // Npm
+import fs from 'fs-extra';
 import cp from 'child_process';
 
 // Libs
@@ -37,6 +38,8 @@ export class CLI {
     
     public debug: boolean = false;
 
+    public packageJson: {[key: string]: any};
+
     public constructor(
         public paths = new Paths( process.cwd() )
     ) {
@@ -45,6 +48,8 @@ export class CLI {
         this.debug && console.log(`[cli] Apply aliases ...`);
         this.paths.applyAliases();
 
+        this.packageJson = this.loadPkg();
+
         this.start();
     }
 
@@ -59,6 +64,10 @@ export class CLI {
         "build": () => import('./commands/build'),
     }
 
+    private loadPkg() {
+        return fs.readJSONSync(this.paths.core.root + '/package.json');
+    }
+
     public start() {
         
         const [, , commandName, ...argv] = process.argv;
@@ -90,7 +99,7 @@ export class CLI {
                 if (Array.isArray( curVal ))
                     curVal.push(a);
                 else
-                    options[opt] = a;
+                    options[opt] = a;   
 
                 opt = null;