Skip to content

Commit

Permalink
repl: avoid interpreting 'npm' as a command when errors are recoverable
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Kohei Ueno <[email protected]>
  • Loading branch information
islandryu authored and RafaelGSS committed Sep 17, 2024
1 parent 8f62f19 commit 67b1d4c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,9 @@ function REPLServer(prompt,
ReflectApply(_memory, self, [cmd]);

if (e && !self[kBufferedCommandSymbol] &&
StringPrototypeStartsWith(StringPrototypeTrim(cmd), 'npm ')) {
StringPrototypeStartsWith(StringPrototypeTrim(cmd), 'npm ') &&
!(e instanceof Recoverable)
) {
self.output.write('npm should be run outside of the ' +
'Node.js REPL, in your normal shell.\n' +
'(Press Ctrl+D to exit.)\n');
Expand Down
21 changes: 21 additions & 0 deletions test/parallel/test-repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,17 @@ const strictModeTests = [
},
];

const possibleTokensAfterIdentifierWithLineBreak = [
'(\n)',
'[\n0]',
'+\n1', '- \n1', '* \n1', '/ \n1', '% \n1', '** \n1',
'== \n1', '=== \n1', '!= \n1', '!== \n1', '< \n1', '> \n1', '<= \n1', '>= \n1',
'&& \n1', '|| \n1', '?? \n1',
'= \n1', '+= \n1', '-= \n1', '*= \n1', '/= \n1', '%= \n1',
': \n',
'? \n1: 1',
];

const errorTests = [
// Uncaught error throws and prints out
{
Expand Down Expand Up @@ -386,6 +397,16 @@ const errorTests = [
'(Press Ctrl+D to exit.)',
]
},
{
send: 'let npm = () => {};',
expect: 'undefined'
},
...possibleTokensAfterIdentifierWithLineBreak.map((token) => (
{
send: `npm ${token}; undefined`,
expect: '... undefined'
}
)),
{
send: '(function() {\n\nreturn 1;\n})()',
expect: '... ... ... 1'
Expand Down

0 comments on commit 67b1d4c

Please sign in to comment.