bare-module-traverse 2.5.7 → 2.5.9

package/index.js

@@ -897,9 +897,7 @@ function moduleType(url, attributes, info, opts = {}) {
 
   const match = url.pathname.match(/\.[a-z]+$/)
 
-  if (match === null) return defaultType
-
-  let [extension] = match
+  let extension = match === null ? '.js' : match[0]
 
   if (aliases !== null && extension in aliases) extension = aliases[extension]
 
@@ -1176,34 +1174,12 @@ function compressImportsMapEntry(resolved) {
     return compressArtifactImportsMapEntry(resolved)
   }
 
-  let entries = []
-  let primary = null
-
-  for (const entry of Object.entries(resolved)) {
-    entry[1] = compressImportsMapEntry(entry[1])
-
-    entries.push(entry)
-
-    if (entry[0] === 'default') primary = entry[1]
-  }
-
-  if (entries.length === 0) return resolved
-
-  const [, first] = entries[0]
-
-  if (entries.every(([, resolved]) => resolved === first)) return first
-
-  entries = entries.filter(
-    ([condition, resolved]) => condition === 'default' || resolved !== primary
-  )
-
-  if (entries.length === 1) return entries[0][1]
-
-  return Object.fromEntries(entries)
+  return compressConditions(resolved)
 }
 
 // Only the condition an addon or asset was resolved for tells it apart from a
-// module, so those conditions must survive compression.
+// module, so those conditions must survive compression. Below them, nothing
+// more needs telling apart.
 const artifactConditions = ['addon', 'asset']
 
 function compressArtifactImportsMapEntry(resolved) {
@@ -1212,7 +1188,7 @@ function compressArtifactImportsMapEntry(resolved) {
 
   for (const [condition, entry] of Object.entries(resolved)) {
     if (artifactConditions.includes(condition)) {
-      artifacts[condition] = compressImportsMapEntry(entry)
+      artifacts[condition] = compressConditions(entry)
     } else {
       rest[condition] = entry
     }
@@ -1222,7 +1198,7 @@ function compressArtifactImportsMapEntry(resolved) {
 
   if (conditions.length === 0) return artifacts
 
-  let compressed = compressImportsMapEntry(rest)
+  let compressed = compressConditions(rest)
 
   if (typeof compressed === 'string') {
     compressed = { [conditions.length === 1 ? conditions[0] : 'default']: compressed }
@@ -1238,6 +1214,35 @@ function compressArtifactImportsMapEntry(resolved) {
   return entry
 }
 
+function compressConditions(resolved) {
+  if (typeof resolved === 'string') return resolved
+
+  let entries = []
+  let primary = null
+
+  for (const entry of Object.entries(resolved)) {
+    entry[1] = compressConditions(entry[1])
+
+    entries.push(entry)
+
+    if (entry[0] === 'default') primary = entry[1]
+  }
+
+  if (entries.length === 0) return resolved
+
+  const [, first] = entries[0]
+
+  if (entries.every(([, resolved]) => resolved === first)) return first
+
+  entries = entries.filter(
+    ([condition, resolved]) => condition === 'default' || resolved !== primary
+  )
+
+  if (entries.length === 1) return entries[0][1]
+
+  return Object.fromEntries(entries)
+}
+
 function mixinImports(target, imports, url) {
   if (typeof imports === 'object' && imports !== null && 'imports' in imports) {
     imports = imports.imports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "2.5.7",
+  "version": "2.5.9",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": {