bare-module-traverse 1.1.0 → 1.2.1

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,7 @@ 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:
 
@@ -76,7 +76,7 @@ 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
 

package/index.js

@@ -32,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
@@ -61,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

package/lib/resolve/bare.js

@@ -0,0 +1,38 @@
+const lex = require('bare-module-lexer')
+const resolve = require('../resolve')
+
+module.exports = function (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 resolve.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 resolve.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}

package/lib/resolve/default.js

@@ -0,0 +1,10 @@
+const lex = require('bare-module-lexer')
+const resolve = require('../resolve')
+
+module.exports = function (entry, parentURL, opts) {
+  if (entry.type & lex.constants.ADDON) {
+    return resolve.addon(entry.specifier, parentURL, opts)
+  }
+
+  return resolve.module(entry.specifier, parentURL, opts)
+}

package/lib/resolve/node.js

@@ -0,0 +1,22 @@
+const lex = require('bare-module-lexer')
+const resolve = require('../resolve')
+
+module.exports = function (entry, parentURL, opts) {
+  let extensions
+  let conditions
+
+  if (entry.type & lex.constants.ADDON) {
+    extensions = ['.node']
+
+    return resolve.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 resolve.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}

package/lib/resolve.js

@@ -1,68 +1,6 @@
-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 })
-}
+exports.default = require('./resolve/default')
+exports.bare = require('./resolve/bare')
+exports.node = require('./resolve/node')

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "bare-module-traverse",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",
     "./package": "./package.json",
-    "./resolve": "./lib/resolve.js"
+    "./resolve": "./lib/resolve.js",
+    "./resolve/default": "./lib/resolve/default.js",
+    "./resolve/bare": "./lib/resolve/bare.js",
+    "./resolve/node": "./lib/resolve/node.js"
   },
   "files": [
     "index.js",