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

package/dist/index.js

@@ -2,7 +2,7 @@ import { n as setViteServer } from "./_chunks/warnings-B30wpfaS.js";
 import { h as swallow } from "./_chunks/logger-DDmK5skc.js";
 import { t as scanRoutes } from "./_chunks/scanner-DmfoB7iK.js";
 import { n as collectInterceptionRewrites, r as generateRouteMap, t as collectLeafRoutes } from "./_chunks/walkers-DGTmJT0f.js";
-import { n as findSchemaFile, r as parseExistingSchemaKeys, t as collectDynamicSegments } from "./_chunks/cli-schema-sync-BvvuK8Rp.js";
+import { a as DEFAULT_BUILD_DIR, c as mergeFileConfig, d as resolveClientJavascript, f as createNoopTimer, l as resolveAppDir, n as findSchemaFile, o as createPluginContext, r as parseExistingSchemaKeys, s as loadTimberConfigFile, t as collectDynamicSegments, u as resolveBuildDir } from "./_chunks/cli-schema-sync-DFZmnmqG.js";
 import { t as formatSize } from "./_chunks/format-CR6v1pWE.js";
 import { dirname, extname, join, normalize, resolve } from "node:path";
 import { createRequire } from "node:module";
@@ -14,7 +14,6 @@ import { Readable } from "node:stream";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { parseAst } from "vite";
-import { performance as performance$1 } from "node:perf_hooks";
 import http from "node:http";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -1980,6 +1979,52 @@ function timberMdx(ctx) {
 	};
 }
 //#endregion
+//#region src/routing/segment-codegen.ts
+/**
+* _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
+*/
+/**
+* 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.
+*/
+function buildDirToRouteMap(tree, appDir) {
+	const map = /* @__PURE__ */ new Map();
+	function walk(node, fsPath) {
+		const routePattern = node.urlPath || "/";
+		map.set(fsPath, routePattern);
+		for (const child of node.children) walk(child, join(fsPath, child.segmentName));
+		for (const [slotName, slotNode] of Object.entries(node.slots)) walk(slotNode, join(fsPath, slotName));
+	}
+	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.
+*/
+async function writeSegmentTypes(routeTree, appDir, root) {
+	const typesBase = join(root, ".timber", "types", appDir.slice(root.length + 1));
+	const map = buildDirToRouteMap(routeTree, appDir);
+	const writes = [];
+	for (const [fsDir, routePattern] of map) {
+		const segmentDir = join(typesBase, fsDir.slice(appDir.length));
+		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);
+}
+//#endregion
 //#region src/routing/convention-lint.ts
 /**
 * Convention linter — validates common misconfigurations in the route tree.
@@ -2218,6 +2263,7 @@ var SEARCH_PARAMS_REGISTRY_ID = "virtual:timber-search-params-registry";
 var RESOLVED_SEARCH_PARAMS_REGISTRY_ID = `\0${SEARCH_PARAMS_REGISTRY_ID}`;
 var SCHEMA_ID = "virtual:timber-schema";
 var RESOLVED_SCHEMA_ID = `\0${SCHEMA_ID}`;
+var SEGMENT_PREFIX = "\0_segment:";
 /**
 * File convention names we track for changes that require manifest regeneration.
 */
@@ -2258,13 +2304,19 @@ function writeCodegen(ctx) {
 	});
 	const routesPath = join(ctx.root, CODEGEN_OUTPUT);
 	const envPath = join(ctx.root, "timber-env.d.ts");
-	mkdir(timberDir, { recursive: true }).then(() => Promise.all([writeFile(routesPath, content, "utf-8"), writeFile(envPath, TIMBER_ENV_DTS, "utf-8")])).catch((err) => {
+	mkdir(timberDir, { recursive: true }).then(() => Promise.all([
+		writeFile(routesPath, content, "utf-8"),
+		writeFile(envPath, TIMBER_ENV_DTS, "utf-8"),
+		writeSegmentTypes(ctx.routeTree, ctx.appDir, ctx.root)
+	])).catch((err) => {
 		console.warn("[timber] Failed to write codegen output:", err);
 	});
 }
 function timberRouting(ctx) {
 	/** Track warned files to avoid repeating warnings on rescan. */
 	const warnedFiles = /* @__PURE__ */ new Set();
+	/** Maps absolute filesystem directory → route pattern for _segment resolution. */
+	let dirToRoute = /* @__PURE__ */ new Map();
 	function rescan() {
 		const appDirWarning = checkAppDirExists(ctx.appDir);
 		if (appDirWarning) {
@@ -2282,6 +2334,7 @@ function timberRouting(ctx) {
 		ctx.timer.start("route-scan");
 		ctx.routeTree = scanRoutes(ctx.appDir, { pageExtensions: ctx.config.pageExtensions });
 		ctx.timer.end("route-scan");
+		dirToRoute = buildDirToRouteMap(ctx.routeTree, ctx.appDir);
 		writeCodegen(ctx);
 		warnUnregisteredSegments(ctx);
 		const newConventionWarnings = lintConventions(ctx.routeTree, ctx.appDir).filter((w) => !warnedFiles.has(w.id));
@@ -2293,12 +2346,18 @@ function timberRouting(ctx) {
 	}
 	return {
 		name: "timber-routing",
-		resolveId(id) {
+		resolveId(id, importer) {
 			const cleanId = id.startsWith("\0") ? id.slice(1) : id;
 			if (cleanId === VIRTUAL_MODULE_ID$1) return RESOLVED_VIRTUAL_ID$1;
 			if (cleanId.endsWith(`/${VIRTUAL_MODULE_ID$1}`)) return RESOLVED_VIRTUAL_ID$1;
 			if (cleanId === SEARCH_PARAMS_REGISTRY_ID || cleanId.endsWith(`/${SEARCH_PARAMS_REGISTRY_ID}`)) return RESOLVED_SEARCH_PARAMS_REGISTRY_ID;
 			if (cleanId === SCHEMA_ID || cleanId.endsWith(`/${SCHEMA_ID}`)) return RESOLVED_SCHEMA_ID;
+			if (importer && (cleanId === "./_segment" || cleanId === "./_segment.js" || cleanId === "./_segment.ts")) {
+				const cleanImporter = importer.startsWith("\0") ? importer.slice(1) : importer;
+				const importerDir = cleanImporter.substring(0, cleanImporter.lastIndexOf("/"));
+				const routePattern = dirToRoute.get(importerDir);
+				if (routePattern !== void 0) return `${SEGMENT_PREFIX}${routePattern}`;
+			}
 			return null;
 		},
 		load(id) {
@@ -2311,6 +2370,10 @@ function timberRouting(ctx) {
 				return generateSearchParamsRegistryModule(ctx.routeTree);
 			}
 			if (id === RESOLVED_SCHEMA_ID) return generateSchemaModule(ctx.appDir);
+			if (id.startsWith(SEGMENT_PREFIX)) {
+				const routePattern = id.slice(10);
+				return `export const route = ${JSON.stringify(routePattern)};\n`;
+			}
 			return null;
 		},
 		buildStart() {
@@ -2392,6 +2455,7 @@ function invalidateManifest(server) {
 			const mod = env.moduleGraph.getModuleById(virtualId);
 			if (mod) env.moduleGraph.invalidateModule(mod);
 		}
+		for (const mod of env.moduleGraph.idToModuleMap.values()) if (mod.id?.startsWith(SEGMENT_PREFIX)) env.moduleGraph.invalidateModule(mod);
 	}
 	server.hot.send({ type: "full-reload" });
 }
@@ -6493,81 +6557,6 @@ function timberBuildReport(ctx) {
 	};
 }
 //#endregion
-//#region src/utils/startup-timer.ts
-/**
-* Startup timer — records named phases with their durations.
-*
-* Used by the plugin system to instrument cold start and report a
-* timing breakdown in dev mode. Zero overhead in production (disabled).
-*
-* See design/18-build-system.md, TIM-155.
-*/
-/**
-* Create a startup timer that records phase durations.
-*/
-function createStartupTimer() {
-	const pending = /* @__PURE__ */ new Map();
-	const phases = [];
-	return {
-		start(phase) {
-			pending.set(phase, performance$1.now());
-		},
-		end(phase) {
-			const startMs = pending.get(phase);
-			if (startMs === void 0) return 0;
-			pending.delete(phase);
-			const durationMs = performance$1.now() - startMs;
-			phases.push({
-				name: phase,
-				startMs,
-				durationMs
-			});
-			return durationMs;
-		},
-		getPhases() {
-			return [...phases].sort((a, b) => a.startMs - b.startMs);
-		},
-		totalMs() {
-			if (phases.length === 0) return 0;
-			const sorted = this.getPhases();
-			const first = sorted[0];
-			const last = sorted[sorted.length - 1];
-			return last.startMs + last.durationMs - first.startMs;
-		},
-		formatSummary() {
-			const sorted = this.getPhases();
-			if (sorted.length === 0) return "No phases recorded.";
-			const lines = sorted.map((p) => {
-				const ms = p.durationMs.toFixed(1);
-				return `  ${p.name.padEnd(30)} ${ms.padStart(8)}ms`;
-			});
-			const total = this.totalMs().toFixed(1);
-			lines.push(`  ${"total".padEnd(30)} ${total.padStart(8)}ms`);
-			return ["[timber] startup timing:", ...lines].join("\n");
-		}
-	};
-}
-/**
-* No-op timer for production builds — all methods are empty.
-*/
-function createNoopTimer() {
-	return {
-		start() {},
-		end() {
-			return 0;
-		},
-		getPhases() {
-			return [];
-		},
-		totalMs() {
-			return 0;
-		},
-		formatSummary() {
-			return "";
-		}
-	};
-}
-//#endregion
 //#region src/server/action-encryption.ts
 /**
 * Regex for safe `defineEncryptionKey` expressions.
@@ -6902,150 +6891,6 @@ async function startDevServerPort(input) {
 	}
 }
 //#endregion
-//#region src/plugin-context.ts
-/**
-* Plugin context — internal types and helpers for timber sub-plugins.
-*
-* These are NOT part of the user-facing API. They are consumed by
-* sub-plugins (routing, entries, shims, etc.) via relative imports.
-* The root entry point (index.ts) does not re-export them.
-*
-* Design doc: 18-build-system.md §"Shared Plugin Context"
-*/
-/**
-* Resolve `clientJavascript` into a fully resolved config.
-*/
-function resolveClientJavascript(config) {
-	if (config.clientJavascript !== void 0) {
-		if (typeof config.clientJavascript === "boolean") return {
-			disabled: !config.clientJavascript,
-			enableHMRInDev: !config.clientJavascript
-		};
-		return {
-			disabled: config.clientJavascript.disabled,
-			enableHMRInDev: config.clientJavascript.enableHMRInDev ?? config.clientJavascript.disabled
-		};
-	}
-	return {
-		disabled: false,
-		enableHMRInDev: false
-	};
-}
-/**
-* Resolve the app directory. Checks (in order):
-* 1. Explicit `configAppDir` from timber.config.ts
-* 2. `<root>/app`
-* 3. `<root>/src/app`
-*
-* Throws if none exist.
-*/
-function resolveAppDir(root, configAppDir) {
-	if (configAppDir) {
-		const explicit = join(root, configAppDir);
-		if (!existsSync(explicit)) throw new Error(`[timber] Configured appDir "${configAppDir}" does not exist at ${explicit}`);
-		return explicit;
-	}
-	const rootApp = join(root, "app");
-	if (existsSync(rootApp)) return rootApp;
-	const srcApp = join(root, "src", "app");
-	if (existsSync(srcApp)) return srcApp;
-	throw new Error(`[timber] Could not find app directory. Expected "app/" or "src/app/" in ${root}. You can set appDir in timber.config.ts to specify a custom location.`);
-}
-function createPluginContext(config, root) {
-	const projectRoot = root ?? process.cwd();
-	const resolvedConfig = { ...config };
-	return {
-		config: resolvedConfig,
-		clientJavascript: resolveClientJavascript(resolvedConfig),
-		routeTree: null,
-		appDir: join(projectRoot, "app"),
-		root: projectRoot,
-		dev: false,
-		buildManifest: null,
-		deploymentId: null,
-		timer: createStartupTimer(),
-		holdingServer: null,
-		buildDir: resolveBuildDir(projectRoot, resolvedConfig.buildDir)
-	};
-}
-/** Default build output directory (relative to root). */
-var DEFAULT_BUILD_DIR = join(".timber", "dist");
-/**
-* Resolve the build output directory.
-*
-* Priority:
-* 1. Explicit `timberBuildDir` from timber.config.ts
-* 2. Explicit `viteBuildOutDir` from Vite's build.outDir (if not the default 'dist')
-* 3. Default: `.timber/dist`
-*
-* Returns an absolute path.
-*/
-function resolveBuildDir(root, timberBuildDir, viteBuildOutDir) {
-	if (timberBuildDir) return join(root, timberBuildDir);
-	if (viteBuildOutDir && viteBuildOutDir !== "dist") return join(root, viteBuildOutDir);
-	return join(root, DEFAULT_BUILD_DIR);
-}
-/**
-* Load timber.config.ts (or .js, .mjs) from the project root.
-* Returns the config object or null if no config file is found.
-*
-* Uses require() which works for ESM modules on Node 22.12+.
-* This keeps timber() synchronous — no async config loading needed.
-*/
-function loadTimberConfigFile(root) {
-	const configNames = [
-		"timber.config.ts",
-		"timber.config.js",
-		"timber.config.mjs"
-	];
-	const req = createRequire(join(root, "package.json"));
-	for (const name of configNames) {
-		const configPath = join(root, name);
-		if (existsSync(configPath)) {
-			const mod = req(configPath);
-			return mod.default ?? mod;
-		}
-	}
-	return null;
-}
-/**
-* Detect config keys set in both inline (vite.config.ts) and file (timber.config.ts)
-* and warn the user. The `output` key is excluded because it defaults to 'server'
-* in createPluginContext and would always appear as an inline key.
-*
-* Returns the list of conflicting key names (for testing).
-*/
-function warnConfigConflicts(inline, fileConfig) {
-	const conflicts = [];
-	for (const key of Object.keys(fileConfig)) if (key in inline && inline[key] !== void 0) conflicts.push(key);
-	if (conflicts.length > 0) console.warn(`[timber] Config conflict: ${conflicts.map((k) => `"${k}"`).join(", ")} set in both vite.config.ts (inline) and timber.config.ts. Move all config to timber.config.ts to avoid confusion. The inline value from vite.config.ts will be used.`);
-	return conflicts;
-}
-/**
-* Merge file-based config into ctx.config. Inline config (already in ctx.config)
-* takes precedence — file config only fills in missing fields.
-*/
-function mergeFileConfig(ctx, fileConfig) {
-	const inline = ctx.config;
-	warnConfigConflicts(inline, fileConfig);
-	ctx.config = {
-		...fileConfig,
-		...inline,
-		...fileConfig.limits && inline.limits ? { limits: {
-			...fileConfig.limits,
-			...inline.limits
-		} } : {},
-		...fileConfig.dev && inline.dev ? { dev: {
-			...fileConfig.dev,
-			...inline.dev
-		} } : {},
-		...fileConfig.mdx && inline.mdx ? { mdx: {
-			...fileConfig.mdx,
-			...inline.mdx
-		} } : {}
-	};
-}
-//#endregion
 //#region src/index.ts
 /**
 * Type-safe helper for timber.config.ts files.