@remix-run/cli 0.1.0 → 0.3.0

package/dist/lib/completion.js

@@ -1,25 +1,6 @@
 const COMPLETION_SHELLS = ['bash', 'zsh'];
-const HELP_COMMANDS = [
-    'completion',
-    'doctor',
-    'help',
-    'new',
-    'routes',
-    'skills',
-    'test',
-    'version',
-];
-const ROOT_COMMANDS = [
-    'completion',
-    'doctor',
-    'help',
-    'new',
-    'routes',
-    'skills',
-    'test',
-    'version',
-];
-const SKILLS_COMMANDS = ['install', 'list'];
+const HELP_COMMANDS = ['completion', 'doctor', 'help', 'new', 'routes', 'test', 'version'];
+const ROOT_COMMANDS = ['completion', 'doctor', 'help', 'new', 'routes', 'test', 'version'];
 export function isCompletionShell(value) {
     return COMPLETION_SHELLS.includes(value);
 }
@@ -152,18 +133,11 @@ function completeCommand(command, tokens, currentWord, usedGlobalFlags) {
     if (command === 'routes') {
         return completeRoutes(tokens, currentWord, usedGlobalFlags);
     }
-    if (command === 'skills') {
-        return completeSkills(tokens, currentWord, usedGlobalFlags);
-    }
     if (command === 'version') {
         return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, []);
     }
     if (command === 'test') {
-        return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, [
-            '--coverage',
-            '--watch',
-            '--help',
-        ]);
+        return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, ['--coverage', '--watch']);
     }
     if (command === 'completion') {
         return completeCompletionCommand(tokens, currentWord, usedGlobalFlags);
@@ -178,11 +152,8 @@ function completeHelp(tokens, currentWord, usedGlobalFlags) {
     if (filteredTokens.length === 0) {
         return completeValues(withHelpFlags([...HELP_COMMANDS], usedGlobalFlags), currentWord);
     }
-    let [topic, ...rest] = filteredTokens;
+    let [, ...rest] = filteredTokens;
     if (rest.length === 0) {
-        if (topic === 'skills') {
-            return completeValues(withHelpFlags([...SKILLS_COMMANDS], usedGlobalFlags), currentWord);
-        }
         return completeValues([], currentWord);
     }
     return completeValues([], currentWord);
@@ -264,79 +235,6 @@ function completeRoutes(tokens, currentWord, usedGlobalFlags) {
     ], usedGlobalFlags);
     return completeValues(flags, currentWord);
 }
-function completeSkills(tokens, currentWord, usedGlobalFlags) {
-    let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
-    if (filteredTokens == null) {
-        return completeValues([], currentWord);
-    }
-    if (filteredTokens.length === 0) {
-        return completeValues(withHelpFlags([...SKILLS_COMMANDS], usedGlobalFlags), currentWord);
-    }
-    let [subcommand, ...rest] = filteredTokens;
-    if (subcommand === 'install') {
-        return completeSkillsInstall(rest, currentWord, usedGlobalFlags);
-    }
-    if (subcommand === 'list') {
-        return completeSkillsList(rest, currentWord, usedGlobalFlags);
-    }
-    return completeValues([], currentWord);
-}
-function completeSkillsInstall(tokens, currentWord, usedGlobalFlags) {
-    let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
-    if (filteredTokens == null) {
-        return completeValues([], currentWord);
-    }
-    let hasDir = false;
-    let expectsDir = false;
-    for (let token of filteredTokens) {
-        if (expectsDir) {
-            expectsDir = false;
-            continue;
-        }
-        if (token === '--dir') {
-            hasDir = true;
-            expectsDir = true;
-            continue;
-        }
-        return completeValues([], currentWord);
-    }
-    if (expectsDir) {
-        return { mode: 'files' };
-    }
-    return completeValues(withHelpFlags(!hasDir ? ['--dir'] : [], usedGlobalFlags), currentWord);
-}
-function completeSkillsList(tokens, currentWord, usedGlobalFlags) {
-    return completeSkillsDirectoryCommand(tokens, currentWord, usedGlobalFlags);
-}
-function completeSkillsDirectoryCommand(tokens, currentWord, usedGlobalFlags) {
-    let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
-    if (filteredTokens == null) {
-        return completeValues([], currentWord);
-    }
-    let hasDir = false;
-    let hasJson = false;
-    let expectsDir = false;
-    for (let token of filteredTokens) {
-        if (expectsDir) {
-            expectsDir = false;
-            continue;
-        }
-        if (token === '--dir') {
-            hasDir = true;
-            expectsDir = true;
-            continue;
-        }
-        if (token === '--json') {
-            hasJson = true;
-            continue;
-        }
-        return completeValues([], currentWord);
-    }
-    if (expectsDir) {
-        return { mode: 'files' };
-    }
-    return completeValues(withHelpFlags([...(!hasDir ? ['--dir'] : []), ...(!hasJson ? ['--json'] : [])], usedGlobalFlags), currentWord);
-}
 function completeCompletionCommand(tokens, currentWord, usedGlobalFlags) {
     let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
     if (filteredTokens == null) {

package/dist/lib/controller-files.d.ts

@@ -1,6 +1,5 @@
 declare const OWNER_FILE_EXTENSIONS: readonly [".ts", ".tsx", ".js", ".jsx"];
 export type OwnerFileExtension = (typeof OWNER_FILE_EXTENSIONS)[number];
-export declare function getActionOwnerCandidates(segments: string[]): string[];
 export declare function getControllerOwnerCandidates(segments: string[]): string[];
 export declare function getRouteSubtreePath(segments: string[]): string;
 export declare function getPreferredOwnerDisplayPath(candidates: string[]): string;

package/dist/lib/controller-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-files.d.ts","sourceRoot":"","sources":["../../src/lib/controller-files.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,qBAAqB,yCAA0C,CAAA;AACrE,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIrE;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIzE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAE9D;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAGzE;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,kBAAkB,GAC5B,MAAM,GAAG,IAAI,CAEf;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAEjF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYrD;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQtE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAS1D"}
+{"version":3,"file":"controller-files.d.ts","sourceRoot":"","sources":["../../src/lib/controller-files.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,qBAAqB,yCAA0C,CAAA;AAGrE,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvE,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIzE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAE9D;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAGzE;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,kBAAkB,GAC5B,MAAM,GAAG,IAAI,CAEf;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAEjF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYrD;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQtE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAS1D"}

package/dist/lib/controller-files.js

@@ -1,13 +1,11 @@
 import * as path from 'node:path';
 const OWNER_FILE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx'];
-export function getActionOwnerCandidates(segments) {
-    return OWNER_FILE_EXTENSIONS.map((extension) => normalizeRelativePath(path.join('app', 'controllers', `${path.join(...segments)}${extension}`)));
-}
+const ACTIONS_DIRECTORY = path.join('app', 'actions');
 export function getControllerOwnerCandidates(segments) {
-    return OWNER_FILE_EXTENSIONS.map((extension) => normalizeRelativePath(path.join('app', 'controllers', ...segments, `controller${extension}`)));
+    return OWNER_FILE_EXTENSIONS.map((extension) => normalizeRelativePath(path.join(ACTIONS_DIRECTORY, ...segments, `controller${extension}`)));
 }
 export function getRouteSubtreePath(segments) {
-    return normalizeRelativePath(path.join('app', 'controllers', ...segments));
+    return normalizeRelativePath(path.join(ACTIONS_DIRECTORY, ...segments));
 }
 export function getPreferredOwnerDisplayPath(candidates) {
     let tsxCandidate = candidates.find((candidate) => candidate.endsWith('.tsx'));

package/dist/lib/controller-ownership.d.ts

@@ -1,4 +1,5 @@
-import type { RouteOwnerKind, RouteTreeNodeKind } from './route-map.ts';
+import type { RouteTreeNodeKind } from './route-map.ts';
+export declare const ROOT_ROUTE_NAME = "<root>";
 export interface OwnershipRouteNode {
     children: OwnershipRouteNode[];
     key: string;
@@ -7,35 +8,34 @@ export interface OwnershipRouteNode {
     name: string;
 }
 export interface ControllerDirectoryScan {
-    actionEntryPaths: Set<string>;
     controllerEntryPaths: Set<string>;
-    rootDirectoryPaths: Set<string>;
+    routeDirectoryPaths: Set<string>;
     routeLocalFilePaths: Set<string>;
 }
+export interface RouteDirectoryPlan {
+    directoryPath: string;
+    routeName: string;
+}
 export interface OwnedSubtreePlan {
-    alternateCandidates: string[];
-    alternateDisplayPath: string;
     entryCandidates: string[];
     entryDisplayPath: string;
-    kind: RouteOwnerKind;
     routeName: string;
     subtreePath: string;
 }
 export interface OwnedSubtree extends OwnedSubtreePlan {
-    actualAlternatePath: string | null;
-    actualAlternatePaths: string[];
     actualEntryPath: string | null;
     actualEntryPaths: string[];
     claimedFilePaths: string[];
     claimedRouteLocalFilePaths: string[];
 }
 export interface ControllerOwnership {
-    orphanActionPaths: string[];
     orphanControllerPaths: string[];
     orphanRouteDirectoryPaths: string[];
+    routeDirectories: RouteDirectoryPlan[];
     scan: ControllerDirectoryScan;
     subtrees: OwnedSubtree[];
 }
 export declare function inspectControllerOwnership(appRoot: string, tree: OwnershipRouteNode[]): Promise<ControllerOwnership>;
 export declare function buildOwnedSubtrees(tree: OwnershipRouteNode[], parentSegments?: string[], subtrees?: OwnedSubtreePlan[]): OwnedSubtreePlan[];
+export declare function buildRouteDirectories(tree: OwnershipRouteNode[], parentSegments?: string[], directories?: RouteDirectoryPlan[]): RouteDirectoryPlan[];
 //# sourceMappingURL=controller-ownership.d.ts.map

package/dist/lib/controller-ownership.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-ownership.d.ts","sourceRoot":"","sources":["../../src/lib/controller-ownership.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,kBAAkB,EAAE,CAAA;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,uBAAuB;IACtC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACjC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,mBAAmB,EAAE,MAAM,EAAE,CAAA;IAC7B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;IACxB,IAAI,EAAE,cAAc,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,oBAAoB,EAAE,MAAM,EAAE,CAAA;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,0BAA0B,EAAE,MAAM,EAAE,CAAA;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAA;IACnC,IAAI,EAAE,uBAAuB,CAAA;IAC7B,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAY9B;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,kBAAkB,EAAE,EAC1B,cAAc,GAAE,MAAM,EAAO,EAC7B,QAAQ,GAAE,gBAAgB,EAAO,GAChC,gBAAgB,EAAE,CAwCpB"}
+{"version":3,"file":"controller-ownership.d.ts","sourceRoot":"","sources":["../../src/lib/controller-ownership.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAIvD,eAAO,MAAM,eAAe,WAAW,CAAA;AAEvC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,kBAAkB,EAAE,CAAA;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,uBAAuB;IACtC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACjC,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAChC,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,0BAA0B,EAAE,MAAM,EAAE,CAAA;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAA;IACnC,gBAAgB,EAAE,kBAAkB,EAAE,CAAA;IACtC,IAAI,EAAE,uBAAuB,CAAA;IAC7B,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAa9B;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,kBAAkB,EAAE,EAC1B,cAAc,GAAE,MAAM,EAAO,EAC7B,QAAQ,GAAE,gBAAgB,EAAO,GAChC,gBAAgB,EAAE,CAsBpB;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,kBAAkB,EAAE,EAC1B,cAAc,GAAE,MAAM,EAAO,EAC7B,WAAW,GAAE,kBAAkB,EAAO,GACrC,kBAAkB,EAAE,CAetB"}

package/dist/lib/controller-ownership.js

@@ -1,58 +1,69 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { getActionOwnerCandidates, getControllerOwnerCandidates, getOwnerModuleBaseName, getPreferredOwnerDisplayPath, getRouteSubtreePath, isActionFileName, isControllerEntryFileName, toDiskSegment, } from "./controller-files.js";
+import { getControllerOwnerCandidates, getOwnerModuleBaseName, getPreferredOwnerDisplayPath, getRouteSubtreePath, isControllerEntryFileName, toDiskSegment, } from "./controller-files.js";
+const ACTIONS_PATH_PREFIX = 'app/actions/';
+export const ROOT_ROUTE_NAME = '<root>';
 export async function inspectControllerOwnership(appRoot, tree) {
     let subtreePlans = buildOwnedSubtrees(tree);
+    let routeDirectories = buildRouteDirectories(tree);
     let scan = await scanControllersDirectory(appRoot);
     let subtrees = applyScanToSubtrees(subtreePlans, scan);
     return {
-        orphanActionPaths: getOrphanActionPaths(subtreePlans, scan),
         orphanControllerPaths: getOrphanControllerPaths(subtreePlans, scan),
-        orphanRouteDirectoryPaths: getOrphanRouteDirectoryPaths(subtreePlans, scan),
+        orphanRouteDirectoryPaths: getOrphanRouteDirectoryPaths(routeDirectories, scan),
+        routeDirectories,
         scan,
         subtrees,
     };
 }
 export function buildOwnedSubtrees(tree, parentSegments = [], subtrees = []) {
+    if (parentSegments.length === 0 &&
+        subtrees.length === 0 &&
+        tree.some((node) => node.kind === 'route')) {
+        addSubtreePlan(ROOT_ROUTE_NAME, [], subtrees);
+    }
     for (let node of tree) {
-        let segments = [...parentSegments, toDiskSegment(node.key)];
-        if (node.kind === 'group') {
-            let alternateCandidates = getActionOwnerCandidates(segments);
-            let entryCandidates = getControllerOwnerCandidates(segments);
-            subtrees.push({
-                alternateCandidates,
-                alternateDisplayPath: getPreferredOwnerDisplayPath(alternateCandidates),
-                entryCandidates,
-                entryDisplayPath: getPreferredOwnerDisplayPath(entryCandidates),
-                kind: 'controller',
-                routeName: node.name,
-                subtreePath: getRouteSubtreePath(segments),
-            });
-            buildOwnedSubtrees(node.children, segments, subtrees);
+        if (node.kind !== 'group') {
             continue;
         }
-        if (parentSegments.length > 0) {
+        let segments = [...parentSegments, toDiskSegment(node.key)];
+        if (hasDirectRouteLeaf(node.children)) {
+            addSubtreePlan(node.name, segments, subtrees);
+        }
+        buildOwnedSubtrees(node.children, segments, subtrees);
+    }
+    return subtrees;
+}
+export function buildRouteDirectories(tree, parentSegments = [], directories = []) {
+    for (let node of tree) {
+        if (node.kind !== 'group') {
             continue;
         }
-        let alternateCandidates = getControllerOwnerCandidates(segments);
-        let entryCandidates = getActionOwnerCandidates(segments);
-        subtrees.push({
-            alternateCandidates,
-            alternateDisplayPath: getPreferredOwnerDisplayPath(alternateCandidates),
-            entryCandidates,
-            entryDisplayPath: getPreferredOwnerDisplayPath(entryCandidates),
-            kind: 'action',
+        let segments = [...parentSegments, toDiskSegment(node.key)];
+        directories.push({
+            directoryPath: getRouteSubtreePath(segments),
             routeName: node.name,
-            subtreePath: getRouteSubtreePath(segments),
         });
+        buildRouteDirectories(node.children, segments, directories);
     }
-    return subtrees;
+    return directories;
+}
+function hasDirectRouteLeaf(tree) {
+    return tree.some((node) => node.kind === 'route');
+}
+function addSubtreePlan(routeName, segments, subtrees) {
+    let entryCandidates = getControllerOwnerCandidates(segments);
+    subtrees.push({
+        entryCandidates,
+        entryDisplayPath: getPreferredOwnerDisplayPath(entryCandidates),
+        routeName,
+        subtreePath: getRouteSubtreePath(segments),
+    });
 }
 async function scanControllersDirectory(appRoot) {
-    let controllersDir = path.join(appRoot, 'app', 'controllers');
+    let actionsDir = path.join(appRoot, 'app', 'actions');
     let controllerEntryPaths = new Set();
-    let actionEntryPaths = new Set();
-    let rootDirectoryPaths = new Set();
+    let routeDirectoryPaths = new Set();
     let routeLocalFilePaths = new Set();
     async function walk(currentDir, isRoot) {
         let entries;
@@ -70,9 +81,7 @@ async function scanControllersDirectory(appRoot) {
             let entryPath = path.join(currentDir, entry.name);
             let relativePath = normalizeRelativePath(path.relative(appRoot, entryPath));
             if (entry.isDirectory()) {
-                if (isRoot) {
-                    rootDirectoryPaths.add(relativePath);
-                }
+                routeDirectoryPaths.add(relativePath);
                 await walk(entryPath, false);
                 continue;
             }
@@ -83,20 +92,15 @@ async function scanControllersDirectory(appRoot) {
                 controllerEntryPaths.add(relativePath);
                 continue;
             }
-            if (isRoot && isActionCandidate(entry.name)) {
-                actionEntryPaths.add(relativePath);
-                continue;
-            }
-            if (!isRoot && isRouteLocalFileName(entry.name)) {
+            if (isRouteLocalFileName(entry.name)) {
                 routeLocalFilePaths.add(relativePath);
             }
         }
     }
-    await walk(controllersDir, true);
+    await walk(actionsDir, true);
     return {
-        actionEntryPaths,
         controllerEntryPaths,
-        rootDirectoryPaths,
+        routeDirectoryPaths,
         routeLocalFilePaths,
     };
 }
@@ -104,12 +108,9 @@ function applyScanToSubtrees(subtreePlans, scan) {
     let claimedRouteLocalPaths = claimFilesToDeepestSubtree([...scan.routeLocalFilePaths], subtreePlans);
     let claimedContentPaths = claimFilesToDeepestSubtree(getNestedContentPaths(scan), subtreePlans);
     return subtreePlans.map((subtree) => {
-        let actualAlternatePaths = findOwnerPaths(scan, invertOwnerKind(subtree.kind), subtree.alternateCandidates);
-        let actualEntryPaths = findOwnerPaths(scan, subtree.kind, subtree.entryCandidates);
+        let actualEntryPaths = findOwnerPaths(scan, subtree.entryCandidates);
         return {
             ...subtree,
-            actualAlternatePath: actualAlternatePaths[0] ?? null,
-            actualAlternatePaths,
             actualEntryPath: actualEntryPaths[0] ?? null,
             actualEntryPaths,
             claimedFilePaths: claimedContentPaths.get(subtree.routeName) ?? [],
@@ -143,49 +144,20 @@ function claimFilesToDeepestSubtree(filePaths, subtreePlans) {
     }
     return claims;
 }
-function getOrphanActionPaths(subtreePlans, scan) {
-    let expectedActionPaths = new Set(subtreePlans
-        .filter((subtree) => subtree.kind === 'action')
-        .flatMap((subtree) => subtree.entryCandidates));
-    let alternateActionPaths = new Set(subtreePlans
-        .filter((subtree) => subtree.kind === 'controller')
-        .flatMap((subtree) => subtree.alternateCandidates));
-    return [...scan.actionEntryPaths]
-        .filter((filePath) => !expectedActionPaths.has(filePath))
-        .filter((filePath) => !alternateActionPaths.has(filePath))
-        .sort();
-}
 function getOrphanControllerPaths(subtreePlans, scan) {
-    let expectedControllerPaths = new Set(subtreePlans
-        .filter((subtree) => subtree.kind === 'controller')
-        .flatMap((subtree) => subtree.entryCandidates));
-    let alternateControllerPaths = new Set(subtreePlans
-        .filter((subtree) => subtree.kind === 'action')
-        .flatMap((subtree) => subtree.alternateCandidates));
+    let expectedControllerPaths = new Set(subtreePlans.flatMap((subtree) => subtree.entryCandidates));
     return [...scan.controllerEntryPaths]
         .filter((filePath) => !expectedControllerPaths.has(filePath))
-        .filter((filePath) => !alternateControllerPaths.has(filePath))
         .sort();
 }
-function getOrphanRouteDirectoryPaths(subtreePlans, scan) {
-    let expectedRootDirectories = new Set(subtreePlans.map((subtree) => getTopLevelSubtreePath(subtree.subtreePath)));
+function getOrphanRouteDirectoryPaths(routeDirectories, scan) {
+    let expectedRouteDirectories = new Set(routeDirectories.map((routeDirectory) => routeDirectory.directoryPath));
     let actualControllerDirectories = [...scan.controllerEntryPaths].map((controllerPath) => normalizeRelativePath(path.dirname(controllerPath)));
-    return [...scan.rootDirectoryPaths]
-        .filter((directoryPath) => !expectedRootDirectories.has(directoryPath))
+    return [...scan.routeDirectoryPaths]
+        .filter((directoryPath) => !expectedRouteDirectories.has(directoryPath))
         .filter((directoryPath) => !actualControllerDirectories.some((controllerPath) => isDirectoryWithinDirectory(controllerPath, directoryPath)))
         .sort();
 }
-function hasOwnerPath(scan, kind, filePath) {
-    return kind === 'action'
-        ? scan.actionEntryPaths.has(filePath)
-        : scan.controllerEntryPaths.has(filePath);
-}
-function invertOwnerKind(kind) {
-    return kind === 'action' ? 'controller' : 'action';
-}
-function isActionCandidate(fileName) {
-    return isActionFileName(fileName);
-}
 function isRouteLocalFileName(fileName) {
     let baseName = getOwnerModuleBaseName(fileName);
     return (baseName != null &&
@@ -193,21 +165,18 @@ function isRouteLocalFileName(fileName) {
         !baseName.endsWith('.test') &&
         !baseName.endsWith('.spec'));
 }
-function findOwnerPath(scan, kind, candidatePaths) {
-    return findOwnerPaths(scan, kind, candidatePaths)[0] ?? null;
-}
-function findOwnerPaths(scan, kind, candidatePaths) {
+function findOwnerPaths(scan, candidatePaths) {
     let existingPaths = [];
     for (let candidatePath of candidatePaths) {
-        if (hasOwnerPath(scan, kind, candidatePath)) {
+        if (scan.controllerEntryPaths.has(candidatePath)) {
             existingPaths.push(candidatePath);
         }
     }
     return existingPaths;
 }
 function isNestedControllerPath(filePath) {
-    return (filePath.startsWith('app/controllers/') &&
-        filePath.slice('app/controllers/'.length).includes('/'));
+    return (filePath.startsWith(ACTIONS_PATH_PREFIX) &&
+        filePath.slice(ACTIONS_PATH_PREFIX.length).includes('/'));
 }
 function isWithinDirectory(filePath, directoryPath) {
     return filePath.startsWith(`${directoryPath}/`);
@@ -215,10 +184,6 @@ function isWithinDirectory(filePath, directoryPath) {
 function isDirectoryWithinDirectory(directoryPath, parentDirectoryPath) {
     return (directoryPath === parentDirectoryPath || isWithinDirectory(directoryPath, parentDirectoryPath));
 }
-function getTopLevelSubtreePath(subtreePath) {
-    let subtreeSegments = subtreePath.slice('app/controllers/'.length).split('/');
-    return getRouteSubtreePath([subtreeSegments[0]]);
-}
 function normalizeRelativePath(filePath) {
     return filePath.split(path.sep).join('/');
 }

package/dist/lib/doctor/controller-findings.d.ts

@@ -1,4 +1,4 @@
-import type { ControllerOwnership } from '../controller-ownership.ts';
+import { type ControllerOwnership } from '../controller-ownership.ts';
 import type { DoctorFinding, DoctorFixPlan } from './types.ts';
 export declare function getControllerFindings(ownership: ControllerOwnership, fixPlans: DoctorFixPlan[]): DoctorFinding[];
 //# sourceMappingURL=controller-findings.d.ts.map

package/dist/lib/doctor/controller-findings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-findings.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controller-findings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAgB,MAAM,4BAA4B,CAAA;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE9D,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,aAAa,EAAE,GACxB,aAAa,EAAE,CAyBjB"}
+{"version":3,"file":"controller-findings.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controller-findings.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EAEzB,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE9D,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,aAAa,EAAE,GACxB,aAAa,EAAE,CAkBjB"}

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

@@ -1,26 +1,20 @@
+import { ROOT_ROUTE_NAME, } from "../controller-ownership.js";
 export function getControllerFindings(ownership, fixPlans) {
     return [
         ...getSubtreeFindings(ownership.subtrees, fixPlans),
-        ...ownership.orphanActionPaths.map((actualPath) => ({
-            actualPath,
-            code: 'orphan-action',
-            message: `Standalone action ${actualPath} does not match any top-level route.`,
-            severity: 'warn',
-            suite: 'controllers',
-        })),
         ...ownership.orphanControllerPaths.map((actualPath) => ({
             actualPath,
             code: 'orphan-controller',
-            message: `Controller ${actualPath} does not match any route group.`,
+            message: `Action controller ${actualPath} does not match any route map.`,
             severity: 'warn',
-            suite: 'controllers',
+            suite: 'actions',
         })),
         ...ownership.orphanRouteDirectoryPaths.map((actualPath) => ({
             actualPath,
             code: 'orphan-route-directory',
-            message: `Directory ${actualPath} does not match any route subtree.`,
+            message: `Directory ${actualPath} does not match any route-map key path.`,
             severity: 'warn',
-            suite: 'controllers',
+            suite: 'actions',
         })),
     ];
 }
@@ -28,63 +22,20 @@ function getSubtreeFindings(subtrees, fixPlans) {
     let findings = [];
     let fixableFindingKeys = new Set(fixPlans.map((fixPlan) => `${fixPlan.code}:${fixPlan.routeName ?? ''}`));
     for (let subtree of subtrees) {
-        let actualEntryPath = subtree.actualEntryPath ?? undefined;
-        let actualAlternatePath = subtree.actualAlternatePath ?? undefined;
+        let routeMapName = formatRouteMapName(subtree.routeName);
         if (subtree.actualEntryPaths.length > 1) {
             findings.push({
                 actualPath: subtree.actualEntryPaths[0],
                 code: 'duplicate-owner-file',
                 expectedPath: subtree.entryDisplayPath,
-                message: `Route "${subtree.routeName}" has multiple ${subtree.kind} files: ${subtree.actualEntryPaths.join(', ')}. Keep only one ${subtree.kind} owner file.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'controllers',
-            });
-            continue;
-        }
-        if (subtree.actualAlternatePaths.length > 1) {
-            let alternateKind = subtree.kind === 'action' ? 'controller' : 'action';
-            findings.push({
-                actualPath: subtree.actualAlternatePaths[0],
-                code: 'duplicate-owner-file',
-                expectedPath: subtree.entryDisplayPath,
-                message: `Route "${subtree.routeName}" has multiple ${alternateKind} files: ${subtree.actualAlternatePaths.join(', ')}. Keep only one ${alternateKind} owner file.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'controllers',
-            });
-            continue;
-        }
-        if (actualEntryPath != null && actualAlternatePath != null) {
-            findings.push({
-                actualPath: actualAlternatePath,
-                code: 'ambiguous-owner',
-                expectedPath: actualEntryPath,
-                message: subtree.kind === 'action'
-                    ? `Route "${subtree.routeName}" has both action ${actualEntryPath} and controller ${actualAlternatePath}.`
-                    : `Route "${subtree.routeName}" has both controller ${actualEntryPath} and standalone action ${actualAlternatePath}.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'controllers',
-            });
-            continue;
-        }
-        if (actualAlternatePath != null) {
-            findings.push({
-                actualPath: actualAlternatePath,
-                code: 'wrong-owner-kind',
-                expectedPath: subtree.entryDisplayPath,
-                message: subtree.kind === 'action'
-                    ? `Route "${subtree.routeName}" expects action ${subtree.entryDisplayPath}, but found controller ${actualAlternatePath}.`
-                    : `Route "${subtree.routeName}" expects controller ${subtree.entryDisplayPath}, but found standalone action ${actualAlternatePath}.`,
-                fixable: fixableFindingKeys.has(`wrong-owner-kind:${subtree.routeName}`),
+                message: `${routeMapName} has multiple action controller files: ${subtree.actualEntryPaths.join(', ')}. Keep only one controller owner file.`,
                 routeName: subtree.routeName,
                 severity: 'warn',
-                suite: 'controllers',
+                suite: 'actions',
             });
             continue;
         }
-        if (subtree.kind === 'controller' && subtree.actualEntryPath == null) {
+        if (subtree.actualEntryPath == null) {
             let code = subtree.claimedFilePaths.length > 0
                 ? 'incomplete-controller'
                 : 'missing-owner';
@@ -94,39 +45,16 @@ function getSubtreeFindings(subtrees, fixPlans) {
                 expectedPath: subtree.entryDisplayPath,
                 fixable: fixableFindingKeys.has(`${code}:${subtree.routeName}`),
                 message: subtree.claimedFilePaths.length > 0
-                    ? `Route "${subtree.routeName}" has files under ${subtree.subtreePath}, but is missing controller ${subtree.entryDisplayPath}.`
-                    : `Route "${subtree.routeName}" is missing controller ${subtree.entryDisplayPath}.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'controllers',
-            });
-            continue;
-        }
-        if (subtree.kind === 'action' && subtree.claimedFilePaths.length > 0) {
-            findings.push({
-                actualPath: subtree.subtreePath,
-                code: 'promotion-drift',
-                expectedPath: actualEntryPath ?? subtree.entryDisplayPath,
-                message: actualEntryPath == null
-                    ? `Route "${subtree.routeName}" has files under ${subtree.subtreePath}, but is still expected to use action ${subtree.entryDisplayPath}. Promote it to controller ${subtree.alternateDisplayPath} or move the files back into ${subtree.entryDisplayPath}.`
-                    : `Route "${subtree.routeName}" uses action ${actualEntryPath}, but also has files under ${subtree.subtreePath}. Promote it to controller ${subtree.alternateDisplayPath} or keep the route in ${actualEntryPath}.`,
-                routeName: subtree.routeName,
-                severity: 'warn',
-                suite: 'controllers',
-            });
-            continue;
-        }
-        if (subtree.actualEntryPath == null) {
-            findings.push({
-                code: 'missing-owner',
-                expectedPath: subtree.entryDisplayPath,
-                fixable: fixableFindingKeys.has(`missing-owner:${subtree.routeName}`),
-                message: `Route "${subtree.routeName}" is missing action ${subtree.entryDisplayPath}.`,
+                    ? `${routeMapName} has files under ${subtree.subtreePath}, but is missing action controller ${subtree.entryDisplayPath}.`
+                    : `${routeMapName} is missing action controller ${subtree.entryDisplayPath}.`,
                 routeName: subtree.routeName,
                 severity: 'warn',
-                suite: 'controllers',
+                suite: 'actions',
             });
         }
     }
     return findings;
 }
+function formatRouteMapName(routeName) {
+    return routeName === ROOT_ROUTE_NAME ? 'Root route map' : `Route map "${routeName}"`;
+}

package/dist/lib/doctor/controller-fix-plans.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-fix-plans.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controller-fix-plans.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,mBAAmB,EAEnB,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAI/C,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,EAC1B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,aAAa,EAAE,CAAC,CAqD1B"}
+{"version":3,"file":"controller-fix-plans.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controller-fix-plans.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,mBAAmB,EAEnB,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAI/C,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EAAE,EAC1B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,aAAa,EAAE,CAAC,CAkD1B"}