bare-module 1.13.3 → 1.13.5

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

@@ -8,12 +8,12 @@ const errors = require('./lib/errors')
 const binding = require('./binding')
 
 module.exports = exports = class Module {
-  constructor (filename, main) {
+  constructor (filename) {
+    this._filename = filename
     this._state = 0
     this._type = 0
     this._defaultType = this._type
-    this._filename = filename
-    this._main = main || this
+    this._main = null
     this._exports = null
     this._imports = null
     this._info = null
@@ -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]
 
@@ -164,18 +181,35 @@ module.exports = exports = class Module {
     return name in this._builtins
   }
 
-  static createRequire (filename) {
+  static createRequire (filename, opts = {}) {
+    const {
+      imports = this._imports,
+      protocol = this._protocolFor(filename, this._protocols['file:']),
+      type = constants.types.SCRIPT,
+      defaultType = constants.types.SCRIPT
+    } = opts
+
     const module = new Module(filename)
+
+    module._type = type
+    module._defaultType = defaultType
+    module._imports = imports
+    module._protocol = protocol
+
     const referrer = module
 
     const resolve = (specifier) => {
       return this.resolve(specifier, path.dirname(module._filename), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
         referrer
       })
     }
 
     const require = (specifier) => {
       const module = this.load(resolve(specifier), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
         referrer
       })
 
@@ -223,7 +257,7 @@ module.exports = exports = class Module {
       })
     }
 
-    const module = this._cache[specifier] = new this(specifier, main)
+    const module = this._cache[specifier] = new this(specifier)
 
     module._defaultType = defaultType
 
@@ -244,6 +278,8 @@ module.exports = exports = class Module {
     if (specifier in this._builtins) {
       module._exports = this._builtins[specifier]
     } else {
+      module._main = main || module
+
       let extension = this._extensionFor(type) || path.extname(specifier)
 
       if (extension in this._extensions === false) {
@@ -251,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)
     }
 
@@ -648,8 +688,8 @@ exports._protocols['data:'] = new Protocol({
   }
 })
 
-process.on('exit', () => binding.destroy(exports._context))
+process.on('exit', exports._ondestroy.bind(exports))
 
 if (process.thread) {
-  process.thread.on('exit', () => binding.destroy(exports._context))
+  process.thread.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.3",
+  "version": "1.13.5",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [