fix: allow incorrect file path in extraneous deps check

SukkaW · Jul 1, 2024 · 3a6dee2 · 3a6dee2
1 parent 0f07c36
commit 3a6dee2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/rules/no-extraneous-dependencies.ts b/src/rules/no-extraneous-dependencies.ts
@@ -55,8 +55,11 @@ function extractDepFields(pkg: PackageJson) {
 
 function getPackageDepFields(packageJsonPath: string, throwAtRead: boolean) {
   if (!depFieldCache.has(packageJsonPath)) {
-    const depFields = extractDepFields(readJSON(packageJsonPath, throwAtRead)!)
-    depFieldCache.set(packageJsonPath, depFields)
+    const packageJson = readJSON<PackageJson>(packageJsonPath, throwAtRead);
+    if (packageJson) {
+      const depFields = extractDepFields(packageJson);
+      depFieldCache.set(packageJsonPath, depFields);
+    }
   }
   return depFieldCache.get(packageJsonPath)
 }
@@ -83,10 +86,12 @@ function getDependencies(context: RuleContext, packageDir?: string | string[]) {
       // use rule config to find package.json
       for (const dir of paths) {
         const packageJsonPath = path.resolve(dir, 'package.json')
-        const packageContent_ = getPackageDepFields(packageJsonPath, true)!
-        for (const depsKey of Object.keys(packageContent)) {
-          const key = depsKey as keyof PackageDeps
-          Object.assign(packageContent[key], packageContent_[key])
+        const packageContent_ = getPackageDepFields(packageJsonPath, paths.length === 1)
+        if (packageContent_) {
+          for (const depsKey of Object.keys(packageContent)) {
+            const key = depsKey as keyof PackageDeps
+            Object.assign(packageContent[key], packageContent_[key])
+          }
         }
       }
     } else {

diff --git a/test/rules/no-extraneous-dependencies.spec.ts b/test/rules/no-extraneous-dependencies.spec.ts
@@ -48,6 +48,9 @@ const packageDirBundledDepsAsObject = testFilePath(
 const packageDirBundledDepsRaceCondition = testFilePath(
   'bundled-dependencies/race-condition',
 )
+const emptyPackageDir = testFilePath(
+  'empty-folder',
+)
 
 ruleTester.run('no-extraneous-dependencies', rule, {
   valid: [
@@ -130,6 +133,14 @@ ruleTester.run('no-extraneous-dependencies', rule, {
       code: 'import leftpad from "left-pad";',
       options: [{ packageDir: packageDirMonoRepoRoot }],
     }),
+    test({
+      code: 'import leftpad from "left-pad";',
+      options: [{ packageDir: [emptyPackageDir, packageDirMonoRepoRoot] }],
+    }),
+    test({
+      code: 'import leftpad from "left-pad";',
+      options: [{ packageDir: [packageDirMonoRepoRoot, emptyPackageDir] }],
+    }),
     test({
       code: 'import react from "react";',
       options: [