Merge pull request #202 from AthennaIO/develop

feat(commands): use env flag from global

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/core",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "description": "The plug and play Node.js framework.",
   "license": "MIT",
   "author": "João Lenon <[email protected]>",
@@ -76,7 +76,7 @@
     "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@athenna/artisan": "^4.21.0",
+    "@athenna/artisan": "^4.24.0",
     "@athenna/common": "^4.24.0",
     "@athenna/config": "^4.10.0",
     "@athenna/http": "^4.15.0",

src/commands/ReplCommand.ts

@@ -11,11 +11,7 @@ import { Module } from '@athenna/common'
 import { BaseCommand, Option } from '@athenna/artisan'
 
 export class ReplCommand extends BaseCommand {
-  @Option({
-    signature: '-e, --env <env>',
-    description: 'Change the environment where the application will run.',
-    default: ''
-  })
+  @Option({ isFromGlobal: true, signature: '--env <env>' })
   public env: string
 
   public static signature(): string {
@@ -27,10 +23,8 @@ export class ReplCommand extends BaseCommand {
   }
 
   public async handle(): Promise<void> {
-    if (this.env !== '') {
-      process.env.APP_ENV = this.env
-      process.env.NODE_ENV = this.env
-    }
+    process.env.APP_ENV = this.env
+    process.env.NODE_ENV = this.env
 
     const entrypoint = Config.get(
       'rc.commands.repl.entrypoint',

src/commands/ServeCommand.ts

@@ -13,11 +13,7 @@ import { Module } from '@athenna/common'
 import { BaseCommand, Option } from '@athenna/artisan'
 
 export class ServeCommand extends BaseCommand {
-  @Option({
-    signature: '-e, --env <env>',
-    description: 'Change the environment where the application will run.',
-    default: ''
-  })
+  @Option({ isFromGlobal: true, signature: '--env <env>' })
   public env: string
 
   @Option({
@@ -36,10 +32,8 @@ export class ServeCommand extends BaseCommand {
   }
 
   public async handle(): Promise<void> {
-    if (this.env !== '') {
-      process.env.APP_ENV = this.env
-      process.env.NODE_ENV = this.env
-    }
+    process.env.APP_ENV = this.env
+    process.env.NODE_ENV = this.env
 
     const entrypoint = Config.get(
       'rc.commands.serve.entrypoint',

src/commands/TestCommand.ts

@@ -11,11 +11,7 @@ import { Module } from '@athenna/common'
 import { Option, BaseCommand, Commander } from '@athenna/artisan'
 
 export class TestCommand extends BaseCommand {
-  @Option({
-    signature: '-e, --env <env>',
-    description: 'Change the environment where your tests wil run.',
-    default: 'test'
-  })
+  @Option({ signature: '--env <env>' })
   public env: string
 
   public static signature(): string {
@@ -47,10 +43,8 @@ export class TestCommand extends BaseCommand {
   }
 
   public async handle(): Promise<void> {
-    if (this.env !== '') {
-      process.env.APP_ENV = this.env
-      process.env.NODE_ENV = this.env
-    }
+    process.env.APP_ENV = this.env || 'test'
+    process.env.NODE_ENV = this.env || 'test'
 
     const entrypoint = Config.get(
       'rc.commands.test.entrypoint',

src/ignite/Ignite.ts

@@ -20,6 +20,7 @@ import { EnvHelper, Rc } from '@athenna/config'
 import { isAbsolute, resolve } from 'node:path'
 import type { ReplImpl } from '#src/repl/ReplImpl'
 import { Console } from '#src/applications/Console'
+import { CommanderHandler } from '@athenna/artisan'
 import { LoadHelper } from '#src/helpers/LoadHelper'
 import { Log, LoggerProvider } from '@athenna/logger'
 import { Repl as ReplApp } from '#src/applications/Repl'
@@ -82,6 +83,8 @@ export class Ignite {
       this.registerItselfToTheContainer()
       this.setApplicationSignals()
 
+      CommanderHandler.reconstruct()
+
       return this
     } catch (err) {
       await this.handleError(err)