esm: ensure watch mode restarts after syntax errors

Move watch dependency reporting earlier in module resolution to ensure
file dependencies are tracked even when parsing fails.
Fixes: #61153
PR-URL: #61232
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>

Author: Xstoudi

lib/internal/modules/esm/loader.js

@@ -542,6 +542,12 @@ class ModuleLoader {
  */
  #getOrCreateModuleJobAfterResolve(parentURL,resolveResult,request,requestType){
 const{ url, format }=resolveResult;
+
+if(process.env.WATCH_REPORT_DEPENDENCIES&&process.send){
+consttype=requestType===kRequireInImportedCJS ? 'require' : 'import';
+process.send({[`watch:${type}`]: [url]});
+}
+
 // TODO(joyeecheung): update the module requests to use importAttributes as property names.
 constimportAttributes=resolveResult.importAttributes??request.attributes;
 letjob=this.loadCache.get(url,importAttributes.type);
@@ -570,11 +576,6 @@ class ModuleLoader {
 assert(moduleOrModulePromiseinstanceofModuleWrap,`Expected ModuleWrap for loading ${url}`);
 }
 
-if(process.env.WATCH_REPORT_DEPENDENCIES&&process.send){
-consttype=requestType===kRequireInImportedCJS ? 'require' : 'import';
-process.send({[`watch:${type}`]: [url]});
-}
-
 const{ ModuleJob, ModuleJobSync }=require('internal/modules/esm/module_job');
 // TODO(joyeecheung): use ModuleJobSync for kRequireInImportedCJS too.
 constModuleJobCtor=(requestType===kImportInRequiredESM ? ModuleJobSync : ModuleJob);

test/sequential/test-watch-mode-restart-esm-loading-error.mjs

@@ -0,0 +1,126 @@
+import*ascommonfrom'../common/index.mjs';
+importtmpdirfrom'../common/tmpdir.js';
+importassertfrom'node:assert';
+importpathfrom'node:path';
+import{execPath}from'node:process';
+import{spawn}from'node:child_process';
+import{writeFileSync}from'node:fs';
+import{inspect}from'node:util';
+import{createInterface}from'node:readline';
+
+if(common.isIBMi)
+common.skip('IBMi does not support `fs.watch()`');
+
+lettmpFiles=0;
+functioncreateTmpFile(content='console.log("running");',ext='.js',basename=tmpdir.path){
+constfile=path.join(basename,`${tmpFiles++}${ext}`);
+writeFileSync(file,content);
+returnfile;
+}
+
+functionrunInBackground({ args =[], options ={}, completed ='Completed running', shouldFail =false}){
+letfuture=Promise.withResolvers();
+letchild;
+letstderr='';
+letstdout=[];
+
+construn=()=>{
+args.unshift('--no-warnings');
+child=spawn(execPath,args,{encoding: 'utf8',stdio: 'pipe', ...options});
+
+child.stderr.on('data',(data)=>{
+stderr+=data;
+});
+
+constrl=createInterface({input: child.stdout});
+rl.on('line',(data)=>{
+if(!data.startsWith('Waiting for graceful termination')&&!data.startsWith('Gracefully restarted')){
+stdout.push(data);
+if(data.startsWith(completed)){
+future.resolve({ stderr, stdout });
+future=Promise.withResolvers();
+stdout=[];
+stderr='';
+}elseif(data.startsWith('Failed running')){
+if(shouldFail){
+future.resolve({ stderr, stdout });
+}else{
+future.reject({ stderr, stdout });
+}
+future=Promise.withResolvers();
+stdout=[];
+stderr='';
+}
+}
+});
+};
+
+return{
+asyncdone(){
+child?.kill();
+future.resolve();
+return{ stdout, stderr };
+},
+restart(timeout=1000){
+if(!child){
+run();
+}
+consttimer=setTimeout(()=>{
+if(!future.resolved){
+child.kill();
+future.reject(newError('Timed out waiting for restart'));
+}
+},timeout);
+returnfuture.promise.finally(()=>{
+clearTimeout(timer);
+});
+},
+};
+}
+
+tmpdir.refresh();
+
+// Create initial file with valid code
+constinitialContent=`console.log('hello, world');`;
+constfile=createTmpFile(initialContent,'.mjs');
+
+const{ done, restart }=runInBackground({
+args: ['--watch',file],
+completed: 'Completed running',
+shouldFail: true,
+});
+
+try{
+const{ stdout, stderr }=awaitrestart();
+assert.strictEqual(stderr,'');
+assert.deepStrictEqual(stdout,[
+'hello, world',
+`Completed running ${inspect(file)}. Waiting for file changes before restarting...`,
+]);
+
+// Update file with syntax error
+constsyntaxErrorContent=`console.log('hello, wor`;
+writeFileSync(file,syntaxErrorContent);
+
+// Wait for the failed restart
+const{stderr: stderr2,stdout: stdout2}=awaitrestart();
+assert.match(stderr2,/SyntaxError:Invalidorunexpectedtoken/);
+assert.deepStrictEqual(stdout2,[
+`Restarting ${inspect(file)}`,
+`Failed running ${inspect(file)}. Waiting for file changes before restarting...`,
+]);
+
+writeFileSync(file,`console.log('hello again, world');`);
+
+const{stderr: stderr3,stdout: stdout3}=awaitrestart();
+
+// Verify it recovered and ran successfully
+assert.strictEqual(stderr3,'');
+assert.deepStrictEqual(stdout3,[
+`Restarting ${inspect(file)}`,
+'hello again, world',
+`Completed running ${inspect(file)}. Waiting for file changes before restarting...`,
+]);
+}finally{
+awaitdone();
+}