repl: avoid interpreting 'npm' as a command when errors are recoverable · nodejs/node@a983726 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a983726

Browse filesBrowse the repository at this point in the historyBrowse files

islandryu

authored and

targos

committed

repl: avoid interpreting 'npm' as a command when errors are recoverable

This change ensures that 'npm' within JavaScript code is not mistakenly interpreted as an npm command when the error is recoverable. This allows 'npm' to be treated as expected in such scenarios. Fixes: #54830 PR-URL: #54848 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Kohei Ueno <kohei.ueno119@gmail.com>

1 parent 2879ce9 commit a983726
Copy full SHA for a983726

2 files changed

+24-1Lines changed: 24 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • repl.js
• test/parallel
  • test-repl.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/repl.js‎

Copy file name to clipboardExpand all lines: lib/repl.js

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -931,7 +931,9 @@ function REPLServer(prompt,
931	931	ReflectApply(_memory, self, [cmd]);
932	932
933	933	if (e && !self[kBufferedCommandSymbol] &&
934		- StringPrototypeStartsWith(StringPrototypeTrim(cmd), 'npm ')) {
	934	+ StringPrototypeStartsWith(StringPrototypeTrim(cmd), 'npm ') &&
	935	+ !(e instanceof Recoverable)
	936	+ ) {
935	937	self.output.write('npm should be run outside of the ' +
936	938	'Node.js REPL, in your normal shell.\n' +
937	939	'(Press Ctrl+D to exit.)\n');

Collapse file

‎test/parallel/test-repl.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-repl.js

+21Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -129,6 +129,17 @@ const strictModeTests = [
129	129	},
130	130	];
131	131
	132	+ const possibleTokensAfterIdentifierWithLineBreak = [
	133	+ '(\n)',
	134	+ '[\n0]',
	135	+ '+\n1', '- \n1', '* \n1', '/ \n1', '% \n1', '** \n1',
	136	+ '== \n1', '=== \n1', '!= \n1', '!== \n1', '< \n1', '> \n1', '<= \n1', '>= \n1',
	137	+ '&& \n1', '|| \n1', '?? \n1',
	138	+ '= \n1', '+= \n1', '-= \n1', '*= \n1', '/= \n1', '%= \n1',
	139	+ ': \n',
	140	+ '? \n1: 1',
	141	+ ];
	142	+
132	143	const errorTests = [
133	144	// Uncaught error throws and prints out
134	145	{
@@ -380,6 +391,16 @@ const errorTests = [
380	391	'(Press Ctrl+D to exit.)',
381	392	]
382	393	},
	394	+ {
	395	+ send: 'let npm = () => {};',
	396	+ expect: 'undefined'
	397	+ },
	398	+ ...possibleTokensAfterIdentifierWithLineBreak.map((token) => (
	399	+ {
	400	+ send: `npm ${token}; undefined`,
	401	+ expect: '... undefined'
	402	+ }
	403	+ )),
383	404	{
384	405	send: '(function() {\n\nreturn 1;\n})()',
385	406	expect: '... ... ... 1'

0 commit comments

Comments

0 (0)