bare-module-traverse 1.2.2 → 1.2.4

package/index.js

@@ -229,7 +229,7 @@ exports.preresolved = function * (url, source, resolutions, artifacts, visited,
 }
 
 exports.imports = function * (parentURL, source, imports, artifacts, visited, opts = {}) {
-  const { resolve = exports.resolve.default } = opts
+  const { resolve = exports.resolve.default, builtinProtocol = 'builtin:', linkedProtocol = 'linked:' } = opts
 
   let yielded = false
 
@@ -252,12 +252,21 @@ exports.imports = function * (parentURL, source, imports, artifacts, visited, op
       const value = next.value
 
       if (value.package) {
-        const url = value.package
-        const source = yield { module: url }
-
-        next = resolver.next(JSON.parse(source))
+        next = resolver.next(JSON.parse(yield { module: value.package }))
       } else {
         const url = value.resolution
+
+        if (url.protocol === builtinProtocol || url.protocol === linkedProtocol) {
+          if (key === 'addon') addURL(artifacts.addons, url)
+          else if (key === 'asset') addURL(artifacts.assets, url)
+
+          imports[specifier] = { [key]: url.href, ...imports[specifier] }
+
+          resolved = yielded = true
+
+          break
+        }
+
         const source = yield { module: url }
 
         if (source !== null) {

package/lib/resolve/bare.js

@@ -7,7 +7,8 @@ module.exports = function (entry, parentURL, opts = {}) {
   const {
     platform = runtime.platform,
     arch = runtime.arch,
-    simulator = false
+    simulator = false,
+    host = `${platform}-${arch}${simulator ? '-simulator' : ''}`
   } = opts
 
   let extensions
@@ -19,7 +20,7 @@ module.exports = function (entry, parentURL, opts = {}) {
     extensions = ['.bare', '.node']
     conditions = ['addon', ...conditions]
 
-    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, host, ...opts })
   }
 
   if (entry.type & lex.constants.ASSET) {

package/lib/resolve/node.js

@@ -1,14 +1,26 @@
 const lex = require('bare-module-lexer')
 const resolve = require('../resolve')
 
-module.exports = function (entry, parentURL, opts) {
+module.exports = function (entry, parentURL, opts = {}) {
+  const runtime = require('#runtime')
+
+  const {
+    platform = runtime.platform,
+    arch = runtime.arch,
+    simulator = false,
+    host = `${platform}-${arch}${simulator ? '-simulator' : ''}`
+  } = opts
+
   let extensions
-  let conditions
+  let conditions = ['node', platform, arch]
+
+  if (simulator) conditions = [...conditions, 'simulator']
 
   if (entry.type & lex.constants.ADDON) {
     extensions = ['.node']
+    conditions = ['addon', ...conditions]
 
-    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, host, ...opts })
   }
 
   if (entry.type & lex.constants.REQUIRE) {

package/package.json

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