@remix-run/cli 0.2.0 → 0.3.0

package/dist/lib/bootstrap-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap-project.d.ts","sourceRoot":"","sources":["../../src/lib/bootstrap-project.ts"],"names":[],"mappings":"AAYA,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAO1E,eAAO,MAAM,8BAA8B,WAAW,CAAA;AAEtD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,qBAAqB,GAC7B,0BAA0B,GAC1B,yBAAyB,GACzB,uBAAuB,CAAA;AAE3B,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;AAUnF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,EAChC,QAAQ,CAAC,EAAE,yBAAyB,GACnC,OAAO,CAAC,mBAAmB,CAAC,CAgC9B"}
+{"version":3,"file":"bootstrap-project.d.ts","sourceRoot":"","sources":["../../src/lib/bootstrap-project.ts"],"names":[],"mappings":"AAYA,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAM1E,eAAO,MAAM,8BAA8B,WAAW,CAAA;AAEtD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,qBAAqB,GAC7B,0BAA0B,GAC1B,yBAAyB,GACzB,uBAAuB,CAAA;AAE3B,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;AAUnF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,EAChC,QAAQ,CAAC,EAAE,yBAAyB,GACnC,OAAO,CAAC,mBAAmB,CAAC,CAgC9B"}

package/dist/lib/bootstrap-project.js

@@ -5,8 +5,10 @@ import { fileURLToPath } from 'node:url';
 import semver from 'semver';
 import { appNameUnavailable, invalidPackageName, targetDirectoryNotEmpty, targetPathNotDirectory, } from "./errors.js";
 import { runProgressStep } from "./reporter.js";
-const BOOTSTRAP_DIRECTORY = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../bootstrap');
-const BOOTSTRAP_EXCLUDED_NAMES = new Set(['.gitkeep', 'node_modules']);
+const MODULE_DIRECTORY = path.dirname(fileURLToPath(import.meta.url));
+const PACKAGE_TEMPLATE_DIRECTORY = path.resolve(MODULE_DIRECTORY, '../../template');
+const REPO_TEMPLATE_DIRECTORY = path.resolve(MODULE_DIRECTORY, '../../../../template');
+const TEMPLATE_EXCLUDED_NAMES = new Set(['.gitkeep', 'node_modules']);
 export const MINIMUM_SUPPORTED_NODE_VERSION = '24.3.0';
 export async function bootstrapProject(options, progress) {
     let cwd = options.cwd ?? process.cwd();
@@ -21,8 +23,8 @@ export async function bootstrapProject(options, progress) {
         remixVersion: readDefaultRemixVersion(options.remixVersion),
     };
     await runProgressStep(progress, 'prepare-target-directory', () => ensureTargetDirectory(targetDir, options.force));
-    await runProgressStep(progress, 'generate-scaffold-files', () => copyBootstrapDirectory({
-        sourceDir: BOOTSTRAP_DIRECTORY,
+    await runProgressStep(progress, 'generate-scaffold-files', async () => copyTemplateDirectory({
+        sourceDir: await resolveTemplateDirectory(),
         targetDir,
         templateValues: createTemplateValues(config),
     }));
@@ -49,6 +51,28 @@ function createTemplateValues(config) {
         '%%RMX_APP_DISPLAY_NAME_URI_COMPONENT%%': encodeURIComponent(config.appDisplayName),
     };
 }
+async function resolveTemplateDirectory() {
+    if (await isDirectory(PACKAGE_TEMPLATE_DIRECTORY)) {
+        return PACKAGE_TEMPLATE_DIRECTORY;
+    }
+    if (await isDirectory(REPO_TEMPLATE_DIRECTORY)) {
+        return REPO_TEMPLATE_DIRECTORY;
+    }
+    throw new Error(`Could not find the Remix app template at ${PACKAGE_TEMPLATE_DIRECTORY} or ${REPO_TEMPLATE_DIRECTORY}.`);
+}
+async function isDirectory(directory) {
+    try {
+        let stats = await fs.stat(directory);
+        return stats.isDirectory();
+    }
+    catch (error) {
+        let nodeError = error;
+        if (nodeError.code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
 async function writeScaffoldPackageJson(targetDir, config) {
     let packageJsonPath = path.join(targetDir, 'package.json');
     let packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
@@ -56,7 +80,6 @@ async function writeScaffoldPackageJson(targetDir, config) {
     packageJson.dependencies = {
         ...packageJson.dependencies,
         remix: config.remixVersion,
-        tsx: 'latest',
     };
     packageJson.devDependencies = {
         ...packageJson.devDependencies,
@@ -88,17 +111,17 @@ async function ensureTargetDirectory(targetDir, force) {
     }
     await fs.mkdir(targetDir, { recursive: true });
 }
-async function copyBootstrapDirectory({ sourceDir, targetDir, templateValues, }) {
+async function copyTemplateDirectory({ sourceDir, targetDir, templateValues, }) {
     let entries = await fs.readdir(sourceDir, { withFileTypes: true });
     for (let entry of entries) {
         let sourcePath = path.join(sourceDir, entry.name);
-        let targetPath = path.join(targetDir, entry.name);
-        if (BOOTSTRAP_EXCLUDED_NAMES.has(entry.name)) {
+        let targetPath = path.join(targetDir, entry.name === 'gitignore' ? '.gitignore' : entry.name);
+        if (TEMPLATE_EXCLUDED_NAMES.has(entry.name)) {
             continue;
         }
         if (entry.isDirectory()) {
             await fs.mkdir(targetPath, { recursive: true });
-            await copyBootstrapDirectory({ sourceDir: sourcePath, targetDir: targetPath, templateValues });
+            await copyTemplateDirectory({ sourceDir: sourcePath, targetDir: targetPath, templateValues });
             continue;
         }
         let content = await fs.readFile(sourcePath, 'utf8');

package/dist/lib/cli.d.ts

@@ -1,6 +1,35 @@
+/**
+ * Options accepted by {@link runRemix}.
+ */
 export interface RunRemixOptions {
+    /**
+     * Directory used as the working root when resolving project files (default
+     * `process.cwd()`).
+     */
     cwd?: string;
+    /**
+     * Override for the Remix version reported by `remix --version`. Defaults to
+     * the version of the installed `@remix-run/cli` package.
+     */
     remixVersion?: string;
 }
+/**
+ * Entry point for the `remix` CLI. Parses `argv`, dispatches to the matching
+ * subcommand (`new`, `doctor`, `routes`, `test`, `version`, `completion`,
+ * `help`), and resolves with the exit code the process should use.
+ *
+ * @param argv Argument vector to parse, excluding the node and script paths
+ *             (default `process.argv.slice(2)`).
+ * @param options Overrides for CLI context resolution.
+ * @returns The numeric exit code (`0` on success, non-zero on failure).
+ *
+ * @example
+ * ```ts
+ * import { runRemix } from '@remix-run/cli'
+ *
+ * let exitCode = await runRemix(process.argv.slice(2))
+ * process.exit(exitCode)
+ * ```
+ */
 export declare function runRemix(argv?: string[], options?: RunRemixOptions): Promise<number>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/lib/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/lib/cli.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAsB,QAAQ,CAC5B,IAAI,GAAE,MAAM,EAA0B,EACtC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CA4BjB"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/lib/cli.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,GAAE,MAAM,EAA0B,EACtC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CA0BjB"}

package/dist/lib/cli.js

@@ -3,14 +3,30 @@ import { getCliHelpText, runHelpCommand } from "./commands/help.js";
 import { resolveCliContext } from "./cli-context.js";
 import { renderCliError, unknownCommand } from "./errors.js";
 import { configureColors, restoreTerminalFormatting } from "./terminal.js";
+/**
+ * Entry point for the `remix` CLI. Parses `argv`, dispatches to the matching
+ * subcommand (`new`, `doctor`, `routes`, `test`, `version`, `completion`,
+ * `help`), and resolves with the exit code the process should use.
+ *
+ * @param argv Argument vector to parse, excluding the node and script paths
+ *             (default `process.argv.slice(2)`).
+ * @param options Overrides for CLI context resolution.
+ * @returns The numeric exit code (`0` on success, non-zero on failure).
+ *
+ * @example
+ * ```ts
+ * import { runRemix } from '@remix-run/cli'
+ *
+ * let exitCode = await runRemix(process.argv.slice(2))
+ * process.exit(exitCode)
+ * ```
+ */
 export async function runRemix(argv = process.argv.slice(2), options = {}) {
     let context = await resolveCliContext(options);
     try {
-        while (argv[0] === '--') {
-            argv = argv.slice(1);
-        }
+        argv = stripLeadingSeparators(argv);
         let globalOptions = extractGlobalOptions(argv);
-        argv = globalOptions.argv;
+        argv = stripLeadingSeparators(globalOptions.argv);
         configureColors({ disabled: globalOptions.noColor });
         if (argv.length === 0) {
             process.stdout.write(getCliHelpText());
@@ -27,6 +43,12 @@ export async function runRemix(argv = process.argv.slice(2), options = {}) {
         restoreTerminalFormatting();
     }
 }
+function stripLeadingSeparators(argv) {
+    while (argv[0] === '--') {
+        argv = argv.slice(1);
+    }
+    return argv;
+}
 async function runCommand(command, argv, context) {
     if (command === 'help') {
         return runHelpCommand(argv);

package/dist/lib/commands/completion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/completion.ts"],"names":[],"mappings":"AAiBA,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA6B1E;AAED,wBAAgB,4BAA4B,CAAC,MAAM,GAAE,MAAM,CAAC,WAA4B,GAAG,MAAM,CAShG"}
+{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/completion.ts"],"names":[],"mappings":"AAiBA,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAkC1E;AAED,wBAAgB,4BAA4B,CAAC,MAAM,GAAE,MAAM,CAAC,WAA4B,GAAG,MAAM,CAShG"}

package/dist/lib/commands/completion.js

@@ -4,13 +4,17 @@ import { invalidCompletionRequest, renderCliError, toCliError, unknownCompletion
 import { formatHelpText } from "../help-text.js";
 import { parseArgs } from "../parse-args.js";
 export async function runCompletionCommand(argv) {
-    if (argv.length === 0 || argv[0] === '-h' || argv[0] === '--help') {
+    if (argv.length === 0) {
         process.stdout.write(getCompletionCommandHelpText());
         return 0;
     }
     if (argv[0] === '--') {
         return runCompletionPlumbing(argv.slice(1));
     }
+    if (argv.includes('-h') || argv.includes('--help')) {
+        process.stdout.write(getCompletionCommandHelpText());
+        return 0;
+    }
     let [shell, ...rest] = argv;
     try {
         parseArgs(rest, {}, { maxPositionals: 0 });

package/dist/lib/commands/doctor.js

@@ -10,9 +10,9 @@ import { formatHelpText } from "../help-text.js";
 import { parseArgs } from "../parse-args.js";
 import { createCommandReporter, createStepProgressReporter, } from "../reporter.js";
 const DOCTOR_SUITE_LABELS = {
-    controllers: {
-        complete: 'controllers',
-        running: 'Checking controllers',
+    actions: {
+        complete: 'actions',
+        running: 'Checking actions',
     },
     environment: {
         complete: 'environment',
@@ -78,7 +78,7 @@ export function getDoctorCommandHelpText(target = process.stdout) {
                 description: 'Exit with status 1 when warning-level findings are present',
                 label: '--strict',
             },
-            { description: 'Apply low-risk project and controller fixes', label: '--fix' },
+            { description: 'Apply low-risk project and action fixes', label: '--fix' },
         ],
         usage: ['remix doctor [--json] [--strict] [--fix] [--no-color]'],
     }, target);
@@ -132,13 +132,13 @@ async function collectDoctorReport(progress, options, reporter, context) {
     progress?.writeSummaryGap();
     if (hasWarningFindings(environment.suite.findings)) {
         let projectSuite = createSkippedDoctorSuite('project', 'Blocked by environment warnings.');
-        let controllersSuite = createSkippedDoctorSuite('controllers', 'Blocked by environment warnings.');
-        suites.push(projectSuite, controllersSuite);
+        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(controllersSuite.name, controllersSuite.reason);
-        writeDoctorSuiteDetails(reporter, controllersSuite);
+        progress?.skip(actionsSuite.name, actionsSuite.reason);
+        writeDoctorSuiteDetails(reporter, actionsSuite);
         progress?.writeSummaryGap();
         return {
             appRoot: environment.projectRoot,
@@ -181,10 +181,10 @@ async function collectDoctorReport(progress, options, reporter, context) {
     writeDoctorSuiteDetails(reporter, project.suite);
     progress?.writeSummaryGap();
     if (hasWarningFindings(project.suite.findings)) {
-        let controllersSuite = createSkippedDoctorSuite('controllers', 'Blocked by project warnings.');
-        suites.push(controllersSuite);
-        progress?.skip(controllersSuite.name, controllersSuite.reason);
-        writeDoctorSuiteDetails(reporter, controllersSuite);
+        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,
@@ -195,7 +195,7 @@ async function collectDoctorReport(progress, options, reporter, context) {
             suites,
         };
     }
-    let controllers = await runDoctorSuite(progress, 'controllers', async () => {
+    let actions = await runDoctorSuite(progress, 'actions', async () => {
         let controllerResult = await checkControllerConventions(project.routeManifest.appRoot, project.routeManifest.tree);
         let remainingFindings = controllerResult.suite.findings;
         let suiteAppliedFixes = [];
@@ -204,16 +204,16 @@ async function collectDoctorReport(progress, options, reporter, context) {
             let finalControllerResult = await checkControllerConventions(project.routeManifest.appRoot, project.routeManifest.tree);
             remainingFindings = finalControllerResult.suite.findings;
         }
-        let suite = createDoctorSuite('controllers', remainingFindings);
+        let suite = createDoctorSuite('actions', remainingFindings);
         if (suiteAppliedFixes.length > 0) {
             suite.appliedFixes = suiteAppliedFixes;
         }
         return { appliedFixes: suiteAppliedFixes, suite };
     });
-    findings.push(...controllers.suite.findings);
-    appliedFixes.push(...(controllers.appliedFixes ?? []));
-    suites.push(controllers.suite);
-    writeDoctorSuiteDetails(reporter, controllers.suite);
+    findings.push(...actions.suite.findings);
+    appliedFixes.push(...(actions.appliedFixes ?? []));
+    suites.push(actions.suite);
+    writeDoctorSuiteDetails(reporter, actions.suite);
     progress?.writeSummaryGap();
     let report = {
         appRoot: environment.projectRoot,

package/dist/lib/commands/routes.js

@@ -5,7 +5,7 @@ import { parseArgs } from "../parse-args.js";
 import { createCommandReporter } from "../reporter.js";
 import { loadRouteMap } from "../route-map.js";
 import { lightRed } from "../terminal.js";
-const CONTROLLERS_PATH_PREFIX = 'app/controllers/';
+const ACTIONS_PATH_PREFIX = 'app/actions/';
 export async function runRoutesCommand(argv, context) {
     if (argv.includes('-h') || argv.includes('--help')) {
         process.stdout.write(getRoutesCommandHelpText());
@@ -154,8 +154,8 @@ function colorRouteLine(line, node) {
     return node.owner.exists ? line : lightRed(line);
 }
 function getCompactOwnerPath(ownerPath) {
-    if (ownerPath.startsWith(CONTROLLERS_PATH_PREFIX)) {
-        return ownerPath.slice(CONTROLLERS_PATH_PREFIX.length);
+    if (ownerPath.startsWith(ACTIONS_PATH_PREFIX)) {
+        return ownerPath.slice(ACTIONS_PATH_PREFIX.length);
     }
     return ownerPath;
 }

package/dist/lib/completion.js

@@ -137,11 +137,7 @@ function completeCommand(command, tokens, currentWord, usedGlobalFlags) {
         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);

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"}