Merge pull request #3000 from micalevisk/feat/issue-2981

feat: support multiple `--env-file` arguments

Author: kamilmysliwiec

actions/generate.action.ts

@@ -19,6 +19,7 @@ import {
   shouldGenerateSpec,
 } from '../lib/utils/project-utils';
 import { AbstractAction } from './abstract.action';
+import { assertNonArray } from '../lib/utils/type-assertions';
 
 export class GenerateAction extends AbstractAction {
   public async handle(inputs: Input[], options: Input[]) {
@@ -153,6 +154,7 @@ const mapSchematicOptions = (inputs: Input[]): SchematicOption[] => {
   const options: SchematicOption[] = [];
   inputs.forEach((input) => {
     if (!excludedInputNames.includes(input.name) && input.value !== undefined) {
+      assertNonArray(input.value);
       options.push(new SchematicOption(input.name, input.value));
     }
   });

actions/new.action.ts

@@ -23,6 +23,7 @@ import { EMOJIS, MESSAGES } from '../lib/ui';
 import { normalizeToKebabOrSnakeCase } from '../lib/utils/formatting';
 import { gracefullyExitOnPromptError } from '../lib/utils/gracefully-exit-on-prompt-error';
 import { AbstractAction } from './abstract.action';
+import { assertNonArray } from '../lib/utils/type-assertions';
 
 export class NewAction extends AbstractAction {
   public async handle(inputs: Input[], options: Input[]) {
@@ -133,6 +134,7 @@ const mapSchematicOptions = (options: Input[]): SchematicOption[] => {
   return options.reduce(
     (schematicOptions: SchematicOption[], option: Input) => {
       if (option.name !== 'skip-install') {
+        assertNonArray(option.value);
         schematicOptions.push(new SchematicOption(option.name, option.value));
       }
       return schematicOptions;

actions/start.action.ts

@@ -13,6 +13,7 @@ import {
 import { ERROR_PREFIX } from '../lib/ui';
 import { treeKillSync as killProcessSync } from '../lib/utils/tree-kill';
 import { BuildAction } from './build.action';
+import { assertNonArray } from '../lib/utils/type-assertions';
 
 export class StartAction extends BuildAction {
   public async handle(commandInputs: Input[], commandOptions: Input[]) {
@@ -44,6 +45,8 @@ export class StartAction extends BuildAction {
         watchAssetsModeOption && watchAssetsModeOption.value
       );
       const debugFlag = debugModeOption && debugModeOption.value;
+      assertNonArray(debugFlag);
+
       const binaryToRun = getValueOrDefault(
         configuration,
         'exec',
@@ -81,7 +84,7 @@ export class StartAction extends BuildAction {
       const envFileOption = commandOptions.find(
         (option) => option.name === 'envFile',
       );
-      const envFile = envFileOption?.value as string;
+      const envFile = (envFileOption?.value ?? []) as string[];
 
       const onSuccess = this.createOnSuccessHook(
         entryFile,
@@ -120,7 +123,7 @@ export class StartAction extends BuildAction {
     binaryToRun: string,
     options: {
       shell: boolean;
-      envFile?: string;
+      envFile?: string[];
     },
   ) {
     let childProcessRef: any;
@@ -177,7 +180,7 @@ export class StartAction extends BuildAction {
     binaryToRun: string,
     options: {
       shell: boolean;
-      envFile?: string;
+      envFile?: string[];
     },
   ) {
     let outputFilePath = join(outDirName, sourceRoot, entryFile);
@@ -206,9 +209,14 @@ export class StartAction extends BuildAction {
         typeof debug === 'string' ? `--inspect=${debug}` : '--inspect';
       processArgs.unshift(inspectFlag);
     }
-    if (options.envFile) {
-      processArgs.unshift(`--env-file=${options.envFile}`);
+
+    if (options.envFile && options.envFile.length > 0) {
+      const envFileNodeArgs = options.envFile.map(
+        (envFilePath) => `--env-file=${envFilePath}`,
+      );
+      processArgs.unshift(envFileNodeArgs.join(' '));
     }
+
     processArgs.unshift('--enable-source-maps');
 
     return spawn(binaryToRun, processArgs, {

commands/command.input.ts

@@ -1,5 +1,5 @@
 export interface Input {
   name: string;
-  value: boolean | string;
+  value: boolean | string | string[];
   options?: any;
 }

commands/start.command.ts

@@ -6,6 +6,10 @@ import { Input } from './command.input';
 
 export class StartCommand extends AbstractCommand {
   public load(program: CommanderStatic): void {
+    const collect = (value: any, previous: any) => {
+      return previous.concat([value]);
+    };
+
     program
       .command('start [app]')
       .allowUnknownOption()
@@ -47,6 +51,8 @@ export class StartCommand extends AbstractCommand {
       .option(
         '--env-file [path]',
         'Path to an env file (.env) to be loaded into the environment.',
+        collect,
+        [],
       )
       .description('Run Nest application.')
       .action(async (app: string, command: Command) => {

lib/utils/type-assertions.ts

@@ -0,0 +1,7 @@
+export function assertNonArray<T>(
+  value: T,
+): asserts value is Exclude<T, any[]> {
+  if (Array.isArray(value)) {
+    throw new TypeError('Expected a non-array value');
+  }
+}