esm: skip file: URL conversion to path when possible

nodejs · Jan 22, 2023 · c643491 · c643491
1 parent de6c0e6
commit c643491
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/lib/internal/modules/esm/get_format.js b/lib/internal/modules/esm/get_format.js
@@ -4,9 +4,10 @@ const {
   ObjectPrototypeHasOwnProperty,
   PromisePrototypeThen,
   PromiseResolve,
+  StringPrototypeCharCodeAt,
   StringPrototypeSlice,
 } = primordials;
-const { basename, extname, relative } = require('path');
+const { basename, relative } = require('path');
 const { getOptionValue } = require('internal/options');
 const {
   extensionFormatMap,
@@ -41,15 +42,37 @@ function getDataProtocolModuleFormat(parsed) {
   return mimeToFormat(mime);
 }
 
+const DOT_CODE = 46;
+const SLASH_CODE = 47;
+
+/**
+ * Returns the file extension from a file: URL. Should give similar result than
+ * require('node:path').extname(require('node:url').fileURLToPath(url)).
+ * @param {URL} url A file: URL.
+ * @returns {string}
+ */
+function extname(url) {
+  const { pathname } = url;
+  for (let i = pathname.length - 1; i > 0; i--) {
+    switch (StringPrototypeCharCodeAt(pathname, i)) {
+      case SLASH_CODE:
+        return '';
+
+      case DOT_CODE:
+        return StringPrototypeSlice(pathname, i);
+    }
+  }
+  return '';
+}
+
 /**
  * @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);
+  const ext = extname(url);
   if (ext === '.js') {
     return getPackageType(url) === 'module' ? 'module' : 'commonjs';
   }
@@ -59,6 +82,7 @@ function getFileProtocolModuleFormat(url, context, ignoreErrors) {
 
   // Explicit undefined return indicates load hook should rerun format check
   if (ignoreErrors) { return undefined; }
+  const filepath = fileURLToPath(url);
   let suggestion = '';
   if (getPackageType(url) === 'module' && ext === '') {
     const config = getPackageScopeConfig(url);

diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -35,8 +35,7 @@ const {
   Module: CJSModule,
   cjsParseCache
 } = require('internal/modules/cjs/loader');
-const internalURLModule = require('internal/url');
-const { fileURLToPath, URL } = require('url');
+const { fileURLToPath, URL } = require('internal/url');
 let debug = require('internal/util/debuglog').debuglog('esm', (fn) => {
   debug = fn;
 });
@@ -147,9 +146,7 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
                                                             isMain) {
   debug(`Translating CJSModule ${url}`);
 
-  let filename = internalURLModule.fileURLToPath(new URL(url));
-  if (isWindows)
-    filename = StringPrototypeReplaceAll(filename, '/', '\\');
+  const filename = fileURLToPath(new URL(url));
 
   if (!cjsParse) await initCJSParse();
   const { module, exportNames } = cjsPreparseModuleExports(filename);