bare-module-traverse 1.2.0 → 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

@@ -0,0 +1,38 @@
+const lex = require('bare-module-lexer')
+const resolve = require('../resolve')
+
+module.exports = function (entry, parentURL, opts = {}) {
+  const runtime = require('#runtime')
+
+  const {
+    platform = runtime.platform,
+    arch = runtime.arch,
+    simulator = false
+  } = opts
+
+  let extensions
+  let conditions = ['bare', 'node', platform, arch]
+
+  if (simulator) conditions = [...conditions, 'simulator']
+
+  if (entry.type & lex.constants.ADDON) {
+    extensions = ['.bare', '.node']
+    conditions = ['addon', ...conditions]
+
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+  }
+
+  if (entry.type & lex.constants.ASSET) {
+    conditions = ['asset', ...conditions]
+  } else {
+    extensions = ['.js', '.cjs', '.mjs', '.json', '.bare', '.node']
+
+    if (entry.type & lex.constants.REQUIRE) {
+      conditions = ['require', ...conditions]
+    } else if (entry.type & lex.constants.IMPORT) {
+      conditions = ['import', ...conditions]
+    }
+  }
+
+  return resolve.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}

package/lib/resolve/default.js

@@ -0,0 +1,10 @@
+const lex = require('bare-module-lexer')
+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.module(entry.specifier, parentURL, opts)
+}

package/lib/resolve/node.js

@@ -0,0 +1,22 @@
+const lex = require('bare-module-lexer')
+const resolve = require('../resolve')
+
+module.exports = function (entry, parentURL, opts) {
+  let extensions
+  let conditions
+
+  if (entry.type & lex.constants.ADDON) {
+    extensions = ['.node']
+
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+  }
+
+  if (entry.type & lex.constants.REQUIRE) {
+    extensions = ['.js', '.json', '.node']
+    conditions = ['node', 'require']
+  } else if (entry.type & lex.constants.IMPORT) {
+    conditions = ['node', 'import']
+  }
+
+  return resolve.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
+}

package/lib/resolve.js

@@ -1,68 +1,6 @@
-const lex = require('bare-module-lexer')
-
 exports.module = require('bare-module-resolve').module
 exports.addon = require('bare-addon-resolve').addon
 
-exports.default = function resolve (entry, parentURL, opts) {
-  if (entry.type & lex.constants.ADDON) {
-    return exports.addon(entry.specifier, parentURL, opts)
-  }
-
-  return exports.module(entry.specifier, parentURL, opts)
-}
-
-exports.bare = function resolve (entry, parentURL, opts = {}) {
-  const runtime = require('#runtime')
-
-  const {
-    platform = runtime.platform,
-    arch = runtime.arch,
-    simulator = false
-  } = opts
-
-  let extensions
-  let conditions = ['bare', 'node', platform, arch]
-
-  if (simulator) conditions = [...conditions, 'simulator']
-
-  if (entry.type & lex.constants.ADDON) {
-    extensions = ['.bare', '.node']
-    conditions = ['addon', ...conditions]
-
-    return exports.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
-  }
-
-  if (entry.type & lex.constants.ASSET) {
-    conditions = ['asset', ...conditions]
-  } else {
-    extensions = ['.js', '.cjs', '.mjs', '.json', '.bare', '.node']
-
-    if (entry.type & lex.constants.REQUIRE) {
-      conditions = ['require', ...conditions]
-    } else if (entry.type & lex.constants.IMPORT) {
-      conditions = ['import', ...conditions]
-    }
-  }
-
-  return exports.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
-}
-
-exports.node = function resolve (entry, parentURL, opts) {
-  let extensions
-  let conditions
-
-  if (entry.type & lex.constants.ADDON) {
-    extensions = ['.node']
-
-    return exports.addon(entry.specifier, parentURL, { extensions, conditions, ...opts })
-  }
-
-  if (entry.type & lex.constants.REQUIRE) {
-    extensions = ['.js', '.json', '.node']
-    conditions = ['node', 'require']
-  } else if (entry.type & lex.constants.IMPORT) {
-    conditions = ['node', 'import']
-  }
-
-  return exports.module(entry.specifier, parentURL, { extensions, conditions, ...opts })
-}
+exports.default = require('./resolve/default')
+exports.bare = require('./resolve/bare')
+exports.node = require('./resolve/node')

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "bare-module-traverse",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": "./index.js",
     "./package": "./package.json",
-    "./resolve": "./lib/resolve.js"
+    "./resolve": "./lib/resolve.js",
+    "./resolve/default": "./lib/resolve/default.js",
+    "./resolve/bare": "./lib/resolve/bare.js",
+    "./resolve/node": "./lib/resolve/node.js"
   },
   "files": [
     "index.js",