bare-module-traverse 1.3.0 → 1.3.2

package/index.js

@@ -268,20 +268,20 @@ exports.imports = function* (
           url.protocol === builtinProtocol ||
           url.protocol === linkedProtocol
         ) {
-          if (addResolution(imports, specifier, matchedConditions, url)) {
-            resolved = yielded = true
-          }
+          addResolution(imports, specifier, matchedConditions, url)
+
+          resolved = yielded = true
         } else {
           const source = yield { module: url }
 
           if (source !== null) {
-            if (addResolution(imports, specifier, matchedConditions, url)) {
-              yield {
-                children: exports.module(url, source, artifacts, visited, opts)
-              }
+            addResolution(imports, specifier, matchedConditions, url)
 
-              resolved = yielded = true
+            yield {
+              children: exports.module(url, source, artifacts, visited, opts)
             }
+
+            resolved = yielded = true
           }
         }
 
@@ -299,9 +299,20 @@ exports.imports = function* (
     matchedConditions.pop()
 
     if (resolutions === 0) {
-      throw errors.ADDON_NOT_FOUND(
-        `Cannot find ${condition === 'default' ? 'module' : condition} '${specifier}' imported from '${parentURL.href}'`
-      )
+      switch (condition) {
+        case 'addon':
+          throw errors.ADDON_NOT_FOUND(
+            `Cannot find addon '${specifier}' imported from '${parentURL.href}'`
+          )
+        case 'asset':
+          throw errors.ASSET_NOT_FOUND(
+            `Cannot find asset '${specifier}' imported from '${parentURL.href}'`
+          )
+        default:
+          throw errors.MODULE_NOT_FOUND(
+            `Cannot find module '${specifier}' imported from '${parentURL.href}'`
+          )
+      }
     }
   }
 
@@ -521,8 +532,6 @@ function addResolution(imports, specifier, conditions, url) {
 
   const last = conditions[conditions.length - 1]
 
-  if (last in current) return false
-
   current[last] = url.href
 
   if ('default' in current) {
@@ -532,8 +541,6 @@ function addResolution(imports, specifier, conditions, url) {
 
     current.default = value
   }
-
-  return true
 }
 
 function compressImportsMap(imports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",