bare-module 2.0.1 → 2.1.0

package/index.js

@@ -6,7 +6,6 @@ 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)
 
 const Module = module.exports = exports = class Module {
   constructor (filename) {
@@ -88,7 +87,6 @@ const Module = module.exports = exports = class Module {
 
   static _extensions = Object.create(null)
   static _protocols = Object.create(null)
-  static _imports = Object.create(null)
   static _cache = Object.create(null)
   static _bundles = Object.create(null)
   static _modules = new Set()
@@ -172,7 +170,7 @@ const Module = module.exports = exports = class Module {
 
   static createRequire (filename, opts = {}) {
     const {
-      imports = this._imports,
+      imports = null,
       protocol = this._protocolFor(filename, this._protocols['file:']),
       type = constants.types.SCRIPT,
       defaultType = constants.types.SCRIPT
@@ -186,9 +184,10 @@ const Module = module.exports = exports = class Module {
     module._protocol = protocol
 
     const referrer = module
+    const dirname = path.dirname(module._filename)
 
     const resolve = (specifier) => {
-      return this.resolve(specifier, path.dirname(module._filename), {
+      return this.resolve(specifier, dirname, {
         protocol: this._protocolFor(specifier, protocol),
         imports,
         referrer
@@ -205,10 +204,16 @@ const Module = module.exports = exports = class Module {
       return module._exports
     }
 
+    const addon = (specifier = '.') => {
+      return Bare.Addon.load(Bare.Addon.resolve(specifier, dirname, {
+        referrer
+      }))
+    }
+
     require.main = module._main
     require.cache = this._cache
     require.resolve = resolve
-    require.addon = (specifier = path.dirname(module._filename)) => addon(specifier)
+    require.addon = addon
 
     return require
   }
@@ -220,7 +225,7 @@ const Module = module.exports = exports = class Module {
     }
 
     let {
-      imports = this._imports,
+      imports = null,
       protocol = this._protocolFor(specifier, this._protocols['file:']),
       referrer = null,
       dynamic = false,
@@ -252,22 +257,8 @@ const Module = module.exports = exports = class Module {
     const module = this._cache[specifier] = new this(specifier)
 
     module._defaultType = defaultType
-
-    let dirname = path.dirname(module._filename)
-    do {
-      const pkg = path.join(dirname, 'package.json')
-
-      if (protocol.exists(pkg)) {
-        try {
-          module._info = this.load(pkg, { protocol })._exports
-        } catch {}
-        break
-      }
-
-      dirname = path.dirname(dirname)
-    } while (dirname !== path.sep && dirname !== '.')
-
     module._main = main || module
+    module._info = this._loadPackageManifest(path.dirname(module._filename), protocol)
 
     let extension = this._extensionFor(type) || path.extname(specifier)
 
@@ -285,6 +276,22 @@ const Module = module.exports = exports = class Module {
     return this._transform(module, referrer, dynamic)
   }
 
+  static _loadPackageManifest (dirname, protocol) {
+    do {
+      const pkg = path.join(dirname, 'package.json')
+
+      if (protocol.exists(pkg)) {
+        try {
+          return this.load(pkg, { protocol })._exports
+        } catch {}
+      }
+
+      dirname = path.dirname(dirname)
+    } while (dirname !== path.sep && dirname !== '.')
+
+    return {}
+  }
+
   static resolve (specifier, dirname = os.cwd(), opts = {}) {
     if (typeof dirname !== 'string') {
       opts = dirname
@@ -292,7 +299,7 @@ const Module = module.exports = exports = class Module {
     }
 
     let {
-      imports = this._imports,
+      imports = null,
       protocol = this._protocols['file:'],
       referrer = null
     } = opts
@@ -329,8 +336,9 @@ const Module = module.exports = exports = class Module {
   }
 
   static * _resolve (specifier, dirname, protocol, imports) {
-    if (specifier in imports) specifier = imports[specifier]
-    else if (specifier in protocol.imports) specifier = protocol.imports[specifier]
+    const info = this._loadPackageManifest(dirname, protocol)
+
+    specifier = this._mapConditionalSpecifier(specifier, specifier, imports, protocol.imports, info.imports)
 
     protocol = this._protocolFor(specifier, protocol)
 
@@ -378,7 +386,7 @@ const Module = module.exports = exports = class Module {
         let specifier
 
         if (info.exports) {
-          specifier = this._mapConditionalExport('.', dirname, info.exports)
+          specifier = this._mapConditionalSpecifier('.', null, info.exports)
 
           if (specifier) specifier = path.join(dirname, specifier)
           else return
@@ -411,7 +419,7 @@ const Module = module.exports = exports = class Module {
 
           if (info) {
             if (info.exports) {
-              resolved = this._mapConditionalExport(expansion, dirname, info.exports)
+              resolved = this._mapConditionalSpecifier(expansion, null, info.exports)
 
               if (resolved) resolved = path.join(name, resolved)
               else return
@@ -439,33 +447,31 @@ const Module = module.exports = exports = class Module {
     }
   }
 
-  static _mapConditionalExport (specifier, dirname, exports) {
-    if (typeof exports !== 'object') exports = { '.': exports }
+  static _mapConditionalSpecifier (specifier, fallback, ...specifierMaps) {
+    const specifiers = this._flattenSpecifierMaps(specifierMaps)
 
-    if (specifier in exports) {
-      specifier = search(exports[specifier])
+    if (specifier in specifiers) {
+      specifier = search(specifiers[specifier])
     } else {
-      specifier = search(exports)
+      specifier = search(specifiers)
     }
 
-    if (specifier) specifier = path.join(dirname, specifier)
-
-    return specifier
+    return specifier || fallback
 
-    function search (specifier) {
+    function search (specifiers) {
       while (true) {
-        if (typeof specifier === 'string') return specifier
-        if (specifier === null || typeof specifier !== 'object') return specifier
-        specifier = first(specifier)
+        if (typeof specifiers === 'string') return specifiers
+        if (specifiers === null || typeof specifiers !== 'object') return specifiers
+        specifiers = first(specifiers)
       }
     }
 
-    function first (exports) {
-      for (const key in exports) {
+    function first (specifiers) {
+      for (const key in specifiers) {
         switch (key) {
           case 'require':
           case 'import':
-            return exports[key]
+            return specifiers[key]
         }
       }
 
@@ -473,6 +479,21 @@ const Module = module.exports = exports = class Module {
     }
   }
 
+  static _flattenSpecifierMaps (specifierMaps) {
+    const specifiers = Object.create(null)
+
+    for (const map of specifierMaps) {
+      this._mergeSpecifierMaps(typeof map === 'object' ? map : { '.': map }, specifiers)
+    }
+
+    return specifiers
+  }
+
+  static _mergeSpecifierMaps (source, destination) {
+    // TODO Do a deep merge
+    Object.assign(destination, source)
+  }
+
   static _extensionFor (type) {
     switch (type) {
       case constants.types.SCRIPT:
@@ -624,8 +645,10 @@ Module._extensions['.cjs'] = function (module, source, referrer, protocol, impor
 
     referrer = module
 
+    const dirname = path.dirname(module._filename)
+
     const resolve = (specifier) => {
-      return this.resolve(specifier, path.dirname(module._filename), {
+      return this.resolve(specifier, dirname, {
         protocol: this._protocolFor(specifier, protocol),
         imports,
         referrer
@@ -642,12 +665,18 @@ Module._extensions['.cjs'] = function (module, source, referrer, protocol, impor
       return module._exports
     }
 
-    module._exports = {}
+    const addon = (specifier = '.') => {
+      return Bare.Addon.load(Bare.Addon.resolve(specifier, dirname, {
+        referrer
+      }))
+    }
 
     require.main = module._main
     require.cache = this._cache
     require.resolve = resolve
-    require.addon = (specifier = path.dirname(module._filename)) => addon(specifier)
+    require.addon = addon
+
+    module._exports = {}
 
     binding.createFunction(module._filename, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)(
       require,
@@ -696,7 +725,7 @@ Module._extensions['.bare'] = function (module, source, referrer, protocol, impo
   module._protocol = protocol
   module._imports = imports
 
-  module._exports = addon(module._filename)
+  module._exports = Bare.Addon.load(module._filename)
 }
 
 Module._extensions['.node'] = function (module, source, referrer, protocol, imports) {
@@ -704,7 +733,7 @@ Module._extensions['.node'] = function (module, source, referrer, protocol, impo
   module._protocol = protocol
   module._imports = imports
 
-  module._exports = addon(module._filename)
+  module._exports = Bare.Addon.load(module._filename)
 }
 
 Module._extensions['.bundle'] = function (module, source, referrer, protocol, imports) {

package/package.json

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