bare-module-traverse 2.4.0 → 2.4.1

package/README.md

@@ -165,11 +165,12 @@ The following generator functions implement the traversal algorithm. The yielded
 
 **Source module**
 
-A module to be read. The driver returns its source if it exists, otherwise `null`.
+A module to be read. The driver returns its source if it exists, otherwise `null`. When `artifact` is `true`, the module is an addon or asset whose contents are loaded lazily and referenced by path. A driver that only needs to locate such artifacts, such as a module loader, may return `null` without reading, having already established existence by probing; a driver that embeds their contents, such as a bundler, reads them as normal.
 
 ```js
 next.value = {
-  module: URL
+  module: URL,
+  artifact: boolean
 }
 ```
 
@@ -265,7 +266,9 @@ function drive(generator) {
     const value = next.value
 
     if (value.module) {
-      // Read `value.module` if it exists, otherwise `null`
+      // Read `value.module` if it exists, otherwise `null`. When
+      // `value.artifact` is `true`, the module is an addon or asset that may be
+      // left unread, returning `null`, unless its contents are needed
       let source
 
       next = generator.next(source)
@@ -322,7 +325,7 @@ Options are the same as `traverse()` for all functions.
 
 #### `const generator = traverse.preresolved(url, source, resolutions, artifacts, visited[, options])`
 
-#### `const generator = traverse.imports(parentURL, source, imports, artifacts, visited[, options])`
+#### `const generator = traverse.imports(parentURL, source, imports, artifacts, lexer, visited[, options])`
 
 #### `const generator = traverse.link(entry, specifier, condition, parentURL, imports, artifacts, visited[, options])`
 

package/index.d.ts

@@ -77,7 +77,7 @@ declare namespace traverse {
   export { type TraverseOptions }
 
   export type Traversal = Generator<
-    | { module: URL }
+    | { module: URL; artifact: boolean }
     | { probe: URL }
     | { resolution: URL }
     | { prefix: URL }
@@ -134,6 +134,10 @@ declare namespace traverse {
     source: string | Buffer,
     imports: ImportsMap,
     artifacts: Artifacts,
+    lexer: {
+      imports: Import[]
+      exports: Export[]
+    },
     visited: Set<string>,
     opts?: TraverseOptions
   ): Traversal
@@ -149,8 +153,8 @@ declare namespace traverse {
     opts?: TraverseOptions
   ): Traversal
 
-  export function prebuilds(
-    packageURL: URL,
+  export function addons(
+    parentURL: URL,
     artifacts: Artifacts,
     visited: Set<string>,
     opts?: TraverseOptions
@@ -158,7 +162,7 @@ declare namespace traverse {
 
   export function assets(
     patterns: ConditionalSpecifier,
-    packageURL: URL,
+    parentURL: URL,
     artifacts: Artifacts,
     visited: Set<string>,
     opts?: TraverseOptions

package/index.js

@@ -202,7 +202,7 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
       throw errors.MODULE_NOT_FOUND(`Cannot find module '${url.href}'`, url.href)
     }
 
-    source = yield { module: url }
+    source = yield { module: url, artifact }
 
     if (exists !== true && source === null) {
       throw errors.MODULE_NOT_FOUND(`Cannot find module '${url.href}'`, url.href)
@@ -220,7 +220,7 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
   let info = null
 
   for (const packageURL of lookupPackageScope(url, opts)) {
-    const source = yield { module: packageURL }
+    const source = yield { module: packageURL, artifact: false }
 
     if (source !== null) {
       info = JSON.parse(source)
@@ -239,7 +239,7 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
   if (typeof attributes.imports === 'string') {
     const url = new URL(attributes.imports)
 
-    const source = yield { module: url }
+    const source = yield { module: url, artifact: false }
 
     if (source !== null) {
       opts = {
@@ -280,7 +280,7 @@ exports.package = function* (url, source, artifacts, visited, opts = {}) {
   visited.add(url.href)
 
   if (source === null) {
-    source = yield { module: url }
+    source = yield { module: url, artifact: false }
 
     if (source === null) return false
   }
@@ -339,16 +339,12 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
         } else if (asset) {
           addURL(artifacts.assets, url)
 
-          const source = yield { module: url }
-
-          if (source !== null) {
-            yield {
-              children: exports.module(url, source, {}, artifacts, visited, {
-                ...opts,
-                asset: true
-              }),
-              deferred: true
-            }
+          yield {
+            children: exports.module(url, null, {}, artifacts, visited, {
+              ...opts,
+              asset: true
+            }),
+            deferred: true
           }
         } else if (
           url.protocol !== builtinProtocol &&
@@ -473,7 +469,7 @@ function* resolveImport(entry, specifier, condition, parentURL, imports, artifac
     const value = next.value
 
     if (value.package) {
-      next = resolver.next(JSON.parse(yield { module: value.package }))
+      next = resolver.next(JSON.parse(yield { module: value.package, artifact: false }))
     } else {
       const url = value.resolution
 
@@ -510,19 +506,22 @@ function* resolveImport(entry, specifier, condition, parentURL, imports, artifac
         }
 
         if (resolved) addResolution(imports, specifier, matchedConditions, url)
-      } else if (condition === 'addon') {
+      } else if (
+        condition === 'addon' ||
+        moduleType(url, entry.attributes, null, opts) === constants.ADDON
+      ) {
         let exists = yield { probe: url }
         let source = null
 
         if (exists === undefined) {
-          source = yield { module: url }
+          source = yield { module: url, artifact: false }
           exists = source !== null
         }
 
         if (exists) {
           resolution = yield* postresolve(url)
 
-          addResolution(imports, specifier, matchedConditions, resolution)
+          addResolution(imports, specifier, matchedConditions, exports.alias(resolution, opts))
 
           yield {
             children: exports.module(resolution, source, {}, artifacts, visited, {
@@ -535,7 +534,7 @@ function* resolveImport(entry, specifier, condition, parentURL, imports, artifac
           resolved = true
         }
       } else {
-        const source = yield { module: url }
+        const source = yield { module: url, artifact: false }
 
         if (source !== null) {
           resolution = yield* postresolve(url)
@@ -621,23 +620,19 @@ exports.assets = function* (patterns, parentURL, artifacts, visited, opts = {})
   let yielded = false
 
   for (const url of matches) {
-    const source = yield { module: url }
-
-    if (source !== null) {
-      const resolution = yield* postresolve(url)
-
-      addURL(artifacts.assets, resolution)
+    const resolution = yield* postresolve(url)
 
-      yield {
-        children: exports.module(resolution, source, {}, artifacts, visited, {
-          ...opts,
-          asset: true
-        }),
-        deferred: true
-      }
+    addURL(artifacts.assets, resolution)
 
-      yielded = true
+    yield {
+      children: exports.module(resolution, null, {}, artifacts, visited, {
+        ...opts,
+        asset: true
+      }),
+      deferred: true
     }
+
+    yielded = true
   }
 
   return yielded

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": {