bare-module-traverse 1.3.2 → 1.4.0

package/index.js

@@ -16,10 +16,6 @@ module.exports = exports = function traverse(
     opts = {}
   }
 
-  if (typeof listPrefix !== 'function') {
-    listPrefix = defaultListPrefix
-  }
-
   return {
     *[Symbol.iterator]() {
       const artifacts = { addons: [], assets: [] }
@@ -39,8 +35,14 @@ module.exports = exports = function traverse(
           } else if (value.prefix) {
             const result = []
 
-            for (const url of listPrefix(value.prefix)) {
-              result.push(url)
+            if (typeof listPrefix === 'function') {
+              for (const url of listPrefix(value.prefix)) {
+                result.push(url)
+              }
+            } else {
+              if (readModule(value.prefix) !== null) {
+                result.push(value.prefix)
+              }
             }
 
             next = generator.next(result)
@@ -74,8 +76,14 @@ module.exports = exports = function traverse(
           } else if (value.prefix) {
             const result = []
 
-            for await (const url of listPrefix(value.prefix)) {
-              result.push(url)
+            if (typeof listPrefix === 'function') {
+              for await (const url of listPrefix(value.prefix)) {
+                result.push(url)
+              }
+            } else {
+              if ((await readModule(value.prefix)) !== null) {
+                result.push(value.prefix)
+              }
             }
 
             next = generator.next(result)
@@ -93,8 +101,6 @@ module.exports = exports = function traverse(
   }
 }
 
-function* defaultListPrefix() {}
-
 exports.resolve = resolve
 
 exports.module = function* (url, source, artifacts, visited, opts = {}) {
@@ -257,8 +263,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
 
@@ -271,6 +275,22 @@ exports.imports = function* (
           addResolution(imports, specifier, matchedConditions, url)
 
           resolved = yielded = true
+        } else if (condition === 'asset') {
+          const prefix = yield { prefix: url }
+
+          if (prefix.length !== 0) {
+            addResolution(imports, specifier, matchedConditions, url)
+
+            for (const url of prefix) {
+              yield {
+                children: exports.module(url, null, artifacts, visited, opts)
+              }
+
+              addURL(artifacts.assets, url)
+            }
+
+            resolved = yielded = true
+          }
         } else {
           const source = yield { module: url }
 
@@ -287,7 +307,6 @@ exports.imports = function* (
 
         if (resolved) {
           if (condition === 'addon') addURL(artifacts.addons, url)
-          else if (condition === 'asset') addURL(artifacts.assets, url)
 
           resolutions++
         }
@@ -497,22 +516,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] || {}
 

package/package.json

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