Commita52de8c

jcbhmr

authored and

marco-ippolito

committed

bootstrap: print--help message usingconsole.log

PR-URL:#51463Fixes:#51448Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>

1 parenta6dd864 commita52de8cCopy full SHA for a52de8c

File tree

2 files changed

+19

-6

lines changed

lib/internal/main
- print_help.js
test/parallel
- test-cli-node-print-help.js

2 files changed

+19

-6

lines changed

`‎lib/internal/main/print_help.js`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ function format(`
`202`	`202`
`203`	`203`	`functionprint(stream){`
`204`	`204`	`const{ options, aliases}=getCLIOptionsInfo();`
	`205`	`+constconsole=require('internal/console/global');`
`205`	`206`
`206`	`207`	`// Use 75 % of the available width, and at least 70 characters.`
`207`	`208`	`constwidth=MathMax(70,(stream.columns\|\|0)*0.75);`
`@@ -212,21 +213,22 @@ function print(stream) {`
`212`	`213`	`'(default if no file name is provided, '+`
`213`	`214`	`'interactive mode if a tty)'});`
`214`	`215`	`options.set('--',{helpText:'indicate the end of node options'});`
`215`		`-stream.write(`
	`216`	`+lethelpText=(`
`216`	`217`	`'Usage: node [options] [ script.js ] [arguments]\n'+`
`217`	`218`	`' node inspect [options] [ script.js \| host:port ] [arguments]\n\n'+`
`218`	`219`	`'Options:\n');`
`219`		`-stream.write(indent(format({`
	`220`	`+helpText+=(indent(format({`
`220`	`221`	`options, aliases, firstColumn, secondColumn,`
`221`	`222`	`}),2));`
`222`	`223`
`223`		`-stream.write('\nEnvironment variables:\n');`
	`224`	`+helpText+=('\nEnvironment variables:\n');`
`224`	`225`
`225`		`-stream.write(format({`
	`226`	`+helpText+=(format({`
`226`	`227`	`options:envVars, firstColumn, secondColumn,`
`227`	`228`	`}));`
`228`	`229`
`229`		`-stream.write('\nDocumentation can be found at https://nodejs.org/\n');`
	`230`	`+helpText+=('\nDocumentation can be found at https://nodejs.org/');`
	`231`	`+console.log(helpText);`
`230`	`232`	`}`
`231`	`233`
`232`	`234`	`prepareMainThreadExecution();`

`‎test/parallel/test-cli-node-print-help.js`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ const common = require('../common');`
`7`	`7`	`// returns the proper set of cli options when invoked`
`8`	`8`
`9`	`9`	`constassert=require('assert');`
`10`		`-const{ exec}=require('child_process');`
	`10`	`+const{ exec, spawn}=require('child_process');`
	`11`	`+const{ once}=require('events');`
`11`	`12`	`letstdOut;`
`12`	`13`
`13`	`14`
`@@ -53,3 +54,13 @@ function testForSubstring(options) {`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`startPrintHelpTest();`
	`57`	`+`
	`58`	+// Test closed stdout for `node --help`. Like `node --help \| head -n5`.
	`59`	`+(async()=>{`
	`60`	`+constcp=spawn(process.execPath,['--help'],{`
	`61`	`+stdio:['inherit','pipe','inherit'],`
	`62`	`+});`
	`63`	`+cp.stdout.destroy();`
	`64`	`+const[exitCode]=awaitonce(cp,'exit');`
	`65`	`+assert.strictEqual(exitCode,0);`
	`66`	`+})().then(common.mustCall());`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commita52de8c

File tree

2 files changed

2 files changed

`‎lib/internal/main/print_help.js`

`‎test/parallel/test-cli-node-print-help.js`

0 commit comments