bare-module-traverse 2.7.0 → 2.7.2

package/README.md

@@ -120,7 +120,7 @@ next.value = {
 
 **Dependency node**
 
-A fully resolved node of the module graph and the traversal's output. This is what the iterable forms yield to the caller.
+A fully resolved node of the module graph and the traversal's output. This is what the iterable forms yield to the caller. A module imported under several `host` or `wasi` attributes is walked once for each, so the same URL may be yielded more than once.
 
 ```js
 next.value = {
@@ -141,7 +141,10 @@ next.value = {
       exports: [
         // See https://github.com/holepunchto/bare-module-lexer#api
       ]
-    }
+    },
+    // The URL of the WASI provider of a WebAssembly addon, if its importer
+    // named one with the `wasi` attribute.
+    wasi: 'string'
   }
 }
 ```
@@ -206,7 +209,7 @@ function drive(generator) {
 }
 
 while (queue.length > 0 || deferred.length > 0) {
-  drive(queue.length > 0 ? queue.pop() : deferred.shift())
+  drive(queue.length > 0 ? queue.shift() : deferred.shift())
 }
 ```
 

package/index.d.ts

@@ -26,6 +26,11 @@ interface Dependency {
     imports: Import[]
     exports: Export[]
   }
+  /**
+   * The URL of the WASI provider of a WebAssembly addon, if its importer named
+   * one with the `wasi` attribute.
+   */
+  wasi?: string
 }
 
 type AliasableExtension =
@@ -74,6 +79,12 @@ interface TraverseOptions extends ResolveOptions {
    * system; a tool that only links wants the error.
    */
   deferUnresolved?: boolean
+  /**
+   * The URL the entry is mounted at when it is a bundle, for consumers that
+   * load it with an explicit mount. The addons and assets it declares resolve
+   * relative to this. Defaults to the URL of the entry itself.
+   */
+  mount?: URL | string
 }
 
 /**

package/index.js

@@ -1,3 +1,4 @@
+const Bundle = require('bare-bundle')
 const { lookupPackageScope, conditionMatches } = require('bare-module-resolve')
 const lex = require('bare-module-lexer')
 const MIME = require('bare-mime')
@@ -194,9 +195,15 @@ exports.alias = function alias(url, opts = {}) {
 exports.module = function* (url, source, attributes, artifacts, visited, opts = {}) {
   attributes = attributes || {}
 
+  // The mount only applies to the module the traversal starts from.
+  const { mount } = opts
+
+  if (mount !== undefined) opts = { ...opts, mount: undefined }
+
   if (opts.contexts === undefined) opts = { ...opts, contexts: new Map() }
   if (opts.addonContexts === undefined) opts = { ...opts, addonContexts: new Map() }
   if (opts.resolvedImports === undefined) opts = { ...opts, resolvedImports: new Map() }
+  if (opts.lexers === undefined) opts = { ...opts, lexers: new Map() }
 
   // The host and WASI attributes set the context that the addons of the module
   // and everything it imports load in. A graph is walked again for each context
@@ -262,6 +269,16 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
     }
   }
 
+  // A bundle declares its own artifacts, whether or not its imports have been
+  // resolved before.
+  if (
+    asset === false &&
+    artifacts !== null &&
+    moduleType(url, attributes, null, opts) === constants.BUNDLE
+  ) {
+    addBundleArtifacts(source, mountFor(url, mount), artifacts)
+  }
+
   // A module resolves its imports once, however many contexts it is loaded in,
   // so a context that reaches it after another walks what the other resolved.
   // The addons that are reached are then checked against the context.
@@ -322,6 +339,8 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
         ...opts,
         importType: 0
       })
+
+      opts.lexers.set(url.href, lexer)
     } else if (type === constants.ADDON && artifacts !== null) {
       yield* exports.addons(url, artifacts, visited, opts)
     }
@@ -409,11 +428,13 @@ exports.preresolved = function* (
 
   const parentURL = url
 
+  const { lexers = null } = opts
+
   // The resolutions map leaves out the import attributes, so they are read
-  // from the source instead.
+  // from the source instead, unless another context already lexed it.
   const lexed =
     opts.asset !== true && isJavaScript(moduleType(url, attributes, null, opts))
-      ? lex(source)
+      ? (lexers !== null && lexers.get(url.href)) || lex(source)
       : null
 
   let info = null
@@ -853,6 +874,19 @@ exports.assertAddonContext = function assertAddonContext(url, scope, context, ad
   }
 }
 
+function addBundleArtifacts(source, mount, artifacts) {
+  const bundle = Bundle.from(source).mount(mount)
+
+  for (const href of bundle.addons) addURL(artifacts.addons, new URL(href))
+  for (const href of bundle.assets) addURL(artifacts.assets, new URL(href))
+}
+
+function mountFor(url, mount) {
+  const href = mount === undefined ? url.href : new URL(mount).href
+
+  return href.endsWith('/') ? href : href + '/'
+}
+
 function isJavaScript(type) {
   return type === constants.SCRIPT || type === constants.MODULE
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": {
@@ -55,6 +55,7 @@
   "homepage": "https://github.com/holepunchto/bare-module-traverse#readme",
   "dependencies": {
     "bare-addon-resolve": "^1.5.0",
+    "bare-bundle": "^1.11.0",
     "bare-mime": "^1.0.0",
     "bare-module-lexer": "^1.6.0",
     "bare-module-resolve": "^1.7.0"