bare-module 1.9.5 → 1.10.0

package/binding.c

@@ -242,7 +242,7 @@ bare_module_create_module (js_env_t *env, js_callback_info_t *info) {
   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, NULL, NULL, &module);
   if (err < 0) return NULL;
 
   js_value_t *result;

package/index.js

@@ -92,12 +92,12 @@ const Module = module.exports = class Module {
 
     if (this._cache[specifier]) return this._transform(this._cache[specifier], referrer, dynamic)
 
-    const bundle = this._bundleFor(specifier, protocol, source)
+    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)
         },
@@ -149,12 +149,12 @@ const Module = module.exports = class Module {
       referrer = null
     } = opts
 
-    const bundle = this._bundleFor(specifier, protocol)
+    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 +180,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 +297,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)

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.5",
+  "version": "1.10.0",
   "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",