bare-module 5.0.3 → 6.0.1

package/binding.c

@@ -66,14 +66,14 @@ err:
   return NULL;
 }
 
-static js_module_t *
+static js_value_t *
 bare_module__on_dynamic_import(js_env_t *env, js_value_t *specifier, js_value_t *assertions, js_value_t *referrer, void *data) {
   bare_module_context_t *context = (bare_module_context_t *) data;
 
   int err;
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
+  js_escapable_handle_scope_t *scope;
+  err = js_open_escapable_handle_scope(env, &scope);
   assert(err == 0);
 
   js_value_t *ctx;
@@ -93,17 +93,16 @@ bare_module__on_dynamic_import(js_env_t *env, js_value_t *specifier, js_value_t
   err = js_call_function(env, ctx, on_import, 4, args, &result);
   if (err < 0) goto err;
 
-  js_module_t *module;
-  err = js_get_value_external(env, result, (void **) &module);
-  if (err < 0) goto err;
+  err = js_escape_handle(env, scope, result, &result);
+  assert(err == 0);
 
-  err = js_close_handle_scope(env, scope);
+  err = js_close_escapable_handle_scope(env, scope);
   assert(err == 0);
 
-  return module;
+  return result;
 
 err:
-  err = js_close_handle_scope(env, scope);
+  err = js_close_escapable_handle_scope(env, scope);
   assert(err == 0);
 
   return NULL;
@@ -249,7 +248,10 @@ bare_module_init(js_env_t *env, js_callback_info_t *info) {
   err = js_add_teardown_callback(env, bare_module__on_teardown, context);
   assert(err == 0);
 
-  err = js_on_dynamic_import(env, bare_module__on_dynamic_import, (void *) context);
+  err = js_on_dynamic_import(env, NULL, NULL);
+  assert(err == 0);
+
+  err = js_on_dynamic_import_transitional(env, bare_module__on_dynamic_import, (void *) context);
   assert(err == 0);
 
   return result;
@@ -477,7 +479,7 @@ bare_module_run_module(js_env_t *env, js_callback_info_t *info) {
     js_call_function(env, ctx, argv[2], 3, args, NULL);
   }
 
-  return NULL;
+  return promise;
 }
 
 static js_value_t *

package/index.js

@@ -16,7 +16,7 @@ const { startsWithWindowsDriveLetter } = resolve
 
 module.exports = exports = class Module {
   static get [kind]() {
-    return 0 // Compatibility version
+    return 1 // Compatibility version
   }
 
   constructor(url) {
@@ -35,6 +35,7 @@ module.exports = exports = class Module {
     this._source = null
     this._function = null
     this._names = null
+    this._promise = null
     this._handle = null
 
     Object.preventExtensions(this)
@@ -231,7 +232,11 @@ module.exports = exports = class Module {
 
     this._synthesize()
 
-    binding.runModule(this._handle, Module._handle, Module._onrun)
+    this._promise = binding.runModule(
+      this._handle,
+      Module._handle,
+      Module._onrun
+    )
   }
 
   [Symbol.for('bare.inspect')]() {
@@ -251,8 +256,14 @@ module.exports = exports = class Module {
   }
 
   static _extensions = Object.create(null)
+
   static _protocol = null
-  static _cache = module.cache || Object.create(null)
+
+  static _cache =
+    module[kind] === Module[kind]
+      ? module.cache || Object.create(null)
+      : Object.create(null)
+
   static _conditions = ['bare', 'node', Bare.platform, Bare.arch]
 
   static _handle = binding.init(
@@ -284,7 +295,9 @@ module.exports = exports = class Module {
       attributes
     })
 
-    return module._handle
+    return isDynamicImport
+      ? module._promise.then(() => binding.getNamespace(module._handle))
+      : module._handle
   }
 
   static _onevaluate(href) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "5.0.3",
+  "version": "6.0.1",
   "description": "Module support for JavaScript",
   "exports": {
     ".": {
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/holepunchto/bare-module#readme",
   "engines": {
-    "bare": ">=1.20.3"
+    "bare": ">=1.23.0"
   },
   "dependencies": {
     "bare-bundle": "^1.3.0",