watch: fix watch path with equals

PR-URL: #47369Fixes: #47296
Reviewed-By: Debadree Chatterjee <debadree333@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: MoLow

lib/internal/main/watch_mode.js

@@ -6,6 +6,7 @@ const {
  ArrayPrototypeMap,
  ArrayPrototypePushApply,
  ArrayPrototypeSlice,
+ StringPrototypeStartsWith,
 }=primordials;
 
 const{
@@ -36,7 +37,9 @@ const kPreserveOutput = getOptionValue('--watch-preserve-output');
 constkCommand=ArrayPrototypeSlice(process.argv,1);
 constkCommandStr=inspect(ArrayPrototypeJoin(kCommand,' '));
 constargs=ArrayPrototypeFilter(process.execArgv,(arg,i,arr)=>
-arg!=='--watch-path'&&arr[i-1]!=='--watch-path'&&arg!=='--watch'&&arg!=='--watch-preserve-output');
+!StringPrototypeStartsWith(arg,'--watch-path')&&
+(!arr[i-1]||!StringPrototypeStartsWith(arr[i-1],'--watch-path'))&&
+arg!=='--watch'&&arg!=='--watch-preserve-output');
 ArrayPrototypePushApply(args,kCommand);
 
 constwatcher=newFilesWatcher({throttle: 500,mode: kShouldFilterModules ? 'filter' : 'all'});
@@ -48,7 +51,7 @@ let exited;
 
 functionstart(){
 exited=false;
-conststdio=kShouldFilterModules ? ['inherit','inherit','inherit','ipc'] : undefined;
+conststdio=kShouldFilterModules ? ['inherit','inherit','inherit','ipc'] : 'inherit';
 child=spawn(process.execPath,args,{ stdio,env: { ...process.env,WATCH_REPORT_DEPENDENCIES: '1'}});
 watcher.watchChildProcessModules(child);
 child.once('exit',(code)=>{

test/sequential/test-watch-mode.mjs

@@ -137,6 +137,23 @@ describe('watch mode', { concurrency: false, timeout: 60_000 }, () => {
 });
 });
 
+it('should watch changes to a file with watch-path',{
+skip: !supportsRecursive,
+},async()=>{
+constfile=createTmpFile();
+constwatchedFile=fixtures.path('watch-mode/subdir/file.js');
+const{ stderr, stdout }=awaitspawnWithRestarts({
+ file,
+ watchedFile,
+args: ['--watch-path',fixtures.path('./watch-mode/subdir'),file],
+});
+assert.strictEqual(stderr,'');
+assertRestartedCorrectly({
+ stdout,
+messages: {inner: 'running',completed: `Completed running ${inspect(file)}`,restarted: `Restarting ${inspect(file)}`},
+});
+});
+
 it('should watch when running an non-existing file - when specified under --watch-path',{
 skip: !supportsRecursive
 },async()=>{
@@ -148,7 +165,28 @@ describe('watch mode', { concurrency: false, timeout: 60_000 }, () => {
 args: ['--watch-path',fixtures.path('./watch-mode/subdir/'),file],
 });
 
-assert.strictEqual(stderr,'');
+assert.match(stderr,/Error:Cannotfindmodule/);
+assert(stderr.match(/Error:Cannotfindmodule/g).length>=2);
+
+assertRestartedCorrectly({
+ stdout,
+messages: {completed: `Failed running ${inspect(file)}`,restarted: `Restarting ${inspect(file)}`},
+});
+});
+
+it('should watch when running an non-existing file - when specified under --watch-path with equals',{
+skip: !supportsRecursive
+},async()=>{
+constfile=fixtures.path('watch-mode/subdir/non-existing.js');
+constwatchedFile=fixtures.path('watch-mode/subdir/file.js');
+const{ stderr, stdout }=awaitspawnWithRestarts({
+ file,
+ watchedFile,
+args: [`--watch-path=${fixtures.path('./watch-mode/subdir/')}`,file],
+});
+
+assert.match(stderr,/Error:Cannotfindmodule/);
+assert(stderr.match(/Error:Cannotfindmodule/g).length>=2);
 assertRestartedCorrectly({
  stdout,
 messages: {completed: `Failed running ${inspect(file)}`,restarted: `Restarting ${inspect(file)}`},