bare-module-traverse 2.5.4 → 2.5.6

package/index.js

@@ -353,7 +353,7 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
 
   if (typeof imports !== 'object' || imports === null) return false
 
-  const type = moduleType(url, {}, null, opts)
+  let info = null
 
   for (const [specifier, entry] of Object.entries(imports)) {
     const stack = [{ entry, asset: false }]
@@ -365,8 +365,18 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
         const url = new URL(entry)
 
         if (specifier === '#package') {
+          const scope = yield* readPackage(url, opts)
+
+          if (scope !== null && info === null) info = scope.info
+
           yield {
-            children: exports.package(url, null, artifacts, visited, opts),
+            children: exports.package(
+              url,
+              scope === null ? null : scope.source,
+              artifacts,
+              visited,
+              opts
+            ),
             deferred: false
           }
         } else if (asset) {
@@ -403,10 +413,15 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
     }
   }
 
+  const type = moduleType(url, {}, info, opts)
+
   const lexer = { imports: [], exports: [] }
 
   if (type === constants.SCRIPT || type === constants.MODULE) {
-    lexer.exports = lex(source).exports
+    const lexed = lex(source)
+
+    lexer.imports = lexed.imports
+    lexer.exports = lexed.exports
   }
 
   yield {
@@ -789,6 +804,22 @@ exports.patternMatches = function* patternMatches(pattern, parentURL, matches, o
   return matches
 }
 
+function* readPackage(url, opts) {
+  const { packages = new Map() } = opts
+
+  const cached = packages.get(url.href)
+
+  if (cached !== undefined) return cached
+
+  const source = yield { module: url, artifact: false }
+
+  const scope = source === null ? null : { url, source, info: JSON.parse(source) }
+
+  packages.set(url.href, scope)
+
+  return scope
+}
+
 function* lookupPackage(url, opts) {
   const { packages = new Map() } = opts
 

package/package.json

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