bare-module 4.8.6 → 5.0.1

package/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 4.0)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
 

package/README.md

@@ -268,7 +268,6 @@ The flags for the current state of a module.
 | :------------ | :------------------------------------------- |
 | `EVALUATED`   | The module has been evaluated.               |
 | `SYNTHESIZED` | The module named exports have been detected. |
-| `DESTROYED`   | The module has been unloaded.                |
 
 #### `Module.constants.types`
 
@@ -290,6 +289,9 @@ The default `ModuleProtocol` class for resolving, reading and loading modules. S
 
 The global cache of loaded modules.
 
+> [!WARNING]
+> The cache may contain `Module` instances from several independent versions of `bare-module` as the cache is inherited through the module graph.
+
 #### `const url = Module.resolve(specifier, parentURL[, options])`
 
 Resolve the module `specifier` relative to the `parentURL`. `specifier` is a string and `parentURL` is a WHATWG `URL`.
@@ -454,10 +456,6 @@ An array of conditions used to resolve dependencies while loading the module. Se
 
 The `ModuleProtocol` class used for resolving, reading and loading modules. See [Protocols](#protocols).
 
-#### `module.destroy()`
-
-Unloads the module.
-
 ### CommonJS modules
 
 #### `require(specifier[, options])`
@@ -635,13 +633,6 @@ methods = {
   // A function that returns the source code of a URL represented as a string or
   // buffer.
   read,
-  // function (url): object
-  // A function that returns the evaluated exports for the url. This is
-  // only called for Javascript modules (extensions `.js`, `.cjs` & `.mjs`)
-  // by default. If defined, this function will skip calling `read()` and
-  // evaluating the source method for the default implementations of the
-  // Javascript extensions.
-  load,
   // function (url): URL
   // A function used to post process URLs for addons before `postresolve()`.
   addon,
@@ -651,12 +642,6 @@ methods = {
 }
 ```
 
-### Bundles
-
-#### `const bundle = new Module.Bundle()`
-
-See <https://github.com/holepunchto/bare-bundle>.
-
 ## License
 
 Apache-2.0

package/binding.c

@@ -9,6 +9,7 @@
 #include <uv.h>
 
 typedef struct {
+  js_env_t *env;
   js_ref_t *ctx;
   js_ref_t *on_import;
   js_ref_t *on_evaluate;
@@ -192,6 +193,27 @@ err:
   assert(err == 0);
 }
 
+static void
+bare_module__on_teardown(void *data) {
+  int err;
+
+  bare_module_context_t *context = data;
+
+  js_env_t *env = context->env;
+
+  err = js_delete_reference(env, context->on_import);
+  assert(err == 0);
+
+  err = js_delete_reference(env, context->on_evaluate);
+  assert(err == 0);
+
+  err = js_delete_reference(env, context->on_meta);
+  assert(err == 0);
+
+  err = js_delete_reference(env, context->ctx);
+  assert(err == 0);
+}
+
 static js_value_t *
 bare_module_init(js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -208,7 +230,9 @@ bare_module_init(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t *result;
   err = js_create_unsafe_arraybuffer(env, sizeof(bare_module_context_t), (void **) &context, &result);
-  if (err < 0) return NULL;
+  assert(err == 0);
+
+  context->env = env;
 
   err = js_create_reference(env, argv[0], 1, &context->ctx);
   assert(err == 0);
@@ -222,41 +246,13 @@ bare_module_init(js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[3], 1, &context->on_meta);
   assert(err == 0);
 
-  err = js_on_dynamic_import(env, bare_module__on_dynamic_import, (void *) context);
-  assert(err == 0);
-
-  return result;
-}
-
-static js_value_t *
-bare_module_destroy(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);
+  err = js_add_teardown_callback(env, bare_module__on_teardown, context);
   assert(err == 0);
 
-  assert(argc == 1);
-
-  bare_module_context_t *context;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &context, NULL);
-  if (err < 0) return NULL;
-
-  err = js_delete_reference(env, context->on_import);
-  assert(err == 0);
-
-  err = js_delete_reference(env, context->on_evaluate);
-  assert(err == 0);
-
-  err = js_delete_reference(env, context->on_meta);
-  assert(err == 0);
-
-  err = js_delete_reference(env, context->ctx);
+  err = js_on_dynamic_import(env, bare_module__on_dynamic_import, (void *) context);
   assert(err == 0);
 
-  return NULL;
+  return result;
 }
 
 static js_value_t *
@@ -282,12 +278,8 @@ bare_module_create_function(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **args = malloc(sizeof(js_value_t *) * args_len);
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[1], args, args_len, 0, &fetched);
-
-  if (err < 0 || fetched != args_len) {
-    goto err;
-  }
+  err = js_get_array_elements(env, argv[1], args, args_len, 0, NULL);
+  if (err < 0) goto err;
 
   js_value_t *source = argv[2];
 
@@ -309,6 +301,16 @@ err:
   return NULL;
 }
 
+static void
+bare_module__on_finalize(js_env_t *env, void *data, void *finalize_hint) {
+  int err;
+
+  js_module_t *module = data;
+
+  err = js_delete_module(env, module);
+  assert(err == 0);
+}
+
 static js_value_t *
 bare_module_create_module(js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -341,7 +343,7 @@ bare_module_create_module(js_env_t *env, js_callback_info_t *info) {
   if (err < 0) return NULL;
 
   js_value_t *result;
-  err = js_create_external(env, (void *) module, NULL, NULL, &result);
+  err = js_create_external(env, (void *) module, bare_module__on_finalize, NULL, &result);
   if (err < 0) return NULL;
 
   return result;
@@ -370,12 +372,8 @@ bare_module_create_synthetic_module(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **export_names = malloc(sizeof(js_value_t *) * names_len);
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[1], export_names, names_len, 0, &fetched);
-
-  if (err < 0 || fetched != names_len) {
-    goto err;
-  }
+  err = js_get_array_elements(env, argv[1], export_names, names_len, 0, NULL);
+  if (err < 0) goto err;
 
   bare_module_context_t *context;
   err = js_get_arraybuffer_info(env, argv[2], (void **) &context, NULL);
@@ -386,7 +384,7 @@ bare_module_create_synthetic_module(js_env_t *env, js_callback_info_t *info) {
   if (err < 0) goto err;
 
   js_value_t *result;
-  err = js_create_external(env, (void *) module, NULL, NULL, &result);
+  err = js_create_external(env, (void *) module, bare_module__on_finalize, NULL, &result);
   if (err < 0) goto err;
 
   free(export_names);
@@ -399,28 +397,6 @@ 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;
@@ -603,7 +579,8 @@ bare_module_realpath(js_env_t *env, js_callback_info_t *info) {
   return result;
 
 err:
-  js_throw_error(env, uv_err_name(err), uv_strerror(err));
+  err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
+  assert(err == 0);
 
   return NULL;
 }
@@ -681,7 +658,8 @@ bare_module_read(js_env_t *env, js_callback_info_t *info) {
   return result;
 
 err:
-  js_throw_error(env, uv_err_name(err), uv_strerror(err));
+  err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
+  assert(err == 0);
 
   return NULL;
 }
@@ -700,12 +678,10 @@ bare_module_exports(js_env_t *env, js_value_t *exports) {
   }
 
   V("init", bare_module_init)
-  V("destroy", bare_module_destroy)
 
   V("createFunction", bare_module_create_function)
   V("createModule", bare_module_create_module)
   V("createSyntheticModule", bare_module_create_synthetic_module)
-  V("deleteModule", bare_module_delete_module)
   V("setExport", bare_module_set_export)
   V("runModule", bare_module_run_module)
   V("getNamespace", bare_module_get_namespace)

package/index.d.ts

@@ -57,8 +57,6 @@ interface Module {
   readonly resolutions: ResolutionsMap
   readonly type: number
   readonly url: URL
-
-  destroy(): void
 }
 
 declare class Module {
@@ -87,7 +85,6 @@ declare namespace Module {
     type LoadOptions,
     type ResolveOptions,
     Protocol,
-    Bundle,
     constants
   }
 

package/index.js

@@ -8,17 +8,22 @@ const constants = require('./lib/constants')
 const errors = require('./lib/errors')
 const binding = require('./binding')
 
+const kind = Symbol.for('bare.module.kind')
+
 const isWindows = Bare.platform === 'win32'
 
 const { startsWithWindowsDriveLetter } = resolve
 
 module.exports = exports = class Module {
+  static get [kind]() {
+    return 0 // Compatibility version
+  }
+
   constructor(url) {
     this._url = url
     this._state = 0
     this._type = 0
-    this._defaultType = this._type
-    this._cache = null
+    this._defaultType = 0
     this._main = null
     this._exports = null
     this._imports = null
@@ -26,28 +31,23 @@ module.exports = exports = class Module {
     this._builtins = null
     this._conditions = null
     this._protocol = null
-    this._bundle = null
+    this._cache = null
+    this._source = null
     this._function = null
     this._names = null
     this._handle = null
 
     Object.preventExtensions(this)
+  }
 
-    Module._modules.add(this)
+  get [kind]() {
+    return Module[kind]
   }
 
   get url() {
     return this._url
   }
 
-  get filename() {
-    return urlToPath(this._url)
-  }
-
-  get dirname() {
-    return urlToDirname(this._url)
-  }
-
   get type() {
     return this._type
   }
@@ -56,10 +56,6 @@ module.exports = exports = class Module {
     return this._defaultType
   }
 
-  get cache() {
-    return this._cache
-  }
-
   get main() {
     return this._main
   }
@@ -92,6 +88,20 @@ module.exports = exports = class Module {
     return this._protocol
   }
 
+  get cache() {
+    return this._cache
+  }
+
+  // For Node.js compatibility
+  get filename() {
+    return urlToPath(this._url)
+  }
+
+  // For Node.js compatibility
+  get dirname() {
+    return urlToDirname(this._url)
+  }
+
   // For Node.js compatibility
   get id() {
     return this.filename
@@ -102,17 +112,6 @@ module.exports = exports = class Module {
     return this.dirname
   }
 
-  destroy() {
-    this._state |= constants.states.DESTROYED
-
-    if (this._handle) {
-      binding.deleteModule(this._handle)
-      this._handle = null
-    }
-
-    Module._modules.delete(this)
-  }
-
   _transform(isImport, isDynamicImport) {
     if (isDynamicImport) {
       this._run()
@@ -145,7 +144,7 @@ module.exports = exports = class Module {
 
       switch (module._type) {
         case constants.types.SCRIPT: {
-          const result = lex(module._function.toString())
+          const result = lex(module._source)
 
           for (const { name } of result.exports) names.add(name)
 
@@ -205,7 +204,7 @@ module.exports = exports = class Module {
     this._state |= constants.states.EVALUATED
 
     if (this._type === constants.types.SCRIPT) {
-      const require = createRequire(this._url, { module: this })
+      const require = exports.createRequire(this._url, { module: this })
 
       this._exports = {}
 
@@ -254,7 +253,6 @@ module.exports = exports = class Module {
   static _extensions = Object.create(null)
   static _protocol = null
   static _cache = module.cache || Object.create(null)
-  static _modules = new Set()
   static _conditions = ['bare', 'node', Bare.platform, Bare.arch]
 
   static _handle = binding.init(
@@ -405,7 +403,6 @@ module.exports = exports = class Module {
     const {
       isImport = false,
       isDynamicImport = false,
-
       referrer = null,
       attributes,
       type = typeForAttributes(attributes),
@@ -449,6 +446,27 @@ module.exports = exports = class Module {
           module._builtins = builtins
           module._conditions = conditions
 
+          if (
+            typeof attributes === 'object' &&
+            attributes !== null &&
+            typeof attributes.imports === 'string'
+          ) {
+            const resolved = self.resolve(attributes.imports, url, {
+              referrer: module
+            })
+
+            const imports = self.load(resolved, {
+              referrer: module,
+              type: constants.types.JSON
+            })
+
+            module._imports = mixinImports(
+              module._imports,
+              imports._exports,
+              resolved
+            )
+          }
+
           let extension =
             canonicalExtensionForType(type) || path.extname(url.pathname)
 
@@ -483,7 +501,6 @@ module.exports = exports = class Module {
 
     const {
       isImport = false,
-
       referrer = null,
       attributes,
       type = typeForAttributes(attributes),
@@ -691,8 +708,21 @@ function typeForAttributes(attributes) {
   }
 }
 
+function mixinImports(target, imports, url) {
+  if (typeof imports === 'object' && imports !== null && 'imports' in imports) {
+    imports = imports.imports
+  }
+
+  if (typeof imports !== 'object' || imports === null) {
+    throw errors.INVALID_IMPORTS_MAP(
+      `Imports map at '${url.href}' is not valid`
+    )
+  }
+
+  return { ...target, ...imports }
+}
+
 exports.Protocol = Protocol
-exports.Bundle = Bundle
 
 exports.constants = constants
 
@@ -704,15 +734,11 @@ exports.isBuiltin = function isBuiltin() {
   return false
 }
 
-const createRequire = (exports.createRequire = function createRequire(
-  parentURL,
-  opts = {}
-) {
+exports.createRequire = function createRequire(parentURL, opts = {}) {
   const self = Module
 
   let {
     module = null,
-
     referrer = null,
     type = constants.types.SCRIPT,
     defaultType = referrer ? referrer._defaultType : constants.types.SCRIPT,
@@ -795,7 +821,7 @@ const createRequire = (exports.createRequire = function createRequire(
   }
 
   return require
-})
+}
 
 if (Bare.simulator) Module._conditions.push('simulator')
 
@@ -837,20 +863,18 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
   module._type = constants.types.SCRIPT
 
-  if (protocol.load) {
-    module._exports = protocol.load(module._url)
-  } else {
-    if (source === null) source = protocol.read(module._url)
+  if (source === null) source = protocol.read(module._url)
 
-    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+  if (typeof source === 'string') source = Buffer.from(source)
 
-    module._function = binding.createFunction(
-      module._url.href,
-      ['require', 'module', 'exports', '__filename', '__dirname'],
-      source,
-      0
-    )
-  }
+  module._source = source
+
+  module._function = binding.createFunction(
+    module._url.href,
+    ['require', 'module', 'exports', '__filename', '__dirname'],
+    source.toString(),
+    0
+  )
 }
 
 Module._extensions['.mjs'] = function (module, source, referrer) {
@@ -860,20 +884,18 @@ Module._extensions['.mjs'] = function (module, source, referrer) {
 
   module._type = constants.types.MODULE
 
-  if (protocol.load) {
-    module._exports = protocol.load(module._url)
-  } else {
-    if (source === null) source = protocol.read(module._url)
+  if (source === null) source = protocol.read(module._url)
 
-    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+  if (typeof source === 'string') source = Buffer.from(source)
 
-    module._handle = binding.createModule(
-      module._url.href,
-      source,
-      0,
-      self._handle
-    )
-  }
+  module._source = source
+
+  module._handle = binding.createModule(
+    module._url.href,
+    source.toString(),
+    0,
+    self._handle
+  )
 }
 
 Module._extensions['.json'] = function (module, source, referrer) {
@@ -881,15 +903,12 @@ Module._extensions['.json'] = function (module, source, referrer) {
 
   module._type = constants.types.JSON
 
-  if (protocol.load) {
-    module._exports = protocol.load(module._url)
-  } else {
-    if (source === null) source = protocol.read(module._url)
+  if (source === null) source = protocol.read(module._url)
 
-    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+  if (typeof source === 'string') source = Buffer.from(source)
 
-    module._exports = JSON.parse(source)
-  }
+  module._source = source
+  module._exports = JSON.parse(source.toString())
 }
 
 Module._extensions['.bare'] = function (module, source, referrer) {
@@ -923,7 +942,7 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
 
   const bundle = Bundle.from(source).mount(module._url.href + '/')
 
-  module._bundle = bundle
+  module._source = source
   module._imports = bundle.imports
   module._resolutions = bundle.resolutions
 
@@ -959,7 +978,7 @@ Module._extensions['.bin'] = function (module, source, referrer) {
 
   if (typeof source === 'string') source = Buffer.from(source)
 
-  module._exports = source
+  module._source = module._exports = source
 }
 
 Module._extensions['.txt'] = function (module, source, referrer) {
@@ -969,9 +988,10 @@ Module._extensions['.txt'] = function (module, source, referrer) {
 
   if (source === null) source = protocol.read(module._url)
 
-  if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+  if (typeof source === 'string') source = Buffer.from(source)
 
-  module._exports = source
+  module._source = source
+  module._exports = source.toString()
 }
 
 Module._protocol = new Protocol({
@@ -1012,14 +1032,6 @@ Module._protocol = new Protocol({
   }
 })
 
-Bare.prependListener('teardown', () => {
-  for (const module of Module._modules) {
-    module.destroy()
-  }
-
-  binding.destroy(Module._handle)
-})
-
 function toURL(value, base) {
   if (isURL(value)) return value
 

package/lib/constants.d.ts

@@ -3,7 +3,6 @@ declare const constants: {
     EVALUATED: number
     SYNTHESIZED: number
     RUN: number
-    DESTROYED: number
   }
   types: {
     SCRIPT: number

package/lib/constants.js

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

package/lib/errors.js

@@ -52,6 +52,14 @@ module.exports = class ModuleError extends Error {
     )
   }
 
+  static INVALID_IMPORTS_MAP(msg) {
+    return new ModuleError(
+      msg,
+      'INVALID_IMPORTS_MAP',
+      ModuleError.INVALID_IMPORTS_MAP
+    )
+  }
+
   static TYPE_INCOMPATIBLE(msg) {
     return new ModuleError(
       msg,

package/lib/protocol.js

@@ -6,7 +6,6 @@ module.exports = class ModuleProtocol {
       'resolve',
       'exists',
       'read',
-      'load',
       'addon',
       'asset'
     ]) {

package/package.json

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