bare-module 3.0.8 → 3.0.10

package/index.js

@@ -8,6 +8,8 @@ const constants = require('./lib/constants')
 const errors = require('./lib/errors')
 const binding = require('./binding')
 
+const { startsWithWindowsDriveLetter } = resolve
+
 const Module = module.exports = exports = class Module {
   constructor (url) {
     this._url = url
@@ -170,18 +172,18 @@ 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] || null
+  static _onimport (href, assertions, referrerHref, isDynamicImport) {
+    const referrer = this._cache[referrerHref] || null
 
     if (referrer === null) {
-      let msg = `Cannot find referrer for module '${specifier}'`
+      let msg = `Cannot find referrer for module '${href}'`
 
-      if (referrerURL) msg += ` imported from '${referrerURL}'`
+      if (referrerHref) msg += ` imported from '${referrerHref}'`
 
-      throw errors.REFERRER_MISSING(msg)
+      throw errors.MODULE_NOT_FOUND(msg)
     }
 
-    const url = this.resolve(specifier, referrer._url, {
+    const url = this.resolve(href, referrer._url, {
       isImport: true,
       referrer
     })
@@ -207,8 +209,12 @@ const Module = module.exports = exports = class Module {
     return module._handle
   }
 
-  static _onevaluate (specifier) {
-    const module = this._cache[specifier]
+  static _onevaluate (href) {
+    const module = this._cache[href] || null
+
+    if (module === null) {
+      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`)
+    }
 
     binding.setExport(module._handle, 'default', module._exports)
 
@@ -217,10 +223,14 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static _onmeta (specifier, meta) {
+  static _onmeta (href, meta) {
     const self = Module
 
-    const module = this._cache[specifier]
+    const module = this._cache[href] || null
+
+    if (module === null) {
+      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`)
+    }
 
     const referrer = module
 
@@ -282,9 +292,9 @@ const Module = module.exports = exports = class Module {
       conditions = referrer ? referrer._conditions : self._conditions
     } = opts
 
-    if (self._cache[url.href]) return self._cache[url.href]._transform(isImport, isDynamicImport)
+    if (cache[url.href]) return cache[url.href]._transform(isImport, isDynamicImport)
 
-    const module = self._cache[url.href] = new Module(url)
+    const module = cache[url.href] = new Module(url)
 
     switch (url.protocol) {
       case 'builtin:':
@@ -406,7 +416,13 @@ exports.isBuiltin = function isBuiltin () {
 exports.createRequire = function createRequire (parentURL, opts = {}) {
   const self = Module
 
-  if (typeof parentURL === 'string') parentURL = new URL(parentURL, 'file:')
+  if (typeof parentURL === 'string') {
+    if (startsWithWindowsDriveLetter(parentURL)) {
+      parentURL = '/' + parentURL
+    }
+
+    parentURL = new URL(parentURL, 'file:')
+  }
 
   let {
     referrer = null,

package/lib/errors.js

@@ -23,8 +23,4 @@ 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.8",
+  "version": "3.0.10",
   "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.4.0",
-    "bare-module-resolve": "^1.4.1",
+    "bare-module-resolve": "^1.4.4",
     "bare-path": "^2.0.0",
     "bare-url": "^0.3.4"
   },