bare-module-traverse 1.2.1 → 1.2.2

package/index.js

@@ -238,6 +238,15 @@ exports.imports = function * (parentURL, source, imports, artifacts, visited, op
 
     let next = resolver.next()
     let resolved = false
+    let specifier = entry.specifier
+    let key = 'default'
+
+    if (entry.type & lex.constants.ADDON) {
+      specifier = specifier || '.'
+      key = 'addon'
+    } else if (entry.type & lex.constants.ASSET) {
+      key = 'asset'
+    }
 
     while (next.done !== true) {
       const value = next.value
@@ -252,17 +261,10 @@ exports.imports = function * (parentURL, source, imports, artifacts, visited, op
         const source = yield { module: url }
 
         if (source !== null) {
-          let key = 'default'
-
-          if (entry.type & lex.constants.ADDON) {
-            key = 'addon'
-            addURL(artifacts.addons, url)
-          } else if (entry.type & lex.constants.ASSET) {
-            key = 'asset'
-            addURL(artifacts.assets, url)
-          }
+          if (key === 'addon') addURL(artifacts.addons, url)
+          else if (key === 'asset') addURL(artifacts.assets, url)
 
-          imports[entry.specifier] = { [key]: url.href, ...imports[entry.specifier] }
+          imports[specifier] = { [key]: url.href, ...imports[specifier] }
 
           yield { children: exports.module(url, source, artifacts, visited, opts) }
 
@@ -276,7 +278,14 @@ exports.imports = function * (parentURL, source, imports, artifacts, visited, op
     }
 
     if (!resolved) {
-      throw errors.MODULE_NOT_FOUND(`Cannot find module '${entry.specifier}' imported from '${parentURL.href}'`)
+      switch (key) {
+        case 'addon':
+          throw errors.ADDON_NOT_FOUND(`Cannot find addon '${specifier}' imported from '${parentURL.href}'`)
+        case 'asset':
+          throw errors.ASSET_NOT_FOUND(`Cannot find asset '${specifier}' imported from '${parentURL.href}'`)
+        default:
+          throw errors.MODULE_NOT_FOUND(`Cannot find module '${specifier}' imported from '${parentURL.href}'`)
+      }
     }
   }
 

package/lib/errors.js

@@ -15,4 +15,12 @@ module.exports = class ModuleTraverseError extends Error {
   static MODULE_NOT_FOUND (msg) {
     return new ModuleTraverseError(msg, 'MODULE_NOT_FOUND', ModuleTraverseError.MODULE_NOT_FOUND)
   }
+
+  static ADDON_NOT_FOUND (msg) {
+    return new ModuleTraverseError(msg, 'ADDON_NOT_FOUND', ModuleTraverseError.ADDON_NOT_FOUND)
+  }
+
+  static ASSET_NOT_FOUND (msg) {
+    return new ModuleTraverseError(msg, 'ASSET_NOT_FOUND', ModuleTraverseError.ASSET_NOT_FOUND)
+  }
 }

package/lib/resolve/bare.js

@@ -19,7 +19,7 @@ module.exports = function (entry, parentURL, opts = {}) {
     extensions = ['.bare', '.node']
     conditions = ['addon', ...conditions]
 
-    return resolve.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
   }
 
   if (entry.type & lex.constants.ASSET) {

package/lib/resolve/default.js

@@ -3,7 +3,7 @@ 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.addon(entry.specifier || '.', parentURL, opts)
   }
 
   return resolve.module(entry.specifier, parentURL, opts)

package/lib/resolve/node.js

@@ -8,7 +8,7 @@ module.exports = function (entry, parentURL, opts) {
   if (entry.type & lex.constants.ADDON) {
     extensions = ['.node']
 
-    return resolve.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
   }
 
   if (entry.type & lex.constants.REQUIRE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",