bare-module-traverse 1.7.1 → 1.7.3

package/README.md

@@ -114,11 +114,11 @@ options = {
   arch: Bare.arch,
   simulator: false,
   host: `${platform}-${arch}${simulator ? '-simulator' : ''}`,
-  target: [host]
+  hosts: [host]
 }
 ```
 
-For single target traversal it is sufficient to pass `platform`, `arch`, `simulator`, and/or `host`. For multi target target traversal pass a list of `target` identifiers instead.
+For single target traversal it is sufficient to pass `platform`, `arch`, `simulator`, and/or `host`. For multi target traversal pass a list of `hosts` identifiers instead.
 
 #### `resolve.node`
 
@@ -130,11 +130,11 @@ options = {
   arch: process.arch,
   simulator: false,
   host: `${platform}-${arch}${simulator ? '-simulator' : ''}`,
-  target: [host]
+  hosts: [host]
 }
 ```
 
-For single target traversal it is sufficient to pass `platform`, `arch`, `simulator`, and/or `host`. For multi target target traversal pass a list of `target` identifiers instead.
+For single target traversal it is sufficient to pass `platform`, `arch`, `simulator`, and/or `host`. For multi target traversal pass a list of `hosts` identifiers instead.
 
 ### Algorithm
 

package/index.js

@@ -271,6 +271,12 @@ exports.package = function* (url, source, artifacts, visited, opts = {}) {
 }
 
 exports.preresolved = function* (url, source, resolutions, artifacts, visited, opts = {}) {
+  const {
+    builtinProtocol = 'builtin:',
+    linkedProtocol = 'linked:',
+    deferredProtocol = 'deferred:'
+  } = opts
+
   const imports = resolutions[url.href]
 
   if (typeof imports !== 'object' || imports === null) return false
@@ -288,7 +294,11 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
           yield {
             children: exports.package(url, null, artifacts, visited, opts)
           }
-        } else {
+        } else if (
+          url.protocol !== builtinProtocol &&
+          url.protocol !== linkedProtocol &&
+          url.protocol !== deferredProtocol
+        ) {
           yield {
             children: exports.module(url, null, {}, artifacts, visited, opts)
           }
@@ -312,6 +322,13 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
 }
 
 exports.imports = function* (parentURL, source, imports, artifacts, lexer, visited, opts = {}) {
+  // Handle backwards compatibility with the `target` option
+  if (opts.target) {
+    const { target, ...rest } = opts
+    rest.hosts = target
+    opts = rest
+  }
+
   const {
     resolve = exports.resolve.default,
     builtinProtocol = 'builtin:',
@@ -458,6 +475,13 @@ exports.imports = function* (parentURL, source, imports, artifacts, lexer, visit
 }
 
 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] : [],

package/lib/resolve/bare.d.ts

@@ -2,10 +2,12 @@ import { type Import } from 'bare-module-lexer'
 import { type ResolveOptions, type Resolver } from 'bare-addon-resolve'
 
 interface BareResolveOptions extends ResolveOptions {
+  linked?: boolean
   platform?: string
   arch?: string
   simulator?: boolean
-  target?: string[]
+  host?: string
+  hosts?: string[]
 }
 
 declare function resolve(entry: Import, parentURL: URL, opts?: BareResolveOptions): Resolver

package/lib/resolve/bare.js

@@ -3,17 +3,24 @@ const resolve = require('../resolve')
 const runtime = require('../runtime')
 
 module.exports = function (entry, parentURL, opts = {}) {
+  // Handle backwards compatibility with the `target` option
+  if (opts.target) {
+    const { target, ...rest } = opts
+    rest.hosts = target
+    opts = rest
+  }
+
   const {
     linked = false,
     platform = runtime.platform,
     arch = runtime.arch,
     simulator = runtime.simulator,
     host = `${platform}-${arch}${simulator ? '-simulator' : ''}`,
-    target = [host]
+    hosts = [host]
   } = opts
 
   let extensions
-  let conditions = target.map((host) => ['bare', 'node', ...host.split('-')])
+  let conditions = hosts.map((host) => ['bare', 'node', ...host.split('-')])
 
   if (entry.type & lex.constants.ADDON) {
     extensions = linked ? [] : ['.bare', '.node']
@@ -22,7 +29,7 @@ module.exports = function (entry, parentURL, opts = {}) {
     return resolve.addon(entry.specifier || '.', parentURL, {
       extensions,
       conditions,
-      hosts: target,
+      hosts,
       linked,
       ...opts
     })

package/lib/resolve/node.d.ts

@@ -5,7 +5,8 @@ interface NodeResolveOptions extends ResolveOptions {
   platform?: string
   arch?: string
   simulator?: boolean
-  target?: string[]
+  host?: string
+  hosts?: string[]
 }
 
 declare function resolve(entry: Import, parentURL: URL, opts?: NodeResolveOptions): Resolver

package/lib/resolve/node.js

@@ -3,12 +3,19 @@ const resolve = require('../resolve')
 const runtime = require('../runtime')
 
 module.exports = function (entry, parentURL, opts = {}) {
+  // Handle backwards compatibility with the `target` option
+  if (opts.target) {
+    const { target, ...rest } = opts
+    rest.hosts = target
+    opts = rest
+  }
+
   const {
     platform = runtime.platform,
     arch = runtime.arch,
     simulator = runtime.simulator,
     host = `${platform}-${arch}${simulator ? '-simulator' : ''}`,
-    target = [host]
+    hosts = [host]
   } = opts
 
   let extensions
@@ -16,12 +23,12 @@ module.exports = function (entry, parentURL, opts = {}) {
 
   if (entry.type & lex.constants.ADDON) {
     extensions = ['.node']
-    conditions = target.map((host) => ['node', 'addon', ...host.split('-')])
+    conditions = hosts.map((host) => ['node', 'addon', ...host.split('-')])
 
     return resolve.addon(entry.specifier || '.', parentURL, {
       extensions,
       conditions,
-      host,
+      hosts,
       ...opts
     })
   }

package/package.json

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