bare-module 4.8.3 → 4.8.5

package/index.js

@@ -114,14 +114,9 @@ module.exports = exports = class Module {
     Module._modules.delete(this)
   }
 
-  _run() {
-    binding.runModule(this._handle, Module._handle, Module._onrun)
-  }
-
   _transform(isImport, isDynamicImport) {
     if (isDynamicImport) {
-      this._synthesize()
-      this._evaluate(true /* eagerRun */)
+      this._run()
     } else if (isImport) {
       this._synthesize()
     } else {
@@ -205,7 +200,7 @@ module.exports = exports = class Module {
     )
   }
 
-  _evaluate(eagerRun = false) {
+  _evaluate() {
     if ((this._state & constants.states.EVALUATED) !== 0) return
 
     this._state |= constants.states.EVALUATED
@@ -224,17 +219,23 @@ module.exports = exports = class Module {
         urlToPath(this._url),
         urlToDirname(this._url)
       )
-
-      if (eagerRun) this._run()
     } else if (this._type === constants.types.MODULE) {
       this._run()
 
       this._exports = binding.getNamespace(this._handle)
-    } else if (eagerRun) {
-      this._run()
     }
   }
 
+  _run() {
+    if ((this._state & constants.states.RUN) !== 0) return
+
+    this._state |= constants.states.RUN
+
+    this._synthesize()
+
+    binding.runModule(this._handle, Module._handle, Module._onrun)
+  }
+
   [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: Module },
@@ -501,6 +502,8 @@ module.exports = exports = class Module {
 
     if (resolution) return protocol.postresolve(resolution)
 
+    const candidates = []
+
     for (const resolution of resolve(
       resolved,
       parentURL,
@@ -516,6 +519,8 @@ module.exports = exports = class Module {
       },
       readPackage
     )) {
+      candidates.push(resolution)
+
       switch (resolution.protocol) {
         case 'builtin:':
           return resolution
@@ -526,9 +531,14 @@ module.exports = exports = class Module {
       }
     }
 
-    throw errors.MODULE_NOT_FOUND(
-      `Cannot find module '${specifier}' imported from '${parentURL.href}'`
-    )
+    let message = `Cannot find module '${specifier}' imported from '${parentURL.href}`
+
+    if (candidates.length > 0) {
+      message += '\nCandidates:'
+      message += '\n' + candidates.map((url) => '- ' + url.href).join('\n')
+    }
+
+    throw errors.MODULE_NOT_FOUND(message, candidates)
 
     function readPackage(packageURL) {
       if (protocol.exists(packageURL, constants.types.JSON)) {

package/lib/constants.d.ts

@@ -2,6 +2,7 @@ declare const constants: {
   states: {
     EVALUATED: number
     SYNTHESIZED: number
+    RUN: number
     DESTROYED: number
   }
   types: {

package/lib/constants.js

@@ -2,7 +2,8 @@ module.exports = {
   states: {
     EVALUATED: 1,
     SYNTHESIZED: 2,
-    DESTROYED: 4
+    RUN: 4,
+    DESTROYED: 8
   },
 
   types: {

package/lib/errors.js

@@ -12,12 +12,16 @@ module.exports = class ModuleError extends Error {
     return 'ModuleError'
   }
 
-  static MODULE_NOT_FOUND(msg) {
-    return new ModuleError(
+  static MODULE_NOT_FOUND(msg, candidates = []) {
+    const err = new ModuleError(
       msg,
       'MODULE_NOT_FOUND',
       ModuleError.MODULE_NOT_FOUND
     )
+
+    err.candidates = candidates
+
+    return err
   }
 
   static ASSET_NOT_FOUND(msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "4.8.3",
+  "version": "4.8.5",
   "description": "Module support for JavaScript",
   "exports": {
     ".": {