bare-module 3.1.13 → 3.1.15

package/binding.c

@@ -461,41 +461,43 @@ bare_module_run_module (js_env_t *env, js_callback_info_t *info) {
   err = js_instantiate_module(env, module, on_static_import, (void *) context);
   if (err < 0) return NULL;
 
-  js_value_t *result;
-  err = js_run_module(env, module, &result);
+  js_value_t *promise;
+  err = js_run_module(env, module, &promise);
   if (err < 0) return NULL;
 
   bool is_promise;
-  err = js_is_promise(env, result, &is_promise);
+  err = js_is_promise(env, promise, &is_promise);
   assert(err == 0);
 
   if (is_promise) {
     js_promise_state_t state;
-    err = js_get_promise_state(env, result, &state);
+    err = js_get_promise_state(env, promise, &state);
     assert(err == 0);
 
+    js_value_t *reason;
+
     if (state == js_promise_rejected) {
-      js_value_t *error;
-      err = js_get_promise_result(env, result, &error);
+      err = js_get_promise_result(env, promise, &reason);
       if (err < 0) return NULL;
-
-      js_value_t *exception;
-      err = js_get_and_clear_last_exception(env, &exception);
+    } else {
+      err = js_get_null(env, &reason);
       assert(err == 0);
+    }
 
-      js_value_t *ctx;
-      err = js_get_reference_value(env, context->ctx, &ctx);
-      assert(err == 0);
+    js_value_t *exception;
+    err = js_get_and_clear_last_exception(env, &exception);
+    assert(err == 0);
 
-      js_value_t *args[2] = {result, error};
+    js_value_t *ctx;
+    err = js_get_reference_value(env, context->ctx, &ctx);
+    assert(err == 0);
 
-      js_call_function(env, ctx, argv[2], 2, args, NULL);
+    js_value_t *args[3] = {reason, promise, exception};
 
-      return NULL;
-    }
+    js_call_function(env, ctx, argv[2], 3, args, NULL);
   }
 
-  return result;
+  return NULL;
 }
 
 static js_value_t *

package/index.js

@@ -180,7 +180,7 @@ const Module = module.exports = exports = class Module {
   }
 
   _run () {
-    binding.runModule(this._handle, Module._handle, Module._onrejection)
+    binding.runModule(this._handle, Module._handle, Module._onrun)
   }
 
   _evaluate (eagerRun = false) {
@@ -343,10 +343,14 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static _onrejection (promise, err) {
-    promise.catch(() => {}) // Don't leak the rejection
+  static _onrun (reason, promise, err = reason) {
+    if (err) {
+      promise.catch(() => {}) // Don't leak the rejection
 
-    throw err
+      throw err
+    } else {
+      promise.catch((err) => queueMicrotask(() => { throw err }))
+    }
   }
 
   static Protocol = Protocol

package/package.json

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