bare-module 1.13.4 → 1.14.0

package/binding.c

@@ -343,6 +343,28 @@ err:
   return NULL;
 }
 
+static js_value_t *
+bare_module_delete_module (js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 1;
+  js_value_t *argv[1];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  js_module_t *module;
+  err = js_get_value_external(env, argv[0], (void **) &module);
+  if (err < 0) return NULL;
+
+  err = js_delete_module(env, module);
+  assert(err == 0);
+
+  return NULL;
+}
+
 static js_value_t *
 bare_module_set_export (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -596,6 +618,11 @@ init (js_env_t *env, js_value_t *exports) {
     js_create_function(env, "createSyntheticModule", -1, bare_module_create_synthetic_module, NULL, &fn);
     js_set_named_property(env, exports, "createSyntheticModule", fn);
   }
+  {
+    js_value_t *fn;
+    js_create_function(env, "deleteModule", -1, bare_module_delete_module, NULL, &fn);
+    js_set_named_property(env, exports, "deleteModule", fn);
+  }
   {
     js_value_t *fn;
     js_create_function(env, "setExport", -1, bare_module_set_export, NULL, &fn);

package/index.js

@@ -59,6 +59,15 @@ module.exports = exports = class Module {
     return this.dirname
   }
 
+  destroy () {
+    this._state |= constants.states.DESTROYED
+
+    if (this._handle) {
+      binding.deleteModule(this._handle)
+      this._handle = null
+    }
+  }
+
   [Symbol.for('bare.inspect')] () {
     return {
       __proto__: { constructor: Module },
@@ -72,8 +81,6 @@ module.exports = exports = class Module {
     }
   }
 
-  static _context = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
-
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
   static _builtins = Object.create(null)
@@ -81,6 +88,16 @@ module.exports = exports = class Module {
   static _cache = Object.create(null)
   static _bundles = Object.create(null)
 
+  static _context = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
+
+  static _ondestroy () {
+    for (const specifier in this._cache) {
+      this._cache[specifier].destroy()
+    }
+
+    binding.destroy(this._context)
+  }
+
   static _onimport (specifier, assertions, referrerFilename, dynamic) {
     const referrer = this._cache[referrerFilename]
 
@@ -270,6 +287,10 @@ module.exports = exports = class Module {
         else extension = '.js'
       }
 
+      if (extension === '.bundle' && path.extname(specifier) !== extension) {
+        throw errors.INVALID_BUNDLE_EXTENSION(`Invalid extension for bundle '${specifier}'`)
+      }
+
       this._extensions[extension].call(this, module, source, referrer, protocol, imports)
     }
 
@@ -667,8 +688,4 @@ exports._protocols['data:'] = new Protocol({
   }
 })
 
-process.on('exit', () => binding.destroy(exports._context))
-
-if (process.thread) {
-  process.thread.on('exit', () => binding.destroy(exports._context))
-}
+process.on('exit', exports._ondestroy.bind(exports))

package/lib/constants.js

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

package/lib/errors.js

@@ -19,4 +19,8 @@ module.exports = class ModuleError extends Error {
   static UNKNOWN_PROTOCOL (msg) {
     return new ModuleError(msg, 'UNKNOWN_PROTOCOL', ModuleError.UNKNOWN_PROTOCOL)
   }
+
+  static INVALID_BUNDLE_EXTENSION (msg) {
+    return new ModuleError(msg, 'INVALID_BUNDLE_EXTENSION', ModuleError.INVALID_BUNDLE_EXTENSION)
+  }
 }

package/package.json

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