@remix-run/cli 0.3.4 → 0.5.0

package/dist/lib/doctor/controller-findings.js

@@ -1,52 +1,36 @@
-import { ROOT_ROUTE_NAME, } from "../controller-ownership.js";
-export function getControllerFindings(ownership, fixPlans) {
+import { ROOT_ROUTE_NAME, } from '../controller-ownership.js';
+export function getControllerFindings(ownership) {
+    let missingRouteNames = new Set(ownership.routeDirectories
+        .filter((directory) => !directory.exists)
+        .map((directory) => directory.routeName));
     return [
-        ...getSubtreeFindings(ownership.subtrees, fixPlans),
-        ...ownership.orphanControllerPaths.map((actualPath) => ({
-            actualPath,
-            code: 'orphan-controller',
-            message: `Action controller ${actualPath} does not match any route map.`,
-            severity: 'warn',
-            suite: 'actions',
-        })),
-        ...ownership.orphanRouteDirectoryPaths.map((actualPath) => ({
-            actualPath,
-            code: 'orphan-route-directory',
-            message: `Directory ${actualPath} does not match any route-map key path.`,
-            severity: 'warn',
-            suite: 'actions',
-        })),
+        ...getSubtreeFindings(ownership.subtrees, missingRouteNames),
+        ...getRouteDirectoryFindings(ownership.routeDirectories),
     ];
 }
-function getSubtreeFindings(subtrees, fixPlans) {
+function getRouteDirectoryFindings(directories) {
+    return directories
+        .filter((directory) => !directory.exists)
+        .map((directory) => ({
+        code: 'missing-route-directory',
+        expectedPath: directory.directoryPath,
+        message: `Route map "${directory.routeName}" is missing action directory ${directory.directoryPath}.`,
+        routeName: directory.routeName,
+        severity: 'warn',
+        suite: 'actions',
+    }));
+}
+function getSubtreeFindings(subtrees, missingRouteNames) {
     let findings = [];
-    let fixableFindingKeys = new Set(fixPlans.map((fixPlan) => `${fixPlan.code}:${fixPlan.routeName ?? ''}`));
     for (let subtree of subtrees) {
-        let routeMapName = formatRouteMapName(subtree.routeName);
-        if (subtree.actualEntryPaths.length > 1) {
-            findings.push({
-                actualPath: subtree.actualEntryPaths[0],
-                code: 'duplicate-owner-file',
-                expectedPath: subtree.entryDisplayPath,
-                message: `${routeMapName} has multiple action controller files: ${subtree.actualEntryPaths.join(', ')}. Keep only one controller owner file.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'actions',
-            });
+        if (missingRouteNames.has(subtree.routeName)) {
             continue;
         }
         if (subtree.actualEntryPath == null) {
-            let code = subtree.claimedFilePaths.length > 0
-                ? 'incomplete-controller'
-                : 'missing-owner';
             findings.push({
-                actualPath: subtree.claimedFilePaths.length > 0 ? subtree.subtreePath : undefined,
-                code,
+                code: 'missing-owner',
                 expectedPath: subtree.entryDisplayPath,
-                fixable: fixableFindingKeys.has(`${code}:${subtree.routeName}`),
-                message: subtree.claimedFilePaths.length > 0
-                    ? `${routeMapName} has files under ${subtree.subtreePath}, but is missing action controller ${subtree.entryDisplayPath}.`
-                    : `${routeMapName} is missing action controller ${subtree.entryDisplayPath}.`,
+                message: `${formatRouteMapName(subtree.routeName)} is missing action controller ${subtree.entryDisplayPath}.`,
                 routeName: subtree.routeName,
                 severity: 'warn',
                 suite: 'actions',

package/dist/lib/doctor/controllers.d.ts

@@ -1,7 +1,6 @@
 import { type OwnershipRouteNode } from '../controller-ownership.ts';
-import { type DoctorFixPlan, type DoctorSuiteResult } from './types.ts';
+import { type DoctorSuiteResult } from './types.ts';
 export interface ControllerDoctorResult {
-    fixPlans: DoctorFixPlan[];
     suite: DoctorSuiteResult;
 }
 export declare function checkControllerConventions(appRoot: string, tree: OwnershipRouteNode[]): Promise<ControllerDoctorResult>;

package/dist/lib/doctor/controllers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controllers.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGhG,OAAO,EAAqB,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAE1F,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,KAAK,EAAE,iBAAiB,CAAA;CACzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,GACzB,OAAO,CAAC,sBAAsB,CAAC,CASjC"}
+{"version":3,"file":"controllers.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEhG,OAAO,EAAqB,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEtE,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,iBAAiB,CAAA;CACzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,GACzB,OAAO,CAAC,sBAAsB,CAAC,CAOjC"}

package/dist/lib/doctor/controllers.js

@@ -1,13 +1,10 @@
-import { inspectControllerOwnership } from "../controller-ownership.js";
-import { getControllerFindings } from "./controller-findings.js";
-import { getControllerFixPlans } from "./controller-fix-plans.js";
-import { createDoctorSuite } from "./types.js";
+import { inspectControllerOwnership } from '../controller-ownership.js';
+import { getControllerFindings } from './controller-findings.js';
+import { createDoctorSuite } from './types.js';
 export async function checkControllerConventions(appRoot, tree) {
     let ownership = await inspectControllerOwnership(appRoot, tree);
-    let fixPlans = await getControllerFixPlans(appRoot, tree, ownership);
-    let findings = getControllerFindings(ownership, fixPlans);
+    let findings = getControllerFindings(ownership);
     return {
-        fixPlans,
         suite: createDoctorSuite('actions', findings),
     };
 }

package/dist/lib/doctor/environment.js

@@ -3,8 +3,8 @@ import * as path from 'node:path';
 import * as process from 'node:process';
 import { createRequire } from 'node:module';
 import * as semver from 'semver';
-import { MINIMUM_SUPPORTED_NODE_VERSION } from "../bootstrap-project.js";
-import { createDoctorSuite, } from "./types.js";
+import { MINIMUM_SUPPORTED_NODE_VERSION } from '../bootstrap-project.js';
+import { createDoctorSuite, } from './types.js';
 export async function checkEnvironment(cwd = process.cwd()) {
     let projectRoot = await findNearestPackageRoot(cwd);
     if (projectRoot == null) {

package/dist/lib/doctor/fixes.js

@@ -1,6 +1,6 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { resolveContainedPath } from "../contained-path.js";
+import { resolveContainedPath } from '../contained-path.js';
 export async function applyDoctorFixPlans(appRoot, fixPlans) {
     let appliedFixes = [];
     for (let fixPlan of dedupeDoctorFixPlans(fixPlans)) {

package/dist/lib/doctor/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/project.ts"],"names":[],"mappings":"AAUA,OAAO,EAAgC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,iBAAiB,CAAA;CACzB;AAED,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmCpF;AAED,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAoDtF"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/project.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,iBAAiB,CAAA;CACzB;AAED,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmCpF;AAED,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA6BtF"}

package/dist/lib/doctor/project.js

@@ -1,9 +1,8 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { getOwnerFileExtension, isActionFileName, isControllerEntryFileName, } from "../controller-files.js";
-import { CliError } from "../errors.js";
-import { loadRouteManifestFromAppRoot } from "../route-map.js";
-import { createDoctorSuite, } from "./types.js";
+import { CliError } from '../errors.js';
+import { loadRouteManifestFromAppRoot } from '../route-map.js';
+import { createDoctorSuite, } from './types.js';
 export async function checkProject(projectRoot) {
     let routesFile = path.join(projectRoot, 'app', 'routes.ts');
     if (!(await pathExists(routesFile))) {
@@ -39,7 +38,6 @@ export async function checkProject(projectRoot) {
 }
 export async function getProjectFixPlans(projectRoot) {
     let routesFile = path.join(projectRoot, 'app', 'routes.ts');
-    let homeActionPath = normalizeRelativePath(path.join('app', 'actions', `controller${await inferHomeOwnerExtension(projectRoot)}`));
     if (await pathExists(routesFile)) {
         let routesSource = await fs.readFile(routesFile, 'utf8');
         if (!hasOnlyWhitespaceAndComments(routesSource)) {
@@ -53,18 +51,6 @@ export async function getProjectFixPlans(projectRoot) {
                 path: 'app/routes.ts',
                 suite: 'project',
             },
-            ...((await pathExists(path.join(projectRoot, homeActionPath)))
-                ? []
-                : [
-                    {
-                        code: 'missing-owner',
-                        contents: renderDefaultHomeAction(homeActionPath),
-                        kind: 'create-file',
-                        path: homeActionPath,
-                        routeName: 'home',
-                        suite: 'project',
-                    },
-                ]),
         ];
     }
     return [
@@ -75,14 +61,6 @@ export async function getProjectFixPlans(projectRoot) {
             path: 'app/routes.ts',
             suite: 'project',
         },
-        {
-            code: 'missing-owner',
-            contents: renderDefaultHomeAction(homeActionPath),
-            kind: 'create-file',
-            path: homeActionPath,
-            routeName: 'home',
-            suite: 'project',
-        },
     ];
 }
 function toProjectFinding(error) {
@@ -180,63 +158,6 @@ function hasOnlyWhitespaceAndComments(source) {
     }
     return true;
 }
-async function inferHomeOwnerExtension(projectRoot) {
-    let actionsDir = path.join(projectRoot, 'app', 'actions');
-    let extensions = await collectOwnerExtensions(actionsDir);
-    if (extensions.length > 0) {
-        return getMostCommonExtension(extensions);
-    }
-    if (await pathExists(path.join(projectRoot, 'tsconfig.json'))) {
-        return '.tsx';
-    }
-    return '.js';
-}
-async function collectOwnerExtensions(directory) {
-    try {
-        let entries = await fs.readdir(directory, { withFileTypes: true });
-        let extensions = [];
-        for (let entry of entries) {
-            let absolutePath = path.join(directory, entry.name);
-            if (entry.isDirectory()) {
-                extensions.push(...(await collectOwnerExtensions(absolutePath)));
-                continue;
-            }
-            let fileName = path.basename(absolutePath);
-            if (!isActionFileName(fileName) && !isControllerEntryFileName(fileName)) {
-                continue;
-            }
-            let extension = getOwnerFileExtension(fileName);
-            if (extension != null) {
-                extensions.push(extension);
-            }
-        }
-        return extensions;
-    }
-    catch (error) {
-        let nodeError = error;
-        if (nodeError.code === 'ENOENT') {
-            return [];
-        }
-        throw error;
-    }
-}
-function getMostCommonExtension(extensions) {
-    let priority = ['.tsx', '.ts', '.jsx', '.js'];
-    let counts = new Map();
-    for (let extension of extensions) {
-        counts.set(extension, (counts.get(extension) ?? 0) + 1);
-    }
-    let bestExtension = priority[0];
-    let bestCount = -1;
-    for (let extension of priority) {
-        let count = counts.get(extension) ?? 0;
-        if (count > bestCount) {
-            bestCount = count;
-            bestExtension = extension;
-        }
-    }
-    return bestExtension;
-}
 function renderDefaultRoutesFile() {
     return [
         `import { route } from 'remix/routes'`,
@@ -247,133 +168,3 @@ function renderDefaultRoutesFile() {
         '',
     ].join('\n');
 }
-function normalizeRelativePath(filePath) {
-    return filePath.split(path.sep).join('/');
-}
-function renderDefaultHomeAction(entryPath) {
-    let extension = getOwnerFileExtension(entryPath);
-    if (extension === '.js') {
-        return [
-            `import { html } from 'remix/html-template'`,
-            `import { createHtmlResponse } from 'remix/response/html'`,
-            '',
-            'export default {',
-            '  actions: {',
-            '    home() {',
-            '      let page = html`',
-            '        <html lang="en">',
-            '          <head>',
-            '            <meta charset="utf-8" />',
-            '            <meta name="viewport" content="width=device-width, initial-scale=1" />',
-            '            <title>Home</title>',
-            '          </head>',
-            '          <body>',
-            '            <h1>Home</h1>',
-            '            <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
-            '          </body>',
-            '        </html>',
-            '      `',
-            '      return createHtmlResponse(page)',
-            '    },',
-            '  },',
-            '}',
-            '',
-        ].join('\n');
-    }
-    if (extension === '.ts') {
-        return [
-            `import { createController } from 'remix/router'`,
-            `import { html } from 'remix/html-template'`,
-            `import { createHtmlResponse } from 'remix/response/html'`,
-            '',
-            `import { routes } from '../routes.ts'`,
-            '',
-            `export default createController(routes, {`,
-            '  actions: {',
-            '    home() {',
-            '      let page = html`',
-            '        <html lang="en">',
-            '          <head>',
-            '            <meta charset="utf-8" />',
-            '            <meta name="viewport" content="width=device-width, initial-scale=1" />',
-            '            <title>Home</title>',
-            '          </head>',
-            '          <body>',
-            '            <h1>Home</h1>',
-            '            <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
-            '          </body>',
-            '        </html>',
-            '      `',
-            '      return createHtmlResponse(page)',
-            '    },',
-            '  },',
-            `})`,
-            '',
-        ].join('\n');
-    }
-    if (extension === '.jsx') {
-        return [
-            `import { renderToStream } from 'remix/ui/server'`,
-            `import { createHtmlResponse } from 'remix/response/html'`,
-            '',
-            'export default {',
-            '  actions: {',
-            '    home() {',
-            '      let page = <HomePage />',
-            '      return createHtmlResponse(renderToStream(page))',
-            '    },',
-            '  },',
-            '}',
-            '',
-            'function HomePage() {',
-            '  return () => (',
-            '    <html lang="en">',
-            '      <head>',
-            '        <meta charSet="utf-8" />',
-            '        <meta name="viewport" content="width=device-width, initial-scale=1" />',
-            '        <title>Home</title>',
-            '      </head>',
-            '      <body>',
-            '        <h1>Home</h1>',
-            '        <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
-            '      </body>',
-            '    </html>',
-            '  )',
-            '}',
-            '',
-        ].join('\n');
-    }
-    return [
-        `import { createController } from 'remix/router'`,
-        `import { renderToStream } from 'remix/ui/server'`,
-        `import { createHtmlResponse } from 'remix/response/html'`,
-        '',
-        `import { routes } from '../routes.ts'`,
-        '',
-        `export default createController(routes, {`,
-        '  actions: {',
-        '    home() {',
-        '      let page = <HomePage />',
-        '      return createHtmlResponse(renderToStream(page))',
-        '    },',
-        '  },',
-        `})`,
-        '',
-        'function HomePage() {',
-        '  return () => (',
-        '    <html lang="en">',
-        '      <head>',
-        '        <meta charSet="utf-8" />',
-        '        <meta name="viewport" content="width=device-width, initial-scale=1" />',
-        '        <title>Home</title>',
-        '      </head>',
-        '      <body>',
-        '        <h1>Home</h1>',
-        '        <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
-        '      </body>',
-        '    </html>',
-        '  )',
-        '}',
-        '',
-    ].join('\n');
-}

package/dist/lib/doctor/run.d.ts

@@ -0,0 +1,9 @@
+export interface RunRemixDoctorOptions {
+    cwd: string;
+    fix: boolean;
+    json: boolean;
+    remixVersion?: string;
+    strict: boolean;
+}
+export declare function runRemixDoctor(options: RunRemixDoctorOptions): Promise<number>;
+//# sourceMappingURL=run.d.ts.map

package/dist/lib/doctor/run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/run.ts"],"names":[],"mappings":"AAsCA,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,OAAO,CAAA;IACZ,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCpF"}

package/dist/lib/doctor/run.js

@@ -0,0 +1,237 @@
+import * as path from 'node:path';
+import * as process from 'node:process';
+import { checkControllerConventions } from './controllers.js';
+import { checkEnvironment, getEnvironmentFixPlans } from './environment.js';
+import { applyDoctorFixPlans } from './fixes.js';
+import { checkProject, getProjectFixPlans } from './project.js';
+import { createDoctorSuite, createSkippedDoctorSuite, hasWarningFindings, } from './types.js';
+import { createCommandReporter, createStepProgressReporter, } from '../reporter.js';
+const DOCTOR_SUITE_LABELS = {
+    actions: {
+        complete: 'actions',
+        running: 'Checking actions',
+    },
+    environment: {
+        complete: 'environment',
+        running: 'Checking environment',
+    },
+    project: {
+        complete: 'project',
+        running: 'Checking project',
+    },
+};
+export async function runRemixDoctor(options) {
+    let reporter = null;
+    let progress = null;
+    try {
+        reporter = options.json
+            ? null
+            : createCommandReporter({
+                remixVersion: options.remixVersion,
+                stderr: process.stdout,
+                stdout: process.stdout,
+            });
+        progress = reporter == null ? null : createDoctorProgressReporter(reporter);
+        if (reporter != null) {
+            await reporter.status.commandHeader('doctor');
+        }
+        let report = await collectDoctorReport(progress, options, reporter);
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+        }
+        else if (reporter != null) {
+            writeDoctorReport(reporter, report);
+            reporter.finish();
+        }
+        if ((options.fix || options.strict) && hasWarningFindings(report.findings)) {
+            return 1;
+        }
+        return 0;
+    }
+    catch (error) {
+        progress?.writeSummaryGap();
+        reporter?.finish();
+        throw error;
+    }
+}
+async function collectDoctorReport(progress, options, reporter) {
+    let cwd = options.cwd;
+    let appliedFixes = [];
+    let environment = await runDoctorSuite(progress, 'environment', async () => {
+        let result = await checkEnvironment(cwd);
+        let suiteAppliedFixes = [];
+        let finalResult = result;
+        if (options.fix && result.projectRoot != null) {
+            let fixPlans = getEnvironmentFixPlans(result, options.remixVersion);
+            if (fixPlans.length > 0) {
+                suiteAppliedFixes = await applyDoctorFixPlans(result.projectRoot, fixPlans);
+                finalResult = await checkEnvironment(result.projectRoot);
+            }
+        }
+        let suite = finalResult.suite;
+        if (suiteAppliedFixes.length > 0) {
+            suite = {
+                ...suite,
+                appliedFixes: suiteAppliedFixes,
+            };
+        }
+        return {
+            appliedFixes: suiteAppliedFixes,
+            projectRoot: finalResult.projectRoot ?? result.projectRoot,
+            suite,
+        };
+    });
+    let findings = [...environment.suite.findings];
+    appliedFixes.push(...(environment.appliedFixes ?? []));
+    let suites = [environment.suite];
+    let routesFile = environment.projectRoot == null
+        ? undefined
+        : path.join(environment.projectRoot, 'app', 'routes.ts');
+    writeDoctorSuiteDetails(reporter, environment.suite);
+    progress?.writeSummaryGap();
+    if (hasWarningFindings(environment.suite.findings)) {
+        let projectSuite = createSkippedDoctorSuite('project', 'Blocked by environment warnings.');
+        let actionsSuite = createSkippedDoctorSuite('actions', 'Blocked by environment warnings.');
+        suites.push(projectSuite, actionsSuite);
+        progress?.skip(projectSuite.name, projectSuite.reason);
+        writeDoctorSuiteDetails(reporter, projectSuite);
+        progress?.writeSummaryGap();
+        progress?.skip(actionsSuite.name, actionsSuite.reason);
+        writeDoctorSuiteDetails(reporter, actionsSuite);
+        progress?.writeSummaryGap();
+        return {
+            appRoot: environment.projectRoot,
+            appliedFixes,
+            findings,
+            remainingFindings: findings,
+            routesFile,
+            suites,
+        };
+    }
+    let project = await runDoctorSuite(progress, 'project', async () => {
+        let result = await checkProject(environment.projectRoot);
+        let suiteAppliedFixes = [];
+        let finalResult = result;
+        if (options.fix) {
+            let fixPlans = await getProjectFixPlans(environment.projectRoot);
+            if (fixPlans.length > 0) {
+                suiteAppliedFixes = await applyDoctorFixPlans(environment.projectRoot, fixPlans);
+                finalResult = await checkProject(environment.projectRoot);
+            }
+        }
+        let suite = finalResult.suite;
+        if (suiteAppliedFixes.length > 0) {
+            suite = {
+                ...suite,
+                appliedFixes: suiteAppliedFixes,
+            };
+        }
+        return {
+            appliedFixes: suiteAppliedFixes,
+            routeManifest: finalResult.routeManifest,
+            routesFile: finalResult.routesFile,
+            suite,
+        };
+    });
+    findings.push(...project.suite.findings);
+    appliedFixes.push(...(project.appliedFixes ?? []));
+    routesFile = project.routesFile;
+    suites.push(project.suite);
+    writeDoctorSuiteDetails(reporter, project.suite);
+    progress?.writeSummaryGap();
+    if (hasWarningFindings(project.suite.findings)) {
+        let actionsSuite = createSkippedDoctorSuite('actions', 'Blocked by project warnings.');
+        suites.push(actionsSuite);
+        progress?.skip(actionsSuite.name, actionsSuite.reason);
+        writeDoctorSuiteDetails(reporter, actionsSuite);
+        progress?.writeSummaryGap();
+        return {
+            appRoot: environment.projectRoot,
+            appliedFixes,
+            findings,
+            remainingFindings: findings,
+            routesFile,
+            suites,
+        };
+    }
+    let actions = await runDoctorSuite(progress, 'actions', async () => {
+        let controllerResult = await checkControllerConventions(project.routeManifest.appRoot, project.routeManifest.tree);
+        return { suite: controllerResult.suite };
+    });
+    findings.push(...actions.suite.findings);
+    suites.push(actions.suite);
+    writeDoctorSuiteDetails(reporter, actions.suite);
+    progress?.writeSummaryGap();
+    let report = {
+        appRoot: environment.projectRoot,
+        findings,
+        routesFile,
+        suites,
+    };
+    if (options.fix) {
+        report.appliedFixes = appliedFixes;
+        report.remainingFindings = findings;
+    }
+    return report;
+}
+function formatAppliedFix(appliedFix) {
+    if (appliedFix.kind === 'update-file') {
+        return `Updated ${appliedFix.path}`;
+    }
+    return `Created ${appliedFix.path}`;
+}
+async function runDoctorSuite(progress, label, callback) {
+    progress?.start(label);
+    try {
+        let result = await callback();
+        if (result.suite.status === 'ok') {
+            progress?.succeed(label);
+        }
+        else if (result.suite.status === 'issues') {
+            progress?.fail(label);
+        }
+        else {
+            progress?.skip(label, result.suite.reason);
+        }
+        return result;
+    }
+    catch (error) {
+        progress?.fail(label);
+        throw error;
+    }
+}
+function createDoctorProgressReporter(reporter) {
+    return createStepProgressReporter(reporter.status, DOCTOR_SUITE_LABELS);
+}
+function writeDoctorReport(reporter, report) {
+    let warningCount = report.findings.filter((finding) => finding.severity === 'warn').length;
+    let adviceCount = report.findings.length - warningCount;
+    if ((report.appliedFixes?.length ?? 0) > 0) {
+        let fixCount = report.appliedFixes.length;
+        reporter.out.line(`Applied ${fixCount} ${fixCount === 1 ? 'fix' : 'fixes'}.`);
+    }
+    if (report.findings.length === 0) {
+        reporter.out.line('Doctor found no issues.');
+    }
+    reporter.out.line(`Summary: ${warningCount} warnings, ${adviceCount} advice.`);
+}
+function writeDoctorSuiteDetails(reporter, suite) {
+    if (reporter == null) {
+        return;
+    }
+    if (suite.findings.length === 0 && (suite.appliedFixes?.length ?? 0) === 0) {
+        return;
+    }
+    reporter.out.withIndent(() => {
+        for (let finding of suite.findings) {
+            reporter.out.bullet(reporter.out.label(finding.severity.toUpperCase(), finding.message, {
+                tone: finding.severity === 'warn' ? 'warn' : undefined,
+            }));
+        }
+        if ((suite.appliedFixes?.length ?? 0) > 0) {
+            reporter.out.section('Applied fixes:', () => {
+                reporter.out.bullets((suite.appliedFixes ?? []).map(formatAppliedFix));
+            });
+        }
+    });
+}

package/dist/lib/doctor/types.d.ts

@@ -1,7 +1,7 @@
 export type DoctorSuiteName = 'environment' | 'project' | 'actions';
 export type DoctorFindingSeverity = 'warn' | 'advice';
 export type DoctorSuiteStatus = 'ok' | 'issues' | 'skipped';
-export type DoctorFindingCode = 'project-root-not-found' | 'package-json-read-failed' | 'package-json-invalid' | 'node-engine-missing' | 'node-engine-unparseable' | 'node-version-unsupported' | 'remix-dependency-missing' | 'remix-install-missing' | 'routes-file-missing' | 'routes-export-missing' | 'route-map-invalid' | 'route-module-import-failed' | 'route-map-invalid-json' | 'route-map-loader-signal' | 'missing-owner' | 'duplicate-owner-file' | 'incomplete-controller' | 'orphan-controller' | 'orphan-route-directory';
+export type DoctorFindingCode = 'project-root-not-found' | 'package-json-read-failed' | 'package-json-invalid' | 'node-engine-missing' | 'node-engine-unparseable' | 'node-version-unsupported' | 'remix-dependency-missing' | 'remix-install-missing' | 'routes-file-missing' | 'routes-export-missing' | 'route-map-invalid' | 'route-module-import-failed' | 'route-map-invalid-json' | 'route-map-loader-signal' | 'missing-owner' | 'missing-route-directory';
 export type DoctorFixKind = 'create-directory' | 'create-file' | 'update-file';
 export interface DoctorFinding {
     actualPath?: string;
@@ -43,6 +43,7 @@ export interface DoctorReport {
     routesFile?: string;
     suites: DoctorSuiteResult[];
 }
+export declare function hasWarningFindings(findings: DoctorFinding[]): boolean;
 export declare function createDoctorSuite(name: DoctorSuiteName, findings: DoctorFinding[]): DoctorSuiteResult;
 export declare function createSkippedDoctorSuite(name: DoctorSuiteName, reason: string): DoctorSuiteResult;
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/doctor/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,CAAA;AACnE,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,QAAQ,CAAA;AACrD,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE3D,MAAM,MAAM,iBAAiB,GACzB,wBAAwB,GACxB,0BAA0B,GAC1B,sBAAsB,GACtB,qBAAqB,GACrB,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,uBAAuB,GACvB,qBAAqB,GACrB,uBAAuB,GACvB,mBAAmB,GACnB,4BAA4B,GAC5B,wBAAwB,GACxB,yBAAyB,GACzB,eAAe,GACf,sBAAsB,GACtB,uBAAuB,GACvB,mBAAmB,GACnB,wBAAwB,CAAA;AAE5B,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,aAAa,GAAG,aAAa,CAAA;AAE9E,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,iBAAiB,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,qBAAqB,CAAA;IAC/B,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,iBAAiB,CAAA;IACvB,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACjC,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,IAAI,EAAE,eAAe,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,iBAAiB,CAAC,EAAE,aAAa,EAAE,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,aAAa,EAAE,GACxB,iBAAiB,CAMnB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAOjG"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,CAAA;AACnE,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,QAAQ,CAAA;AACrD,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE3D,MAAM,MAAM,iBAAiB,GACzB,wBAAwB,GACxB,0BAA0B,GAC1B,sBAAsB,GACtB,qBAAqB,GACrB,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,uBAAuB,GACvB,qBAAqB,GACrB,uBAAuB,GACvB,mBAAmB,GACnB,4BAA4B,GAC5B,wBAAwB,GACxB,yBAAyB,GACzB,eAAe,GACf,yBAAyB,CAAA;AAE7B,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,aAAa,GAAG,aAAa,CAAA;AAE9E,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,iBAAiB,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,qBAAqB,CAAA;IAC/B,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,iBAAiB,CAAA;IACvB,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACjC,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,IAAI,EAAE,eAAe,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,iBAAiB,CAAC,EAAE,aAAa,EAAE,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAErE;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,aAAa,EAAE,GACxB,iBAAiB,CAMnB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAOjG"}