bare-module-traverse 1.0.1 → 1.2.0

package/README.md

@@ -17,8 +17,8 @@ function readModule (url) {
   // Read `url` if it exists, otherwise `null`
 }
 
-function listPrefix (url) {
-  // Return a list of URLs that have `url` as a prefix. The list may be empty.
+function * listPrefix (url) {
+  // Yield URLs that have `url` as a prefix. The list may be empty.
 }
 
 for (const dependency of traverse(new URL('file:///directory/file.js'), readModule, listPrefix)) {
@@ -35,8 +35,8 @@ async function readModule (url) {
   // Read `url` if it exists, otherwise `null`
 }
 
-async function listPrefix (url) {
-  // Return a list of URLs that have `url` as a prefix. The list may be empty.
+async function * listPrefix (url) {
+  // Yield URLs that have `url` as a prefix. The list may be empty.
 }
 
 for await (const dependency of traverse(new URL('file:///directory/file.js'), readModule, listPrefix)) {
@@ -48,7 +48,17 @@ for await (const dependency of traverse(new URL('file:///directory/file.js'), re
 
 #### `const dependencies = traverse(url[, options], readModule[, listPrefix])`
 
-Traverse the module graph rooted at `url`, which must be a WHATWG `URL` instance. `readModule` is called with a `URL` instance for every module to be read and must either return the module source, if it exists, or `null`. `listPrefix` is called with a `URL` instance of every prefix to be listed and must return a list of `URL` instances that have the specified `URL` as a prefix. If not provided, prefixes won't be traversed. If one or both of `readModule` or `listPrefix` returns a promise, synchronous iteration is not supported.
+Traverse the module graph rooted at `url`, which must be a WHATWG `URL` instance. `readModule` is called with a `URL` instance for every module to be read and must either return the module source, if it exists, or `null`. `listPrefix` is called with a `URL` instance of every prefix to be listed and must return a list of `URL` instances that have the specified `URL` as a prefix. If not provided, prefixes won't be traversed. If `readModule` returns a promise or `listPrefix` returns a promise generator, synchronous iteration is not supported.
+
+Options include:
+
+```js
+{
+  resolve: resolve.default
+}
+```
+
+Options supported by <https://github.com/holepunchto/bare-module-resolve> and <https://github.com/holepunchto/bare-addon-resolve> may also be specified.
 
 #### `for (const dependency of dependencies)`
 
@@ -66,7 +76,29 @@ Synchronously iterate the module graph. Each yielded dependency has the followin
 
 #### `for await (const dependency of dependencies)`
 
-Asynchronously iterate the module graph. If one or both of `readModule` or `listPrefix` returns promises, these will be awaited. The same comments as `for (const dependency of dependencies)` apply.
+Asynchronously iterate the module graph. If `readModule` returns a promise or `listPrefix` returns a promise generator, these will be awaited. The same comments as `for (const dependency of dependencies)` apply.
+
+### Resolution
+
+#### `resolve.module`
+
+Convenience export from <https://github.com/holepunchto/bare-module-resolve>.
+
+#### `resolve.addon`
+
+Convenience export from <https://github.com/holepunchto/bare-addon-resolve>.
+
+#### `resolve.default`
+
+The default resolver, which simply forwards to <https://github.com/holepunchto/bare-module-resolve> and <https://github.com/holepunchto/bare-addon-resolve> with the literal options passed by the caller.
+
+#### `resolve.bare`
+
+The Bare resolver, which matches the options used by the Bare module system.
+
+#### `resolve.node`
+
+The Node.js resolver, which matches the options used by the Node.js module system.
 
 ### Algorithm
 
@@ -117,6 +149,8 @@ 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.assets(patterns, parentURL, artifacts, visited[, options])`
 
 ## License

package/index.js

@@ -1,4 +1,5 @@
 const { lookupPackageScope } = 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')
@@ -16,7 +17,7 @@ module.exports = exports = function traverse (entry, opts, readModule, listPrefi
 
   return {
     * [Symbol.iterator] () {
-      const artifacts = createArtifacts()
+      const artifacts = { addons: [], assets: [] }
 
       const queue = [exports.module(entry, null, artifacts, new Set(), opts)]
 
@@ -31,7 +32,13 @@ module.exports = exports = function traverse (entry, opts, readModule, listPrefi
           if (value.module) {
             next = generator.next(readModule(value.module))
           } else if (value.prefix) {
-            next = generator.next(listPrefix(value.prefix))
+            const result = []
+
+            for (const url of listPrefix(value.prefix)) {
+              result.push(url)
+            }
+
+            next = generator.next(result)
           } else {
             if (value.children) queue.push(value.children)
             else yield value.dependency
@@ -45,7 +52,7 @@ module.exports = exports = function traverse (entry, opts, readModule, listPrefi
     },
 
     async * [Symbol.asyncIterator] () {
-      const artifacts = createArtifacts()
+      const artifacts = { addons: [], assets: [] }
 
       const queue = [exports.module(entry, null, artifacts, new Set(), opts)]
 
@@ -60,7 +67,13 @@ module.exports = exports = function traverse (entry, opts, readModule, listPrefi
           if (value.module) {
             next = generator.next(await readModule(value.module))
           } else if (value.prefix) {
-            next = generator.next(await listPrefix(value.prefix))
+            const result = []
+
+            for await (const url of listPrefix(value.prefix)) {
+              result.push(url)
+            }
+
+            next = generator.next(result)
           } else {
             if (value.children) queue.push(value.children)
             else yield value.dependency
@@ -79,19 +92,27 @@ function defaultListPrefix () {
   return []
 }
 
-function defaultResolve (entry, parentURL, opts) {
-  if (entry.type & lex.constants.ADDON) {
-    return resolve.addon(entry.specifier, parentURL, opts)
-  } else {
-    return resolve.module(entry.specifier, parentURL, opts)
+function addURL (array, url) {
+  let lo = 0
+  let hi = array.length - 1
+
+  while (lo <= hi) {
+    const mid = lo + ((hi - lo) >> 1)
+    const found = array[mid]
+
+    if (found.href === url.href) return
+
+    if (found.href < url.href) {
+      lo = mid + 1
+    } else {
+      hi = mid - 1
+    }
   }
-}
 
-function createArtifacts () {
-  return { addons: [], assets: [] }
+  array.splice(lo, 0, url)
 }
 
-function addURL (array, url) {
+function removeURL (array, url) {
   let lo = 0
   let hi = array.length - 1
 
@@ -99,7 +120,7 @@ function addURL (array, url) {
     const mid = lo + ((hi - lo) >> 1)
     const found = array[mid]
 
-    if (found.href === url.href) return
+    if (found.href === url.href) break
 
     if (found.href < url.href) {
       lo = mid + 1
@@ -108,7 +129,7 @@ function addURL (array, url) {
     }
   }
 
-  array.splice(lo, 0, url)
+  if (array[lo].href === url.href) array.splice(lo, 1)
 }
 
 exports.resolve = resolve
@@ -163,6 +184,10 @@ exports.package = function * (url, source, artifacts, visited, opts = {}) {
   if (info) {
     yield { dependency: { url, source, 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) }
     }
@@ -204,7 +229,7 @@ exports.preresolved = function * (url, source, resolutions, artifacts, visited,
 }
 
 exports.imports = function * (parentURL, source, imports, artifacts, visited, opts = {}) {
-  const { resolve = defaultResolve } = opts
+  const { resolve = exports.resolve.default } = opts
 
   let yielded = false
 
@@ -258,13 +283,34 @@ exports.imports = function * (parentURL, source, imports, artifacts, visited, op
   return yielded
 }
 
+exports.prebuilds = function * (packageURL, artifacts, visited, opts = {}) {
+  const [prefix = null] = lookupPrebuildsScope(packageURL, opts)
+
+  if (prefix === null) return false
+
+  let yielded = false
+
+  for (const url of yield { prefix }) {
+    const source = yield { module: url }
+
+    if (source !== null) {
+      addURL(artifacts.addons, url)
+
+      yield { children: exports.module(url, source, artifacts, visited, opts) }
+
+      yielded = true
+    }
+  }
+
+  return yielded
+}
+
 exports.assets = function * (patterns, parentURL, artifacts, visited, opts = {}) {
-  const matches = yield * exports.matches(patterns, parentURL, opts)
+  const matches = yield * exports.patternMatches(patterns, parentURL, [], opts)
 
   let yielded = false
 
-  for (const href of matches) {
-    const url = new URL(href)
+  for (const url of matches) {
     const source = yield { module: url }
 
     if (source !== null) {
@@ -279,10 +325,10 @@ exports.assets = function * (patterns, parentURL, artifacts, visited, opts = {})
   return yielded
 }
 
-exports.matches = function * (patterns, parentURL) {
-  const matches = new Set()
+exports.patternMatches = function * (pattern, parentURL, matches, opts = {}) {
+  const { conditions = [] } = opts
 
-  for (let pattern of patterns) {
+  if (typeof pattern === 'string') {
     let patternNegate = false
     let patternBase
     let patternTrailer
@@ -306,12 +352,26 @@ exports.matches = function * (patterns, parentURL) {
 
     for (const url of yield { prefix }) {
       if (patternIndex === -1) {
-        if (patternNegate) matches.delete(url.href)
-        else matches.add(url.href)
+        if (patternNegate) removeURL(matches, url)
+        else addURL(matches, url)
       } else if (patternTrailer === '' || url.href.endsWith(patternTrailer)) {
-        matches.add(url.href)
+        addURL(matches, url)
       } else if (patternNegate) {
-        matches.delete(url.href)
+        removeURL(matches, url)
+      }
+    }
+  } else if (Array.isArray(pattern)) {
+    for (const patternValue of pattern) {
+      yield * exports.patternMatches(patternValue, parentURL, matches, opts)
+    }
+  } else if (typeof pattern === 'object' && pattern !== null) {
+    const keys = Object.keys(pattern)
+
+    for (const p of keys) {
+      if (p === 'default' || conditions.includes(p)) {
+        const patternValue = pattern[p]
+
+        return yield * exports.patternMatches(patternValue, parentURL, matches, opts)
       }
     }
   }

package/lib/resolve.js

@@ -1,2 +1,68 @@
+const lex = require('bare-module-lexer')
+
 exports.module = require('bare-module-resolve').module
 exports.addon = require('bare-addon-resolve').addon
+
+exports.default = function resolve (entry, parentURL, opts) {
+  if (entry.type & lex.constants.ADDON) {
+    return exports.addon(entry.specifier, parentURL, opts)
+  }
+
+  return exports.module(entry.specifier, parentURL, opts)
+}
+
+exports.bare = function resolve (entry, parentURL, opts = {}) {
+  const runtime = require('#runtime')
+
+  const {
+    platform = runtime.platform,
+    arch = runtime.arch,
+    simulator = false
+  } = opts
+
+  let extensions
+  let conditions = ['bare', 'node', platform, arch]
+
+  if (simulator) conditions = [...conditions, 'simulator']
+
+  if (entry.type & lex.constants.ADDON) {
+    extensions = ['.bare', '.node']
+    conditions = ['addon', ...conditions]
+
+    return exports.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
+  }
+
+  if (entry.type & lex.constants.ASSET) {
+    conditions = ['asset', ...conditions]
+  } else {
+    extensions = ['.js', '.cjs', '.mjs', '.json', '.bare', '.node']
+
+    if (entry.type & lex.constants.REQUIRE) {
+      conditions = ['require', ...conditions]
+    } else if (entry.type & lex.constants.IMPORT) {
+      conditions = ['import', ...conditions]
+    }
+  }
+
+  return exports.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}
+
+exports.node = function resolve (entry, parentURL, opts) {
+  let extensions
+  let conditions
+
+  if (entry.type & lex.constants.ADDON) {
+    extensions = ['.node']
+
+    return exports.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
+  }
+
+  if (entry.type & lex.constants.REQUIRE) {
+    extensions = ['.js', '.json', '.node']
+    conditions = ['node', 'require']
+  } else if (entry.type & lex.constants.IMPORT) {
+    conditions = ['node', 'import']
+  }
+
+  return exports.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}

package/lib/runtime/bare.js

@@ -0,0 +1,3 @@
+/* global Bare */
+exports.platform = Bare.platform
+exports.arch = Bare.arch

package/lib/runtime/node.js

@@ -0,0 +1,2 @@
+exports.platform = process.platform
+exports.arch = process.arch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",
@@ -11,6 +11,12 @@
     "index.js",
     "lib"
   ],
+  "imports": {
+    "#runtime": {
+      "bare": "./lib/runtime/bare.js",
+      "node": "./lib/runtime/node.js"
+    }
+  },
   "scripts": {
     "test": "standard && bare test.js"
   },