bare-module 3.1.9 → 3.1.11

package/binding.c

@@ -465,6 +465,25 @@ bare_module_run_module (js_env_t *env, js_callback_info_t *info) {
   err = js_run_module(env, module, &result);
   if (err < 0) return NULL;
 
+  bool is_promise;
+  err = js_is_promise(env, result, &is_promise);
+  assert(err == 0);
+
+  if (is_promise) {
+    js_promise_state_t state;
+    err = js_get_promise_state(env, result, &state);
+    assert(err == 0);
+
+    if (state == js_promise_rejected) {
+      js_value_t *error;
+      err = js_get_promise_result(env, result, &error);
+      if (err < 0) return NULL;
+
+      err = js_set_named_property(env, result, "error", error);
+      if (err < 0) return NULL;
+    }
+  }
+
   return result;
 }
 

package/index.js

@@ -162,7 +162,7 @@ const Module = module.exports = exports = class Module {
           break
         }
 
-        case constants.types.MODULE: {
+        case constants.types.MODULE:
           module._evaluate()
 
           for (const name of Object.keys(module._exports)) {
@@ -170,13 +170,11 @@ const Module = module.exports = exports = class Module {
           }
 
           break
-        }
 
-        case constants.types.JSON: {
+        case constants.types.JSON:
           for (const name of Object.keys(module._exports)) {
             names.push(name)
           }
-        }
       }
     }
 
@@ -190,12 +188,16 @@ const Module = module.exports = exports = class Module {
 
     this._state |= constants.states.EVALUATED
 
+    let result
+
     if (this._type === constants.types.SCRIPT) {
       const require = createRequire(this._url, { module: this })
 
       this._exports = {}
 
-      this._function(
+      const fn = this._function // Bind to variable to ensure proper stack trace
+
+      fn(
         require,
         this,
         this._exports,
@@ -203,17 +205,23 @@ const Module = module.exports = exports = class Module {
         urlToDirname(this._url)
       )
 
-      if (eagerRun) binding.runModule(this._handle, Module._handle)
+      if (eagerRun) result = binding.runModule(this._handle, Module._handle)
     }
 
     if (this._type === constants.types.MODULE) {
-      binding.runModule(this._handle, Module._handle)
+      result = binding.runModule(this._handle, Module._handle)
 
       this._exports = binding.getNamespace(this._handle)
     }
 
     if (this._type === constants.types.ADDON) {
-      if (eagerRun) binding.runModule(this._handle, Module._handle)
+      if (eagerRun) result = binding.runModule(this._handle, Module._handle)
+    }
+
+    if (result && result.error) {
+      result.catch(() => {}) // Handle the promise rejection
+
+      throw result.error
     }
   }
 
@@ -365,33 +373,39 @@ const Module = module.exports = exports = class Module {
 
     const module = cache[url.href] = new Module(url)
 
-    switch (url.protocol) {
-      case 'builtin:':
-        module._exports = builtins[url.pathname]
-        break
+    try {
+      switch (url.protocol) {
+        case 'builtin:':
+          module._exports = builtins[url.pathname]
+          break
 
-      default: {
-        module._defaultType = defaultType
-        module._cache = cache
-        module._main = main || module
-        module._protocol = protocol
-        module._imports = imports
-        module._resolutions = resolutions
-        module._builtins = builtins
-        module._conditions = conditions
-
-        let extension = self._extensionFor(type) || path.extname(url.pathname)
-
-        if (extension in self._extensions === false) {
-          if (defaultType) extension = self._extensionFor(defaultType) || '.js'
-          else extension = '.js'
-        }
+        default: {
+          module._defaultType = defaultType
+          module._cache = cache
+          module._main = main || module
+          module._protocol = protocol
+          module._imports = imports
+          module._resolutions = resolutions
+          module._builtins = builtins
+          module._conditions = conditions
+
+          let extension = self._extensionFor(type) || path.extname(url.pathname)
+
+          if (extension in self._extensions === false) {
+            if (defaultType) extension = self._extensionFor(defaultType) || '.js'
+            else extension = '.js'
+          }
 
-        self._extensions[extension](module, source, referrer)
+          self._extensions[extension](module, source, referrer)
+        }
       }
-    }
 
-    return module._transform(isImport, isDynamicImport)
+      return module._transform(isImport, isDynamicImport)
+    } catch (err) {
+      delete cache[url.href]
+
+      throw err
+    }
   }
 
   static resolve (specifier, parentURL, opts = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "3.1.9",
+  "version": "3.1.11",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [