bare-module-traverse 1.7.3 → 1.8.0

package/README.md

@@ -232,7 +232,7 @@ Options are the same as `traverse()` for all functions.
 
 #### `const generator = traverse.imports(parentURL, source, imports, artifacts, visited[, options])`
 
-#### `const generator = traverse.prebuilds(packageURL, artifacts, visited[, options])`
+#### `const generator = traverse.addons(parentURL, artifacts, visited[, options])`
 
 #### `const generator = traverse.assets(patterns, parentURL, artifacts, visited[, options])`
 

package/index.js

@@ -1,5 +1,4 @@
 const { lookupPackageScope, conditionMatches } = require('bare-module-resolve')
-const { lookupPrebuildsScope } = require('bare-addon-resolve')
 const lex = require('bare-module-lexer')
 const resolve = require('./lib/resolve')
 const errors = require('./lib/errors')
@@ -233,8 +232,10 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
 
   const lexer = { imports: [] }
 
-  if (type === constants.SCRIPT || constants.MODULE) {
+  if (type === constants.SCRIPT || type === constants.MODULE) {
     yield* exports.imports(url, source, imports, artifacts, lexer, visited, opts)
+  } else if (type === constants.ADDON) {
+    yield* exports.addons(url, artifacts, visited, opts)
   }
 
   yield {
@@ -254,10 +255,6 @@ exports.package = function* (url, source, artifacts, visited, opts = {}) {
   if (info) {
     yield { dependency: { url, source, imports: {}, lexer: { imports: [] } } }
 
-    if (info.addon) {
-      yield { children: exports.prebuilds(url, artifacts, visited, opts) }
-    }
-
     if (info.assets) {
       yield {
         children: exports.assets(info.assets, url, artifacts, visited, opts)
@@ -405,21 +402,19 @@ exports.imports = function* (parentURL, source, imports, artifacts, lexer, visit
 
           resolved = yielded = true
         } else if (condition === 'asset') {
-          const prefix = yield { prefix: url }
-
-          if (prefix.length !== 0) {
-            addResolution(imports, specifier, matchedConditions, url)
+          const prefix = url
 
-            for (const url of prefix) {
-              yield {
-                children: exports.module(url, null, {}, artifacts, visited, opts)
-              }
-
-              addURL(artifacts.assets, url)
+          for (const url of yield { prefix }) {
+            yield {
+              children: exports.module(url, null, {}, artifacts, visited, opts)
             }
 
+            addURL(artifacts.assets, url)
+
             resolved = yielded = true
           }
+
+          if (resolved) addResolution(imports, specifier, matchedConditions, url)
         } else {
           const source = yield { module: url }
 
@@ -474,48 +469,25 @@ exports.imports = function* (parentURL, source, imports, artifacts, lexer, visit
   return yielded
 }
 
-exports.prebuilds = function* (packageURL, artifacts, visited, opts = {}) {
-  // Handle backwards compatibility with the `target` option
-  if (opts.target) {
-    const { target, ...rest } = opts
-    rest.hosts = target
-    opts = rest
-  }
-
-  const {
-    host = null, // Shorthand for single host resolution
-    hosts = host !== null ? [host] : [],
-    matchedConditions = []
-  } = opts
-
-  const [prebuildsURL = null] = lookupPrebuildsScope(packageURL, opts)
-
-  if (prebuildsURL === null) return false
+const ADDON_EXTENSION = /\.(bare|node)$/
 
+exports.addons = function* (parentURL, artifacts, visited, opts = {}) {
   let yielded = false
 
-  for (const host of hosts) {
-    const prefix = new URL(host + '/', prebuildsURL)
+  if (ADDON_EXTENSION.test(parentURL.pathname)) {
+    const prefix = new URL(parentURL)
 
-    const conditions = host.split('-')
-
-    matchedConditions.push(...conditions)
+    prefix.pathname = prefix.pathname.replace(ADDON_EXTENSION, '') + '/'
 
     for (const url of yield { prefix }) {
-      const source = yield { module: url }
-
-      if (source !== null) {
-        addURL(artifacts.addons, url)
+      yield {
+        children: exports.module(url, null, {}, artifacts, visited, opts)
+      }
 
-        yield {
-          children: exports.module(url, source, {}, artifacts, visited, opts)
-        }
+      addURL(artifacts.addons, url)
 
-        yielded = true
-      }
+      yielded = true
     }
-
-    for (const _ of conditions) matchedConditions.pop()
   }
 
   return yielded

package/package.json

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