bare-module 2.6.1 → 2.6.3

package/index.js

@@ -21,6 +21,7 @@ const Module = module.exports = exports = class Module {
     this._builtins = null
     this._conditions = null
     this._protocol = null
+    this._bundle = null
     this._handle = null
 
     Module._modules.add(this)
@@ -91,6 +92,59 @@ const Module = module.exports = exports = class Module {
     Module._modules.delete(this)
   }
 
+  _transform (referrer = null, dynamic = false) {
+    if (dynamic) {
+      this._synthesize()
+      this._evaluate()
+
+      return this
+    }
+
+    if (referrer) {
+      if (referrer._type === constants.types.MODULE) {
+        this._synthesize()
+      } else if (this._type === constants.types.MODULE) {
+        this._evaluate()
+      }
+
+      return this
+    }
+
+    if (this._type === constants.types.MODULE) {
+      this._evaluate()
+    }
+
+    return this
+  }
+
+  _evaluate () {
+    if ((this._state & constants.states.EVALUATED) !== 0) return
+
+    binding.runModule(this._handle, Module._handle)
+
+    if (this._type === constants.types.MODULE) {
+      this._exports = binding.getNamespace(this._handle)
+    }
+
+    this._state |= constants.states.EVALUATED
+  }
+
+  _synthesize () {
+    if ((this._state & constants.states.SYNTHESIZED) !== 0) return
+
+    if (this._type !== constants.types.MODULE) {
+      const names = ['default']
+
+      for (const key of Object.keys(this._exports)) {
+        if (key !== 'default') names.push(key)
+      }
+
+      this._handle = binding.createSyntheticModule(this._filename, names, Module._handle)
+    }
+
+    this._state |= constants.states.SYNTHESIZED
+  }
+
   [Symbol.for('bare.inspect')] () {
     return {
       __proto__: { constructor: Module },
@@ -110,7 +164,6 @@ const Module = module.exports = exports = class Module {
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
   static _cache = Object.create(null)
-  static _bundles = Object.create(null)
   static _modules = new Set()
   static _conditions = ['import', 'require', 'bare', 'node']
 
@@ -280,7 +333,7 @@ const Module = module.exports = exports = class Module {
       type = 0
     } = opts
 
-    if (self._cache[specifier]) return self._transform(self._cache[specifier], referrer, dynamic)
+    if (self._cache[specifier]) return self._cache[specifier]._transform(referrer, dynamic)
 
     const bundle = self._bundleFor(path.dirname(specifier), protocol)
 
@@ -324,7 +377,7 @@ const Module = module.exports = exports = class Module {
       self._extensions[extension](module, source, referrer)
     }
 
-    return self._transform(module, referrer, dynamic)
+    return module._transform(referrer, dynamic)
   }
 
   static resolve (specifier, dirname = os.cwd(), opts = {}) {
@@ -391,7 +444,7 @@ const Module = module.exports = exports = class Module {
           const path = url.fileURLToPath(resolution)
 
           if (protocol.exists(path)) {
-            return protocol.postresolve(resolution.pathname, dirname)
+            return protocol.postresolve(path, dirname)
           }
         }
       }
@@ -449,7 +502,7 @@ const Module = module.exports = exports = class Module {
     return protocol
   }
 
-  static _bundleFor (specifier, protocol, source = null) {
+  static _bundleFor (specifier, protocol) {
     let name = specifier
     do {
       if (path.extname(name) === '.bundle') {
@@ -461,76 +514,7 @@ const Module = module.exports = exports = class Module {
 
     if (path.extname(name) !== '.bundle') return null
 
-    let bundle = this._bundles[name]
-
-    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)
-
-    return bundle
-  }
-
-  static _transform (module, referrer = null, dynamic = false) {
-    if (dynamic) {
-      this._synthesize(module)
-      this._evaluate(module)
-    } else if (referrer) {
-      if (referrer._type === constants.types.MODULE) {
-        this._synthesize(module)
-      } else if (module._type === constants.types.MODULE) {
-        this._evaluate(module)
-      }
-    } else if (module._type === constants.types.MODULE) {
-      this._evaluate(module)
-    }
-
-    return module
-  }
-
-  static _evaluate (module) {
-    if ((module._state & constants.states.EVALUATED) !== 0) return
-
-    binding.runModule(module._handle, this._handle)
-
-    if (module._type === constants.types.MODULE) {
-      module._exports = binding.getNamespace(module._handle)
-    }
-
-    module._state |= constants.states.EVALUATED
-  }
-
-  static _synthesize (module) {
-    if ((module._state & constants.states.SYNTHESIZED) !== 0) return
-
-    if (module._type !== constants.types.MODULE) {
-      const names = ['default']
-
-      for (const key of Object.keys(module._exports)) {
-        if (key !== 'default') names.push(key)
-      }
-
-      module._handle = binding.createSyntheticModule(module._filename, names, this._handle)
-    }
-
-    module._state |= constants.states.SYNTHESIZED
+    return Module.load(name, { protocol })._bundle
   }
 }
 
@@ -687,9 +671,11 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
 
   if (typeof source === 'string') source = Buffer.from(source)
 
-  const bundle = self._bundleFor(module._filename, protocol, source)
+  const bundle = module._bundle = Bundle.from(source).mount(module._filename)
 
-  module._exports = self.load(bundle.main, bundle.read(bundle.main), { protocol, referrer })._exports
+  if (bundle.main) {
+    module._exports = self.load(bundle.main, bundle.read(bundle.main), { protocol, referrer })._exports
+  }
 }
 
 Module._protocols['file:'] = new Protocol({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/holepunchto/bare-module#readme",
   "dependencies": {
     "bare-bundle": "^0.3.0",
-    "bare-module-resolve": "^1.0.0",
+    "bare-module-resolve": "^1.2.6",
     "bare-os": "^2.0.0",
     "bare-path": "^2.0.0",
     "bare-url": "^0.3.4"