esm: use import.meta.filename/dirname instead of import.meta.url

Author: mag123c

lib/internal/modules/esm/module_job.js

@@ -86,8 +86,10 @@ const explainCommonJSGlobalLikeNotDefinedError = (e, url, hasTopLevelAwait) => {
         advice = 'replace require() with import';
       } else if (undefinedGlobal === 'module' || undefinedGlobal === 'exports') {
         advice = 'use export instead of module.exports/exports';
-      } else if (undefinedGlobal === '__filename' || undefinedGlobal === '__dirname') {
-        advice = 'use import.meta.url instead';
+      } else if (undefinedGlobal === '__filename') {
+        advice = 'use import.meta.filename instead';
+      } else if (undefinedGlobal === '__dirname') {
+        advice = 'use import.meta.dirname instead';
       }
 
       e.message = `Cannot determine intended module format because both ${undefinedGlobal} and top-level await are present. If the code is intended to be CommonJS, wrap await in an async function. If the code is intended to be an ES module, ${advice}.`;

test/es-module/test-esm-detect-ambiguous.mjs

@@ -463,4 +463,40 @@ describe('cjs & esm ambiguous syntax case', () => {
     strictEqual(code, 1);
     strictEqual(signal, null);
   });
+
+  it('should throw an ambiguous syntax error when using top-level await with __filename', async () => {
+    const { stderr, code, signal } = await spawnPromisified(
+      process.execPath,
+      [
+        '--eval',
+        `console.log(__filename);\nawait 1;`,
+      ]
+    );
+
+    match(
+      stderr,
+      /ReferenceError: Cannot determine intended module format because both __filename and top-level await are present\. If the code is intended to be CommonJS, wrap await in an async function\. If the code is intended to be an ES module, use import\.meta\.filename instead\./
+    );
+
+    strictEqual(code, 1);
+    strictEqual(signal, null);
+  });
+
+  it('should throw an ambiguous syntax error when using top-level await with __dirname', async () => {
+    const { stderr, code, signal } = await spawnPromisified(
+      process.execPath,
+      [
+        '--eval',
+        `console.log(__dirname);\nawait 1;`,
+      ]
+    );
+
+    match(
+      stderr,
+      /ReferenceError: Cannot determine intended module format because both __dirname and top-level await are present\. If the code is intended to be CommonJS, wrap await in an async function\. If the code is intended to be an ES module, use import\.meta\.dirname instead\./
+    );
+
+    strictEqual(code, 1);
+    strictEqual(signal, null);
+  });
 });