@rollup/plugin-node-resolve 11.0.0 → 11.0.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v11.0.1
+
+_2020-12-14_
+
+### Bugfixes
+
+- fix: export map specificity (#675)
+- fix: add missing type import (#668)
+
+### Updates
+
+- docs: corrected word "yse" to "use" (#723)
+
 ## v11.0.0
 
 _2020-11-30_

package/README.md

@@ -181,7 +181,7 @@ By default this plugin will prefer built-ins over local modules, marking them as
 
 See [`preferBuiltins`](#preferbuiltins).
 
-To provide stubbed versions of Node built-ins, yse a plugin like [rollup-plugin-node-polyfills](https://github.com/ionic-team/rollup-plugin-node-polyfills) or use [`builtin-modules`](https://github.com/sindresorhus/builtin-modules) with `external`, and set `preferBuiltins` to `false`. e.g.
+To provide stubbed versions of Node built-ins, use a plugin like [rollup-plugin-node-polyfills](https://github.com/ionic-team/rollup-plugin-node-polyfills) or use [`builtin-modules`](https://github.com/sindresorhus/builtin-modules) with `external`, and set `preferBuiltins` to `false`. e.g.
 
 ```js
 import { nodeResolve } from '@rollup/plugin-node-resolve';

package/dist/cjs/index.js

@@ -232,11 +232,22 @@ function normalizeInput(input) {
 const resolveImportPath = util.promisify(resolve__default['default']);
 const readFile$1 = util.promisify(fs__default['default'].readFile);
 
-const pathNotFoundError = (subPath, pkgPath) =>
-  new Error(`Package subpath '${subPath}' is not defined by "exports" in ${pkgPath}`);
+const pathNotFoundError = (importPath, importer, subPath, pkgPath) =>
+  new Error(
+    `Could not resolve import "${importPath}" in "${importer}".` +
+      ` Package subpath "${subPath}" is not defined by "exports" in ${pkgPath}`
+  );
 
 function findExportKeyMatch(exportMap, subPath) {
-  for (const key of Object.keys(exportMap)) {
+  if (subPath in exportMap) {
+    return subPath;
+  }
+
+  const matchKeys = Object.keys(exportMap)
+    .filter((key) => key.endsWith('/') || key.endsWith('*'))
+    .sort((a, b) => b.length - a.length);
+
+  for (const key of matchKeys) {
     if (key.endsWith('*')) {
       // star match: "./foo/*": "./foo/*.js"
       const keyWithoutStar = key.substring(0, key.length - 1);
@@ -258,7 +269,7 @@ function findExportKeyMatch(exportMap, subPath) {
   return null;
 }
 
-function mapSubPath(pkgJsonPath, subPath, key, value) {
+function mapSubPath({ importPath, importer, pkgJsonPath, subPath, key, value }) {
   if (typeof value === 'string') {
     if (typeof key === 'string' && key.endsWith('*')) {
       // star match: "./foo/*": "./foo/*.js"
@@ -281,34 +292,57 @@ function mapSubPath(pkgJsonPath, subPath, key, value) {
     return value.find((v) => v.startsWith('./'));
   }
 
-  throw pathNotFoundError(subPath, pkgJsonPath);
+  throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
 }
 
-function findEntrypoint(pkgJsonPath, subPath, exportMap, conditions, key) {
+function findEntrypoint({
+  importPath,
+  importer,
+  pkgJsonPath,
+  subPath,
+  exportMap,
+  conditions,
+  key
+}) {
   if (typeof exportMap !== 'object') {
-    return mapSubPath(pkgJsonPath, subPath, key, exportMap);
+    return mapSubPath({ importPath, importer, pkgJsonPath, subPath, key, value: exportMap });
   }
 
   // iterate conditions recursively, find the first that matches all conditions
   for (const [condition, subExportMap] of Object.entries(exportMap)) {
     if (conditions.includes(condition)) {
-      const mappedSubPath = findEntrypoint(pkgJsonPath, subPath, subExportMap, conditions, key);
+      const mappedSubPath = findEntrypoint({
+        importPath,
+        importer,
+        pkgJsonPath,
+        subPath,
+        exportMap: subExportMap,
+        conditions,
+        key
+      });
       if (mappedSubPath) {
         return mappedSubPath;
       }
     }
   }
-  throw pathNotFoundError(subPath, pkgJsonPath);
+  throw pathNotFoundError(importer, subPath, pkgJsonPath);
 }
 
-function findEntrypointTopLevel(pkgJsonPath, subPath, exportMap, conditions) {
+function findEntrypointTopLevel({
+  importPath,
+  importer,
+  pkgJsonPath,
+  subPath,
+  exportMap,
+  conditions
+}) {
   if (typeof exportMap !== 'object') {
     // the export map shorthand, for example { exports: "./index.js" }
     if (subPath !== '.') {
       // shorthand only supports a main entrypoint
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
-    return mapSubPath(pkgJsonPath, subPath, null, exportMap);
+    return mapSubPath({ importPath, importer, pkgJsonPath, subPath, key: null, value: exportMap });
   }
 
   // export map is an object, the top level can be either conditions or sub path mappings
@@ -331,22 +365,31 @@ function findEntrypointTopLevel(pkgJsonPath, subPath, exportMap, conditions) {
     // top level is conditions, for example { "import": ..., "require": ..., "module": ... }
     if (subPath !== '.') {
       // package with top level conditions means it only supports a main entrypoint
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
     exportMapForSubPath = exportMap;
   } else {
     // top level is sub path mappings, for example { ".": ..., "./foo": ..., "./bar": ... }
     key = findExportKeyMatch(exportMap, subPath);
     if (!key) {
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
     exportMapForSubPath = exportMap[key];
   }
 
-  return findEntrypoint(pkgJsonPath, subPath, exportMapForSubPath, conditions, key);
+  return findEntrypoint({
+    importPath,
+    importer,
+    pkgJsonPath,
+    subPath,
+    exportMap: exportMapForSubPath,
+    conditions,
+    key
+  });
 }
 
 async function resolveId({
+  importer,
   importPath,
   exportConditions,
   warn,
@@ -408,12 +451,14 @@ async function resolveId({
       try {
         const packageSubPath =
           pkgName === importPath ? '.' : `.${importPath.substring(pkgName.length)}`;
-        const mappedSubPath = findEntrypointTopLevel(
+        const mappedSubPath = findEntrypointTopLevel({
+          importer,
+          importPath,
           pkgJsonPath,
-          packageSubPath,
-          pkgJson.exports,
-          exportConditions
-        );
+          subPath: packageSubPath,
+          exportMap: pkgJson.exports,
+          conditions: exportConditions
+        });
         const pkgDir = path__default['default'].dirname(pkgJsonPath);
         location = path__default['default'].join(pkgDir, mappedSubPath);
       } catch (error) {
@@ -452,6 +497,7 @@ async function resolveId({
 // Resolve module specifiers in order. Promise resolves to the first module that resolves
 // successfully, or the error that resulted from the last attempted module resolution.
 async function resolveImportSpecifiers({
+  importer,
   importSpecifierList,
   exportConditions,
   warn,
@@ -466,6 +512,7 @@ async function resolveImportSpecifiers({
   for (let i = 0; i < importSpecifierList.length; i++) {
     // eslint-disable-next-line no-await-in-loop
     const resolved = await resolveId({
+      importer,
       importPath: importSpecifierList[i],
       exportConditions,
       warn,
@@ -712,6 +759,7 @@ function nodeResolve(opts = {}) {
       const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
       const resolvedWithoutBuiltins = await resolveImportSpecifiers({
+        importer,
         importSpecifierList,
         exportConditions,
         warn,

package/dist/es/index.js

@@ -219,11 +219,22 @@ function normalizeInput(input) {
 const resolveImportPath = promisify(resolve$1);
 const readFile$1 = promisify(fs.readFile);
 
-const pathNotFoundError = (subPath, pkgPath) =>
-  new Error(`Package subpath '${subPath}' is not defined by "exports" in ${pkgPath}`);
+const pathNotFoundError = (importPath, importer, subPath, pkgPath) =>
+  new Error(
+    `Could not resolve import "${importPath}" in "${importer}".` +
+      ` Package subpath "${subPath}" is not defined by "exports" in ${pkgPath}`
+  );
 
 function findExportKeyMatch(exportMap, subPath) {
-  for (const key of Object.keys(exportMap)) {
+  if (subPath in exportMap) {
+    return subPath;
+  }
+
+  const matchKeys = Object.keys(exportMap)
+    .filter((key) => key.endsWith('/') || key.endsWith('*'))
+    .sort((a, b) => b.length - a.length);
+
+  for (const key of matchKeys) {
     if (key.endsWith('*')) {
       // star match: "./foo/*": "./foo/*.js"
       const keyWithoutStar = key.substring(0, key.length - 1);
@@ -245,7 +256,7 @@ function findExportKeyMatch(exportMap, subPath) {
   return null;
 }
 
-function mapSubPath(pkgJsonPath, subPath, key, value) {
+function mapSubPath({ importPath, importer, pkgJsonPath, subPath, key, value }) {
   if (typeof value === 'string') {
     if (typeof key === 'string' && key.endsWith('*')) {
       // star match: "./foo/*": "./foo/*.js"
@@ -268,34 +279,57 @@ function mapSubPath(pkgJsonPath, subPath, key, value) {
     return value.find((v) => v.startsWith('./'));
   }
 
-  throw pathNotFoundError(subPath, pkgJsonPath);
+  throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
 }
 
-function findEntrypoint(pkgJsonPath, subPath, exportMap, conditions, key) {
+function findEntrypoint({
+  importPath,
+  importer,
+  pkgJsonPath,
+  subPath,
+  exportMap,
+  conditions,
+  key
+}) {
   if (typeof exportMap !== 'object') {
-    return mapSubPath(pkgJsonPath, subPath, key, exportMap);
+    return mapSubPath({ importPath, importer, pkgJsonPath, subPath, key, value: exportMap });
   }
 
   // iterate conditions recursively, find the first that matches all conditions
   for (const [condition, subExportMap] of Object.entries(exportMap)) {
     if (conditions.includes(condition)) {
-      const mappedSubPath = findEntrypoint(pkgJsonPath, subPath, subExportMap, conditions, key);
+      const mappedSubPath = findEntrypoint({
+        importPath,
+        importer,
+        pkgJsonPath,
+        subPath,
+        exportMap: subExportMap,
+        conditions,
+        key
+      });
       if (mappedSubPath) {
         return mappedSubPath;
       }
     }
   }
-  throw pathNotFoundError(subPath, pkgJsonPath);
+  throw pathNotFoundError(importer, subPath, pkgJsonPath);
 }
 
-function findEntrypointTopLevel(pkgJsonPath, subPath, exportMap, conditions) {
+function findEntrypointTopLevel({
+  importPath,
+  importer,
+  pkgJsonPath,
+  subPath,
+  exportMap,
+  conditions
+}) {
   if (typeof exportMap !== 'object') {
     // the export map shorthand, for example { exports: "./index.js" }
     if (subPath !== '.') {
       // shorthand only supports a main entrypoint
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
-    return mapSubPath(pkgJsonPath, subPath, null, exportMap);
+    return mapSubPath({ importPath, importer, pkgJsonPath, subPath, key: null, value: exportMap });
   }
 
   // export map is an object, the top level can be either conditions or sub path mappings
@@ -318,22 +352,31 @@ function findEntrypointTopLevel(pkgJsonPath, subPath, exportMap, conditions) {
     // top level is conditions, for example { "import": ..., "require": ..., "module": ... }
     if (subPath !== '.') {
       // package with top level conditions means it only supports a main entrypoint
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
     exportMapForSubPath = exportMap;
   } else {
     // top level is sub path mappings, for example { ".": ..., "./foo": ..., "./bar": ... }
     key = findExportKeyMatch(exportMap, subPath);
     if (!key) {
-      throw pathNotFoundError(subPath, pkgJsonPath);
+      throw pathNotFoundError(importPath, importer, subPath, pkgJsonPath);
     }
     exportMapForSubPath = exportMap[key];
   }
 
-  return findEntrypoint(pkgJsonPath, subPath, exportMapForSubPath, conditions, key);
+  return findEntrypoint({
+    importPath,
+    importer,
+    pkgJsonPath,
+    subPath,
+    exportMap: exportMapForSubPath,
+    conditions,
+    key
+  });
 }
 
 async function resolveId({
+  importer,
   importPath,
   exportConditions,
   warn,
@@ -395,12 +438,14 @@ async function resolveId({
       try {
         const packageSubPath =
           pkgName === importPath ? '.' : `.${importPath.substring(pkgName.length)}`;
-        const mappedSubPath = findEntrypointTopLevel(
+        const mappedSubPath = findEntrypointTopLevel({
+          importer,
+          importPath,
           pkgJsonPath,
-          packageSubPath,
-          pkgJson.exports,
-          exportConditions
-        );
+          subPath: packageSubPath,
+          exportMap: pkgJson.exports,
+          conditions: exportConditions
+        });
         const pkgDir = path.dirname(pkgJsonPath);
         location = path.join(pkgDir, mappedSubPath);
       } catch (error) {
@@ -439,6 +484,7 @@ async function resolveId({
 // Resolve module specifiers in order. Promise resolves to the first module that resolves
 // successfully, or the error that resulted from the last attempted module resolution.
 async function resolveImportSpecifiers({
+  importer,
   importSpecifierList,
   exportConditions,
   warn,
@@ -453,6 +499,7 @@ async function resolveImportSpecifiers({
   for (let i = 0; i < importSpecifierList.length; i++) {
     // eslint-disable-next-line no-await-in-loop
     const resolved = await resolveId({
+      importer,
       importPath: importSpecifierList[i],
       exportConditions,
       warn,
@@ -699,6 +746,7 @@ function nodeResolve(opts = {}) {
       const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
       const resolvedWithoutBuiltins = await resolveImportSpecifiers({
+        importer,
         importSpecifierList,
         exportConditions,
         warn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "publishConfig": {
     "access": "public"
   },

package/types/index.d.ts

@@ -1,3 +1,5 @@
+import { Plugin } from 'rollup';
+
 export const DEFAULTS: {
   customResolveOptions: {};
   dedupe: [];