5htp 0.0.2 → 0.0.4

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "5htp",
 	"description": "5-HTP, scientifically called 5-Hydroxytryptophan, is the precursor of happiness neurotransmitter.",
-	"version": "0.0.2",
+	"version": "0.0.4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-cli.git",
 	"license": "MIT",
 	"bin": {
-		"5htp": "cli/index.ts"
+		"5htp": "src/index.ts"
 	},
 	"engines": {
 		"node": ">=16.1.0",
@@ -42,7 +42,6 @@
 		"@types/universal-analytics": "^0.4.5",
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
-		"5htp-core": "^0.0.2",
 		"babel-loader": "^8.2.2",
 		"babel-plugin-transform-imports": "^2.0.0",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
@@ -90,5 +89,8 @@
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
 		"@types/webpack-env": "^1.16.2"
-	}
+	},
+    "peerDependencies": {
+        "5htp-core": "^0.0.4"
+    }
 }

package/src/commands/dev.ts

@@ -32,7 +32,7 @@ export const run = () => new Promise<void>(async () => {
     });
 
     // Allow the dev servet to fetch the frameworg node modules
-    fs.createSymlinkSync( cli.paths.core.root + '/node_modules', cli.paths.app.bin + '/node_modules', 'dir' );
+    //fs.createSymlinkSync( cli.paths.core.cli + '/node_modules', cli.paths.app.bin + '/node_modules', 'dir' );
 
     multiCompiler.watch({
 

package/src/compiler/common/index.ts

@@ -51,7 +51,8 @@ export default function createCommonConfig( side: TAppSide, mode: TCompileMode )
         resolveLoader: {
             // Recherche des loaders dans framework/node_modules (psinon, webpack cherche dans le projet)
             modules: [
-                cli.paths.core.root + '/node_modules'
+                cli.paths.core.root + '/node_modules',
+                cli.paths.core.cli + '/node_modules',
             ],
             mainFields: ['loader', 'main'],
         },

package/src/index.ts

@@ -7,21 +7,18 @@
 // Npm
 import { Logger } from "tslog";
 import cp from 'child_process';
-import fs from 'fs-extra';
 
 // Libs
 import Paths from './paths';
-import ConfigParser from '5htp-core/src/server/app/config';
-
-// Types from core
+import ConfigParser from './utils/config';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-type TCliCommand = { 
+type TCliCommand = () => Promise<{ 
     run: () => Promise<void> 
-}
+}>
 
 export type TAppSide = 'server' | 'client'
 
@@ -65,9 +62,10 @@ export class CLI {
     - COMMANDS
     ----------------------------------*/
     // 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 } = {
-        "dev": require('./commands/dev'),
-        "build": require('./commands/build'),
+        "dev": () => import('./commands/dev'),
+        "build": () => import('./commands/build'),
     }
 
     public start() {
@@ -125,8 +123,10 @@ export class CLI {
         if (this.commands[command] === undefined)
             throw new Error(`Command ${command} does not exists.`);
 
+        const runner = await this.commands[command]();
+
         // Running
-        this.commands[command].run().then(() => {
+        runner.run().then(() => {
 
             console.info(`Command ${command} finished.`);
 

package/src/paths.ts

@@ -46,9 +46,9 @@ export default class Paths {
     }
 
     public core = {
+        cli: path.resolve(__dirname, '..'),
         root: this.coreRoot,
         src: this.coreRoot + '/src',
-        realRoot: path.resolve(__dirname, '..'),
         pages: this.coreRoot + '/src/client/pages',
     }
 
@@ -148,7 +148,7 @@ export default class Paths {
 
     public applyAliases() {
 
-        const aliases = new TsAlias( this.core.root + '/cli' );
+        const aliases = new TsAlias( this.core.cli );
 
         console.log('Applying Aliases ...', aliases);
 

package/src/utils/config.ts

@@ -0,0 +1,41 @@
+/*----------------------------------
+- DEPENDANCES
+----------------------------------*/
+
+/*
+    WARNING: This file SHOULDN'T import deps from the project
+        Because it's imported by the CLI, which should be independant of the app escept for loading config
+*/
+
+// Npm
+import fs from 'fs-extra';
+import yaml from 'yaml';
+
+/*----------------------------------
+- LOADE
+----------------------------------*/
+export default class ConfigParser {
+
+    public constructor(
+        public appDir: string,
+        public envName?: string
+    ) {
+
+    }
+
+    private loadYaml( filepath: string ) {
+        console.info(`Loading config ${filepath}`);
+        const rawConfig = fs.readFileSync(filepath, 'utf-8');
+        return yaml.parse(rawConfig);
+    }
+
+    public env() {
+        const envFile = this.appDir + '/env' + (this.envName === undefined ? '' : '.' + this.envName) + '.yaml';
+        return this.loadYaml( envFile );
+    }
+
+    public identity() {
+        const identityFile = this.appDir + '/identity.yaml';
+        return this.loadYaml( identityFile );
+    }
+}