bare-module 2.2.0 → 2.3.1

package/index.js

@@ -151,17 +151,27 @@ const Module = module.exports = exports = class Module {
   static _onmeta (specifier, meta) {
     const module = this._cache[specifier]
 
+    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, module._protocol),
         imports: module._imports,
-        referrer: module
+        referrer
       })
     }
 
+    const addon = (specifier = '.') => {
+      return Bare.Addon.load(Bare.Addon.resolve(specifier, dirname, {
+        referrer
+      }))
+    }
+
     meta.url = module._filename
     meta.main = module._main === module
     meta.resolve = resolve
+    meta.addon = addon
   }
 
   static Protocol = Protocol
@@ -280,17 +290,24 @@ const Module = module.exports = exports = class Module {
     return this._transform(module, referrer, dynamic)
   }
 
-  static _loadPackageManifest (dirname, protocol) {
+  static _loadPackageManifest (dirname, protocol, opts = {}) {
+    const {
+      traverse = true
+    } = opts
+
     do {
-      const pkg = path.join(dirname, 'package.json')
+      const specifier = path.join(dirname, 'package.json')
+
+      if (this._cache[specifier]) return this._cache[specifier]._exports
 
-      if (protocol.exists(pkg)) {
+      if (protocol.exists(specifier)) {
         try {
-          return this.load(pkg, { protocol })._exports
+          return this.load(specifier, { protocol })._exports
         } catch {}
       }
 
-      dirname = path.dirname(dirname)
+      if (traverse) dirname = path.dirname(dirname)
+      else break
     } while (dirname !== path.sep && dirname !== '.')
 
     return {}
@@ -378,29 +395,22 @@ const Module = module.exports = exports = class Module {
   }
 
   static * _resolveDirectory (dirname, protocol) {
-    const pkg = path.join(dirname, 'package.json')
+    const info = this._loadPackageManifest(dirname, protocol, { traverse: false })
 
-    if (protocol.exists(pkg)) {
-      let info = null
-      try {
-        info = this.load(pkg, { protocol })._exports
-      } catch {}
+    let specifier = null
 
-      if (info) {
-        let specifier
+    if (info.exports) {
+      specifier = this._mapConditionalSpecifier('.', null, info.exports)
 
-        if (info.exports) {
-          specifier = this._mapConditionalSpecifier('.', null, info.exports)
-
-          if (specifier) specifier = path.join(dirname, specifier)
-          else return
-        } else if (info.main) {
-          specifier = path.join(dirname, info.main)
-        }
+      if (specifier) specifier = path.join(dirname, specifier)
+      else return // Unexported
+    } else if (info.main) {
+      specifier = path.join(dirname, info.main)
+    }
 
-        yield * this._resolveFile(specifier, protocol)
-        yield * this._resolveIndex(specifier, protocol)
-      }
+    if (specifier) {
+      yield * this._resolveFile(specifier, protocol)
+      yield * this._resolveIndex(specifier, protocol)
     }
 
     yield * this._resolveIndex(dirname, protocol)
@@ -413,22 +423,13 @@ const Module = module.exports = exports = class Module {
       let resolved = specifier
 
       if (name) {
-        const pkg = path.join(nodeModules, name, 'package.json')
-
-        if (protocol.exists(pkg)) {
-          let info = null
-          try {
-            info = this.load(pkg, { protocol })._exports
-          } catch {}
-
-          if (info) {
-            if (info.exports) {
-              resolved = this._mapConditionalSpecifier(expansion, null, info.exports)
-
-              if (resolved) resolved = path.join(name, resolved)
-              else return
-            }
-          }
+        const info = this._loadPackageManifest(path.join(nodeModules, name), protocol, { traverse: false })
+
+        if (info.exports) {
+          resolved = this._mapConditionalSpecifier(expansion, null, info.exports)
+
+          if (resolved) resolved = path.join(name, resolved)
+          else return // Unexported
         }
       }
 
@@ -475,6 +476,9 @@ const Module = module.exports = exports = class Module {
         switch (key) {
           case 'require':
           case 'import':
+          case 'bare':
+          case 'node':
+          case 'default':
             return specifiers[key]
         }
       }

package/package.json

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