@timber-js/app 0.2.0-alpha.14 → 0.2.0-alpha.141

package/src/routing/scanner.ts

@@ -18,8 +18,10 @@ import type {
   ScannerConfig,
   InterceptionMarker,
 } from './types.js';
-import { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS } from './types.js';
-import { classifyMetadataRoute, isDynamicMetadataExtension } from '#/server/metadata-routes.js';
+import { classifySegment } from './segment-classify.js';
+import { DEFAULT_PAGE_EXTENSIONS } from './types.js';
+import { classifyMetadataRoute, isDynamicMetadataExtension } from '../server/metadata-routes.js';
+import { swallow } from '../server/logger.js';
 
 /**
  * Pattern matching encoded path delimiters that must be rejected during route discovery.
@@ -53,7 +55,7 @@ const LEGACY_STATUS_FILES: Record<string, number> = {
 /**
  * File convention names that are always .ts/.tsx (never .mdx etc.)
  */
-const FIXED_CONVENTIONS = new Set(['middleware', 'access', 'route', 'prerender', 'search-params']);
+const FIXED_CONVENTIONS = new Set(['middleware', 'access', 'route', 'params']);
 
 /**
  * Status-code file patterns:
@@ -83,6 +85,14 @@ export function scanRoutes(appDir: string, config: ScannerConfig = {}): RouteTre
     tree.proxy = proxyFile;
   }
 
+  // Check for global-error.{tsx,ts,jsx,js} at app root.
+  // Tier 2 error page — renders standalone (no layouts) when no segment-level
+  // error file is found. See design/10-error-handling.md §"Tier 2".
+  const globalErrorFile = findPageExtFile(appDir, 'global-error', extSet);
+  if (globalErrorFile) {
+    tree.globalError = globalErrorFile;
+  }
+
   // Scan the root directory's files
   scanSegmentFiles(appDir, tree.root, extSet);
 
@@ -92,6 +102,14 @@ export function scanRoutes(appDir: string, config: ScannerConfig = {}): RouteTre
   // Validate: detect route group collisions (different groups producing pages at the same URL)
   validateRouteGroupCollisions(tree.root);
 
+  // Validate: detect duplicate param names in nested dynamic segments
+  // e.g., /[id]/items/[id] — same param name in ancestor and descendant
+  validateDuplicateParamNames(tree.root);
+
+  // Validate: detect same param name used with different bracket forms
+  // e.g., [id] in one route and [...id] in another
+  validateUniqueBracketForms(tree.root);
+
   return tree;
 }
 
@@ -114,96 +132,10 @@ function createSegmentNode(
     interceptionMarker,
     interceptedSegmentName,
     children: [],
-    slots: new Map(),
+    slots: {},
   };
 }
 
-/**
- * Classify a directory name into its segment type.
- */
-export function classifySegment(dirName: string): {
-  type: SegmentType;
-  paramName?: string;
-  interceptionMarker?: InterceptionMarker;
-  interceptedSegmentName?: string;
-} {
-  // Private folder: _name (excluded from routing)
-  if (dirName.startsWith('_')) {
-    return { type: 'private' };
-  }
-
-  // Parallel route slot: @name
-  if (dirName.startsWith('@')) {
-    return { type: 'slot' };
-  }
-
-  // Intercepting routes: (.)name, (..)name, (...)name, (..)(..)name
-  // Check before route groups since intercepting markers also start with (
-  const interception = parseInterceptionMarker(dirName);
-  if (interception) {
-    return {
-      type: 'intercepting',
-      interceptionMarker: interception.marker,
-      interceptedSegmentName: interception.segmentName,
-    };
-  }
-
-  // Route group: (name)
-  if (dirName.startsWith('(') && dirName.endsWith(')')) {
-    return { type: 'group' };
-  }
-
-  // Optional catch-all: [[...name]]
-  if (dirName.startsWith('[[...') && dirName.endsWith(']]')) {
-    const paramName = dirName.slice(5, -2);
-    return { type: 'optional-catch-all', paramName };
-  }
-
-  // Catch-all: [...name]
-  if (dirName.startsWith('[...') && dirName.endsWith(']')) {
-    const paramName = dirName.slice(4, -1);
-    return { type: 'catch-all', paramName };
-  }
-
-  // Dynamic: [name]
-  if (dirName.startsWith('[') && dirName.endsWith(']')) {
-    const paramName = dirName.slice(1, -1);
-    return { type: 'dynamic', paramName };
-  }
-
-  return { type: 'static' };
-}
-
-/**
- * Parse an interception marker from a directory name.
- *
- * Returns the marker and the remaining segment name, or null if not an
- * intercepting route. Markers are checked longest-first to avoid (..)
- * matching before (..)(..).
- *
- * Examples:
- *   "(.)photo"      → { marker: "(.)", segmentName: "photo" }
- *   "(..)feed"      → { marker: "(..)", segmentName: "feed" }
- *   "(...)photos"   → { marker: "(...)", segmentName: "photos" }
- *   "(..)(..)admin" → { marker: "(..)(..)", segmentName: "admin" }
- *   "(marketing)"   → null (route group, not interception)
- */
-function parseInterceptionMarker(
-  dirName: string
-): { marker: InterceptionMarker; segmentName: string } | null {
-  for (const marker of INTERCEPTION_MARKERS) {
-    if (dirName.startsWith(marker)) {
-      const rest = dirName.slice(marker.length);
-      // Must have a segment name after the marker, and the rest must not
-      // be empty or end with ) (which would be a route group like "(auth)")
-      if (rest.length > 0 && !rest.endsWith(')')) {
-        return { marker, segmentName: rest };
-      }
-    }
-  }
-  return null;
-}
-
 /**
  * Compute the URL path for a child segment given its parent's URL path.
  * Route groups, slots, and intercepting routes do NOT add URL depth.
@@ -225,7 +157,8 @@ function scanSegmentFiles(dirPath: string, node: SegmentNode, extSet: Set<string
   let entries: string[];
   try {
     entries = readdirSync(dirPath);
-  } catch {
+  } catch (err) {
+    swallow(err, `scanSegmentFiles: unreadable directory ${dirPath}`, { level: 'warn' });
     return;
   }
 
@@ -278,11 +211,8 @@ function scanSegmentFiles(dirPath: string, node: SegmentNode, extSet: Set<string
         case 'route':
           node.route = file;
           break;
-        case 'prerender':
-          node.prerender = file;
-          break;
-        case 'search-params':
-          node.searchParams = file;
+        case 'params':
+          node.params = file;
           break;
       }
       continue;
@@ -292,27 +222,27 @@ function scanSegmentFiles(dirPath: string, node: SegmentNode, extSet: Set<string
     // Recognized regardless of pageExtensions — .json is a data format, not a page extension.
     if (STATUS_CODE_PATTERN.test(name) && ext === 'json') {
       if (!node.jsonStatusFiles) {
-        node.jsonStatusFiles = new Map();
+        node.jsonStatusFiles = {};
       }
-      node.jsonStatusFiles.set(name, { filePath: fullPath, extension: ext });
+      node.jsonStatusFiles[name] = { filePath: fullPath, extension: ext };
       continue;
     }
 
     // Status-code files (401.tsx, 4xx.tsx, 503.tsx, 5xx.tsx)
     if (STATUS_CODE_PATTERN.test(name) && extSet.has(ext)) {
       if (!node.statusFiles) {
-        node.statusFiles = new Map();
+        node.statusFiles = {};
       }
-      node.statusFiles.set(name, { filePath: fullPath, extension: ext });
+      node.statusFiles[name] = { filePath: fullPath, extension: ext };
       continue;
     }
 
     // Legacy compat files (not-found.tsx, forbidden.tsx, unauthorized.tsx)
     if (name in LEGACY_STATUS_FILES && extSet.has(ext)) {
       if (!node.legacyStatusFiles) {
-        node.legacyStatusFiles = new Map();
+        node.legacyStatusFiles = {};
       }
-      node.legacyStatusFiles.set(name, { filePath: fullPath, extension: ext });
+      node.legacyStatusFiles[name] = { filePath: fullPath, extension: ext };
       continue;
     }
 
@@ -323,19 +253,19 @@ function scanSegmentFiles(dirPath: string, node: SegmentNode, extSet: Set<string
     const metaInfo = classifyMetadataRoute(entry);
     if (metaInfo) {
       if (!node.metadataRoutes) {
-        node.metadataRoutes = new Map();
+        node.metadataRoutes = {};
       }
-      const existing = node.metadataRoutes.get(name);
+      const existing = node.metadataRoutes[name];
       if (existing) {
         // Dynamic > static precedence: only overwrite if the new file is dynamic
         // or the existing file is static (dynamic always wins).
         const existingIsDynamic = isDynamicMetadataExtension(name, existing.extension);
         const newIsDynamic = isDynamicMetadataExtension(name, ext);
         if (newIsDynamic || !existingIsDynamic) {
-          node.metadataRoutes.set(name, { filePath: fullPath, extension: ext });
+          node.metadataRoutes[name] = { filePath: fullPath, extension: ext };
         }
       } else {
-        node.metadataRoutes.set(name, { filePath: fullPath, extension: ext });
+        node.metadataRoutes[name] = { filePath: fullPath, extension: ext };
       }
     }
   }
@@ -358,7 +288,8 @@ function scanChildren(dirPath: string, parentNode: SegmentNode, extSet: Set<stri
   let entries: string[];
   try {
     entries = readdirSync(dirPath);
-  } catch {
+  } catch (err) {
+    swallow(err, `scanChildren: unreadable directory ${dirPath}`, { level: 'warn' });
     return;
   }
 
@@ -412,10 +343,10 @@ function scanChildren(dirPath: string, parentNode: SegmentNode, extSet: Set<stri
     // Recurse into subdirectories
     scanChildren(fullPath, childNode, extSet);
 
-    // Attach to parent: slots go into slots map, everything else is a child
+    // Attach to parent: slots go into slots record, everything else is a child
     if (type === 'slot') {
       const slotName = entry.slice(1); // remove @
-      parentNode.slots.set(slotName, childNode);
+      parentNode.slots[slotName] = childNode;
     } else {
       parentNode.children.push(childNode);
     }
@@ -477,11 +408,113 @@ function collectRoutableLeaves(
   }
 
   // Recurse into slots — each slot is its own parallel route space
-  for (const [, slotNode] of node.slots) {
+  for (const slotNode of Object.values(node.slots)) {
     collectRoutableLeaves(slotNode, seen, currentPath, true);
   }
 }
 
+/**
+ * Validate that no route chain contains duplicate dynamic param names.
+ *
+ * Example violation:
+ *   app/[id]/items/[id]/page.tsx — 'id' appears twice in the ancestor chain.
+ *
+ * Route groups are transparent — params accumulate through them.
+ * Slots are independent — duplicate detection does NOT cross slot boundaries.
+ *
+ * See design/07-routing.md §"Duplicate Param Name Detection"
+ */
+function validateDuplicateParamNames(root: SegmentNode): void {
+  walkForDuplicateParams(root, new Map());
+}
+
+/**
+ * Recursively walk the segment tree, tracking seen param names → segment paths.
+ * Throws on the first duplicate found.
+ */
+function walkForDuplicateParams(node: SegmentNode, seen: Map<string, string>): void {
+  // If this node introduces a param name, check for duplicates
+  if (node.paramName) {
+    const existing = seen.get(node.paramName);
+    if (existing) {
+      throw new Error(
+        `[timber] Duplicate param name '${node.paramName}' in route chain.\n` +
+          `  First defined at: ${existing}\n` +
+          `  Duplicate at: ${node.urlPath || '/'}\n` +
+          `  Rename one of the segments to avoid ambiguity.`
+      );
+    }
+    // Add to seen for descendants (use a new Map to avoid polluting siblings)
+    seen = new Map(seen);
+    seen.set(node.paramName, node.urlPath || '/');
+  }
+
+  // Recurse into children (they inherit the accumulated params)
+  for (const child of node.children) {
+    walkForDuplicateParams(child, seen);
+  }
+
+  // Slots are independent parallel routes — start fresh param tracking
+  // (a slot's params don't conflict with the main route's params)
+  for (const slotNode of Object.values(node.slots)) {
+    walkForDuplicateParams(slotNode, new Map(seen));
+  }
+}
+
+/**
+ * Validate that each param name uses a single bracket form across the entire route tree.
+ *
+ * Different bracket forms produce different types:
+ *   [id]      → string
+ *   [...id]   → string[]
+ *   [[...id]] → string[] | undefined
+ *
+ * If the same param name appears with multiple forms, the no-argument
+ * getSegmentParams() / useSegmentParams() return type becomes ambiguous.
+ *
+ * Same name + same form across different routes is fine and expected.
+ */
+function validateUniqueBracketForms(root: SegmentNode): void {
+  const forms = new Map<string, { segmentType: SegmentType; urlPath: string }>();
+  collectBracketForms(root, forms);
+}
+
+function collectBracketForms(
+  node: SegmentNode,
+  forms: Map<string, { segmentType: SegmentType; urlPath: string }>
+): void {
+  if (node.paramName && node.segmentType !== 'static' && node.segmentType !== 'group') {
+    const existing = forms.get(node.paramName);
+    if (existing && existing.segmentType !== node.segmentType) {
+      const bracketExamples: Record<string, string> = {
+        'dynamic': `[${node.paramName}]`,
+        'catch-all': `[...${node.paramName}]`,
+        'optional-catch-all': `[[...${node.paramName}]]`,
+      };
+      throw new Error(
+        `[timber] Param name '${node.paramName}' uses multiple bracket forms.\n` +
+          `  ${bracketExamples[existing.segmentType] ?? existing.segmentType} at: ${existing.urlPath}\n` +
+          `  ${bracketExamples[node.segmentType] ?? node.segmentType} at: ${node.urlPath || '/'}\n` +
+          `  Each param name must use a single bracket form across all routes.\n` +
+          `  Rename one of the segments to fix this (e.g., [${node.paramName}] → [${node.paramName}Id]).`
+      );
+    }
+    if (!existing) {
+      forms.set(node.paramName, {
+        segmentType: node.segmentType,
+        urlPath: node.urlPath || '/',
+      });
+    }
+  }
+
+  for (const child of node.children) {
+    collectBracketForms(child, forms);
+  }
+  for (const slotNode of Object.values(node.slots)) {
+    collectBracketForms(slotNode, forms);
+  }
+}
+
 /**
  * Find a fixed-extension file (proxy.ts) in a directory.
  */
@@ -498,3 +531,25 @@ function findFixedFile(dirPath: string, name: string): RouteFile | undefined {
   }
   return undefined;
 }
+
+/**
+ * Find a file using the configured page extensions (tsx, ts, jsx, js, mdx, etc.).
+ * Used for app-root conventions like global-error that aren't per-segment.
+ */
+function findPageExtFile(
+  dirPath: string,
+  name: string,
+  extSet: Set<string>
+): RouteFile | undefined {
+  for (const ext of extSet) {
+    const fullPath = join(dirPath, `${name}.${ext}`);
+    try {
+      if (statSync(fullPath).isFile()) {
+        return { filePath: fullPath, extension: ext };
+      }
+    } catch {
+      // File doesn't exist
+    }
+  }
+  return undefined;
+}

package/src/routing/schema-validation.ts

@@ -0,0 +1,149 @@
+/**
+ * Schema key/value validation against the filesystem route tree.
+ *
+ * Runs at codegen time (build + dev) to catch mismatches between
+ * app/schema.ts keys and the actual dynamic segments on disk.
+ *
+ * Design doc: design/41-global-params.md
+ */
+
+import { readFileSync } from 'node:fs';
+import type { RouteTree, SegmentNode } from './types.js';
+import { findSchemaFile, parseExistingSchemaKeys } from '../cli-schema-sync.js';
+import { classifyUrlSegment } from './segment-classify.js';
+
+export interface SchemaWarning {
+  type: 'stale-key' | 'missing-key' | 'bracket-mismatch';
+  key: string;
+  message: string;
+  filesystemKey?: string;
+}
+
+/**
+ * Collect all unique bracket-keyed dynamic segment names from a route tree.
+ * Returns entries like '[artistSlug]', '[...slug]', '[[...topic]]'.
+ */
+export function collectDynamicSegmentsFromTree(tree: RouteTree): Set<string> {
+  const segments = new Set<string>();
+  walkTree(tree.root, segments);
+  return segments;
+}
+
+function walkTree(node: SegmentNode, segments: Set<string>): void {
+  if (node.paramName && node.segmentName) {
+    const classified = classifyUrlSegment(node.segmentName);
+    if (classified.kind !== 'static') {
+      segments.add(node.segmentName);
+    }
+  }
+  for (const child of node.children) {
+    walkTree(child, segments);
+  }
+  for (const slot of Object.values(node.slots)) {
+    walkTree(slot, segments);
+  }
+}
+
+/**
+ * Extract the param name from a bracket key.
+ * '[id]' → 'id', '[...slug]' → 'slug', '[[...topic]]' → 'topic'
+ */
+function extractParamName(bracketKey: string): string | null {
+  const seg = classifyUrlSegment(bracketKey);
+  if (seg.kind === 'static') return null;
+  return seg.name;
+}
+
+/**
+ * Validate schema keys against the filesystem route tree.
+ *
+ * Returns warnings for:
+ * - Stale keys: schema keys that don't match any filesystem segment
+ * - Bracket form mismatches: same param name, different bracket form
+ * - Missing keys: filesystem segments not registered in schema (informational)
+ */
+export function validateSchemaAgainstRoutes(tree: RouteTree, appDir: string): SchemaWarning[] {
+  const schemaPath = findSchemaFile(appDir);
+  if (!schemaPath) return [];
+
+  const content = readFileSync(schemaPath, 'utf-8');
+  const schemaKeys = parseExistingSchemaKeys(content);
+
+  if (schemaKeys.length === 0) return [];
+
+  const filesystemSegments = collectDynamicSegmentsFromTree(tree);
+
+  return validateKeys(schemaKeys, filesystemSegments);
+}
+
+/**
+ * Core validation: compare schema keys against filesystem segments.
+ * Exported separately for testing without filesystem dependencies.
+ */
+export function validateKeys(
+  schemaKeys: string[],
+  filesystemSegments: Set<string>
+): SchemaWarning[] {
+  const warnings: SchemaWarning[] = [];
+
+  // Build a map of param name → bracket form for filesystem segments
+  const fsParamToKey = new Map<string, string>();
+  for (const fsKey of filesystemSegments) {
+    const name = extractParamName(fsKey);
+    if (name) {
+      fsParamToKey.set(name, fsKey);
+    }
+  }
+
+  // Build a set of schema param names for the missing-key check
+  const schemaParamNames = new Set<string>();
+
+  for (const schemaKey of schemaKeys) {
+    const schemaParamName = extractParamName(schemaKey);
+    if (!schemaParamName) continue;
+
+    schemaParamNames.add(schemaParamName);
+
+    if (filesystemSegments.has(schemaKey)) {
+      // Exact match — no issue
+      continue;
+    }
+
+    // Check if the param name exists but with a different bracket form
+    const fsKey = fsParamToKey.get(schemaParamName);
+    if (fsKey) {
+      warnings.push({
+        type: 'bracket-mismatch',
+        key: schemaKey,
+        filesystemKey: fsKey,
+        message:
+          `Schema key '${schemaKey}' does not match filesystem bracket form '${fsKey}'. ` +
+          `Update the schema key to '${fsKey}'.`,
+      });
+    } else {
+      warnings.push({
+        type: 'stale-key',
+        key: schemaKey,
+        message:
+          `Schema key '${schemaKey}' does not match any dynamic segment in the filesystem. ` +
+          `Remove it from app/schema.ts or create the corresponding route segment.`,
+      });
+    }
+  }
+
+  // Check for filesystem segments not in schema (informational)
+  for (const fsKey of filesystemSegments) {
+    const name = extractParamName(fsKey);
+    if (name && !schemaParamNames.has(name)) {
+      warnings.push({
+        type: 'missing-key',
+        key: fsKey,
+        message:
+          `Dynamic segment '${fsKey}' has no codec in app/schema.ts (defaults to string). ` +
+          `Run: timber schema sync`,
+      });
+    }
+  }
+
+  return warnings;
+}