@timber-js/app 0.2.0-alpha.112 → 0.2.0-alpha.113

package/dist/plugins/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/plugins/routing.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAmBlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAkF1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAyLxD"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/plugins/routing.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAoBlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0F1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAmNxD"}

package/dist/routing/segment-codegen.d.ts

@@ -0,0 +1,25 @@
+/**
+ * _segment type generation and directory-to-route mapping.
+ *
+ * Generates per-route _segment.d.ts files in .timber/types/ that mirror
+ * the app/ directory structure. TypeScript's rootDirs feature makes these
+ * importable as './_segment' from route files.
+ *
+ * Design doc: design/41-global-params.md §The _segment Module
+ */
+import type { RouteTree } from './types.js';
+/**
+ * Build a map of absolute filesystem directory → route pattern.
+ * Used by resolveId to map a _segment import's importer to the correct route.
+ *
+ * Walks every segment (not just leaves) so layouts and middleware
+ * at any depth can import _segment.
+ */
+export declare function buildDirToRouteMap(tree: RouteTree, appDir: string): Map<string, string>;
+/**
+ * Generate per-route _segment.d.ts files in .timber/types/ mirroring
+ * the app/ directory structure. These files are importable via TypeScript's
+ * rootDirs feature.
+ */
+export declare function writeSegmentTypes(routeTree: RouteTree, appDir: string, root: string): Promise<void>;
+//# sourceMappingURL=segment-codegen.d.ts.map

package/dist/routing/segment-codegen.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"segment-codegen.d.ts","sourceRoot":"","sources":["../../src/routing/segment-codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,YAAY,CAAC;AAEzD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAmBvF;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAqBf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.112",
+  "version": "0.2.0-alpha.113",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/plugins/routing.ts

@@ -15,6 +15,7 @@ import { join } from 'node:path';
 import { scanRoutes } from '../routing/scanner.js';
 import { generateRouteMap } from '../routing/codegen.js';
 import { collectInterceptionRewrites } from '../routing/interception.js';
+import { buildDirToRouteMap, writeSegmentTypes } from '../routing/segment-codegen.js';
 import {
   collectDynamicSegments,
   findSchemaFile,
@@ -55,6 +56,13 @@ const RESOLVED_SEARCH_PARAMS_REGISTRY_ID = `\0${SEARCH_PARAMS_REGISTRY_ID}`;
 const SCHEMA_ID = 'virtual:timber-schema';
 const RESOLVED_SCHEMA_ID = `\0${SCHEMA_ID}`;
 
+// TIM-935: _segment virtual module prefix.
+//
+// Each route directory gets a virtual module that exports the route
+// pattern string. `import { route } from './_segment'` resolves to
+// `\0_segment:<route-pattern>` which returns `export const route = '...'`.
+const SEGMENT_PREFIX = '\0_segment:';
+
 /**
  * File convention names we track for changes that require manifest regeneration.
  */
@@ -101,6 +109,7 @@ function writeCodegen(ctx: PluginContext): void {
       Promise.all([
         writeFile(routesPath, content, 'utf-8'),
         writeFile(envPath, TIMBER_ENV_DTS, 'utf-8'),
+        writeSegmentTypes(ctx.routeTree!, ctx.appDir, ctx.root),
       ])
     )
     .catch((err) => {
@@ -113,6 +122,9 @@ export function timberRouting(ctx: PluginContext): Plugin {
   /** Track warned files to avoid repeating warnings on rescan. */
   const warnedFiles = new Set<string>();
 
+  /** Maps absolute filesystem directory → route pattern for _segment resolution. */
+  let dirToRoute: Map<string, string> = new Map();
+
   function rescan(): void {
     // Check app/ directory exists before scanning
     const appDirWarning = checkAppDirExists(ctx.appDir);
@@ -137,6 +149,7 @@ export function timberRouting(ctx: PluginContext): Plugin {
       pageExtensions: ctx.config.pageExtensions,
     });
     ctx.timer.end('route-scan');
+    dirToRoute = buildDirToRouteMap(ctx.routeTree, ctx.appDir);
     writeCodegen(ctx);
 
     // Dev: warn about dynamic segments not registered in app/schema.ts.
@@ -165,7 +178,7 @@ export function timberRouting(ctx: PluginContext): Plugin {
      * - <root>/virtual:timber-route-manifest (Vite SSR build root prefix)
      * - \0virtual:timber-route-manifest (RSC plugin re-imports)
      */
-    resolveId(id: string) {
+    resolveId(id: string, importer?: string) {
       // Strip \0 prefix if present (RSC plugin generates these)
       const cleanId = id.startsWith('\0') ? id.slice(1) : id;
 
@@ -191,6 +204,22 @@ export function timberRouting(ctx: PluginContext): Plugin {
         return RESOLVED_SCHEMA_ID;
       }
 
+      // TIM-935: _segment virtual module.
+      // Resolves `import { route } from './_segment'` based on the
+      // importing file's directory in the app/ tree.
+      if (
+        importer &&
+        (cleanId === './_segment' || cleanId === './_segment.js' || cleanId === './_segment.ts')
+      ) {
+        // Strip \0 prefix from importer if present
+        const cleanImporter = importer.startsWith('\0') ? importer.slice(1) : importer;
+        const importerDir = cleanImporter.substring(0, cleanImporter.lastIndexOf('/'));
+        const routePattern = dirToRoute.get(importerDir);
+        if (routePattern !== undefined) {
+          return `${SEGMENT_PREFIX}${routePattern}`;
+        }
+      }
+
       return null;
     },
 
@@ -220,6 +249,12 @@ export function timberRouting(ctx: PluginContext): Plugin {
         return generateSchemaModule(ctx.appDir);
       }
 
+      // TIM-935: _segment virtual module — exports the route pattern string.
+      if (id.startsWith(SEGMENT_PREFIX)) {
+        const routePattern = id.slice(SEGMENT_PREFIX.length);
+        return `export const route = ${JSON.stringify(routePattern)};\n`;
+      }
+
       return null;
     },
 
@@ -347,6 +382,13 @@ function invalidateManifest(server: ViteDevServer): void {
         env.moduleGraph.invalidateModule(mod);
       }
     }
+
+    // TIM-935: Invalidate all _segment virtual modules (prefixed \0_segment:)
+    for (const mod of env.moduleGraph.idToModuleMap.values()) {
+      if (mod.id?.startsWith(SEGMENT_PREFIX)) {
+        env.moduleGraph.invalidateModule(mod);
+      }
+    }
   }
 
   // Trigger HMR full reload — route changes are structural

package/src/routing/segment-codegen.ts

@@ -0,0 +1,73 @@
+/**
+ * _segment type generation and directory-to-route mapping.
+ *
+ * Generates per-route _segment.d.ts files in .timber/types/ that mirror
+ * the app/ directory structure. TypeScript's rootDirs feature makes these
+ * importable as './_segment' from route files.
+ *
+ * Design doc: design/41-global-params.md §The _segment Module
+ */
+
+import { writeFile, mkdir } from 'node:fs/promises';
+import { join } from 'node:path';
+import type { RouteTree, SegmentNode } from './types.js';
+
+/**
+ * Build a map of absolute filesystem directory → route pattern.
+ * Used by resolveId to map a _segment import's importer to the correct route.
+ *
+ * Walks every segment (not just leaves) so layouts and middleware
+ * at any depth can import _segment.
+ */
+export function buildDirToRouteMap(tree: RouteTree, appDir: string): Map<string, string> {
+  const map = new Map<string, string>();
+
+  function walk(node: SegmentNode, fsPath: string): void {
+    const routePattern = node.urlPath || '/';
+    map.set(fsPath, routePattern);
+
+    for (const child of node.children) {
+      const childDir = join(fsPath, child.segmentName);
+      walk(child, childDir);
+    }
+    for (const [slotName, slotNode] of Object.entries(node.slots)) {
+      const slotDir = join(fsPath, slotName);
+      walk(slotNode, slotDir);
+    }
+  }
+
+  walk(tree.root, appDir);
+  return map;
+}
+
+/**
+ * Generate per-route _segment.d.ts files in .timber/types/ mirroring
+ * the app/ directory structure. These files are importable via TypeScript's
+ * rootDirs feature.
+ */
+export async function writeSegmentTypes(
+  routeTree: RouteTree,
+  appDir: string,
+  root: string
+): Promise<void> {
+  // Compute the relative prefix from project root to appDir.
+  // e.g. if appDir is /project/src/app, relative is 'src/app'
+  const relative = appDir.slice(root.length + 1);
+  const typesBase = join(root, '.timber', 'types', relative);
+  const map = buildDirToRouteMap(routeTree, appDir);
+
+  const writes: Promise<void>[] = [];
+  for (const [fsDir, routePattern] of map) {
+    // Mirror the app/ structure under .timber/types/
+    const relDir = fsDir.slice(appDir.length); // e.g. '/[artistSlug]/[year]'
+    const segmentDir = join(typesBase, relDir);
+    const segmentPath = join(segmentDir, '_segment.d.ts');
+    const content = `export const route: '${routePattern}';\n`;
+
+    writes.push(
+      mkdir(segmentDir, { recursive: true }).then(() => writeFile(segmentPath, content, 'utf-8'))
+    );
+  }
+
+  await Promise.all(writes);
+}