bare-module 1.14.3 → 1.14.4

package/binding.c

@@ -542,7 +542,10 @@ bare_module_read (js_env_t *env, js_callback_info_t *info) {
   int fd = req.result;
   uv_fs_req_cleanup(&req);
 
-  if (fd < 0) goto err;
+  if (fd < 0) {
+    err = fd;
+    goto err;
+  }
 
   uv_fs_fstat(loop, &req, fd, NULL);
   uv_stat_t *st = req.ptr;

package/index.js

@@ -56,7 +56,7 @@ module.exports = exports = class Module {
     return this.filename
   }
 
-  // For Node.s compatibility
+  // For Node.js compatibility
   get path () {
     return this.dirname
   }
@@ -343,9 +343,7 @@ module.exports = exports = class Module {
 
     specifier = protocol.preresolve(specifier, dirname)
 
-    if (protocol.resolve) {
-      yield * protocol.resolve(specifier, dirname, imports)
-    }
+    yield * protocol.resolve(specifier, dirname, imports)
 
     if (this.isBuiltin(specifier)) {
       yield specifier
@@ -384,18 +382,25 @@ module.exports = exports = class Module {
     const pkg = path.join(dirname, 'package.json')
 
     if (protocol.exists(pkg)) {
-      let info
+      let info = null
       try {
         info = this.load(pkg, { protocol })._exports
-      } catch {
-        info = null
-      }
+      } catch {}
+
+      if (info) {
+        let specifier
 
-      if (info && info.main) {
-        const main = path.join(dirname, info.main)
+        if (info.exports) {
+          specifier = this._mapConditionalExport('.', dirname, info.exports)
 
-        yield * this._resolveFile(main, protocol)
-        yield * this._resolveIndex(main, protocol)
+          if (specifier) specifier = path.join(dirname, specifier)
+          else return
+        } else if (info.main) {
+          specifier = path.join(dirname, info.main)
+        }
+
+        yield * this._resolveFile(specifier, protocol)
+        yield * this._resolveIndex(specifier, protocol)
       }
     }
 
@@ -404,6 +409,28 @@ module.exports = exports = class Module {
 
   static * _resolveNodeModules (specifier, dirname, protocol) {
     for (const nodeModules of this._resolveNodeModulesPaths(dirname)) {
+      const [, name, expansion = '.'] = /^((?:@[^/\\%]+\/)?[^./\\%][^/\\%]*)(\/.*)?$/.exec(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) {
+              specifier = this._mapConditionalExport(expansion, dirname, info.exports)
+
+              if (specifier) specifier = path.join(name, specifier)
+              else return
+            }
+          }
+        }
+      }
+
       const filename = path.join(nodeModules, specifier)
 
       yield * this._resolveFile(filename, protocol)
@@ -423,6 +450,40 @@ module.exports = exports = class Module {
     }
   }
 
+  static _mapConditionalExport (specifier, dirname, exports) {
+    if (typeof exports !== 'object') exports = { '.': exports }
+
+    if (specifier in exports) {
+      specifier = search(exports[specifier])
+    } else {
+      specifier = search(exports)
+    }
+
+    if (specifier) specifier = path.join(dirname, specifier)
+
+    return specifier
+
+    function search (specifier) {
+      while (true) {
+        if (typeof specifier === 'string') return specifier
+        if (specifier === null || typeof specifier !== 'object') return specifier
+        specifier = first(specifier)
+      }
+    }
+
+    function first (exports) {
+      for (const key in exports) {
+        switch (key) {
+          case 'require':
+          case 'import':
+            return exports[key]
+        }
+      }
+
+      return null
+    }
+  }
+
   static _extensionFor (type) {
     switch (type) {
       case constants.types.SCRIPT:
@@ -650,7 +711,7 @@ exports._extensions['.bundle'] = function (module, source, referrer, protocol, i
 
 exports._protocols['file:'] = new Protocol({
   preresolve (specifier) {
-    return specifier.replace(/^file:/, '')
+    return path.normalize(specifier.replace(/^file:/, ''))
   },
 
   postresolve (specifier) {

package/lib/protocol.js

@@ -1,4 +1,4 @@
-module.exports = class Protocol {
+module.exports = class ModuleProtocol {
   constructor (opts = {}) {
     const {
       imports = Object.create(null),
@@ -13,9 +13,7 @@ module.exports = class Protocol {
 
     if (preresolve) this.preresolve = preresolve.bind(this)
     if (postresolve) this.postresolve = postresolve.bind(this)
-
     if (resolve) this.resolve = resolve.bind(this)
-    else this.resolve = null
     if (exists) this.exists = exists.bind(this)
     if (read) this.read = read.bind(this)
   }
@@ -28,6 +26,8 @@ module.exports = class Protocol {
     return specifier
   }
 
+  * resolve (specifier, dirname, imports) {}
+
   exists (filename) {
     return false
   }

package/package.json

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