bare-module 3.0.4 → 3.0.6

package/index.js

@@ -166,7 +166,15 @@ const Module = module.exports = exports = class Module {
   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,
@@ -244,81 +252,6 @@ const Module = module.exports = exports = class Module {
     return this._cache
   }
 
-  // For Node.js compatibility
-  static get builtinModules () {
-    return []
-  }
-
-  // For Node.js compatibility
-  static isBuiltin () {
-    return false
-  }
-
-  static createRequire (parentURL, opts = {}) {
-    const self = Module
-
-    if (typeof parentURL === 'string') parentURL = new URL(parentURL, 'file:')
-
-    let {
-      referrer = null,
-      protocol = referrer ? referrer._protocol : self._protocols['file:'],
-      imports = referrer ? referrer._imports : null,
-      resolutions = referrer ? referrer._resolutions : null,
-      builtins = referrer ? referrer._builtins : null,
-      conditions = referrer ? referrer._conditions : self._conditions,
-      main = referrer ? referrer._main : null,
-      defaultType = referrer ? referrer._defaultType : constants.types.SCRIPT,
-      type = constants.types.SCRIPT
-    } = opts
-
-    const module = new Module(parentURL)
-
-    module._main = main || module
-    module._type = type
-    module._defaultType = defaultType
-    module._protocol = protocol
-    module._imports = imports
-    module._resolutions = resolutions
-    module._builtins = builtins
-    module._conditions = conditions
-
-    referrer = module
-
-    addon.host = Bare.Addon.host
-
-    require.main = module._main
-    require.cache = self._cache
-    require.resolve = resolve
-    require.addon = addon
-
-    return require
-
-    function require (specifier) {
-      const resolved = self.resolve(specifier, referrer._url, { referrer })
-
-      const module = self.load(resolved, { referrer })
-
-      return module._exports
-    }
-
-    function resolve (specifier) {
-      const resolved = self.resolve(specifier, referrer._url, { referrer })
-
-      switch (resolved.protocol) {
-        case 'builtin:': return resolved.pathname
-        default: return url.fileURLToPath(resolved)
-      }
-    }
-
-    function addon (specifier = '.') {
-      const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
-
-      const addon = Bare.Addon.load(resolved)
-
-      return addon._exports
-    }
-  }
-
   static load (url, source = null, opts = {}) {
     const self = Module
 
@@ -454,6 +387,79 @@ const Module = module.exports = exports = class Module {
   }
 }
 
+// For Node.js compatibility
+exports.builtinModules = []
+
+// For Node.js compatibility
+exports.isBuiltin = function isBuiltin () {
+  return false
+}
+
+exports.createRequire = function createRequire (parentURL, opts = {}) {
+  const self = Module
+
+  if (typeof parentURL === 'string') parentURL = new URL(parentURL, 'file:')
+
+  let {
+    referrer = null,
+    protocol = referrer ? referrer._protocol : self._protocols['file:'],
+    imports = referrer ? referrer._imports : null,
+    resolutions = referrer ? referrer._resolutions : null,
+    builtins = referrer ? referrer._builtins : null,
+    conditions = referrer ? referrer._conditions : self._conditions,
+    main = referrer ? referrer._main : null,
+    defaultType = referrer ? referrer._defaultType : constants.types.SCRIPT,
+    type = constants.types.SCRIPT
+  } = opts
+
+  const module = new Module(parentURL)
+
+  module._main = main || module
+  module._type = type
+  module._defaultType = defaultType
+  module._protocol = protocol
+  module._imports = imports
+  module._resolutions = resolutions
+  module._builtins = builtins
+  module._conditions = conditions
+
+  referrer = module
+
+  addon.host = Bare.Addon.host
+
+  require.main = module._main
+  require.cache = self._cache
+  require.resolve = resolve
+  require.addon = addon
+
+  return require
+
+  function require (specifier) {
+    const resolved = self.resolve(specifier, referrer._url, { referrer })
+
+    const module = self.load(resolved, { referrer })
+
+    return module._exports
+  }
+
+  function resolve (specifier) {
+    const resolved = self.resolve(specifier, referrer._url, { referrer })
+
+    switch (resolved.protocol) {
+      case 'builtin:': return resolved.pathname
+      default: return url.fileURLToPath(resolved)
+    }
+  }
+
+  function addon (specifier = '.') {
+    const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
+
+    const addon = Bare.Addon.load(resolved)
+
+    return addon._exports
+  }
+}
+
 Module._extensions['.js'] = function (module, source, referrer) {
   const self = Module
 

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.4",
+  "version": "3.0.6",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [