bare-module 4.6.3 → 4.7.1

package/index.js

@@ -13,8 +13,8 @@ const isWindows = Bare.platform === 'win32'
 
 const { startsWithWindowsDriveLetter } = resolve
 
-const Module = module.exports = exports = class Module {
-  constructor (url) {
+module.exports = exports = class Module {
+  constructor(url) {
     this._url = url
     this._state = 0
     this._type = 0
@@ -37,73 +37,73 @@ const Module = module.exports = exports = class Module {
     Module._modules.add(this)
   }
 
-  get url () {
+  get url() {
     return this._url
   }
 
-  get filename () {
+  get filename() {
     return urlToPath(this._url)
   }
 
-  get dirname () {
+  get dirname() {
     return urlToDirname(this._url)
   }
 
-  get type () {
+  get type() {
     return this._type
   }
 
-  get defaultType () {
+  get defaultType() {
     return this._defaultType
   }
 
-  get cache () {
+  get cache() {
     return this._cache
   }
 
-  get main () {
+  get main() {
     return this._main
   }
 
-  get exports () {
+  get exports() {
     return this._exports
   }
 
-  set exports (value) {
+  set exports(value) {
     this._exports = value
   }
 
-  get imports () {
+  get imports() {
     return this._imports
   }
 
-  get resolutions () {
+  get resolutions() {
     return this._resolutions
   }
 
-  get builtins () {
+  get builtins() {
     return this._builtins
   }
 
-  get conditions () {
+  get conditions() {
     return Array.from(this._conditions)
   }
 
-  get protocol () {
+  get protocol() {
     return this._protocol
   }
 
   // For Node.js compatibility
-  get id () {
+  get id() {
     return this.filename
   }
 
   // For Node.js compatibility
-  get path () {
+  get path() {
     return this.dirname
   }
 
-  destroy () {
+  destroy() {
     this._state |= constants.states.DESTROYED
 
     if (this._handle) {
@@ -114,11 +114,11 @@ const Module = module.exports = exports = class Module {
     Module._modules.delete(this)
   }
 
-  _run () {
+  _run() {
     binding.runModule(this._handle, Module._handle, Module._onrun)
   }
 
-  _transform (isImport, isDynamicImport) {
+  _transform(isImport, isDynamicImport) {
     if (isDynamicImport) {
       this._synthesize()
       this._evaluate(true /* eagerRun */)
@@ -131,7 +131,7 @@ const Module = module.exports = exports = class Module {
     return this
   }
 
-  _synthesize () {
+  _synthesize() {
     if ((this._state & constants.states.SYNTHESIZED) !== 0) return
 
     this._state |= constants.states.SYNTHESIZED
@@ -159,9 +159,15 @@ const Module = module.exports = exports = class Module {
 
           for (const { specifier, type } of result.imports) {
             if (type & lex.constants.REEXPORT) {
-              const resolved = Module.resolve(specifier, referrer._url, { isImport: true, referrer })
+              const resolved = Module.resolve(specifier, referrer._url, {
+                isImport: true,
+                referrer
+              })
 
-              const module = Module.load(resolved, { isImport: true, referrer })
+              const module = Module.load(resolved, {
+                isImport: true,
+                referrer
+              })
 
               if (module._names) {
                 for (const name of module._names) names.add(name)
@@ -188,10 +194,14 @@ const Module = 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 (eagerRun = false) {
+  _evaluate(eagerRun = false) {
     if ((this._state & constants.states.EVALUATED) !== 0) return
 
     this._state |= constants.states.EVALUATED
@@ -221,7 +231,7 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  [Symbol.for('bare.inspect')] () {
+  [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: Module },
 
@@ -243,23 +253,39 @@ const Module = module.exports = exports = class Module {
   static _modules = new Set()
   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 (href, attributes, referrerHref, isDynamicImport) {
+  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 '${href}' imported from '${referrerHref}'`)
+      throw errors.MODULE_NOT_FOUND(
+        `Cannot find referrer for module '${specifier}' imported from '${referrerHref}'`
+      )
     }
 
-    const url = this.resolve(href, referrer._url, { isImport: true, referrer, attributes })
+    const resolved = this.resolve(specifier, referrer._url, {
+      isImport: true,
+      referrer,
+      attributes
+    })
 
-    const module = this.load(url, { isImport: true, isDynamicImport, referrer, attributes })
+    const module = this.load(resolved, {
+      isImport: true,
+      isDynamicImport,
+      referrer,
+      attributes
+    })
 
     return module._handle
   }
 
-  static _onevaluate (href) {
+  static _onevaluate(href) {
     const module = this._cache[href] || null
 
     if (module === null) {
@@ -272,11 +298,10 @@ const Module = module.exports = exports = class Module {
       let value
 
       if (
-        name === 'default' && (
-          typeof module._exports !== 'object' ||
+        name === 'default' &&
+        (typeof module._exports !== 'object' ||
           module._exports === null ||
-          name in module._exports === false
-        )
+          name in module._exports === false)
       ) {
         value = module._exports
       } else {
@@ -287,7 +312,7 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static _onmeta (href, meta) {
+  static _onmeta(href, meta) {
     const self = Module
 
     const module = this._cache[href] || null
@@ -298,59 +323,76 @@ const Module = module.exports = exports = class Module {
 
     const referrer = module
 
-    addon.host = Bare.Addon.host
-
     meta.url = module._url.href
     meta.main = module._main === module
     meta.cache = module._cache
-    meta.resolve = resolve
-    meta.addon = addon
-    meta.asset = asset
-
-    function resolve (specifier, parentURL = referrer._url) {
-      const resolved = self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
-      switch (resolved.protocol) {
-        case 'builtin:': return resolved.pathname
-        default: return resolved.href
-      }
+    meta.resolve = function resolve(specifier, parentURL = referrer._url) {
+      return self.resolve(specifier, toURL(parentURL, referrer._url), {
+        referrer
+      }).href
     }
 
-    function addon (specifier = '.', parentURL = referrer._url) {
-      const resolved = Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
+    meta.addon = function addon(specifier = '.', parentURL = referrer._url) {
+      const resolved = Bare.Addon.resolve(
+        specifier,
+        toURL(parentURL, referrer._url),
+        { referrer }
+      )
 
       const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
 
-    function asset (specifier, parentURL = referrer._url) {
-      return self.asset(specifier, toURL(parentURL, referrer._url), { referrer }).href
+    meta.addon.resolve = function resolve(
+      specifier = '.',
+      parentURL = referrer._url
+    ) {
+      return Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), {
+        referrer
+      }).href
+    }
+
+    meta.addon.host = Bare.Addon.host
+
+    meta.asset = function asset(specifier, parentURL = referrer._url) {
+      return self.asset(specifier, toURL(parentURL, referrer._url), {
+        referrer
+      }).href
     }
   }
 
-  static _onrun (reason, promise, err = reason) {
+  static _onrun(reason, promise, err = reason) {
     if (err) {
       promise.catch(() => {}) // Don't leak the rejection
 
       throw err
     } else {
-      promise.catch((err) => queueMicrotask(() => { throw err }))
+      promise.catch((err) =>
+        queueMicrotask(() => {
+          throw err
+        })
+      )
     }
   }
 
-  static get protocol () {
+  static get protocol() {
     return this._protocol
   }
 
-  static get cache () {
+  static get cache() {
     return this._cache
   }
 
-  static load (url, source = null, opts = {}) {
+  static load(url, source = null, opts = {}) {
     const self = Module
 
-    if (!ArrayBuffer.isView(source) && typeof source !== 'string' && source !== null) {
+    if (
+      !ArrayBuffer.isView(source) &&
+      typeof source !== 'string' &&
+      source !== null
+    ) {
       opts = source
       source = null
     }
@@ -376,7 +418,9 @@ const Module = module.exports = exports = class Module {
 
     if (module !== null) {
       if (type !== 0 && type !== module._type) {
-        throw errors.TYPE_INCOMPATIBLE(`Module '${module.url.href}' is not of type '${nameOfType(type)}'`)
+        throw errors.TYPE_INCOMPATIBLE(
+          `Module '${module.url.href}' is not of type '${nameOfType(type)}'`
+        )
       }
 
       return module._transform(isImport, isDynamicImport)
@@ -400,10 +444,12 @@ const Module = module.exports = exports = class Module {
           module._builtins = builtins
           module._conditions = conditions
 
-          let extension = canonicalExtensionForType(type) || path.extname(url.pathname)
+          let extension =
+            canonicalExtensionForType(type) || path.extname(url.pathname)
 
           if (extension in self._extensions === false) {
-            if (defaultType) extension = canonicalExtensionForType(defaultType) || '.js'
+            if (defaultType)
+              extension = canonicalExtensionForType(defaultType) || '.js'
             else extension = '.js'
           }
 
@@ -419,11 +465,13 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static resolve (specifier, parentURL, opts = {}) {
+  static resolve(specifier, parentURL, opts = {}) {
     const self = Module
 
     if (typeof specifier !== 'string') {
-      throw new TypeError(`Specifier must be a string. Received type ${typeof specifier} (${specifier})`)
+      throw new TypeError(
+        `Specifier must be a string. Received type ${typeof specifier} (${specifier})`
+      )
     }
 
     const {
@@ -446,18 +494,24 @@ const Module = module.exports = exports = class Module {
 
     if (resolution) return protocol.postresolve(resolution)
 
-    for (const resolution of resolve(resolved, parentURL, {
-      conditions: isImport ? ['import', ...conditions] : ['require', ...conditions],
-      imports,
-      resolutions,
-      extensions,
-      builtins: builtins ? Object.keys(builtins) : [],
-      engines: {
-        ...Bare.versions
-      }
-    }, readPackage)) {
+    for (const resolution of resolve(
+      resolved,
+      parentURL,
+      {
+        conditions: isImport
+          ? ['import', ...conditions]
+          : ['require', ...conditions],
+        imports,
+        resolutions,
+        extensions,
+        builtins: builtins ? Object.keys(builtins) : [],
+        engines: Bare.versions
+      },
+      readPackage
+    )) {
       switch (resolution.protocol) {
-        case 'builtin:': return resolution
+        case 'builtin:':
+          return resolution
         default:
           if (protocol.exists(resolution)) {
             return protocol.postresolve(resolution)
@@ -465,9 +519,11 @@ const Module = module.exports = exports = class Module {
       }
     }
 
-    throw errors.MODULE_NOT_FOUND(`Cannot find module '${specifier}' imported from '${parentURL.href}'`)
+    throw errors.MODULE_NOT_FOUND(
+      `Cannot find module '${specifier}' imported from '${parentURL.href}'`
+    )
 
-    function readPackage (packageURL) {
+    function readPackage(packageURL) {
       if (protocol.exists(packageURL)) {
         return Module.load(packageURL, { protocol })._exports
       }
@@ -476,11 +532,13 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static asset (specifier, parentURL, opts = {}) {
+  static asset(specifier, parentURL, opts = {}) {
     const self = Module
 
     if (typeof specifier !== 'string') {
-      throw new TypeError(`Specifier must be a string. Received type ${typeof specifier} (${specifier})`)
+      throw new TypeError(
+        `Specifier must be a string. Received type ${typeof specifier} (${specifier})`
+      )
     }
 
     const {
@@ -497,19 +555,29 @@ const Module = module.exports = exports = class Module {
 
     if (resolution) return protocol.postresolve(resolution)
 
-    for (const resolution of resolve(resolved, parentURL, {
-      conditions: ['asset', ...conditions],
-      imports,
-      resolutions
-    }, readPackage)) {
+    for (const resolution of resolve(
+      resolved,
+      parentURL,
+      {
+        conditions: ['asset', ...conditions],
+        imports,
+        resolutions,
+        engines: Bare.versions
+      },
+      readPackage
+    )) {
       if (protocol.exists(resolution)) {
-        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}'`)
+    throw errors.ASSET_NOT_FOUND(
+      `Cannot find asset '${specifier}' imported from '${parentURL.href}'`
+    )
 
-    function readPackage (packageURL) {
+    function readPackage(packageURL) {
       if (protocol.exists(packageURL)) {
         return Module.load(packageURL, { protocol })._exports
       }
@@ -519,7 +587,9 @@ const Module = module.exports = exports = class Module {
   }
 }
 
-function extensionsForType (type) {
+const Module = exports
+
+function extensionsForType(type) {
   switch (type) {
     case constants.types.SCRIPT:
       return ['.js', '.cjs']
@@ -540,7 +610,7 @@ function extensionsForType (type) {
   }
 }
 
-function canonicalExtensionForType (type) {
+function canonicalExtensionForType(type) {
   switch (type) {
     case constants.types.SCRIPT:
       return '.cjs'
@@ -561,7 +631,7 @@ function canonicalExtensionForType (type) {
   }
 }
 
-function nameOfType (type) {
+function nameOfType(type) {
   switch (type) {
     case constants.types.SCRIPT:
       return 'script'
@@ -582,7 +652,7 @@ function nameOfType (type) {
   }
 }
 
-function typeForAttributes (attributes) {
+function typeForAttributes(attributes) {
   if (typeof attributes !== 'object' || attributes === null) return 0
 
   switch (attributes.type) {
@@ -614,11 +684,14 @@ exports.constants = constants
 exports.builtinModules = []
 
 // For Node.js compatibility
-exports.isBuiltin = function isBuiltin () {
+exports.isBuiltin = function isBuiltin() {
   return false
 }
 
-const createRequire = exports.createRequire = function createRequire (parentURL, opts = {}) {
+const createRequire = (exports.createRequire = function createRequire(
+  parentURL,
+  opts = {}
+) {
   const self = Module
 
   let {
@@ -652,47 +725,61 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
 
   referrer = module
 
-  addon.host = Bare.Addon.host
-
-  require.main = module._main
-  require.cache = module._cache
-  require.resolve = resolve
-  require.addon = addon
-  require.asset = asset
-
-  return require
-
-  function require (specifier, opts = {}) {
+  function require(specifier, opts = {}) {
     const attributes = opts && opts.with
 
-    const resolved = self.resolve(specifier, referrer._url, { referrer, attributes })
+    const resolved = self.resolve(specifier, referrer._url, {
+      referrer,
+      attributes
+    })
 
     const module = self.load(resolved, { referrer, attributes })
 
     return module._exports
   }
 
-  function resolve (specifier, parentURL = referrer._url) {
-    const resolved = self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
+  require.main = module._main
+  require.cache = module._cache
 
-    switch (resolved.protocol) {
-      case 'builtin:': return resolved.pathname
-      default: return urlToPath(resolved)
-    }
+  require.resolve = function resolve(specifier, parentURL = referrer._url) {
+    return urlToPath(
+      self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
+    )
   }
 
-  function addon (specifier = '.', parentURL = referrer._url) {
-    const resolved = Bare.Addon.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 addon = Bare.Addon.load(resolved, { referrer })
 
     return addon._exports
   }
 
-  function asset (specifier, parentURL = referrer._url) {
-    return urlToPath(self.asset(specifier, toURL(parentURL, referrer._url), { referrer }))
+  require.addon.host = Bare.Addon.host
+
+  require.addon.resolve = function resolve(
+    specifier = '.',
+    parentURL = referrer._url
+  ) {
+    return urlToPath(
+      Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), {
+        referrer
+      })
+    )
   }
-}
+
+  require.asset = function asset(specifier, parentURL = referrer._url) {
+    return urlToPath(
+      self.asset(specifier, toURL(parentURL, referrer._url), { referrer })
+    )
+  }
+
+  return require
+})
 
 if (Bare.simulator) Module._conditions.push('simulator')
 
@@ -704,7 +791,9 @@ Module._extensions['.js'] = function (module, source, referrer) {
 
   let pkg
 
-  for (const packageURL of resolve.lookupPackageScope(module._url, { resolutions })) {
+  for (const packageURL of resolve.lookupPackageScope(module._url, {
+    resolutions
+  })) {
     if (self._cache[packageURL.href]) {
       pkg = self._cache[packageURL.href]
       break
@@ -718,13 +807,11 @@ Module._extensions['.js'] = function (module, source, referrer) {
 
   const info = (pkg && pkg._exports) || {}
 
-  const isESM = (
+  const isESM =
     // The default type is ES modules.
-    (constants.types.MODULE === module._defaultType) ||
-
+    constants.types.MODULE === module._defaultType ||
     // The package is explicitly declared as an ES module.
     (info && info.type === 'module')
-  )
 
   return self._extensions[isESM ? '.mjs' : '.cjs'](module, source, referrer)
 }
@@ -741,7 +828,12 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
     if (typeof source !== 'string') source = Buffer.coerce(source).toString()
 
-    module._function = binding.createFunction(module._url.href, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)
+    module._function = binding.createFunction(
+      module._url.href,
+      ['require', 'module', 'exports', '__filename', '__dirname'],
+      source,
+      0
+    )
   }
 }
 
@@ -759,7 +851,12 @@ Module._extensions['.mjs'] = function (module, source, referrer) {
 
     if (typeof source !== 'string') source = Buffer.coerce(source).toString()
 
-    module._handle = binding.createModule(module._url.href, source, 0, self._handle)
+    module._handle = binding.createModule(
+      module._url.href,
+      source,
+      0,
+      self._handle
+    )
   }
 }
 
@@ -808,27 +905,33 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
 
   referrer = module
 
-  const bundle = module._bundle = Bundle.from(source).mount(module._url.href + '/')
+  const bundle = (module._bundle = Bundle.from(source).mount(
+    module._url.href + '/'
+  ))
 
   module._imports = bundle.imports
   module._resolutions = bundle.resolutions
 
   module._protocol = protocol.extend({
-    postresolve (context, url) {
+    postresolve(context, url) {
       return bundle.exists(url.href) ? url : context.postresolve(url)
     },
 
-    exists (context, url) {
+    exists(context, url) {
       return bundle.exists(url.href) || context.exists(url)
     },
 
-    read (context, url) {
+    read(context, url) {
       return bundle.read(url.href) || context.read(url)
     }
   })
 
   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
   }
 }
 
@@ -857,7 +960,7 @@ Module._extensions['.txt'] = function (module, source, referrer) {
 }
 
 Module._protocol = new Protocol({
-  postresolve (url) {
+  postresolve(url) {
     switch (url.protocol) {
       case 'file:':
         return pathToFileURL(binding.realpath(fileURLToPath(url)))
@@ -866,7 +969,7 @@ Module._protocol = new Protocol({
     }
   },
 
-  exists (url) {
+  exists(url) {
     switch (url.protocol) {
       case 'file:':
         return binding.exists(fileURLToPath(url))
@@ -875,7 +978,7 @@ Module._protocol = new Protocol({
     }
   },
 
-  read (url) {
+  read(url) {
     switch (url.protocol) {
       case 'file:':
         return Buffer.from(binding.read(fileURLToPath(url)))
@@ -885,16 +988,15 @@ Module._protocol = new Protocol({
   }
 })
 
-Bare
-  .prependListener('teardown', () => {
-    for (const module of Module._modules) {
-      module.destroy()
-    }
+Bare.prependListener('teardown', () => {
+  for (const module of Module._modules) {
+    module.destroy()
+  }
 
-    binding.destroy(Module._handle)
-  })
+  binding.destroy(Module._handle)
+})
 
-function toURL (value, base) {
+function toURL(value, base) {
   if (isURL(value)) return value
 
   if (startsWithWindowsDriveLetter(value)) {
@@ -904,34 +1006,42 @@ function toURL (value, base) {
   return URL.parse(value, base) || pathToFileURL(value)
 }
 
-function urlToPath (url) {
+function urlToPath(url) {
   if (url.protocol === 'file:') return fileURLToPath(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'
+      )
     }
   }
 
   return decodeURIComponent(url.pathname)
 }
 
-function urlToDirname (url) {
+function urlToDirname(url) {
   if (url.protocol === 'file:') return path.dirname(fileURLToPath(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'
+      )
     }
   }
 
-  return decodeURIComponent((new URL('.', url)).pathname).replace(/\/$/, '')
+  return decodeURIComponent(new URL('.', url).pathname).replace(/\/$/, '')
 }