Fix resolving non-js files

Closes GH-5. Closes GH-6. Reviewed-by: Titus Wormer <[email protected]> Reviewed-by: Nicolò Ribaudo <[email protected]>
wooorm · Jun 11, 2022 · 521dce7 · 521dce7
1 parent 937d3f3
commit 521dce7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 9 deletions.
diff --git a/lib/get-format.js b/lib/get-format.js
@@ -36,7 +36,15 @@ function mimeToFormat(mime) {
 }
 
 /**
- * @type {Record<string, (parsed: URL) => string|null>}
+ * @callback ProtocolHandler
+ * @param {URL} parsed
+ * @param {{parentURL: string}} context
+ * @param {boolean} ignoreErrors
+ * @returns {string|null}
+ */
+
+/**
+ * @type {Record<string, ProtocolHandler>}
  */
 const protocolHandlers = Object.assign(Object.create(null), {
   'data:': getDataProtocolModuleFormat,
@@ -59,9 +67,9 @@ function getDataProtocolModuleFormat(parsed) {
 }
 
 /**
- * @param {URL} url
+ * @type {ProtocolHandler}
  */
-function getFileProtocolModuleFormat(url) {
+function getFileProtocolModuleFormat(url, _context, ignoreErrors) {
   const filepath = fileURLToPath(url)
   const ext = path.extname(filepath)
   if (ext === '.js') {
@@ -70,6 +78,7 @@ function getFileProtocolModuleFormat(url) {
 
   const format = extensionFormatMap[ext]
   if (format) return format
+  if (ignoreErrors) return null
 
   throw new ERR_UNKNOWN_FILE_EXTENSION(ext, filepath)
 }
@@ -80,24 +89,26 @@ function getHttpProtocolModuleFormat() {
 
 /**
  * @param {URL} url
+ * @param {{parentURL: string}} context
  * @returns {string|null}
  */
-export function defaultGetFormatWithoutErrors(url) {
+export function defaultGetFormatWithoutErrors(url, context) {
   if (!hasOwnProperty.call(protocolHandlers, url.protocol)) {
     return null
   }
 
-  return protocolHandlers[url.protocol](url)
+  return protocolHandlers[url.protocol](url, context, true)
 }
 
 /**
  * @param {string} url
+ * @param {{parentURL: string}} context
  * @returns {string|null}
  */
-export function defaultGetFormat(url) {
+export function defaultGetFormat(url, context) {
   const parsed = new URL(url)
 
   return hasOwnProperty.call(protocolHandlers, parsed.protocol)
-    ? protocolHandlers[parsed.protocol](parsed)
+    ? protocolHandlers[parsed.protocol](parsed, context, false)
     : null
 }
diff --git a/lib/resolve.js b/lib/resolve.js
@@ -74,7 +74,7 @@ const packageJsonCache = new Map()
  * @returns {void}
  */
 function emitLegacyIndexDeprecation(url, packageJsonUrl, base, main) {
-  const format = defaultGetFormatWithoutErrors(url)
+  const format = defaultGetFormatWithoutErrors(url, {parentURL: base.href})
   if (format !== 'module') return
   const path = fileURLToPath(url.href)
   const pkgPath = fileURLToPath(new URL('.', packageJsonUrl))
@@ -1275,6 +1275,6 @@ export function defaultResolve(specifier, context = {}) {
     // Do NOT cast `url` to a string: that will work even when there are real
     // problems, silencing them
     url: url.href,
-    format: defaultGetFormatWithoutErrors(url)
+    format: defaultGetFormatWithoutErrors(url, {parentURL})
   }
 }
diff --git a/test/core.js b/test/core.js
@@ -644,5 +644,19 @@ test('resolve(specifier, base?, conditions?)', async function (t) {
     'should be able to resolve a self-import from a sub-file'
   )
 
+  t.is(
+    await resolve('package-custom-extensions', import.meta.url),
+    new URL('node_modules/package-custom-extensions/b.ts', import.meta.url)
+      .href,
+    'should be able to resolve a custom `.ts` extension'
+  )
+
+  t.is(
+    await resolve('package-custom-extensions/c', import.meta.url),
+    new URL('node_modules/package-custom-extensions/d.wasm', import.meta.url)
+      .href,
+    'should be able to resolve a custom `.wasm` extension'
+  )
+
   t.end()
 })
diff --git a/test/node_modules/package-custom-extensions/b.ts b/test/node_modules/package-custom-extensions/b.ts
diff --git a/test/node_modules/package-custom-extensions/d.wasm b/test/node_modules/package-custom-extensions/d.wasm
diff --git a/test/node_modules/package-custom-extensions/lib/c.ts b/test/node_modules/package-custom-extensions/lib/c.ts
diff --git a/test/node_modules/package-custom-extensions/package.json b/test/node_modules/package-custom-extensions/package.json