diff --git a/doc/api/cli.md b/doc/api/cli.md index 3aeac43afb3e3e..a2eb47235575f4 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md @@ -10,7 +10,7 @@ To view this documentation as a manual page in your terminal, run `man node`. ## Synopsis -`node [options] [v8 options] [script.js | -e "script"] [arguments]` +`node [options] [v8 options] [script.js | -e "script"] [--] [arguments]` `node debug [script.js | -e "script" | :] …` @@ -269,6 +269,15 @@ added: v0.11.15 Specify ICU data load path. (overrides `NODE_ICU_DATA`) +### `--` + + +Indicate the end of node options. Pass the rest of the arguments to the script. +If no script filename or eval/print script is supplied prior to this, then +the next argument will be used as a script filename. + ## Environment Variables ### `NODE_DEBUG=module[,…]` diff --git a/doc/node.1 b/doc/node.1 index e609a9d781e04a..ffe72e1d022aa6 100644 --- a/doc/node.1 +++ b/doc/node.1 @@ -37,6 +37,7 @@ node \- Server-side JavaScript runtime .RI [ script.js \ | .B -e .RI \&" script \&"] +.B [--] .RI [ arguments ] .br .B node debug @@ -191,6 +192,13 @@ See \fBSSL_CERT_DIR\fR and \fBSSL_CERT_FILE\fR. .BR \-\-icu\-data\-dir =\fIfile\fR Specify ICU data load path. (overrides \fBNODE_ICU_DATA\fR) +.TP +.BR \-\-\fR +Indicate the end of node options. Pass the rest of the arguments to the script. + +If no script filename or eval/print script is supplied prior to this, then +the next argument will be used as a script filename. + .SH ENVIRONMENT VARIABLES .TP diff --git a/src/node.cc b/src/node.cc index 96cfe9f2c3206c..3c6b9a731dc2b1 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3688,6 +3688,9 @@ static void ParseArgs(int* argc, } else if (strcmp(arg, "--expose-internals") == 0 || strcmp(arg, "--expose_internals") == 0) { // consumed in js + } else if (strcmp(arg, "--") == 0) { + index += 1; + break; } else { // V8 option. Pass through as-is. new_v8_argv[new_v8_argc] = arg; diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js index 3eb821958539af..260acdb0d6f90a 100644 --- a/test/parallel/test-cli-eval.js +++ b/test/parallel/test-cli-eval.js @@ -12,6 +12,11 @@ const child = require('child_process'); const path = require('path'); const nodejs = `"${process.execPath}"`; +if (process.argv.length > 2) { + console.log(process.argv.slice(2).join(' ')); + process.exit(0); +} + // Assert that nothing is written to stdout. child.exec(`${nodejs} --eval 42`, common.mustCall((err, stdout, stderr) => { assert.ifError(err); @@ -133,3 +138,38 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`, assert.strictEqual(proc.stderr, ''); assert.strictEqual(proc.stdout, 'start\nbeforeExit\nexit\n'); } + +[ '-arg1', + '-arg1 arg2 --arg3', + '--', + 'arg1 -- arg2', +].forEach(function(args) { + + // Ensure that arguments are successfully passed to eval. + const opt = ' --eval "console.log(process.argv.slice(1).join(\' \'))"'; + const cmd = `${nodejs}${opt} -- ${args}`; + child.exec(cmd, common.mustCall(function(err, stdout, stderr) { + assert.strictEqual(stdout, args + '\n'); + assert.strictEqual(stderr, ''); + assert.strictEqual(err, null); + })); + + // Ensure that arguments are successfully passed to print. + const popt = ' --print "process.argv.slice(1).join(\' \')"'; + const pcmd = `${nodejs}${popt} -- ${args}`; + child.exec(pcmd, common.mustCall(function(err, stdout, stderr) { + assert.strictEqual(stdout, args + '\n'); + assert.strictEqual(stderr, ''); + assert.strictEqual(err, null); + })); + + // Ensure that arguments are successfully passed to a script. + // The first argument after '--' should be interpreted as a script + // filename. + const filecmd = `${nodejs} -- ${__filename} ${args}`; + child.exec(filecmd, common.mustCall(function(err, stdout, stderr) { + assert.strictEqual(stdout, args + '\n'); + assert.strictEqual(stderr, ''); + assert.strictEqual(err, null); + })); +});