bare-module 6.0.0 → 6.1.0

package/index.d.ts

@@ -64,11 +64,7 @@ declare class Module {
   static readonly cache: Cache
 
   static load(url: URL, opts: LoadOptions): Module
-  static load(
-    url: URL,
-    source?: Buffer | string | Bundle | null,
-    opts?: LoadOptions
-  ): Module
+  static load(url: URL, source?: Buffer | string | Bundle | null, opts?: LoadOptions): Module
 
   static resolve(specifier: string, parentURL: URL, opts?: ResolveOptions): URL
 
@@ -115,10 +111,7 @@ declare namespace Module {
     asset: (specifier: string, parentURL?: URL) => string
   }
 
-  export function createRequire(
-    parentURL: string | URL,
-    opts?: CreateRequireOptions
-  ): Require
+  export function createRequire(parentURL: string | URL, opts?: CreateRequireOptions): Require
 }
 
 export = Module

package/index.js

@@ -192,11 +192,7 @@ module.exports = exports = class Module {
 
     this._names = Array.from(names)
 
-    this._handle = binding.createSyntheticModule(
-      this._url.href,
-      this._names,
-      Module._handle
-    )
+    this._handle = binding.createSyntheticModule(this._url.href, this._names, Module._handle)
   }
 
   _evaluate() {
@@ -211,13 +207,7 @@ module.exports = exports = class Module {
 
       const fn = this._function // Bind to variable to ensure proper stack trace
 
-      fn(
-        require,
-        this,
-        this._exports,
-        urlToPath(this._url),
-        urlToDirname(this._url)
-      )
+      fn(require, this, this._exports, urlToPath(this._url), urlToDirname(this._url))
     } else if (this._type === constants.types.MODULE) {
       this._run()
 
@@ -232,11 +222,7 @@ module.exports = exports = class Module {
 
     this._synthesize()
 
-    this._promise = binding.runModule(
-      this._handle,
-      Module._handle,
-      Module._onrun
-    )
+    this._promise = binding.runModule(this._handle, Module._handle, Module._onrun)
   }
 
   [Symbol.for('bare.inspect')]() {
@@ -256,23 +242,24 @@ module.exports = exports = class Module {
   }
 
   static _extensions = Object.create(null)
+
   static _protocol = null
-  static _cache = module.cache || Object.create(null)
+
+  static _cache =
+    module[kind] === Module[kind] ? module.cache || Object.create(null) : Object.create(null)
+
   static _conditions = ['bare', 'node', Bare.platform, Bare.arch]
 
-  static _handle = binding.init(
-    this,
-    this._onimport,
-    this._onevaluate,
-    this._onmeta
-  )
+  static _handle = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
   static _onimport(specifier, attributes, referrerHref, isDynamicImport) {
     const referrer = this._cache[referrerHref] || null
 
     if (referrer === null) {
       throw errors.MODULE_NOT_FOUND(
-        `Cannot find referrer for module '${specifier}' imported from '${referrerHref}'`
+        `Cannot find referrer for module '${specifier}' imported from '${referrerHref}'`,
+        specifier,
+        referrer
       )
     }
 
@@ -298,7 +285,7 @@ module.exports = exports = class Module {
     const module = this._cache[href] || null
 
     if (module === null) {
-      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`)
+      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`, href)
     }
 
     module._evaluate()
@@ -327,7 +314,7 @@ module.exports = exports = class Module {
     const module = this._cache[href] || null
 
     if (module === null) {
-      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`)
+      throw errors.MODULE_NOT_FOUND(`Cannot find module '${href}'`, href)
     }
 
     const referrer = module
@@ -343,21 +330,14 @@ module.exports = exports = class Module {
     }
 
     meta.addon = function addon(specifier = '.', parentURL = referrer._url) {
-      const resolved = Bare.Addon.resolve(
-        specifier,
-        toURL(parentURL, referrer._url),
-        { referrer }
-      )
+      const resolved = Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
       const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
 
-    meta.addon.resolve = function resolve(
-      specifier = '.',
-      parentURL = referrer._url
-    ) {
+    meta.addon.resolve = function resolve(specifier = '.', parentURL = referrer._url) {
       return Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), {
         referrer
       }).href
@@ -467,15 +447,10 @@ module.exports = exports = class Module {
               type: constants.types.JSON
             })
 
-            module._imports = mixinImports(
-              module._imports,
-              imports._exports,
-              resolved
-            )
+            module._imports = mixinImports(module._imports, imports._exports, resolved)
           }
 
-          let extension =
-            canonicalExtensionForType(type) || path.extname(url.pathname)
+          let extension = canonicalExtensionForType(type) || path.extname(url.pathname)
 
           if (extension in self._extensions === false) {
             if (defaultType) {
@@ -531,9 +506,7 @@ module.exports = exports = class Module {
       resolved,
       parentURL,
       {
-        conditions: isImport
-          ? ['import', ...conditions]
-          : ['require', ...conditions],
+        conditions: isImport ? ['import', ...conditions] : ['require', ...conditions],
         imports,
         resolutions,
         extensions,
@@ -561,7 +534,7 @@ module.exports = exports = class Module {
       message += '\n' + candidates.map((url) => '- ' + url.href).join('\n')
     }
 
-    throw errors.MODULE_NOT_FOUND(message, candidates)
+    throw errors.MODULE_NOT_FOUND(message, specifier, parentURL, candidates)
 
     function readPackage(packageURL) {
       if (protocol.exists(packageURL, constants.types.JSON)) {
@@ -595,6 +568,8 @@ module.exports = exports = class Module {
 
     if (resolution) return protocol.postresolve(resolution)
 
+    const candidates = []
+
     for (const resolution of resolve(
       resolved,
       parentURL,
@@ -606,16 +581,21 @@ module.exports = exports = class Module {
       },
       readPackage
     )) {
+      candidates.push(resolution)
+
       if (protocol.exists(resolution, constants.types.ASSET)) {
-        return protocol.postresolve(
-          protocol.asset ? protocol.asset(resolution) : resolution
-        )
+        return protocol.postresolve(protocol.asset ? protocol.asset(resolution) : resolution)
       }
     }
 
-    throw errors.ASSET_NOT_FOUND(
-      `Cannot find asset '${specifier}' imported from '${parentURL.href}'`
-    )
+    let message = `Cannot find asset '${specifier}' imported from '${parentURL.href}'`
+
+    if (candidates.length > 0) {
+      message += '\nCandidates:'
+      message += '\n' + candidates.map((url) => '- ' + url.href).join('\n')
+    }
+
+    throw errors.ASSET_NOT_FOUND(message, specifier, parentURL, candidates)
 
     function readPackage(packageURL) {
       if (protocol.exists(packageURL, constants.types.JSON)) {
@@ -721,9 +701,7 @@ function mixinImports(target, imports, url) {
   }
 
   if (typeof imports !== 'object' || imports === null) {
-    throw errors.INVALID_IMPORTS_MAP(
-      `Imports map at '${url.href}' is not valid`
-    )
+    throw errors.INVALID_IMPORTS_MAP(`Imports map at '${url.href}' is not valid`)
   }
 
   return { ...target, ...imports }
@@ -791,17 +769,11 @@ exports.createRequire = function createRequire(parentURL, opts = {}) {
   require.cache = module._cache
 
   require.resolve = function resolve(specifier, parentURL = referrer._url) {
-    return urlToPath(
-      self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
-    )
+    return urlToPath(self.resolve(specifier, toURL(parentURL, referrer._url), { referrer }))
   }
 
   require.addon = function addon(specifier = '.', parentURL = referrer._url) {
-    const resolved = Bare.Addon.resolve(
-      specifier,
-      toURL(parentURL, referrer._url),
-      { referrer }
-    )
+    const resolved = Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
     const addon = Bare.Addon.load(resolved, { referrer })
 
@@ -810,10 +782,7 @@ exports.createRequire = function createRequire(parentURL, opts = {}) {
 
   require.addon.host = Bare.Addon.host
 
-  require.addon.resolve = function resolve(
-    specifier = '.',
-    parentURL = referrer._url
-  ) {
+  require.addon.resolve = function resolve(specifier = '.', parentURL = referrer._url) {
     return urlToPath(
       Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), {
         referrer
@@ -822,9 +791,7 @@ exports.createRequire = function createRequire(parentURL, opts = {}) {
   }
 
   require.asset = function asset(specifier, parentURL = referrer._url) {
-    return urlToPath(
-      self.asset(specifier, toURL(parentURL, referrer._url), { referrer })
-    )
+    return urlToPath(self.asset(specifier, toURL(parentURL, referrer._url), { referrer }))
   }
 
   return require
@@ -897,12 +864,7 @@ Module._extensions['.mjs'] = function (module, source, referrer) {
 
   module._source = source
 
-  module._handle = binding.createModule(
-    module._url.href,
-    source.toString(),
-    0,
-    self._handle
-  )
+  module._handle = binding.createModule(module._url.href, source.toString(), 0, self._handle)
 }
 
 Module._extensions['.json'] = function (module, source, referrer) {
@@ -968,11 +930,9 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
   })
 
   if (bundle.main) {
-    module._exports = self.load(
-      new URL(bundle.main),
-      bundle.read(bundle.main),
-      { referrer }
-    )._exports
+    module._exports = self.load(new URL(bundle.main), bundle.read(bundle.main), {
+      referrer
+    })._exports
   }
 }
 
@@ -1005,9 +965,7 @@ Module._protocol = new Protocol({
   postresolve(url) {
     switch (url.protocol) {
       case 'file:':
-        return pathToFileURL(
-          binding.realpath(path.toNamespacedPath(fileURLToPath(url)))
-        )
+        return pathToFileURL(binding.realpath(path.toNamespacedPath(fileURLToPath(url))))
       default:
         return url
     }
@@ -1018,9 +976,7 @@ Module._protocol = new Protocol({
       case 'file:':
         return binding.exists(
           path.toNamespacedPath(fileURLToPath(url)),
-          type === constants.types.ASSET
-            ? binding.FILE | binding.DIR
-            : binding.FILE
+          type === constants.types.ASSET ? binding.FILE | binding.DIR : binding.FILE
         )
       default:
         return false
@@ -1030,9 +986,7 @@ Module._protocol = new Protocol({
   read(url) {
     switch (url.protocol) {
       case 'file:':
-        return Buffer.from(
-          binding.read(path.toNamespacedPath(fileURLToPath(url)))
-        )
+        return Buffer.from(binding.read(path.toNamespacedPath(fileURLToPath(url))))
       default:
         throw errors.UNKNOWN_PROTOCOL(`Cannot load module '${url.href}'`)
     }
@@ -1054,15 +1008,11 @@ function urlToPath(url) {
 
   if (isWindows) {
     if (/%2f|%5c/i.test(url.pathname)) {
-      throw errors.INVALID_URL_PATH(
-        'The URL path must not include encoded \\ or / characters'
-      )
+      throw errors.INVALID_URL_PATH('The URL path must not include encoded \\ or / characters')
     }
   } else {
     if (/%2f/i.test(url.pathname)) {
-      throw errors.INVALID_URL_PATH(
-        'The URL path must not include encoded / characters'
-      )
+      throw errors.INVALID_URL_PATH('The URL path must not include encoded / characters')
     }
   }
 
@@ -1074,15 +1024,11 @@ function urlToDirname(url) {
 
   if (isWindows) {
     if (/%2f|%5c/i.test(url.pathname)) {
-      throw errors.INVALID_URL_PATH(
-        'The URL path must not include encoded \\ or / characters'
-      )
+      throw errors.INVALID_URL_PATH('The URL path must not include encoded \\ or / characters')
     }
   } else {
     if (/%2f/i.test(url.pathname)) {
-      throw errors.INVALID_URL_PATH(
-        'The URL path must not include encoded / characters'
-      )
+      throw errors.INVALID_URL_PATH('The URL path must not include encoded / characters')
     }
   }
 

package/lib/errors.js

@@ -1,5 +1,5 @@
 module.exports = class ModuleError extends Error {
-  constructor(msg, code, fn = ModuleError) {
+  constructor(msg, fn = ModuleError, code = fn.name) {
     super(`${code}: ${msg}`)
     this.code = code
 
@@ -12,59 +12,43 @@ module.exports = class ModuleError extends Error {
     return 'ModuleError'
   }
 
-  static MODULE_NOT_FOUND(msg, candidates = []) {
-    const err = new ModuleError(
-      msg,
-      'MODULE_NOT_FOUND',
-      ModuleError.MODULE_NOT_FOUND
-    )
+  static MODULE_NOT_FOUND(msg, specifier, referrer = null, candidates = []) {
+    const err = new ModuleError(msg, ModuleError.MODULE_NOT_FOUND)
 
+    err.specifier = specifier
+    err.referrer = referrer
     err.candidates = candidates
 
     return err
   }
 
-  static ASSET_NOT_FOUND(msg) {
-    return new ModuleError(msg, 'ASSET_NOT_FOUND', ModuleError.ASSET_NOT_FOUND)
+  static ASSET_NOT_FOUND(msg, specifier, referrer = null, candidates = []) {
+    const err = new ModuleError(msg, ModuleError.ASSET_NOT_FOUND)
+
+    err.specifier = specifier
+    err.referrer = referrer
+    err.candidates = candidates
+
+    return err
   }
 
   static UNKNOWN_PROTOCOL(msg) {
-    return new ModuleError(
-      msg,
-      'UNKNOWN_PROTOCOL',
-      ModuleError.UNKNOWN_PROTOCOL
-    )
+    return new ModuleError(msg, ModuleError.UNKNOWN_PROTOCOL)
   }
 
   static INVALID_BUNDLE_EXTENSION(msg) {
-    return new ModuleError(
-      msg,
-      'INVALID_BUNDLE_EXTENSION',
-      ModuleError.INVALID_BUNDLE_EXTENSION
-    )
+    return new ModuleError(msg, ModuleError.INVALID_BUNDLE_EXTENSION)
   }
 
   static INVALID_URL_PATH(msg) {
-    return new ModuleError(
-      msg,
-      'INVALID_URL_PATH',
-      ModuleError.INVALID_URL_PATH
-    )
+    return new ModuleError(msg, ModuleError.INVALID_URL_PATH)
   }
 
   static INVALID_IMPORTS_MAP(msg) {
-    return new ModuleError(
-      msg,
-      'INVALID_IMPORTS_MAP',
-      ModuleError.INVALID_IMPORTS_MAP
-    )
+    return new ModuleError(msg, ModuleError.INVALID_IMPORTS_MAP)
   }
 
   static TYPE_INCOMPATIBLE(msg) {
-    return new ModuleError(
-      msg,
-      'TYPE_INCOMPATIBLE',
-      ModuleError.TYPE_INCOMPATIBLE
-    )
+    return new ModuleError(msg, ModuleError.TYPE_INCOMPATIBLE)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Module support for JavaScript",
   "exports": {
     ".": {
@@ -47,7 +47,7 @@
     "brittle": "^3.1.1",
     "cmake-bare": "^1.1.6",
     "prettier": "^3.3.3",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   },
   "peerDependencies": {
     "bare-buffer": "*"