bare-module 1.14.8 → 2.0.1

package/binding.js

@@ -1 +1 @@
-module.exports = process.addon(__dirname)
+module.exports = require.addon()

package/index.js

@@ -1,13 +1,14 @@
-const path = require('path')
-const os = require('os')
-const Addon = require('addon')
+/* global Bare */
+const path = require('bare-path')
+const os = require('bare-os')
 const Bundle = require('bare-bundle')
 const Protocol = require('./lib/protocol')
 const constants = require('./lib/constants')
 const errors = require('./lib/errors')
 const binding = require('./binding')
+const addon = require.addon.bind(require)
 
-module.exports = exports = class Module {
+const Module = module.exports = exports = class Module {
   constructor (filename) {
     this._filename = filename
     this._state = 0
@@ -87,7 +88,6 @@ module.exports = exports = class Module {
 
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
-  static _builtins = Object.create(null)
   static _imports = Object.create(null)
   static _cache = Object.create(null)
   static _bundles = Object.create(null)
@@ -170,14 +170,6 @@ module.exports = exports = class Module {
     return this._cache
   }
 
-  static get builtinModules () {
-    return Object.keys(this._builtins)
-  }
-
-  static isBuiltin (name) {
-    return name in this._builtins
-  }
-
   static createRequire (filename, opts = {}) {
     const {
       imports = this._imports,
@@ -216,6 +208,7 @@ module.exports = exports = class Module {
     require.main = module._main
     require.cache = this._cache
     require.resolve = resolve
+    require.addon = (specifier = path.dirname(module._filename)) => addon(specifier)
 
     return require
   }
@@ -274,25 +267,21 @@ module.exports = exports = class Module {
       dirname = path.dirname(dirname)
     } while (dirname !== path.sep && dirname !== '.')
 
-    if (specifier in this._builtins) {
-      module._exports = this._builtins[specifier]
-    } else {
-      module._main = main || module
-
-      let extension = this._extensionFor(type) || path.extname(specifier)
+    module._main = main || module
 
-      if (extension in this._extensions === false) {
-        if (defaultType) extension = this._extensionFor(defaultType) || '.js'
-        else extension = '.js'
-      }
+    let extension = this._extensionFor(type) || path.extname(specifier)
 
-      if (extension === '.bundle' && path.extname(specifier) !== extension) {
-        throw errors.INVALID_BUNDLE_EXTENSION(`Invalid extension for bundle '${specifier}'`)
-      }
+    if (extension in this._extensions === false) {
+      if (defaultType) extension = this._extensionFor(defaultType) || '.js'
+      else extension = '.js'
+    }
 
-      this._extensions[extension].call(this, module, source, referrer, protocol, imports)
+    if (extension === '.bundle' && path.extname(specifier) !== extension) {
+      throw errors.INVALID_BUNDLE_EXTENSION(`Invalid extension for bundle '${specifier}'`)
     }
 
+    this._extensions[extension].call(this, module, source, referrer, protocol, imports)
+
     return this._transform(module, referrer, dynamic)
   }
 
@@ -349,10 +338,6 @@ module.exports = exports = class Module {
 
     yield * protocol.resolve(specifier, dirname, imports)
 
-    if (this.isBuiltin(specifier)) {
-      yield specifier
-    }
-
     if (path.isAbsolute(specifier)) {
       yield * this._resolveFile(specifier, protocol)
       yield * this._resolveDirectory(specifier, protocol)
@@ -410,8 +395,10 @@ module.exports = exports = class Module {
   }
 
   static * _resolveNodeModules (specifier, dirname, protocol) {
+    const [, name, expansion = '.'] = /^((?:@[^/\\%]+\/)?[^./\\%][^/\\%]*)(\/.*)?$/.exec(specifier) || []
+
     for (const nodeModules of this._resolveNodeModulesPaths(dirname)) {
-      const [, name, expansion = '.'] = /^((?:@[^/\\%]+\/)?[^./\\%][^/\\%]*)(\/.*)?$/.exec(specifier) || []
+      let resolved = specifier
 
       if (name) {
         const pkg = path.join(nodeModules, name, 'package.json')
@@ -424,16 +411,16 @@ module.exports = exports = class Module {
 
           if (info) {
             if (info.exports) {
-              specifier = this._mapConditionalExport(expansion, dirname, info.exports)
+              resolved = this._mapConditionalExport(expansion, dirname, info.exports)
 
-              if (specifier) specifier = path.join(name, specifier)
+              if (resolved) resolved = path.join(name, resolved)
               else return
             }
           }
         }
       }
 
-      const filename = path.join(nodeModules, specifier)
+      const filename = path.join(nodeModules, resolved)
 
       yield * this._resolveFile(filename, protocol)
       yield * this._resolveDirectory(filename, protocol)
@@ -606,7 +593,7 @@ module.exports = exports = class Module {
   }
 }
 
-exports._extensions['.js'] = function (module, source, referrer, protocol, imports) {
+Module._extensions['.js'] = function (module, source, referrer, protocol, imports) {
   const isESM = (
     // The default type is ES modules.
     (module._defaultType === constants.types.MODULE) ||
@@ -623,99 +610,118 @@ exports._extensions['.js'] = function (module, source, referrer, protocol, impor
   return loader.call(this, module, source, referrer, protocol, imports)
 }
 
-exports._extensions['.cjs'] = function (module, source, referrer, protocol, imports) {
-  if (source === null) source = protocol.read(module._filename)
+Module._extensions['.cjs'] = function (module, source, referrer, protocol, imports) {
+  module._type = constants.types.SCRIPT
+  module._protocol = protocol
+  module._imports = imports
 
-  if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+  if (protocol.load) {
+    module._exports = protocol.load(module._filename)
+  } else {
+    if (source === null) source = protocol.read(module._filename)
 
-  referrer = module
+    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
 
-  const resolve = (specifier) => {
-    return this.resolve(specifier, path.dirname(module._filename), {
-      protocol: this._protocolFor(specifier, protocol),
-      imports,
-      referrer
-    })
-  }
+    referrer = module
 
-  const require = (specifier) => {
-    const module = this.load(resolve(specifier), {
-      protocol: this._protocolFor(specifier, protocol),
-      imports,
-      referrer
-    })
+    const resolve = (specifier) => {
+      return this.resolve(specifier, path.dirname(module._filename), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
+        referrer
+      })
+    }
 
-    return module._exports
-  }
+    const require = (specifier) => {
+      const module = this.load(resolve(specifier), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
+        referrer
+      })
 
-  module._type = constants.types.SCRIPT
-  module._protocol = protocol
-  module._imports = imports
-  module._exports = {}
-
-  require.main = module._main
-  require.cache = this._cache
-  require.resolve = resolve
-
-  binding.createFunction(module._filename, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)(
-    require,
-    module,
-    module._exports,
-    module._filename,
-    path.dirname(module._filename)
-  )
-}
+      return module._exports
+    }
 
-exports._extensions['.mjs'] = function (module, source, referrer, protocol, imports) {
-  if (source === null) source = protocol.read(module._filename)
+    module._exports = {}
 
-  if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+    require.main = module._main
+    require.cache = this._cache
+    require.resolve = resolve
+    require.addon = (specifier = path.dirname(module._filename)) => addon(specifier)
 
+    binding.createFunction(module._filename, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)(
+      require,
+      module,
+      module._exports,
+      module._filename,
+      path.dirname(module._filename)
+    )
+  }
+}
+
+Module._extensions['.mjs'] = function (module, source, referrer, protocol, imports) {
   module._type = constants.types.MODULE
   module._protocol = protocol
   module._imports = imports
-  module._handle = binding.createModule(module._filename, source, 0, this._handle)
-}
 
-exports._extensions['.json'] = function (module, source, referrer, protocol, imports) {
-  if (source === null) source = protocol.read(module._filename)
+  if (protocol.load) {
+    module._exports = protocol.load(module._filename)
+  } else {
+    if (source === null) source = protocol.read(module._filename)
+
+    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
 
-  if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+    module._handle = binding.createModule(module._filename, source, 0, this._handle)
+  }
+}
 
+Module._extensions['.json'] = function (module, source, referrer, protocol, imports) {
   module._type = constants.types.JSON
   module._protocol = protocol
   module._imports = imports
-  module._exports = JSON.parse(source)
+
+  if (protocol.load) {
+    module._exports = protocol.load(module._filename)
+  } else {
+    if (source === null) source = protocol.read(module._filename)
+
+    if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+
+    module._exports = JSON.parse(source)
+  }
 }
 
-exports._extensions['.bare'] = function (module, source, referrer, protocol, imports) {
+Module._extensions['.bare'] = function (module, source, referrer, protocol, imports) {
   module._type = constants.types.ADDON
   module._protocol = protocol
   module._imports = imports
-  module._exports = Addon.load(module._filename)
+
+  module._exports = addon(module._filename)
 }
 
-exports._extensions['.node'] = function (module, source, referrer, protocol, imports) {
+Module._extensions['.node'] = function (module, source, referrer, protocol, imports) {
   module._type = constants.types.ADDON
   module._protocol = protocol
   module._imports = imports
-  module._exports = Addon.load(module._filename)
+
+  module._exports = addon(module._filename)
 }
 
-exports._extensions['.bundle'] = function (module, source, referrer, protocol, imports) {
+Module._extensions['.bundle'] = function (module, source, referrer, protocol, imports) {
+  module._type = constants.types.BUNDLE
+  module._protocol = protocol
+  module._imports = imports
+
   if (source === null) source = protocol.read(module._filename)
 
   if (typeof source === 'string') source = Buffer.from(source)
 
   const bundle = this._bundleFor(module._filename, protocol, source)
 
-  module._type = constants.types.BUNDLE
-  module._protocol = protocol
-  module._imports = imports
-  module._exports = exports.load(bundle.main, bundle.read(bundle.main), { protocol, imports, referrer })._exports
+  module._exports = this.load(bundle.main, bundle.read(bundle.main), { protocol, imports, referrer })._exports
 }
 
-exports._protocols['file:'] = new Protocol({
+Module._protocols['file:'] = new Protocol({
   preresolve (specifier, dirname) {
     specifier = specifier.replace(/^file:/, '')
 
@@ -726,7 +732,6 @@ exports._protocols['file:'] = new Protocol({
   },
 
   postresolve (specifier) {
-    if (exports.isBuiltin(specifier)) return specifier
     return binding.realpath(specifier)
   },
 
@@ -739,13 +744,7 @@ exports._protocols['file:'] = new Protocol({
   }
 })
 
-exports._protocols['node:'] = new Protocol({
-  preresolve (specifier) {
-    return specifier.replace(/^node:/, '')
-  }
-})
-
-exports._protocols['data:'] = new Protocol({
+Module._protocols['data:'] = new Protocol({
   * resolve (specifier) {
     yield specifier
   },
@@ -757,11 +756,11 @@ exports._protocols['data:'] = new Protocol({
   }
 })
 
-process
+Bare
   .prependListener('teardown', () => {
-    for (const module of exports._modules) {
+    for (const module of Module._modules) {
       module.destroy()
     }
 
-    binding.destroy(exports._handle)
+    binding.destroy(Module._handle)
   })

package/lib/protocol.js

@@ -6,7 +6,8 @@ module.exports = class ModuleProtocol {
       postresolve = null,
       resolve = null,
       exists = null,
-      read = null
+      read = null,
+      load = null
     } = opts
 
     this.imports = imports
@@ -16,6 +17,7 @@ module.exports = class ModuleProtocol {
     if (resolve) this.resolve = resolve.bind(this)
     if (exists) this.exists = exists.bind(this)
     if (read) this.read = read.bind(this)
+    if (load) this.load = load.bind(this)
   }
 
   preresolve (specifier, dirname) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "1.14.8",
+  "version": "2.0.1",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/holepunchto/bare-module.git"
+    "url": "git+https://github.com/holepunchto/bare-module.git"
   },
   "author": "Holepunch",
   "license": "Apache-2.0",
@@ -25,7 +25,9 @@
   },
   "homepage": "https://github.com/holepunchto/bare-module#readme",
   "dependencies": {
-    "bare-bundle": "^0.1.2"
+    "bare-bundle": "^0.3.0",
+    "bare-os": "^2.0.0",
+    "bare-path": "^2.0.0"
   },
   "devDependencies": {
     "brittle": "^3.1.1",