src: swap dotenv and config file parsing order

Signed-off-by: Marco Ippolito <marcoippolito54@gmail.com>
PR-URL: #63035
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Author: marco-ippolito

doc/api/cli.md

@@ -1020,12 +1020,12 @@ node --import amaro/strip --watch-path=src --watch-preserve-output --test-isolat
 The priority in configuration is as follows:
 
 1. NODE\_OPTIONS and command-line options
-2.Configuration file
-3.Dotenv NODE\_OPTIONS
+2.Dotenv NODE\_OPTIONS
+3.Configuration file
 
 Values in the configuration file will not override the values in the environment
-variables and command-line options, but will override the values in the `NODE_OPTIONS`
-env file parsed by the `--env-file` flag.
+variables, command-line options, or the `NODE_OPTIONS` env file parsed by the
+`--env-file` flag.
 
 Keys cannot be duplicated within the same or different namespaces.
 

src/node.cc

@@ -879,6 +879,7 @@ static ExitCode InitializeNodeWithArgsInternal(
 HandleEnvOptions(per_process::cli_options->per_isolate->per_env);
 
  std::string node_options;
+ std::string node_options_from_dotenv;
 auto env_files = node::Dotenv::GetDataFromArgs(*argv);
 
 if (!env_files.empty()) {
@@ -905,7 +906,8 @@ static ExitCode InitializeNodeWithArgsInternal(
  }
  }
 
- per_process::dotenv_file.AssignNodeOptionsIfAvailable(&node_options);
+ per_process::dotenv_file.AssignNodeOptionsIfAvailable(
+ &node_options_from_dotenv);
  }
 
  std::string node_options_from_config;
@@ -935,9 +937,10 @@ static ExitCode InitializeNodeWithArgsInternal(
  errors->emplace_back("The number of NODE_OPTIONS doesn't match "
 "the number of flags in the config file");
  }
- node_options += node_options_from_config;
  }
 
+ node_options = node_options_from_config + node_options_from_dotenv;
+
 #if !defined(NODE_WITHOUT_NODE_OPTIONS)
 bool should_parse_node_options =
  !(flags & ProcessInitializationFlags::kDisableNodeOptionsEnv);

src/node_dotenv.cc

@@ -345,7 +345,7 @@ void Dotenv::AssignNodeOptionsIfAvailable(std::string* node_options) const {
 auto match = store_.find("NODE_OPTIONS");
 
 if (match != store_.end()) {
- *node_options = match->second;
+ *node_options = "" + match->second;
  }
 }
 

test/parallel/test-config-file.js

@@ -92,17 +92,17 @@ test('should throw an error when a flag is declared twice', async () => {
 assert.strictEqual(result.code,9);
 });
 
-test('should override env-file',onlyWithAmaroAndNodeOptions,async()=>{
+test('should not override env-file',onlyWithAmaroAndNodeOptions,async()=>{
 constresult=awaitspawnPromisified(process.execPath,[
 '--no-warnings',
 '--experimental-config-file',
 fixtures.path('rc/transform-types.json'),
 '--env-file',fixtures.path('dotenv/node-options-no-tranform.env'),
 fixtures.path('typescript/ts/transformation/test-enum.ts'),
 ]);
-assert.strictEqual(result.stderr,'');
-assert.match(result.stdout,/Hello,TypeScript!/);
-assert.strictEqual(result.code,0);
+assert.match(result.stderr,/SyntaxError/);
+assert.strictEqual(result.stdout,'');
+assert.strictEqual(result.code,1);
 });
 
 test('should not override NODE_OPTIONS',onlyWithAmaro,async()=>{