bare-module 3.1.11 → 3.1.13

package/binding.c

@@ -442,13 +442,13 @@ static js_value_t *
 bare_module_run_module (js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 3;
+  js_value_t *argv[3];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 3);
 
   js_module_t *module;
   err = js_get_value_external(env, argv[0], (void **) &module);
@@ -479,8 +479,19 @@ bare_module_run_module (js_env_t *env, js_callback_info_t *info) {
       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;
+      js_value_t *exception;
+      err = js_get_and_clear_last_exception(env, &exception);
+      assert(err == 0);
+
+      js_value_t *ctx;
+      err = js_get_reference_value(env, context->ctx, &ctx);
+      assert(err == 0);
+
+      js_value_t *args[2] = {result, error};
+
+      js_call_function(env, ctx, argv[2], 2, args, NULL);
+
+      return NULL;
     }
   }
 

package/index.js

@@ -132,7 +132,7 @@ const Module = module.exports = exports = class Module {
 
     if (this._type === constants.types.MODULE) return
 
-    const names = ['default']
+    const names = new Set(['default'])
     const queue = [this]
     const seen = new Set()
 
@@ -147,7 +147,7 @@ const Module = module.exports = exports = class Module {
         case constants.types.SCRIPT: {
           const result = parse(module._function.toString())
 
-          names.push(...result.exports)
+          for (const name of result.exports) names.add(name)
 
           const referrer = module
 
@@ -165,31 +165,29 @@ const Module = module.exports = exports = class Module {
         case constants.types.MODULE:
           module._evaluate()
 
-          for (const name of Object.keys(module._exports)) {
-            names.push(name)
-          }
+          for (const name of Object.keys(module._exports)) names.add(name)
 
           break
 
         case constants.types.JSON:
-          for (const name of Object.keys(module._exports)) {
-            names.push(name)
-          }
+          for (const name of Object.keys(module._exports)) names.add(name)
       }
     }
 
-    this._names = names
+    this._names = Array.from(names)
 
     this._handle = binding.createSyntheticModule(this._url.href, this._names, Module._handle)
   }
 
+  _run () {
+    binding.runModule(this._handle, Module._handle, Module._onrejection)
+  }
+
   _evaluate (eagerRun = false) {
     if ((this._state & constants.states.EVALUATED) !== 0) return
 
     this._state |= constants.states.EVALUATED
 
-    let result
-
     if (this._type === constants.types.SCRIPT) {
       const require = createRequire(this._url, { module: this })
 
@@ -205,23 +203,17 @@ const Module = module.exports = exports = class Module {
         urlToDirname(this._url)
       )
 
-      if (eagerRun) result = binding.runModule(this._handle, Module._handle)
+      if (eagerRun) this._run()
     }
 
     if (this._type === constants.types.MODULE) {
-      result = binding.runModule(this._handle, Module._handle)
+      this._run()
 
       this._exports = binding.getNamespace(this._handle)
     }
 
     if (this._type === constants.types.ADDON) {
-      if (eagerRun) result = binding.runModule(this._handle, Module._handle)
-    }
-
-    if (result && result.error) {
-      result.catch(() => {}) // Handle the promise rejection
-
-      throw result.error
+      if (eagerRun) this._run()
     }
   }
 
@@ -296,7 +288,21 @@ const Module = module.exports = exports = class Module {
     module._evaluate()
 
     for (const name of module._names) {
-      binding.setExport(module._handle, name, name === 'default' ? module._exports : module._exports[name])
+      let value
+
+      if (
+        name === 'default' && (
+          typeof module._exports !== 'object' ||
+          module._exports === null ||
+          name in module._exports === false
+        )
+      ) {
+        value = module._exports
+      } else {
+        value = module._exports[name]
+      }
+
+      binding.setExport(module._handle, name, value)
     }
   }
 
@@ -337,6 +343,12 @@ const Module = module.exports = exports = class Module {
     }
   }
 
+  static _onrejection (promise, err) {
+    promise.catch(() => {}) // Don't leak the rejection
+
+    throw err
+  }
+
   static Protocol = Protocol
   static Bundle = Bundle
   static constants = constants

package/package.json

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