bare-module-traverse 1.3.1 → 1.3.3

package/index.js

@@ -257,8 +257,6 @@ exports.imports = function* (
 
       if (value.package) {
         next = resolver.next(JSON.parse(yield { module: value.package }))
-      } else if (hasResolution(imports, specifier, matchedConditions)) {
-        next = resolver.next(false)
       } else {
         const url = value.resolution
 
@@ -268,20 +266,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
           }
         }
 
@@ -497,22 +495,6 @@ function removeURL(array, url) {
   if (array[lo].href === url.href) array.splice(lo, 1)
 }
 
-function hasResolution(imports, specifier, conditions) {
-  if (specifier in imports === false) return false
-
-  let current = imports[specifier]
-
-  for (const key of conditions) {
-    if (key in current === false || typeof current[key] !== 'object') {
-      return false
-    }
-
-    current = current[key]
-  }
-
-  return true
-}
-
 function addResolution(imports, specifier, conditions, url) {
   imports[specifier] = imports[specifier] || {}
 
@@ -532,8 +514,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) {
@@ -543,8 +523,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.1",
+  "version": "1.3.3",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",