bare-module 3.0.5 → 3.0.7

package/index.js

@@ -14,6 +14,7 @@ const Module = module.exports = exports = class Module {
     this._state = 0
     this._type = 0
     this._defaultType = this._type
+    this._cache = null
     this._main = null
     this._exports = null
     this._imports = null
@@ -47,6 +48,10 @@ const Module = module.exports = exports = class Module {
     return this._defaultType
   }
 
+  get cache () {
+    return this._cache
+  }
+
   get main () {
     return this._main
   }
@@ -159,14 +164,22 @@ const Module = module.exports = exports = class Module {
 
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
-  static _cache = Object.create(null)
+  static _cache = module.cache || Object.create(null)
   static _modules = new Set()
   static _conditions = ['bare', 'node']
 
   static _handle = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
   static _onimport (specifier, assertions, referrerURL, isDynamicImport) {
-    const referrer = this._cache[referrerURL]
+    const referrer = this._cache[referrerURL] || null
+
+    if (referrer === null) {
+      let msg = `Cannot find referrer for module '${specifier}'`
+
+      if (referrerURL) msg += ` imported from '${referrerURL}'`
+
+      throw errors.REFERRER_MISSING(msg)
+    }
 
     const url = this.resolve(specifier, referrer._url, {
       isImport: true,
@@ -215,6 +228,7 @@ const Module = module.exports = exports = class Module {
 
     meta.url = module._url.href
     meta.main = module._main === module
+    meta.cache = module._cache
     meta.resolve = resolve
     meta.addon = addon
 
@@ -259,6 +273,7 @@ const Module = module.exports = exports = class Module {
       referrer = null,
       type = 0,
       defaultType = referrer ? referrer._defaultType : 0,
+      cache = referrer ? referrer._cache : self._cache,
       main = referrer ? referrer._main : null,
       protocol = referrer ? referrer._protocol : self._protocols['file:'],
       imports = referrer ? referrer._imports : null,
@@ -277,8 +292,9 @@ const Module = module.exports = exports = class Module {
         break
 
       default: {
-        module._main = main || module
         module._defaultType = defaultType
+        module._cache = cache
+        module._main = main || module
         module._protocol = protocol
         module._imports = imports
         module._resolutions = resolutions
@@ -420,7 +436,7 @@ exports.createRequire = function createRequire (parentURL, opts = {}) {
   addon.host = Bare.Addon.host
 
   require.main = module._main
-  require.cache = self._cache
+  require.cache = module._cache
   require.resolve = resolve
   require.addon = addon
 
@@ -503,7 +519,7 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
     addon.host = Bare.Addon.host
 
     require.main = module._main
-    require.cache = self._cache
+    require.cache = module._cache
     require.resolve = resolve
     require.addon = addon
 

package/lib/errors.js

@@ -23,4 +23,8 @@ module.exports = class ModuleError extends Error {
   static INVALID_BUNDLE_EXTENSION (msg) {
     return new ModuleError(msg, 'INVALID_BUNDLE_EXTENSION', ModuleError.INVALID_BUNDLE_EXTENSION)
   }
+
+  static REFERRER_MISSING (msg) {
+    return new ModuleError(msg, 'REFERRER_MISSING', ModuleError.REFERRER_MISSING)
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [