util: fix parseArgs skipping positional arg with --eval and --print

Author: azadgupta1

lib/internal/util/parse_args/parse_args.js

@@ -2,7 +2,6 @@
 
 const {
   ArrayPrototypeForEach,
-  ArrayPrototypeIncludes,
   ArrayPrototypeMap,
   ArrayPrototypePush,
   ArrayPrototypePushApply,
@@ -54,20 +53,16 @@ const {
   kEmptyObject,
 } = require('internal/util');
 
+const { getOptionValue } = require('internal/options');
 
 function getMainArgs() {
-  // Work out where to slice process.argv for user supplied arguments.
-
-  // Check node options for scenarios where user CLI args follow executable.
-  const execArgv = process.execArgv;
-  if (ArrayPrototypeIncludes(execArgv, '-e') ||
-      ArrayPrototypeIncludes(execArgv, '--eval') ||
-      ArrayPrototypeIncludes(execArgv, '-p') ||
-      ArrayPrototypeIncludes(execArgv, '--print')) {
+  // -p / --print internally sets --eval, so this works for all cases
+  const evalValue = getOptionValue('--eval');
+
+  if (evalValue.length !== 0) {
     return ArrayPrototypeSlice(process.argv, 1);
   }
 
-  // Normally first two arguments are executable and script, then CLI arguments
   return ArrayPrototypeSlice(process.argv, 2);
 }
 

test/parallel/test-parse-args-eval.js

@@ -0,0 +1,22 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { getMainArgs } = require('../../lib/internal/util/parse_args/parse_args');
+
+const originalArgv = process.argv;
+const originalExecArgv = process.execArgv;
+
+common.mustCall(() => {
+  process.argv = ['node', '--eval=code', 'arg1', 'arg2'];
+  process.execArgv = ['--eval=code'];
+  const evalArgs = getMainArgs();
+  assert.deepStrictEqual(evalArgs, ['--eval=code', 'arg1', 'arg2']);
+
+  process.argv = ['node', 'script.js', 'arg1', 'arg2'];
+  process.execArgv = [];
+  const normalArgs = getMainArgs();
+  assert.deepStrictEqual(normalArgs, ['script.js', 'arg1', 'arg2']);
+})();
+
+process.argv = originalArgv;
+process.execArgv = originalExecArgv;