fixup: reviews and make suggestion copy paste friendly

Author: bmeck

lib/internal/modules/esm/formats.js

@@ -31,10 +31,6 @@ if (experimentalWasmModules) {
   extensionFormatMap['.wasm'] = legacyExtensionFormatMap['.wasm'] = 'wasm';
 }
 
-/**
- * @param {string} mime
- * @returns {string | null}
- */
 function mimeToFormat(mime) {
   if (
     RegExpPrototypeTest(

lib/internal/modules/esm/get_format.js

@@ -6,8 +6,9 @@ const {
   ObjectPrototypeHasOwnProperty,
   PromisePrototypeThen,
   PromiseResolve,
+  StringPrototypeSlice,
 } = primordials;
-const { extname, basename } = require('path');
+const { basename, extname, relative } = require('path');
 const { getOptionValue } = require('internal/options');
 const { fetchModule } = require('internal/modules/esm/fetch_module');
 const {
@@ -32,10 +33,6 @@ const protocolHandlers = ObjectAssign(ObjectCreate(null), {
   'node:'() { return 'builtin'; },
 });
 
-/**
- * @param {URL} parsed
- * @returns {string | null}
- */
 function getDataProtocolModuleFormat(parsed) {
   const { 1: mime } = RegExpPrototypeExec(
     /^([^/]+\/[^;,]+)(?:[^,]*?)(;base64)?,/,
@@ -45,12 +42,6 @@ function getDataProtocolModuleFormat(parsed) {
   return mimeToFormat(mime);
 }
 
-/**
- * @param {URL} url
- * @param {{parentURL: string}} context
- * @param {boolean} ignoreErrors
- * @returns {string}
- */
 function getFileProtocolModuleFormat(url, context, ignoreErrors) {
   const filepath = fileURLToPath(url);
   const ext = extname(filepath);
@@ -68,24 +59,20 @@ function getFileProtocolModuleFormat(url, context, ignoreErrors) {
     if (getPackageType(url) === 'module' && ext === '') {
       const config = getPackageScopeConfig(url);
       const fileBasename = basename(filepath);
-      suggestion = 'Extension-less files are disabled inside of ' +
+      const relativePath = StringPrototypeSlice(relative(config.pjsonPath, filepath), 1);
+      suggestion = 'Extension-less files are unsupported inside of ' +
         '"type":"module" package.json contexts. The package.json file ' +
         `${config.pjsonPath} caused this "type":"module" context. Try ` +
         `changing ${filepath} to have a file extension. Note the "bin" ` +
         'field of package.json can point to a file with an extension, for example ' +
-        `{"type":"module","bin":{"${fileBasename}":"${fileBasename}.js"}}`;
+        `{"type":"module","bin":{"${fileBasename}":"${relativePath}.js"}}`;
     }
     throw new ERR_UNKNOWN_FILE_EXTENSION(ext, filepath, suggestion);
   }
 
   return getLegacyExtensionFormat(ext) ?? null;
 }
 
-/**
- * @param {URL} url
- * @param {{parentURL: string}} context
- * @returns {Promise<string> | undefined} only works when enabled
- */
 function getHttpProtocolModuleFormat(url, context) {
   if (experimentalNetworkImports) {
     return PromisePrototypeThen(
@@ -97,23 +84,13 @@ function getHttpProtocolModuleFormat(url, context) {
   }
 }
 
-/**
- * @param {URL | URL['href']} url
- * @param {{parentURL: string}} context
- * @returns {Promise<string> | string | undefined} only works when enabled
- */
 function defaultGetFormatWithoutErrors(url, context) {
   const parsed = new URL(url);
   if (!ObjectPrototypeHasOwnProperty(protocolHandlers, parsed.protocol))
     return null;
   return protocolHandlers[parsed.protocol](parsed, context, true);
 }
 
-/**
- * @param {URL | URL['href']} url
- * @param {{parentURL: string}} context
- * @returns {Promise<string> | string | undefined} only works when enabled
- */
 function defaultGetFormat(url, context) {
   const parsed = new URL(url);
   return ObjectPrototypeHasOwnProperty(protocolHandlers, parsed.protocol) ?

lib/internal/modules/esm/resolve.js

@@ -79,7 +79,6 @@ const DEFAULT_CONDITIONS_SET = new SafeSet(DEFAULT_CONDITIONS);
  * @typedef {string | string[] | Record<string, unknown>} Exports
  * @typedef {'module' | 'commonjs'} PackageType
  * @typedef {{
- *   pjsonPath: string,
  *   exports?: ExportConfig;
  *   name?: string;
  *   main?: string;

test/es-module/test-esm-basic-imports.mjs

@@ -1,10 +1,7 @@
 import '../common/index.mjs';
 import assert from 'assert';
 import ok from '../fixtures/es-modules/test-esm-ok.mjs';
-import * as okShebangNs from './test-esm-shebang.mjs';
-// encode the '.'
-import * as okShebangPercentNs from './test-esm-shebang%2emjs';
+import okShebang from './test-esm-shebang.mjs';
 
 assert(ok);
-assert(okShebangNs.default);
-assert.strict.equal(okShebangNs, okShebangPercentNs);
+assert(okShebang);