@remix-run/cli 0.3.4 → 0.5.0

package/dist/lib/completion.js

@@ -1,6 +1,39 @@
+import { testCommandFlags } from './commands/test.js';
 const COMPLETION_SHELLS = ['bash', 'zsh'];
-const HELP_COMMANDS = ['completion', 'doctor', 'help', 'new', 'routes', 'test', 'version'];
-const ROOT_COMMANDS = ['completion', 'doctor', 'help', 'new', 'routes', 'test', 'version'];
+const DB_COMMANDS = ['migrate', 'reset', 'seed', 'status', 'wipe'];
+const HELP_COMMANDS = [
+    'completion',
+    'db',
+    'doctor',
+    'help',
+    'new',
+    'routes',
+    'test',
+    'version',
+];
+const ROOT_COMMANDS = [
+    'completion',
+    'db',
+    'doctor',
+    'help',
+    'new',
+    'routes',
+    'test',
+    'version',
+];
+// Derived from the `remix test` flag table so completion stays in sync with
+// argument parsing and help text.
+const TEST_BOOLEAN_FLAGS = testCommandFlags
+    .filter((flag) => flag.type === 'boolean')
+    .map((flag) => flag.name);
+const TEST_VALUE_FLAGS = testCommandFlags
+    .filter((flag) => flag.type === 'string')
+    .map((flag) => flag.name);
+const TEST_BOOLEAN_FLAG_SET = new Set(TEST_BOOLEAN_FLAGS);
+const TEST_VALUE_FLAG_SET = new Set(TEST_VALUE_FLAGS);
+const TEST_REPEATABLE_FLAGS = new Set(testCommandFlags.filter((flag) => flag.multiple).map((flag) => flag.name));
+const TEST_FILE_VALUE_FLAGS = new Set(testCommandFlags.filter((flag) => flag.files).map((flag) => flag.name));
+const TEST_FLAG_ALIASES = new Map(testCommandFlags.flatMap((flag) => flag.alias === undefined ? [] : [[flag.alias, flag.name]]));
 export function isCompletionShell(value) {
     return COMPLETION_SHELLS.includes(value);
 }
@@ -8,6 +41,9 @@ export function getCompletionResult(words, currentIndex) {
     let resolvedIndex = Math.max(0, currentIndex);
     let currentWord = words[resolvedIndex] ?? '';
     let tokens = getTokensBeforeCursor(words, resolvedIndex);
+    if (currentWord.startsWith('--config=')) {
+        return { mode: 'files' };
+    }
     return completeTopLevel(tokens, currentWord);
 }
 export function renderCompletionResult(result) {
@@ -33,7 +69,9 @@ if type complete &>/dev/null; then
     local lines
 
     if type _get_comp_words_by_ref &>/dev/null; then
-      _get_comp_words_by_ref -w words -i cword
+      # -n = keeps --config=<path> together as one word; bash's default
+      # COMP_WORDBREAKS would otherwise split it at the equals sign.
+      _get_comp_words_by_ref -n = -w words -i cword
     else
       cword="$COMP_CWORD"
       words=("\${COMP_WORDS[@]}")
@@ -52,7 +90,15 @@ if type complete &>/dev/null; then
     fi
 
     if [[ "$mode" == "mode:files" ]]; then
-      COMPREPLY=($(compgen -f -- "$current"))
+      if [[ "$current" == --config=* ]]; then
+        # Readline still breaks the insertion point at '=', so complete the
+        # path portion alone; prefixing --config= would duplicate the flag.
+        local config_value
+        config_value="\${current#--config=}"
+        COMPREPLY=($(compgen -f -- "$config_value"))
+      else
+        COMPREPLY=($(compgen -f -- "$current"))
+      fi
       return 0
     fi
 
@@ -78,6 +124,9 @@ elif type compdef &>/dev/null; then
     fi
 
     if [[ "$mode" == "mode:files" ]]; then
+      if [[ "\${words[CURRENT]}" == --config=* ]]; then
+        compset -P '--config='
+      fi
       if autoload -U +X _files 2>/dev/null; then
         _files
       else
@@ -99,6 +148,18 @@ function completeTopLevel(tokens, currentWord) {
     let index = 0;
     while (index < tokens.length) {
         let token = tokens[index];
+        if (token === '--config') {
+            usedFlags.add('--config');
+            if (tokens[index + 1] === undefined)
+                return { mode: 'files' };
+            index += 2;
+            continue;
+        }
+        if (token.startsWith('--config=')) {
+            usedFlags.add('--config');
+            index++;
+            continue;
+        }
         if (token === '--no-color') {
             usedFlags.add('--no-color');
             index++;
@@ -117,17 +178,24 @@ function completeTopLevel(tokens, currentWord) {
     return completeValues(getTopLevelSuggestions(currentWord, usedFlags), currentWord);
 }
 function completeCommand(command, tokens, currentWord, usedGlobalFlags) {
+    if (expectsGlobalConfigValue(tokens)) {
+        return { mode: 'files' };
+    }
     if (command === 'help') {
         return completeHelp(tokens, currentWord, usedGlobalFlags);
     }
     if (command === 'new') {
         return completeNew(tokens, currentWord, usedGlobalFlags);
     }
+    if (command === 'db') {
+        return completeDb(tokens, currentWord, usedGlobalFlags);
+    }
     if (command === 'doctor') {
         return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, [
             '--fix',
             '--json',
             '--strict',
+            '--no-strict',
         ]);
     }
     if (command === 'routes') {
@@ -137,13 +205,87 @@ function completeCommand(command, tokens, currentWord, usedGlobalFlags) {
         return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, []);
     }
     if (command === 'test') {
-        return completeSimpleFlags(tokens, currentWord, usedGlobalFlags, ['--coverage', '--watch']);
+        return completeTest(tokens, currentWord, usedGlobalFlags);
     }
     if (command === 'completion') {
         return completeCompletionCommand(tokens, currentWord, usedGlobalFlags);
     }
     return completeValues([], currentWord);
 }
+function completeTest(tokens, currentWord, usedGlobalFlags) {
+    let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
+    if (filteredTokens == null) {
+        return completeValues([], currentWord);
+    }
+    let usedFlags = new Set();
+    let expectedValueFor;
+    let afterSeparator = false;
+    for (let token of filteredTokens) {
+        if (expectedValueFor != null) {
+            expectedValueFor = undefined;
+            continue;
+        }
+        // Everything after a bare `--` is a positional test file glob
+        if (afterSeparator) {
+            continue;
+        }
+        if (token === '--') {
+            afterSeparator = true;
+            continue;
+        }
+        if (token.startsWith('--')) {
+            // `--flag=value` carries its value inline
+            let equalsIndex = token.indexOf('=');
+            let flag = equalsIndex === -1 ? token : token.slice(0, equalsIndex);
+            if (TEST_VALUE_FLAG_SET.has(flag)) {
+                usedFlags.add(flag);
+                if (equalsIndex === -1) {
+                    expectedValueFor = flag;
+                }
+                continue;
+            }
+            if (TEST_BOOLEAN_FLAG_SET.has(flag)) {
+                usedFlags.add(flag);
+                continue;
+            }
+            return completeValues([], currentWord);
+        }
+        if (token.startsWith('-') && token !== '-') {
+            let aliased = TEST_FLAG_ALIASES.get(token.slice(0, 2));
+            // A value alias may carry its value inline (`-c1`); a bare alias
+            // expects the value in the next token.
+            if (aliased !== undefined && TEST_VALUE_FLAG_SET.has(aliased)) {
+                usedFlags.add(aliased);
+                if (token.length === 2) {
+                    expectedValueFor = aliased;
+                }
+                continue;
+            }
+            // A group of boolean aliases (`-qw`)
+            let group = [...token.slice(1)].map((char) => TEST_FLAG_ALIASES.get(`-${char}`));
+            if (group.every((flag) => flag !== undefined && TEST_BOOLEAN_FLAG_SET.has(flag))) {
+                for (let flag of group) {
+                    usedFlags.add(flag);
+                }
+                continue;
+            }
+            return completeValues([], currentWord);
+        }
+        // Anything else is a positional test file glob
+    }
+    if (expectedValueFor != null) {
+        return TEST_FILE_VALUE_FLAGS.has(expectedValueFor) ? { mode: 'files' } : { mode: 'none' };
+    }
+    if (afterSeparator) {
+        return { mode: 'files' };
+    }
+    let longFlags = [...TEST_BOOLEAN_FLAGS, ...TEST_VALUE_FLAGS].filter((flag) => !usedFlags.has(flag) || TEST_REPEATABLE_FLAGS.has(flag));
+    let shortFlags = [...TEST_FLAG_ALIASES].flatMap(([short, long]) => !usedFlags.has(long) || TEST_REPEATABLE_FLAGS.has(long) ? [short] : []);
+    let suggestions = withHelpFlags([...longFlags, ...shortFlags], usedGlobalFlags);
+    return currentWord.startsWith('-') || currentWord === ''
+        ? completeValues(suggestions, currentWord)
+        : { mode: 'files' };
+}
 function completeHelp(tokens, currentWord, usedGlobalFlags) {
     let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
     if (filteredTokens == null) {
@@ -235,6 +377,62 @@ function completeRoutes(tokens, currentWord, usedGlobalFlags) {
     ], usedGlobalFlags);
     return completeValues(flags, currentWord);
 }
+function completeDb(tokens, currentWord, usedGlobalFlags) {
+    let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
+    if (filteredTokens == null) {
+        return completeValues([], currentWord);
+    }
+    if (filteredTokens.length === 0) {
+        return completeValues(withHelpFlags([...DB_COMMANDS], usedGlobalFlags), currentWord);
+    }
+    let [subcommand, ...rest] = filteredTokens;
+    if (subcommand === 'migrate') {
+        return completeDbOptions(rest, currentWord, usedGlobalFlags, [], ['--connection-env', '--journal-table', '--migrations', '--to']);
+    }
+    if (subcommand === 'reset') {
+        return completeDbOptions(rest, currentWord, usedGlobalFlags, ['--force'], ['--connection-env', '--journal-table', '--migrations', '--seed']);
+    }
+    if (subcommand === 'wipe') {
+        return completeDbOptions(rest, currentWord, usedGlobalFlags, ['--force'], ['--connection-env']);
+    }
+    if (subcommand === 'seed') {
+        return completeDbOptions(rest, currentWord, usedGlobalFlags, [], ['--connection-env', '--seed']);
+    }
+    if (subcommand === 'status') {
+        return completeDbOptions(rest, currentWord, usedGlobalFlags, [], ['--connection-env', '--journal-table', '--migrations']);
+    }
+    return completeValues([], currentWord);
+}
+function completeDbOptions(tokens, currentWord, usedGlobalFlags, booleanFlags, valueFlags) {
+    let usedFlags = new Set();
+    let expectedValueFor;
+    for (let token of tokens) {
+        if (expectedValueFor !== undefined) {
+            expectedValueFor = undefined;
+            continue;
+        }
+        let equalsIndex = token.indexOf('=');
+        let flag = equalsIndex === -1 ? token : token.slice(0, equalsIndex);
+        if (booleanFlags.includes(flag)) {
+            usedFlags.add(flag);
+            continue;
+        }
+        if (valueFlags.includes(flag)) {
+            usedFlags.add(flag);
+            if (equalsIndex === -1)
+                expectedValueFor = flag;
+            continue;
+        }
+        return completeValues([], currentWord);
+    }
+    if (expectedValueFor !== undefined) {
+        return expectedValueFor === '--migrations' || expectedValueFor === '--seed'
+            ? { mode: 'files' }
+            : { mode: 'none' };
+    }
+    let available = [...booleanFlags, ...valueFlags].filter((flag) => !usedFlags.has(flag));
+    return completeValues(withHelpFlags(available, usedGlobalFlags), currentWord);
+}
 function completeCompletionCommand(tokens, currentWord, usedGlobalFlags) {
     let filteredTokens = filterGlobalCommandTokens(tokens, usedGlobalFlags);
     if (filteredTokens == null) {
@@ -262,6 +460,7 @@ function completeSimpleFlags(tokens, currentWord, usedGlobalFlags, commandFlags)
 }
 function getTopLevelSuggestions(currentWord, usedFlags) {
     let flags = [
+        ...(!usedFlags.has('--config') ? ['--config'] : []),
         ...(!usedFlags.has('-h') ? ['-h', '--help'] : []),
         ...(!usedFlags.has('--no-color') ? ['--no-color'] : []),
         ...(!usedFlags.has('-v') ? ['-v', '--version'] : []),
@@ -274,13 +473,24 @@ function getTopLevelSuggestions(currentWord, usedFlags) {
 function withHelpFlags(values, usedGlobalFlags) {
     return [
         ...values,
+        ...(!usedGlobalFlags.has('--config') ? ['--config'] : []),
         ...(!usedGlobalFlags.has('-h') ? ['-h', '--help'] : []),
         ...(!usedGlobalFlags.has('--no-color') ? ['--no-color'] : []),
     ];
 }
 function filterGlobalCommandTokens(tokens, usedGlobalFlags) {
     let filtered = [];
-    for (let token of tokens) {
+    for (let index = 0; index < tokens.length; index++) {
+        let token = tokens[index];
+        if (token === '--config') {
+            usedGlobalFlags.add('--config');
+            index++;
+            continue;
+        }
+        if (token.startsWith('--config=')) {
+            usedGlobalFlags.add('--config');
+            continue;
+        }
         if (token === '--no-color') {
             usedGlobalFlags.add('--no-color');
             continue;
@@ -293,6 +503,19 @@ function filterGlobalCommandTokens(tokens, usedGlobalFlags) {
     }
     return filtered;
 }
+function expectsGlobalConfigValue(tokens) {
+    let expectsValue = false;
+    for (let token of tokens) {
+        if (expectsValue) {
+            expectsValue = false;
+            continue;
+        }
+        if (token === '--config') {
+            expectsValue = true;
+        }
+    }
+    return expectsValue;
+}
 function completeValues(values, currentWord) {
     return {
         mode: 'values',

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

@@ -1,13 +1,5 @@
-declare const OWNER_FILE_EXTENSIONS: readonly [".ts", ".tsx", ".js", ".jsx"];
-export type OwnerFileExtension = (typeof OWNER_FILE_EXTENSIONS)[number];
 export declare function getControllerOwnerCandidates(segments: string[]): string[];
 export declare function getRouteSubtreePath(segments: string[]): string;
 export declare function getPreferredOwnerDisplayPath(candidates: string[]): string;
-export declare function getOwnerCandidateForExtension(candidates: string[], extension: OwnerFileExtension): string | null;
-export declare function getOwnerFileExtension(filePath: string): OwnerFileExtension | null;
 export declare function toDiskSegment(segment: string): string;
-export declare function isControllerEntryFileName(fileName: string): boolean;
-export declare function getOwnerModuleBaseName(fileName: string): string | null;
-export declare function isActionFileName(fileName: string): boolean;
-export {};
 //# sourceMappingURL=controller-files.d.ts.map

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;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"}
+{"version":3,"file":"controller-files.d.ts","sourceRoot":"","sources":["../../src/lib/controller-files.ts"],"names":[],"mappings":"AAKA,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,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYrD"}

package/dist/lib/controller-files.js

@@ -11,12 +11,6 @@ export function getPreferredOwnerDisplayPath(candidates) {
     let tsxCandidate = candidates.find((candidate) => candidate.endsWith('.tsx'));
     return tsxCandidate ?? candidates[0] ?? '';
 }
-export function getOwnerCandidateForExtension(candidates, extension) {
-    return candidates.find((candidate) => candidate.endsWith(extension)) ?? null;
-}
-export function getOwnerFileExtension(filePath) {
-    return OWNER_FILE_EXTENSIONS.find((extension) => filePath.endsWith(extension)) ?? null;
-}
 export function toDiskSegment(segment) {
     let diskSegment = segment
         .replace(/[\\/]+/g, '-')
@@ -29,23 +23,6 @@ export function toDiskSegment(segment) {
         .replace(/^-+|-+$/g, '');
     return diskSegment.length === 0 ? 'route' : diskSegment;
 }
-export function isControllerEntryFileName(fileName) {
-    return OWNER_FILE_EXTENSIONS.some((extension) => fileName === `controller${extension}`);
-}
-export function getOwnerModuleBaseName(fileName) {
-    let extension = OWNER_FILE_EXTENSIONS.find((ownerExtension) => fileName.endsWith(ownerExtension));
-    if (extension == null) {
-        return null;
-    }
-    return fileName.slice(0, -extension.length);
-}
-export function isActionFileName(fileName) {
-    let baseName = getOwnerModuleBaseName(fileName);
-    return (baseName != null &&
-        baseName !== 'controller' &&
-        !baseName.endsWith('.test') &&
-        !baseName.endsWith('.spec'));
-}
 function normalizeRelativePath(filePath) {
     return filePath.split(path.sep).join('/');
 }

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

@@ -7,15 +7,13 @@ export interface OwnershipRouteNode {
     method?: string;
     name: string;
 }
-export interface ControllerDirectoryScan {
-    controllerEntryPaths: Set<string>;
-    routeDirectoryPaths: Set<string>;
-    routeLocalFilePaths: Set<string>;
-}
 export interface RouteDirectoryPlan {
     directoryPath: string;
     routeName: string;
 }
+export interface RouteDirectory extends RouteDirectoryPlan {
+    exists: boolean;
+}
 export interface OwnedSubtreePlan {
     entryCandidates: string[];
     entryDisplayPath: string;
@@ -24,15 +22,9 @@ export interface OwnedSubtreePlan {
 }
 export interface OwnedSubtree extends OwnedSubtreePlan {
     actualEntryPath: string | null;
-    actualEntryPaths: string[];
-    claimedFilePaths: string[];
-    claimedRouteLocalFilePaths: string[];
 }
 export interface ControllerOwnership {
-    orphanControllerPaths: string[];
-    orphanRouteDirectoryPaths: string[];
-    routeDirectories: RouteDirectoryPlan[];
-    scan: ControllerDirectoryScan;
+    routeDirectories: RouteDirectory[];
     subtrees: OwnedSubtree[];
 }
 export declare function inspectControllerOwnership(appRoot: string, tree: OwnershipRouteNode[]): Promise<ControllerOwnership>;

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":"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"}
+{"version":3,"file":"controller-ownership.d.ts","sourceRoot":"","sources":["../../src/lib/controller-ownership.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,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,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,MAAM,EAAE,OAAO,CAAA;CAChB;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;CAC/B;AAED,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,cAAc,EAAE,CAAA;IAClC,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,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,18 +1,16 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { getControllerOwnerCandidates, getOwnerModuleBaseName, getPreferredOwnerDisplayPath, getRouteSubtreePath, isControllerEntryFileName, toDiskSegment, } from "./controller-files.js";
-const ACTIONS_PATH_PREFIX = 'app/actions/';
+import { getControllerOwnerCandidates, getPreferredOwnerDisplayPath, getRouteSubtreePath, toDiskSegment, } from './controller-files.js';
 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);
+    let routeDirectoryPlans = buildRouteDirectories(tree);
+    let [routeDirectories, subtrees] = await Promise.all([
+        inspectRouteDirectories(appRoot, routeDirectoryPlans),
+        inspectOwnedSubtrees(appRoot, subtreePlans),
+    ]);
     return {
-        orphanControllerPaths: getOrphanControllerPaths(subtreePlans, scan),
-        orphanRouteDirectoryPaths: getOrphanRouteDirectoryPaths(routeDirectories, scan),
         routeDirectories,
-        scan,
         subtrees,
     };
 }
@@ -60,130 +58,36 @@ function addSubtreePlan(routeName, segments, subtrees) {
         subtreePath: getRouteSubtreePath(segments),
     });
 }
-async function scanControllersDirectory(appRoot) {
-    let actionsDir = path.join(appRoot, 'app', 'actions');
-    let controllerEntryPaths = new Set();
-    let routeDirectoryPaths = new Set();
-    let routeLocalFilePaths = new Set();
-    async function walk(currentDir, isRoot) {
-        let entries;
-        try {
-            entries = await fs.readdir(currentDir, { withFileTypes: true });
-        }
-        catch (error) {
-            let nodeError = error;
-            if (nodeError.code === 'ENOENT' && isRoot) {
-                return;
-            }
-            throw error;
-        }
-        for (let entry of entries) {
-            let entryPath = path.join(currentDir, entry.name);
-            let relativePath = normalizeRelativePath(path.relative(appRoot, entryPath));
-            if (entry.isDirectory()) {
-                routeDirectoryPaths.add(relativePath);
-                await walk(entryPath, false);
-                continue;
-            }
-            if (!entry.isFile()) {
-                continue;
-            }
-            if (isControllerEntryFileName(entry.name)) {
-                controllerEntryPaths.add(relativePath);
-                continue;
-            }
-            if (isRouteLocalFileName(entry.name)) {
-                routeLocalFilePaths.add(relativePath);
-            }
-        }
-    }
-    await walk(actionsDir, true);
-    return {
-        controllerEntryPaths,
-        routeDirectoryPaths,
-        routeLocalFilePaths,
-    };
+async function inspectRouteDirectories(appRoot, plans) {
+    return Promise.all(plans.map(async (plan) => ({
+        ...plan,
+        exists: await pathHasType(appRoot, plan.directoryPath, 'directory'),
+    })));
 }
-function applyScanToSubtrees(subtreePlans, scan) {
-    let claimedRouteLocalPaths = claimFilesToDeepestSubtree([...scan.routeLocalFilePaths], subtreePlans);
-    let claimedContentPaths = claimFilesToDeepestSubtree(getNestedContentPaths(scan), subtreePlans);
-    return subtreePlans.map((subtree) => {
-        let actualEntryPaths = findOwnerPaths(scan, subtree.entryCandidates);
-        return {
-            ...subtree,
-            actualEntryPath: actualEntryPaths[0] ?? null,
-            actualEntryPaths,
-            claimedFilePaths: claimedContentPaths.get(subtree.routeName) ?? [],
-            claimedRouteLocalFilePaths: claimedRouteLocalPaths.get(subtree.routeName) ?? [],
-        };
-    });
-}
-function getNestedContentPaths(scan) {
-    let nestedControllerPaths = [...scan.controllerEntryPaths].filter((filePath) => isNestedControllerPath(filePath));
-    return [...new Set([...nestedControllerPaths, ...scan.routeLocalFilePaths])].sort();
+async function inspectOwnedSubtrees(appRoot, plans) {
+    return Promise.all(plans.map(async (plan) => ({
+        ...plan,
+        actualEntryPath: await findControllerEntryPath(appRoot, plan.entryCandidates),
+    })));
 }
-function claimFilesToDeepestSubtree(filePaths, subtreePlans) {
-    let subtreesByDepth = [...subtreePlans].sort((left, right) => {
-        if (right.subtreePath.length !== left.subtreePath.length) {
-            return right.subtreePath.length - left.subtreePath.length;
-        }
-        return left.routeName.localeCompare(right.routeName);
-    });
-    let claims = new Map();
-    for (let filePath of filePaths.sort()) {
-        let matchingSubtree = subtreesByDepth.find((subtree) => isWithinDirectory(filePath, subtree.subtreePath));
-        if (matchingSubtree == null) {
-            continue;
-        }
-        let claimedPaths = claims.get(matchingSubtree.routeName);
-        if (claimedPaths == null) {
-            claims.set(matchingSubtree.routeName, [filePath]);
-            continue;
+async function findControllerEntryPath(appRoot, candidatePaths) {
+    for (let candidatePath of candidatePaths) {
+        if (await pathHasType(appRoot, candidatePath, 'file')) {
+            return candidatePath;
         }
-        claimedPaths.push(filePath);
     }
-    return claims;
-}
-function getOrphanControllerPaths(subtreePlans, scan) {
-    let expectedControllerPaths = new Set(subtreePlans.flatMap((subtree) => subtree.entryCandidates));
-    return [...scan.controllerEntryPaths]
-        .filter((filePath) => !expectedControllerPaths.has(filePath))
-        .sort();
+    return null;
 }
-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.routeDirectoryPaths]
-        .filter((directoryPath) => !expectedRouteDirectories.has(directoryPath))
-        .filter((directoryPath) => !actualControllerDirectories.some((controllerPath) => isDirectoryWithinDirectory(controllerPath, directoryPath)))
-        .sort();
-}
-function isRouteLocalFileName(fileName) {
-    let baseName = getOwnerModuleBaseName(fileName);
-    return (baseName != null &&
-        baseName !== 'controller' &&
-        !baseName.endsWith('.test') &&
-        !baseName.endsWith('.spec'));
-}
-function findOwnerPaths(scan, candidatePaths) {
-    let existingPaths = [];
-    for (let candidatePath of candidatePaths) {
-        if (scan.controllerEntryPaths.has(candidatePath)) {
-            existingPaths.push(candidatePath);
+async function pathHasType(appRoot, relativePath, type) {
+    try {
+        let stats = await fs.stat(path.join(appRoot, relativePath));
+        return type === 'directory' ? stats.isDirectory() : stats.isFile();
+    }
+    catch (error) {
+        let nodeError = error;
+        if (nodeError.code === 'ENOENT' || nodeError.code === 'ENOTDIR') {
+            return false;
         }
+        throw error;
     }
-    return existingPaths;
-}
-function isNestedControllerPath(filePath) {
-    return (filePath.startsWith(ACTIONS_PATH_PREFIX) &&
-        filePath.slice(ACTIONS_PATH_PREFIX.length).includes('/'));
-}
-function isWithinDirectory(filePath, directoryPath) {
-    return filePath.startsWith(`${directoryPath}/`);
-}
-function isDirectoryWithinDirectory(directoryPath, parentDirectoryPath) {
-    return (directoryPath === parentDirectoryPath || isWithinDirectory(directoryPath, parentDirectoryPath));
-}
-function normalizeRelativePath(filePath) {
-    return filePath.split(path.sep).join('/');
 }

package/dist/lib/database-command.d.ts

@@ -0,0 +1,20 @@
+import type { RemixDbAdapterConfig } from './remix-config.ts';
+export type DatabaseCommand = 'migrate' | 'reset' | 'seed' | 'status' | 'wipe';
+export interface DatabaseCommandInvocation {
+    command: DatabaseCommand;
+    connectionEnv?: string;
+    journalTable?: string;
+    migrations?: string;
+    seed?: string;
+    to?: string;
+}
+export interface DatabaseCommandPlan {
+    adapter: RemixDbAdapterConfig;
+    command: DatabaseCommand;
+    journalTable?: string;
+    migrations?: string;
+    seed?: string;
+    to?: string;
+}
+export declare function isDatabaseCommand(value: unknown): value is DatabaseCommand;
+//# sourceMappingURL=database-command.d.ts.map

package/dist/lib/database-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"database-command.d.ts","sourceRoot":"","sources":["../../src/lib/database-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAA;AAE9E,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,oBAAoB,CAAA;IAC7B,OAAO,EAAE,eAAe,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAQ1E"}

package/dist/lib/database-command.js

@@ -0,0 +1,7 @@
+export function isDatabaseCommand(value) {
+    return (value === 'migrate' ||
+        value === 'reset' ||
+        value === 'seed' ||
+        value === 'status' ||
+        value === 'wipe');
+}

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

@@ -1,4 +1,4 @@
 import { type ControllerOwnership } from '../controller-ownership.ts';
-import type { DoctorFinding, DoctorFixPlan } from './types.ts';
-export declare function getControllerFindings(ownership: ControllerOwnership, fixPlans: DoctorFixPlan[]): DoctorFinding[];
+import type { DoctorFinding } from './types.ts';
+export declare function getControllerFindings(ownership: ControllerOwnership): 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,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"}
+{"version":3,"file":"controller-findings.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/controller-findings.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAWrF"}