module: refine enrichCJSError

PR-URL: #39507
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: aduh95

lib/internal/modules/cjs/helpers.js

@@ -187,6 +187,7 @@ function normalizeReferrerURL(referrer) {
 
 // For error messages only - used to check if ESM syntax is in use.
 functionhasEsmSyntax(code){
+debug('Checking for ESM syntax');
 constparser=require('internal/deps/acorn/acorn/dist/acorn').Parser;
 letroot;
 try{
@@ -196,6 +197,7 @@ function hasEsmSyntax(code) {
 }
 
 returnArrayPrototypeSome(root.body,(stmt)=>
+stmt.type==='ExportDefaultDeclaration'||
 stmt.type==='ExportNamedDeclaration'||
 stmt.type==='ImportDeclaration'||
 stmt.type==='ExportAllDeclaration');

lib/internal/modules/cjs/loader.js

@@ -1043,7 +1043,7 @@ function wrapSafe(filename, content, cjsModuleInstance) {
 });
 }catch(err){
 if(process.mainModule===cjsModuleInstance)
-enrichCJSError(err);
+enrichCJSError(err,content);
 throwerr;
 }
 }

lib/internal/modules/esm/translators.js

@@ -10,13 +10,11 @@ const {
  ObjectKeys,
  PromisePrototypeCatch,
  PromiseReject,
- RegExpPrototypeTest,
  SafeArrayIterator,
  SafeMap,
  SafeSet,
  StringPrototypeReplace,
  StringPrototypeSlice,
- StringPrototypeSplit,
  StringPrototypeStartsWith,
  SyntaxErrorPrototype,
 globalThis: { WebAssembly },
@@ -31,8 +29,9 @@ function lazyTypes() {
 const{ readFileSync }=require('fs');
 const{ extname, isAbsolute }=require('path');
 const{
+ hasEsmSyntax,
+ loadNativeModule,
  stripBOM,
- loadNativeModule
 }=require('internal/modules/cjs/helpers');
 const{
 Module: CJSModule,
@@ -152,18 +151,14 @@ translators.set('module', async function moduleStrategy(url) {
 returnmodule;
 });
 
-functionenrichCJSError(err){
-if(err==null||ObjectGetPrototypeOf(err)!==SyntaxErrorPrototype){
-return;
-}
-conststack=StringPrototypeSplit(err.stack,'\n');
-/*
- * The regular expression below targets the most common import statement
- * usage. However, some cases are not matching, cases like import statement
- * after a comment block and/or after a variable definition.
- */
-if(StringPrototypeStartsWith(err.message,'Unexpected token \'export\'')||
-RegExpPrototypeTest(/^\s*import(?=[{'"*])\s*(?![(])/,stack[1])){
+/**
+ * @param {Error | any} err
+ * @param {string} [content] Content of the file, if known.
+ * @param {string} [filename] Useful only if `content` is unknown.
+ */
+functionenrichCJSError(err,content,filename){
+if(err!=null&&ObjectGetPrototypeOf(err)===SyntaxErrorPrototype&&
+hasEsmSyntax(content||readFileSync(filename,'utf-8'))){
 // Emit the warning synchronously because we are in the middle of handling
 // a SyntaxError that will throw and likely terminate the process before an
 // asynchronous warning would be emitted.
@@ -200,7 +195,7 @@ translators.set('commonjs', async function commonjsStrategy(url, isMain) {
 try{
 exports=CJSModule._load(filename,undefined,isMain);
 }catch(err){
-enrichCJSError(err);
+enrichCJSError(err,undefined,filename);
 throwerr;
 }
 }