bare-module 3.1.0 → 3.1.2

package/index.js

@@ -35,11 +35,11 @@ const Module = module.exports = exports = class Module {
   }
 
   get filename () {
-    return url.fileURLToPath(this._url)
+    return urlToPath(this._url)
   }
 
   get dirname () {
-    return path.dirname(url.fileURLToPath(this._url))
+    return urlToDirname(this._url)
   }
 
   get type () {
@@ -254,7 +254,7 @@ const Module = module.exports = exports = class Module {
     function addon (specifier = '.') {
       const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
 
-      const addon = Bare.Addon.load(resolved)
+      const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
@@ -473,14 +473,14 @@ exports.createRequire = function createRequire (parentURL, opts = {}) {
 
     switch (resolved.protocol) {
       case 'builtin:': return resolved.pathname
-      default: return url.fileURLToPath(resolved)
+      default: return urlToPath(resolved)
     }
   }
 
   function addon (specifier = '.') {
     const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
 
-    const addon = Bare.Addon.load(resolved)
+    const addon = Bare.Addon.load(resolved, { referrer })
 
     return addon._exports
   }
@@ -490,10 +490,11 @@ Module._extensions['.js'] = function (module, source, referrer) {
   const self = Module
 
   const protocol = module._protocol
+  const resolutions = module._resolutions
 
   let pkg
 
-  for (const packageURL of resolve.lookupPackageScope(module._url)) {
+  for (const packageURL of resolve.lookupPackageScope(module._url, { resolutions })) {
     if (self._cache[packageURL.href]) {
       pkg = self._cache[packageURL.href]
       break
@@ -543,7 +544,7 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
     module._exports = {}
 
-    const filename = url.fileURLToPath(module._url)
+    const filename = urlToPath(module._url)
 
     binding.createFunction(module._url.href, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)(
       require,
@@ -566,14 +567,14 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
       switch (resolved.protocol) {
         case 'builtin:': return resolved.pathname
-        default: url.fileURLToPath(resolved)
+        default: urlToPath(resolved)
       }
     }
 
     function addon (specifier = '.') {
       const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
 
-      const addon = Bare.Addon.load(resolved)
+      const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
@@ -617,13 +618,17 @@ Module._extensions['.json'] = function (module, source, referrer) {
 Module._extensions['.bare'] = function (module, source, referrer) {
   module._type = constants.types.ADDON
 
-  module._exports = Bare.Addon.load(module._url).exports
+  referrer = module
+
+  module._exports = Bare.Addon.load(module._url, { referrer }).exports
 }
 
 Module._extensions['.node'] = function (module, source, referrer) {
   module._type = constants.types.ADDON
 
-  module._exports = Bare.Addon.load(module._url).exports
+  referrer = module
+
+  module._exports = Bare.Addon.load(module._url, { referrer }).exports
 }
 
 Module._extensions['.bundle'] = function (module, source, referrer) {
@@ -681,3 +686,15 @@ Bare
 
     binding.destroy(Module._handle)
   })
+
+function urlToPath (u) {
+  return u.protocol === 'file:'
+    ? url.fileURLToPath(u)
+    : decodeURIComponent(u.pathname)
+}
+
+function urlToDirname (u) {
+  return u.protocol === 'file:'
+    ? path.dirname(url.fileURLToPath(u))
+    : decodeURIComponent((new URL('.', u)).pathname).replace(/\/$/, '')
+}

package/package.json

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