More tests + bundled fixes

Author: luxaritas

src/rules/no-extraneous-dependencies.js

@@ -3,7 +3,6 @@ import fs from 'fs';
 import minimatch from 'minimatch';
 import resolve from 'eslint-module-utils/resolve';
 import moduleVisitor from 'eslint-module-utils/moduleVisitor';
-import includes from 'array-includes';
 import importType from '../core/importType';
 import { getFilePackageName } from '../core/packagePath';
 import docsUrl from '../docsUrl';
@@ -60,11 +59,13 @@ function getPackageDepFields(packageDir, considerInParents, requireInDir) {
           (depsKey === 'dependencies' && considerInParents.has('prod')) ||
           (depsKey === 'devDependencies' && considerInParents.has('dev')) ||
           (depsKey === 'peerDependencies' && considerInParents.has('peer')) ||
-          (depsKey === 'optionalDependencies' && considerInParents.has('optional')) ||
-          (depsKey === 'bundledDependencies' && considerInParents.has('bundled'))
+          (depsKey === 'optionalDependencies' && considerInParents.has('optional'))
         ) {
           Object.assign(depFields[depsKey], parentDepFields[depsKey]);
         }
+        if (depsKey === 'bundledDependencies' && considerInParents.has('bundled')) {
+          depFields[depsKey] = depFields[depsKey].concat(parentDepFields[depsKey]);
+        }
       });
     }
 
@@ -97,9 +98,13 @@ function getDependencies(context, packageDir, considerInParents) {
       // use rule config to find package.json
       paths.forEach(dir => {
         const _packageContent = getPackageDepFields(dir, considerInParents, true);
-        Object.keys(packageContent).forEach(depsKey =>
-          Object.assign(packageContent[depsKey], _packageContent[depsKey]),
-        );
+        Object.keys(packageContent).forEach(depsKey => {
+          if (depsKey === 'bundledDependencies') {
+            packageContent[depsKey] = packageContent[depsKey].concat(_packageContent[depsKey]);
+          } else {
+            Object.assign(packageContent[depsKey], _packageContent[depsKey]);
+          }
+        });
       });
     } else {
       // use closest package.json

tests/files/monorepo/package.json

@@ -5,5 +5,12 @@
   },
   "devDependencies": {
     "left-pad": "^1.2.0"
-  }
+  },
+  "peerDependencies": {
+    "lodash": "4.17.21"
+  },
+  "optionalDependencies": {
+    "chalk": "5.2.0"
+  },
+  "bundledDependencies": ["commander"]
 }

tests/src/rules/no-extraneous-dependencies.js

@@ -128,6 +128,18 @@ ruleTester.run('no-extraneous-dependencies', rule, {
       code: 'import leftpad from "left-pad";',
       options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['dev'] }],
     }),
+    test({
+      code: 'import lodash from "lodash";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['peer'] }],
+    }),
+    test({
+      code: 'import chalk from "chalk";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['optional'] }],
+    }),
+    test({
+      code: 'import commander from "commander";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['bundled'] }],
+    }),
     test({ code: 'import foo from "@generated/foo"' }),
     test({
       code: 'import foo from "@generated/foo"',
@@ -331,13 +343,48 @@ ruleTester.run('no-extraneous-dependencies', rule, {
         message: "'left-pad' should be listed in the project's dependencies. Run 'npm i -S left-pad' to add it",
       }],
     }),
+    test({
+      code: 'import rightpad from "right-pad";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: [] }],
+      errors: [{
+        message: "'right-pad' should be listed in the project's dependencies. Run 'npm i -S right-pad' to add it",
+      }],
+    }),
+    test({
+      code: 'import rightpad from "right-pad";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['dev'] }],
+      errors: [{
+        message: "'right-pad' should be listed in the project's dependencies. Run 'npm i -S right-pad' to add it",
+      }],
+    }),
     test({
       code: 'import leftpad from "left-pad";',
       options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['prod'] }],
       errors: [{
         message: "'left-pad' should be listed in the project's dependencies. Run 'npm i -S left-pad' to add it",
       }],
     }),
+    test({
+      code: 'import lodash from "lodash";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['prod'] }],
+      errors: [{
+        message: "'lodash' should be listed in the project's dependencies. Run 'npm i -S lodash' to add it",
+      }],
+    }),
+    test({
+      code: 'import chalk from "chalk";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['prod'] }],
+      errors: [{
+        message: "'chalk' should be listed in the project's dependencies. Run 'npm i -S chalk' to add it",
+      }],
+    }),
+    test({
+      code: 'import commander from "commander";',
+      options: [{ packageDir: packageDirMonoRepoWithNested, considerInParents: ['prod'] }],
+      errors: [{
+        message: "'commander' should be listed in the project's dependencies. Run 'npm i -S commander' to add it",
+      }],
+    }),
     test({
       code: 'import react from "react";',
       filename: path.join(packageDirMonoRepoRoot, 'foo.js'),