@remix-run/cli 0.2.0 → 0.3.0

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

@@ -1,92 +1,13 @@
 import * as path from 'node:path';
 import { getOwnerFileExtension } from "../controller-files.js";
-const RESERVED_BINDING_IDENTIFIERS = new Set([
-    'await',
-    'break',
-    'case',
-    'catch',
-    'class',
-    'const',
-    'continue',
-    'debugger',
-    'default',
-    'delete',
-    'do',
-    'else',
-    'enum',
-    'export',
-    'extends',
-    'false',
-    'finally',
-    'for',
-    'function',
-    'if',
-    'implements',
-    'import',
-    'in',
-    'instanceof',
-    'interface',
-    'let',
-    'new',
-    'null',
-    'package',
-    'private',
-    'protected',
-    'public',
-    'return',
-    'static',
-    'super',
-    'switch',
-    'this',
-    'throw',
-    'true',
-    'try',
-    'typeof',
-    'var',
-    'void',
-    'while',
-    'with',
-    'yield',
-]);
-export function renderActionPlaceholder(routeNode, entryPath) {
-    let routeMessage = `TODO: implement routes.${routeNode.name}`;
-    let extension = getOwnerFileExtension(entryPath);
-    let exportName = getActionExportName(routeNode.key);
-    if (extension === '.js' || extension === '.jsx') {
-        return [
-            `export const ${exportName} = {`,
-            `  handler() {`,
-            `    return new Response(${JSON.stringify(routeMessage)})`,
-            `  },`,
-            `}`,
-            '',
-        ].join('\n');
-    }
-    let routeExpression = getRouteAccessExpression(routeNode.name);
-    let routesImportPath = getRelativeImportPath(entryPath, 'app/routes.ts');
-    let method = routeNode.method ?? 'ANY';
-    return [
-        `import type { BuildAction } from 'remix/fetch-router'`,
-        '',
-        `import type { routes } from '${routesImportPath}'`,
-        '',
-        `export const ${exportName}: BuildAction<'${method}', typeof ${routeExpression}> = {`,
-        `  handler() {`,
-        `    return new Response(${JSON.stringify(routeMessage)})`,
-        `  },`,
-        `}`,
-        '',
-    ].join('\n');
-}
-export function renderControllerPlaceholder(routeNode, entryPath, resolvedEntryPathByRouteName) {
+import { ROOT_ROUTE_NAME } from "../controller-ownership.js";
+export function renderControllerPlaceholder(routeNode, entryPath) {
     let extension = getOwnerFileExtension(entryPath);
     let lines = [];
-    let childImports = getControllerChildImports(routeNode, entryPath, resolvedEntryPathByRouteName);
-    let actionEntries = routeNode.children.map((childNode) => renderControllerActionEntry(childNode, entryPath, resolvedEntryPathByRouteName));
+    let actionEntries = routeNode.children
+        .filter((childNode) => childNode.kind === 'route')
+        .map((childNode) => renderControllerActionEntry(childNode));
     if (extension === '.js' || extension === '.jsx') {
-        if (childImports.length > 0) {
-            lines.push(...childImports, '');
-        }
         lines.push('export default {', '  actions: {');
         lines.push(...actionEntries);
         lines.push('  },', '}', '');
@@ -94,57 +15,24 @@ export function renderControllerPlaceholder(routeNode, entryPath, resolvedEntryP
     }
     let routeExpression = getRouteAccessExpression(routeNode.name);
     let routesImportPath = getRelativeImportPath(entryPath, 'app/routes.ts');
-    lines.push(`import type { Controller } from 'remix/fetch-router'`, '');
-    lines.push(`import type { routes } from '${routesImportPath}'`);
-    if (childImports.length > 0) {
-        lines.push('', ...childImports);
-    }
-    lines.push('', 'export default {', '  actions: {');
+    lines.push(`import { createController } from 'remix/router'`, '');
+    lines.push(`import { routes } from '${routesImportPath}'`);
+    lines.push('', `export default createController(${routeExpression}, {`, '  actions: {');
     lines.push(...actionEntries);
-    lines.push('  },', `} satisfies Controller<typeof ${routeExpression}>`, '');
+    lines.push('  },', '})', '');
     return lines.join('\n');
 }
-function getControllerChildImports(routeNode, entryPath, resolvedEntryPathByRouteName) {
-    let imports = [];
-    for (let childNode of routeNode.children) {
-        if (childNode.kind !== 'group') {
-            continue;
-        }
-        let childEntryPath = resolvedEntryPathByRouteName.get(childNode.name);
-        if (childEntryPath == null) {
-            continue;
-        }
-        imports.push(`import ${getControllerImportName(childNode.key)} from '${getRelativeImportPath(entryPath, childEntryPath)}'`);
-    }
-    return imports;
-}
-function renderControllerActionEntry(childNode, entryPath, resolvedEntryPathByRouteName) {
-    if (childNode.kind === 'route') {
-        return [
-            `    ${formatObjectKey(childNode.key)}() {`,
-            `      return new Response(${JSON.stringify(`TODO: implement routes.${childNode.name}`)})`,
-            `    },`,
-        ].join('\n');
-    }
-    let childEntryPath = resolvedEntryPathByRouteName.get(childNode.name);
-    if (childEntryPath != null) {
-        return `    ${formatObjectKey(childNode.key)}: ${getControllerImportName(childNode.key)},`;
-    }
-    return `    ${formatObjectKey(childNode.key)}: ${renderInlineControllerPlaceholder(childNode)},`;
-}
-function renderInlineControllerPlaceholder(routeNode) {
-    let childEntries = routeNode.children.map((childNode) => childNode.kind === 'route'
-        ? `${formatObjectKey(childNode.key)}() { return new Response(${JSON.stringify(`TODO: implement routes.${childNode.name}`)}) }`
-        : `${formatObjectKey(childNode.key)}: ${renderInlineControllerPlaceholder(childNode)}`);
-    return `{ actions: { ${childEntries.join(', ')} } }`;
-}
-function getControllerImportName(key) {
-    return `${toIdentifier(key)}Controller`;
-}
-function getActionExportName(key) {
-    return toIdentifier(key);
+function renderControllerActionEntry(childNode) {
+    return [
+        `    ${formatObjectKey(childNode.key)}() {`,
+        `      return new Response(${JSON.stringify(`TODO: implement routes.${childNode.name}`)})`,
+        `    },`,
+    ].join('\n');
 }
 function getRouteAccessExpression(routeName) {
+    if (routeName === ROOT_ROUTE_NAME) {
+        return 'routes';
+    }
     let segments = routeName.split('.');
     let expression = 'routes';
     for (let segment of segments) {
@@ -159,25 +47,6 @@ function getRelativeImportPath(fromFilePath, toFilePath) {
 function formatObjectKey(key) {
     return isIdentifier(key) ? key : JSON.stringify(key);
 }
-function toIdentifier(value) {
-    let parts = value.split(/[^A-Za-z0-9_$]+/).filter(Boolean);
-    if (parts.length === 0) {
-        return 'route';
-    }
-    let identifier = parts
-        .map((part, index) => index === 0 ? part.replace(/^./, (char) => char.toLowerCase()) : capitalize(part))
-        .join('');
-    if (!/^[A-Za-z_$]/.test(identifier)) {
-        return `route${capitalize(identifier)}`;
-    }
-    if (RESERVED_BINDING_IDENTIFIERS.has(identifier)) {
-        return `route${capitalize(identifier)}`;
-    }
-    return identifier;
-}
-function capitalize(value) {
-    return value.length === 0 ? value : `${value[0].toUpperCase()}${value.slice(1)}`;
-}
 function isIdentifier(value) {
     return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value);
 }

package/dist/lib/doctor/controllers.js

@@ -8,6 +8,6 @@ export async function checkControllerConventions(appRoot, tree) {
     let findings = getControllerFindings(ownership, fixPlans);
     return {
         fixPlans,
-        suite: createDoctorSuite('controllers', findings),
+        suite: createDoctorSuite('actions', findings),
     };
 }

package/dist/lib/doctor/project.js

@@ -39,7 +39,7 @@ export async function checkProject(projectRoot) {
 }
 export async function getProjectFixPlans(projectRoot) {
     let routesFile = path.join(projectRoot, 'app', 'routes.ts');
-    let homeActionPath = normalizeRelativePath(path.join('app', 'controllers', `home${await inferHomeOwnerExtension(projectRoot)}`));
+    let homeActionPath = normalizeRelativePath(path.join('app', 'actions', `controller${await inferHomeOwnerExtension(projectRoot)}`));
     if (await pathExists(routesFile)) {
         let routesSource = await fs.readFile(routesFile, 'utf8');
         if (!hasOnlyWhitespaceAndComments(routesSource)) {
@@ -181,8 +181,8 @@ function hasOnlyWhitespaceAndComments(source) {
     return true;
 }
 async function inferHomeOwnerExtension(projectRoot) {
-    let controllersDir = path.join(projectRoot, 'app', 'controllers');
-    let extensions = await collectOwnerExtensions(controllersDir);
+    let actionsDir = path.join(projectRoot, 'app', 'actions');
+    let extensions = await collectOwnerExtensions(actionsDir);
     if (extensions.length > 0) {
         return getMostCommonExtension(extensions);
     }
@@ -239,7 +239,7 @@ function getMostCommonExtension(extensions) {
 }
 function renderDefaultRoutesFile() {
     return [
-        `import { route } from 'remix/fetch-router/routes'`,
+        `import { route } from 'remix/routes'`,
         '',
         'export const routes = route({',
         `  home: '/',`,
@@ -257,22 +257,24 @@ function renderDefaultHomeAction(entryPath) {
             `import { html } from 'remix/html-template'`,
             `import { createHtmlResponse } from 'remix/response/html'`,
             '',
-            'export const home = {',
-            '  handler() {',
-            '    let page = html`',
-            '      <html lang="en">',
-            '        <head>',
-            '          <meta charset="utf-8" />',
-            '          <meta name="viewport" content="width=device-width, initial-scale=1" />',
-            '          <title>Home</title>',
-            '        </head>',
-            '        <body>',
-            '          <h1>Home</h1>',
-            '          <p>Update app/routes.ts and app/controllers/home to keep building your app.</p>',
-            '        </body>',
-            '      </html>',
-            '    `',
-            '    return createHtmlResponse(page)',
+            'export default {',
+            '  actions: {',
+            '    home() {',
+            '      let page = html`',
+            '        <html lang="en">',
+            '          <head>',
+            '            <meta charset="utf-8" />',
+            '            <meta name="viewport" content="width=device-width, initial-scale=1" />',
+            '            <title>Home</title>',
+            '          </head>',
+            '          <body>',
+            '            <h1>Home</h1>',
+            '            <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
+            '          </body>',
+            '        </html>',
+            '      `',
+            '      return createHtmlResponse(page)',
+            '    },',
             '  },',
             '}',
             '',
@@ -280,30 +282,32 @@ function renderDefaultHomeAction(entryPath) {
     }
     if (extension === '.ts') {
         return [
-            `import type { BuildAction } from 'remix/fetch-router'`,
+            `import { createController } from 'remix/router'`,
             `import { html } from 'remix/html-template'`,
             `import { createHtmlResponse } from 'remix/response/html'`,
             '',
-            `import type { routes } from '../routes.ts'`,
+            `import { routes } from '../routes.ts'`,
             '',
-            `export const home: BuildAction<'ANY', typeof routes.home> = {`,
-            '  handler() {',
-            '    let page = html`',
-            '      <html lang="en">',
-            '        <head>',
-            '          <meta charset="utf-8" />',
-            '          <meta name="viewport" content="width=device-width, initial-scale=1" />',
-            '          <title>Home</title>',
-            '        </head>',
-            '        <body>',
-            '          <h1>Home</h1>',
-            '          <p>Update app/routes.ts and app/controllers/home to keep building your app.</p>',
-            '        </body>',
-            '      </html>',
-            '    `',
-            '    return createHtmlResponse(page)',
+            `export default createController(routes, {`,
+            '  actions: {',
+            '    home() {',
+            '      let page = html`',
+            '        <html lang="en">',
+            '          <head>',
+            '            <meta charset="utf-8" />',
+            '            <meta name="viewport" content="width=device-width, initial-scale=1" />',
+            '            <title>Home</title>',
+            '          </head>',
+            '          <body>',
+            '            <h1>Home</h1>',
+            '            <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
+            '          </body>',
+            '        </html>',
+            '      `',
+            '      return createHtmlResponse(page)',
+            '    },',
             '  },',
-            '}',
+            `})`,
             '',
         ].join('\n');
     }
@@ -312,10 +316,12 @@ function renderDefaultHomeAction(entryPath) {
             `import { renderToStream } from 'remix/ui/server'`,
             `import { createHtmlResponse } from 'remix/response/html'`,
             '',
-            'export const home = {',
-            '  handler() {',
-            '    let page = <HomePage />',
-            '    return createHtmlResponse(renderToStream(page))',
+            'export default {',
+            '  actions: {',
+            '    home() {',
+            '      let page = <HomePage />',
+            '      return createHtmlResponse(renderToStream(page))',
+            '    },',
             '  },',
             '}',
             '',
@@ -329,7 +335,7 @@ function renderDefaultHomeAction(entryPath) {
             '      </head>',
             '      <body>',
             '        <h1>Home</h1>',
-            '        <p>Update app/routes.ts and app/controllers/home to keep building your app.</p>',
+            '        <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
             '      </body>',
             '    </html>',
             '  )',
@@ -338,18 +344,20 @@ function renderDefaultHomeAction(entryPath) {
         ].join('\n');
     }
     return [
-        `import type { BuildAction } from 'remix/fetch-router'`,
+        `import { createController } from 'remix/router'`,
         `import { renderToStream } from 'remix/ui/server'`,
         `import { createHtmlResponse } from 'remix/response/html'`,
         '',
-        `import type { routes } from '../routes.ts'`,
+        `import { routes } from '../routes.ts'`,
         '',
-        `export const home: BuildAction<'ANY', typeof routes.home> = {`,
-        '  handler() {',
-        '    let page = <HomePage />',
-        '    return createHtmlResponse(renderToStream(page))',
+        `export default createController(routes, {`,
+        '  actions: {',
+        '    home() {',
+        '      let page = <HomePage />',
+        '      return createHtmlResponse(renderToStream(page))',
+        '    },',
         '  },',
-        '}',
+        `})`,
         '',
         'function HomePage() {',
         '  return () => (',
@@ -361,7 +369,7 @@ function renderDefaultHomeAction(entryPath) {
         '      </head>',
         '      <body>',
         '        <h1>Home</h1>',
-        '        <p>Update app/routes.ts and app/controllers/home to keep building your app.</p>',
+        '        <p>Update app/routes.ts and app/actions/controller to keep building your app.</p>',
         '      </body>',
         '    </html>',
         '  )',

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

@@ -1,7 +1,7 @@
-export type DoctorSuiteName = 'environment' | 'project' | 'controllers';
+export type DoctorSuiteName = 'environment' | 'project' | 'actions';
 export type DoctorFindingSeverity = 'warn' | 'advice';
 export type DoctorSuiteStatus = 'ok' | 'issues' | 'skipped';
-export type DoctorFindingCode = 'project-root-not-found' | 'package-json-read-failed' | 'package-json-invalid' | 'node-engine-missing' | 'node-engine-unparseable' | 'node-version-unsupported' | 'remix-dependency-missing' | 'remix-install-missing' | 'routes-file-missing' | 'routes-export-missing' | 'route-map-invalid' | 'route-module-import-failed' | 'route-map-invalid-json' | 'route-map-loader-signal' | 'missing-owner' | 'wrong-owner-kind' | 'ambiguous-owner' | 'duplicate-owner-file' | 'incomplete-controller' | 'promotion-drift' | 'orphan-action' | 'orphan-controller' | 'orphan-route-directory';
+export type DoctorFindingCode = 'project-root-not-found' | 'package-json-read-failed' | 'package-json-invalid' | 'node-engine-missing' | 'node-engine-unparseable' | 'node-version-unsupported' | 'remix-dependency-missing' | 'remix-install-missing' | 'routes-file-missing' | 'routes-export-missing' | 'route-map-invalid' | 'route-module-import-failed' | 'route-map-invalid-json' | 'route-map-loader-signal' | 'missing-owner' | 'duplicate-owner-file' | 'incomplete-controller' | 'orphan-controller' | 'orphan-route-directory';
 export type DoctorFixKind = 'create-directory' | 'create-file' | 'update-file';
 export interface DoctorFinding {
     actualPath?: string;

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

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

package/dist/lib/load-route-map-worker.js

@@ -30,7 +30,7 @@ async function loadRawRouteTree(routesFile) {
     if (!('routes' in routeModule)) {
         throw new Error(`Route module ${routesFile} must export a named "routes" value.`);
     }
-    return normalizeRouteGroup(Reflect.get(routeModule, 'routes'), [], new Map());
+    return normalizeRouteGroup(routeModule.routes, [], new Map());
 }
 function normalizeRouteGroup(value, parentSegments, seen) {
     if (!isPlainObject(value)) {
@@ -47,14 +47,15 @@ function normalizeRouteGroup(value, parentSegments, seen) {
         return Object.entries(value).map(([key, entryValue]) => {
             let nameSegments = [...parentSegments, key];
             let name = nameSegments.join('.');
-            if (isRouteLeaf(entryValue)) {
+            let routeLeaf = readRouteLeaf(entryValue);
+            if (routeLeaf !== undefined) {
                 return {
                     children: [],
                     key,
                     kind: 'route',
-                    method: entryValue.method,
+                    method: routeLeaf.method,
                     name,
-                    pattern: entryValue.pattern.source,
+                    pattern: routeLeaf.pattern,
                 };
             }
             if (isPlainObject(entryValue)) {
@@ -72,13 +73,20 @@ function normalizeRouteGroup(value, parentSegments, seen) {
         seen.delete(value);
     }
 }
-function isRouteLeaf(value) {
+function readRouteLeaf(value) {
+    if (typeof value !== 'object' || value == null)
+        return undefined;
+    let method = Reflect.get(value, 'method');
+    let pattern = Reflect.get(value, 'pattern');
+    if (typeof method !== 'string' || !hasToString(pattern))
+        return undefined;
+    return { method, pattern: pattern.toString() };
+}
+function hasToString(value) {
     return (typeof value === 'object' &&
         value != null &&
-        typeof Reflect.get(value, 'method') === 'string' &&
-        typeof Reflect.get(value, 'pattern') === 'object' &&
-        Reflect.get(value, 'pattern') != null &&
-        typeof Reflect.get(Reflect.get(value, 'pattern'), 'source') === 'string');
+        'toString' in value &&
+        typeof value.toString === 'function');
 }
 function isPlainObject(value) {
     if (typeof value !== 'object' || value == null) {

package/dist/lib/route-map.d.ts

@@ -1,4 +1,4 @@
-export type RouteOwnerKind = 'action' | 'controller';
+export type RouteOwnerKind = 'controller' | 'directory';
 export type RouteTreeNodeKind = 'group' | 'route';
 export interface RouteTreeOwner {
     exists: boolean;

package/dist/lib/route-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-map.d.ts","sourceRoot":"","sources":["../../src/lib/route-map.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAA;AACpD,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,OAAO,CAAA;AAEjD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,gBAAgB,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,EAAE,CAAA;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,wBAAsB,YAAY,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAUvF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAGjG;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAShG"}
+{"version":3,"file":"route-map.d.ts","sourceRoot":"","sources":["../../src/lib/route-map.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,WAAW,CAAA;AACvD,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,OAAO,CAAA;AAEjD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,gBAAgB,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,EAAE,CAAA;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,iBAAiB,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,wBAAsB,YAAY,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAUvF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAGjG;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAShG"}

package/dist/lib/route-map.js

@@ -3,12 +3,12 @@ import * as path from 'node:path';
 import * as process from 'node:process';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import { inspectControllerOwnership } from "./controller-ownership.js";
+import { ROOT_ROUTE_NAME, inspectControllerOwnership, } from "./controller-ownership.js";
 import { routeMapLoaderFailed, routeMapLoaderInvalidJson, routeMapLoaderSignal, routeOwnerPlanUnresolved, routesFileNotFound, } from "./errors.js";
 export async function loadRouteMap(cwd = process.cwd()) {
     let manifest = await loadRouteManifest(cwd);
     let ownership = await inspectControllerOwnership(manifest.appRoot, manifest.tree);
-    let tree = decorateRouteTree(manifest.tree, ownership.subtrees);
+    let tree = decorateRouteTree(manifest.tree, ownership);
     return {
         appRoot: manifest.appRoot,
         routesFile: manifest.routesFile,
@@ -70,17 +70,18 @@ async function loadRawRouteMap(appRoot, routesFile) {
     }
     return assertRawRouteTree(parsed);
 }
-function decorateRouteTree(rawTree, subtrees, parentSegments = []) {
-    let subtreesByRouteName = new Map(subtrees.map((subtree) => [subtree.routeName, subtree]));
-    return decorateRouteTreeWithLookup(rawTree, subtreesByRouteName, parentSegments);
+function decorateRouteTree(rawTree, ownership) {
+    let subtreesByRouteName = new Map(ownership.subtrees.map((subtree) => [subtree.routeName, subtree]));
+    let directoriesByRouteName = new Map(ownership.routeDirectories.map((directory) => [directory.routeName, directory]));
+    return decorateRouteTreeWithLookup(rawTree, subtreesByRouteName, directoriesByRouteName, ownership.scan.routeDirectoryPaths);
 }
-function decorateRouteTreeWithLookup(rawTree, subtreesByRouteName, parentSegments = []) {
+function decorateRouteTreeWithLookup(rawTree, subtreesByRouteName, directoriesByRouteName, actualRouteDirectories, parentSegments = []) {
     return rawTree.map((rawNode) => {
-        let owner = getRouteOwner(rawNode, parentSegments, subtreesByRouteName);
+        let owner = getRouteOwner(rawNode, parentSegments, subtreesByRouteName, directoriesByRouteName, actualRouteDirectories);
         let nextParentSegments = rawNode.kind === 'group' ? [...parentSegments, rawNode.key] : parentSegments;
         return {
             children: rawNode.kind === 'group'
-                ? decorateRouteTreeWithLookup(rawNode.children, subtreesByRouteName, nextParentSegments)
+                ? decorateRouteTreeWithLookup(rawNode.children, subtreesByRouteName, directoriesByRouteName, actualRouteDirectories, nextParentSegments)
                 : [],
             key: rawNode.key,
             kind: rawNode.kind,
@@ -91,21 +92,32 @@ function decorateRouteTreeWithLookup(rawTree, subtreesByRouteName, parentSegment
         };
     });
 }
-function getRouteOwner(rawNode, parentSegments, subtreesByRouteName) {
+function getRouteOwner(rawNode, parentSegments, subtreesByRouteName, directoriesByRouteName, actualRouteDirectories) {
     let ownerRouteName = rawNode.kind === 'group'
         ? rawNode.name
         : parentSegments.length === 0
-            ? rawNode.name
+            ? ROOT_ROUTE_NAME
             : parentSegments.join('.');
     let subtree = subtreesByRouteName.get(ownerRouteName);
-    if (subtree == null) {
-        throw routeOwnerPlanUnresolved(rawNode.name);
+    if (subtree != null) {
+        return {
+            exists: subtree.actualEntryPath != null,
+            kind: 'controller',
+            path: subtree.actualEntryPath ?? subtree.entryDisplayPath,
+        };
     }
-    return {
-        exists: subtree.actualEntryPath != null,
-        kind: subtree.kind,
-        path: subtree.actualEntryPath ?? subtree.entryDisplayPath,
-    };
+    if (rawNode.kind === 'group') {
+        let directory = directoriesByRouteName.get(rawNode.name);
+        if (directory == null) {
+            throw routeOwnerPlanUnresolved(rawNode.name);
+        }
+        return {
+            exists: actualRouteDirectories.has(directory.directoryPath),
+            kind: 'directory',
+            path: directory.directoryPath,
+        };
+    }
+    throw routeOwnerPlanUnresolved(rawNode.name);
 }
 function assertRawRouteTree(value) {
     if (!Array.isArray(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Command-line interface for Remix",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -11,11 +11,11 @@
   },
   "homepage": "https://github.com/remix-run/remix/tree/main/packages/cli#readme",
   "files": [
-    "bootstrap",
     "LICENSE",
     "README.md",
     "dist",
     "src",
+    "template",
     "!src/**/*.test.ts"
   ],
   "type": "module",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "semver": "^7.7.4",
-    "@remix-run/test": "^0.3.0",
+    "@remix-run/test": "^0.4.0",
     "@remix-run/terminal": "^0.1.0"
   },
   "devDependencies": {