bare-module-traverse 2.7.0 → 2.7.1

package/index.d.ts

@@ -74,6 +74,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,6 +195,11 @@ 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() }
@@ -262,6 +268,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.
@@ -853,6 +869,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.1",
   "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"