fix (#68)

Author: aidenybai

packages/react-doctor/src/cli.ts

@@ -85,8 +85,8 @@ const resolveCliScanOptions = (
     programInstance.getOptionValueSource(optionName) === "cli";
 
   return {
-    lint: isCliOverride("lint") ? flags.lint : (userConfig?.lint ?? flags.lint),
-    deadCode: isCliOverride("deadCode") ? flags.deadCode : (userConfig?.deadCode ?? flags.deadCode),
+    lint: isCliOverride("lint") ? flags.lint : (userConfig?.lint ?? true),
+    deadCode: isCliOverride("deadCode") ? flags.deadCode : (userConfig?.deadCode ?? true),
     verbose: isCliOverride("verbose") ? Boolean(flags.verbose) : (userConfig?.verbose ?? false),
     scoreOnly: flags.score,
     offline: flags.offline,
@@ -133,7 +133,9 @@ const program = new Command()
   .description("Diagnose React codebase health")
   .version(VERSION, "-v, --version", "display the version number")
   .argument("[directory]", "project directory to scan", ".")
+  .option("--lint", "enable linting")
   .option("--no-lint", "skip linting")
+  .option("--dead-code", "enable dead code detection")
   .option("--no-dead-code", "skip dead code detection")
   .option("--verbose", "show file details per rule")
   .option("--score", "output only the score")
@@ -326,7 +328,12 @@ const openAmiToFix = (directory: string): void => {
   if (!isInstalled) {
     if (process.platform === "darwin") {
       installAmi();
-      logger.success("Ami installed successfully.");
+      if (isAmiInstalled()) {
+        logger.success("Ami installed successfully.");
+      } else {
+        logger.error("Installation could not be verified.");
+        logger.dim(`Install manually at ${highlighter.info(AMI_WEBSITE_URL)}`);
+      }
     } else {
       logger.error("Ami is not installed.");
       logger.dim(`Download at ${highlighter.info(AMI_RELEASES_URL)}`);

packages/react-doctor/src/utils/discover-project.ts

@@ -247,19 +247,31 @@ const findReactInWorkspaces = (rootDirectory: string, packageJson: PackageJson):
   return result;
 };
 
+const REACT_DEPENDENCY_NAMES = new Set(["react", "react-native", "next"]);
+
 const hasReactDependency = (packageJson: PackageJson): boolean => {
   const allDependencies = collectAllDependencies(packageJson);
-  return Object.keys(allDependencies).some(
-    (packageName) => packageName === "next" || packageName.includes("react"),
+  return Object.keys(allDependencies).some((packageName) =>
+    REACT_DEPENDENCY_NAMES.has(packageName),
   );
 };
 
 export const discoverReactSubprojects = (rootDirectory: string): WorkspacePackage[] => {
   if (!fs.existsSync(rootDirectory) || !fs.statSync(rootDirectory).isDirectory()) return [];
 
-  const entries = fs.readdirSync(rootDirectory, { withFileTypes: true });
   const packages: WorkspacePackage[] = [];
 
+  const rootPackageJsonPath = path.join(rootDirectory, "package.json");
+  if (fs.existsSync(rootPackageJsonPath)) {
+    const rootPackageJson = readPackageJson(rootPackageJsonPath);
+    if (hasReactDependency(rootPackageJson)) {
+      const name = rootPackageJson.name ?? path.basename(rootDirectory);
+      packages.push({ name, directory: rootDirectory });
+    }
+  }
+
+  const entries = fs.readdirSync(rootDirectory, { withFileTypes: true });
+
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "node_modules") {
       continue;

packages/react-doctor/src/utils/load-config.ts

@@ -15,16 +15,14 @@ export const loadConfig = (rootDirectory: string): ReactDoctorConfig | null => {
     try {
       const fileContent = fs.readFileSync(configFilePath, "utf-8");
       const parsed: unknown = JSON.parse(fileContent);
-      if (!isPlainObject(parsed)) {
-        console.warn(`Warning: ${CONFIG_FILENAME} must be a JSON object, ignoring.`);
-        return null;
+      if (isPlainObject(parsed)) {
+        return parsed as ReactDoctorConfig;
       }
-      return parsed as ReactDoctorConfig;
+      console.warn(`Warning: ${CONFIG_FILENAME} must be a JSON object, ignoring.`);
     } catch (error) {
       console.warn(
         `Warning: Failed to parse ${CONFIG_FILENAME}: ${error instanceof Error ? error.message : String(error)}`,
       );
-      return null;
     }
   }
 

packages/react-doctor/src/utils/run-knip.ts

@@ -81,8 +81,10 @@ const extractFailedPluginName = (error: unknown): string | null => {
   return match?.[1] ?? null;
 };
 
+const TSCONFIG_FILENAMES = ["tsconfig.base.json", "tsconfig.json"];
+
 const resolveTsConfigFile = (directory: string): string | undefined =>
-  fs.existsSync(path.join(directory, "tsconfig.base.json")) ? "tsconfig.base.json" : undefined;
+  TSCONFIG_FILENAMES.find((filename) => fs.existsSync(path.join(directory, filename)));
 
 const runKnipWithOptions = async (
   knipCwd: string,

packages/react-doctor/tests/discover-project.test.ts

@@ -1,7 +1,10 @@
+import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
+import { afterAll, describe, expect, it } from "vitest";
 import {
   discoverProject,
+  discoverReactSubprojects,
   formatFrameworkName,
   listWorkspacePackages,
 } from "../src/utils/discover-project.js";
@@ -46,6 +49,69 @@ describe("listWorkspacePackages", () => {
   });
 });
 
+const tempDirectory = fs.mkdtempSync(path.join(os.tmpdir(), "react-doctor-discover-test-"));
+
+afterAll(() => {
+  fs.rmSync(tempDirectory, { recursive: true, force: true });
+});
+
+describe("discoverReactSubprojects", () => {
+  it("includes root directory when it has a react dependency", () => {
+    const rootDirectory = path.join(tempDirectory, "root-with-react");
+    fs.mkdirSync(rootDirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(rootDirectory, "package.json"),
+      JSON.stringify({ name: "my-app", dependencies: { react: "^19.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toContainEqual({ name: "my-app", directory: rootDirectory });
+  });
+
+  it("includes both root and subdirectory when both have react", () => {
+    const rootDirectory = path.join(tempDirectory, "root-and-sub");
+    const subdirectory = path.join(rootDirectory, "extension");
+    fs.mkdirSync(subdirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(rootDirectory, "package.json"),
+      JSON.stringify({ name: "my-app", dependencies: { react: "^19.0.0" } }),
+    );
+    fs.writeFileSync(
+      path.join(subdirectory, "package.json"),
+      JSON.stringify({ name: "my-extension", dependencies: { react: "^18.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toHaveLength(2);
+    expect(packages[0]).toEqual({ name: "my-app", directory: rootDirectory });
+    expect(packages[1]).toEqual({ name: "my-extension", directory: subdirectory });
+  });
+
+  it("does not match packages with only @types/react", () => {
+    const rootDirectory = path.join(tempDirectory, "types-only");
+    fs.mkdirSync(rootDirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(rootDirectory, "package.json"),
+      JSON.stringify({ name: "types-only", devDependencies: { "@types/react": "^18.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toHaveLength(0);
+  });
+
+  it("matches packages with react-native dependency", () => {
+    const rootDirectory = path.join(tempDirectory, "rn-app");
+    fs.mkdirSync(rootDirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(rootDirectory, "package.json"),
+      JSON.stringify({ name: "rn-app", dependencies: { "react-native": "^0.74.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toHaveLength(1);
+  });
+});
+
 describe("formatFrameworkName", () => {
   it("formats known frameworks", () => {
     expect(formatFrameworkName("nextjs")).toBe("Next.js");

packages/react-doctor/tests/load-config.test.ts

@@ -184,6 +184,50 @@ describe("loadConfig", () => {
       warnSpy.mockRestore();
     });
 
+    it("falls through to package.json when config file has malformed JSON", () => {
+      const fallbackDirectory = path.join(tempRootDirectory, "malformed-with-fallback");
+      fs.mkdirSync(fallbackDirectory, { recursive: true });
+      fs.writeFileSync(
+        path.join(fallbackDirectory, "react-doctor.config.json"),
+        "not valid json{{{",
+      );
+      fs.writeFileSync(
+        path.join(fallbackDirectory, "package.json"),
+        JSON.stringify({
+          name: "test",
+          reactDoctor: { ignore: { rules: ["from-fallback"] } },
+        }),
+      );
+
+      const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+      const config = loadConfig(fallbackDirectory);
+      expect(config).toEqual({ ignore: { rules: ["from-fallback"] } });
+      expect(warnSpy).toHaveBeenCalledOnce();
+      warnSpy.mockRestore();
+    });
+
+    it("falls through to package.json when config file is not an object", () => {
+      const nonObjectFallbackDirectory = path.join(tempRootDirectory, "non-object-with-fallback");
+      fs.mkdirSync(nonObjectFallbackDirectory, { recursive: true });
+      fs.writeFileSync(
+        path.join(nonObjectFallbackDirectory, "react-doctor.config.json"),
+        JSON.stringify([1, 2, 3]),
+      );
+      fs.writeFileSync(
+        path.join(nonObjectFallbackDirectory, "package.json"),
+        JSON.stringify({
+          name: "test",
+          reactDoctor: { ignore: { rules: ["from-non-object-fallback"] } },
+        }),
+      );
+
+      const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+      const config = loadConfig(nonObjectFallbackDirectory);
+      expect(config).toEqual({ ignore: { rules: ["from-non-object-fallback"] } });
+      expect(warnSpy).toHaveBeenCalledOnce();
+      warnSpy.mockRestore();
+    });
+
     it("ignores non-object reactDoctor key in package.json", () => {
       const arrayConfigDirectory = path.join(tempRootDirectory, "array-pkg-config");
       fs.mkdirSync(arrayConfigDirectory, { recursive: true });