bare-module 1.9.6 → 1.10.1

package/binding.c

@@ -12,6 +12,7 @@ typedef struct {
   js_ref_t *ctx;
   js_ref_t *on_import;
   js_ref_t *on_evaluate;
+  js_ref_t *on_meta;
 } bare_module_context_t;
 
 static js_module_t *
@@ -109,17 +110,47 @@ on_evaluate (js_env_t *env, js_module_t *module, void *data) {
   if (err < 0) return;
 }
 
+static void
+on_meta (js_env_t *env, js_module_t *module, js_value_t *meta, void *data) {
+  bare_module_context_t *context = (bare_module_context_t *) data;
+
+  int err;
+
+  js_value_t *ctx;
+  err = js_get_reference_value(env, context->ctx, &ctx);
+  assert(err == 0);
+
+  js_value_t *on_meta;
+  err = js_get_reference_value(env, context->on_meta, &on_meta);
+  assert(err == 0);
+
+  const char *name;
+  err = js_get_module_name(env, module, &name);
+  assert(err == 0);
+
+  js_value_t *args[2];
+
+  err = js_create_string_utf8(env, (utf8_t *) name, -1, &args[0]);
+  if (err < 0) return;
+
+  args[1] = meta;
+
+  js_value_t *result;
+  err = js_call_function(env, ctx, on_meta, 2, args, &result);
+  if (err < 0) return;
+}
+
 static js_value_t *
 bare_module_init (js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 3;
-  js_value_t *argv[3];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 3);
+  assert(argc == 4);
 
   bare_module_context_t *context;
 
@@ -136,6 +167,9 @@ bare_module_init (js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[2], 1, &context->on_evaluate);
   assert(err == 0);
 
+  err = js_create_reference(env, argv[3], 1, &context->on_meta);
+  assert(err == 0);
+
   err = js_on_dynamic_import(env, on_dynamic_import, (void *) context);
   assert(err == 0);
 
@@ -222,13 +256,13 @@ static js_value_t *
 bare_module_create_module (js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 3;
-  js_value_t *argv[3];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 3);
+  assert(argc == 4);
 
   size_t file_len;
   utf8_t file[1024];
@@ -241,8 +275,12 @@ bare_module_create_module (js_env_t *env, js_callback_info_t *info) {
   err = js_get_value_int32(env, argv[2], &offset);
   if (err < 0) return NULL;
 
+  bare_module_context_t *context;
+  err = js_get_arraybuffer_info(env, argv[3], (void **) &context, NULL);
+  if (err < 0) return NULL;
+
   js_module_t *module;
-  err = js_create_module(env, (char *) file, file_len, offset, source, &module);
+  err = js_create_module(env, (char *) file, file_len, offset, source, on_meta, (void *) context, &module);
   if (err < 0) return NULL;
 
   js_value_t *result;

package/index.js

@@ -22,7 +22,7 @@ const Module = module.exports = class Module {
     return path.dirname(this.filename)
   }
 
-  static _context = binding.init(this, this._onimport, this._onevaluate)
+  static _context = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
@@ -70,6 +70,21 @@ const Module = module.exports = class Module {
     }
   }
 
+  static _onmeta (specifier, meta) {
+    const module = this._cache[specifier]
+
+    const resolve = (specifier) => {
+      return this.resolve(specifier, module.dirname, {
+        protocol: this._protocolFor(specifier, module._protocol),
+        imports: module._imports,
+        referrer: module
+      })
+    }
+
+    meta.url = module.filename
+    meta.resolve = resolve
+  }
+
   static Protocol = Protocol
   static Bundle = Bundle
 
@@ -95,9 +110,9 @@ const Module = module.exports = class Module {
     const bundle = this._bundleFor(path.dirname(specifier), protocol, source)
 
     if (bundle) {
-      imports = { ...imports, ...bundle.imports }
-
       protocol = new Protocol({
+        imports: bundle.imports,
+
         exists (filename) {
           return bundle.exists(filename)
         },
@@ -152,9 +167,9 @@ const Module = module.exports = class Module {
     const bundle = this._bundleFor(path.dirname(specifier), protocol)
 
     if (bundle) {
-      imports = { ...imports, ...bundle.imports }
-
       protocol = new Protocol({
+        imports: bundle.imports,
+
         exists (filename) {
           return bundle.exists(filename)
         },
@@ -180,6 +195,7 @@ const Module = module.exports = class Module {
 
   static * _resolve (specifier, dirname, protocol, imports) {
     if (specifier in imports) specifier = imports[specifier]
+    else if (specifier in protocol.imports) specifier = protocol.imports[specifier]
 
     protocol = this._protocolFor(specifier, protocol)
 
@@ -296,6 +312,22 @@ const Module = module.exports = class Module {
 
     if (bundle) return bundle
 
+    const parent = this._bundleFor(path.dirname(name), protocol)
+
+    if (parent) {
+      protocol = new Protocol({
+        imports: parent.imports,
+
+        exists (filename) {
+          return parent.exists(filename)
+        },
+
+        read (filename) {
+          return parent.read(filename)
+        }
+      })
+    }
+
     if (source === null || name !== specifier) source = protocol.read(name)
 
     bundle = this._bundles[name] = Bundle.from(source).mount(name)
@@ -416,7 +448,7 @@ Module._extensions['.mjs'] = function (module, source, referrer, protocol, impor
   module._protocol = protocol
   module._imports = imports
 
-  module._handle = binding.createModule(module.filename, source, 0)
+  module._handle = binding.createModule(module.filename, source, 0, this._context)
 }
 
 Module._extensions['.json'] = function (module, source, referrer, protocol, imports) {

package/lib/protocol.js

@@ -1,12 +1,15 @@
 module.exports = class Protocol {
   constructor (opts = {}) {
     const {
+      imports = Object.create(null),
       map = null,
       resolve = null,
       exists = null,
       read = null
     } = opts
 
+    this.imports = imports
+
     if (map) this.map = map.bind(this)
     if (resolve) this.resolve = resolve.bind(this)
     else this.resolve = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "1.9.6",
+  "version": "1.10.1",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [
@@ -12,9 +12,7 @@
     "prebuilds"
   ],
   "scripts": {
-    "test": "standard && bare test.js",
-    "install": "bare-dev rebuild",
-    "prebuild": "bare-dev prebuild"
+    "test": "standard && bare test.js"
   },
   "repository": {
     "type": "git",