@timber-js/app 0.2.0-alpha.114 → 0.2.0-alpha.116

package/dist/index.js

@@ -1,7 +1,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-DGV9dQRq.js";
+import { n as collectInterceptionRewrites, r as generateRouteMap, t as collectLeafRoutes } from "./_chunks/walkers-DgOXkTts.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";
@@ -1981,34 +1981,47 @@ function timberMdx(ctx) {
 //#endregion
 //#region src/routing/segment-codegen.ts
 /**
-* _segment type generation and directory-to-route mapping.
+* $segment type generation and directory-to-route mapping.
 *
-* Generates per-route _segment.d.ts files in .timber/types/ that mirror
+* 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.
+* importable as './$segment' from route files.
 *
-* Design doc: design/41-global-params.md §The _segment Module
+* 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.
+* Build a map of absolute filesystem directory → segment info.
+* Used by resolveId to map a $segment import's importer to the correct route,
+* and by writeSegmentTypes to generate per-route $segment.d.ts files.
 *
 * Walks every segment (not just leaves) so layouts and middleware
-* at any depth can import _segment.
+* 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));
+	function walk(node, fsPath, treePath) {
+		map.set(fsPath, {
+			route: node.urlPath || "/",
+			segmentPath: treePath || "/"
+		});
+		for (const child of node.children) walk(child, join(fsPath, child.segmentName), `${treePath}/${child.segmentName}`);
+		for (const [slotName, slotNode] of Object.entries(node.slots)) walk(slotNode, join(fsPath, `@${slotName}`), `${treePath}/@${slotName}`);
 	}
-	walk(tree.root, appDir);
+	walk(tree.root, appDir, "");
 	return map;
 }
 /**
-* Generate per-route _segment.d.ts files in .timber/types/ mirroring
+* Generate the full $segment.d.ts content for a segment.
+*/
+function generateSegmentDts(info) {
+	return [
+		`export const ROUTE: '${info.route}';`,
+		`export const SEGMENT_PATH: '${info.segmentPath}';`,
+		""
+	].join("\n");
+}
+/**
+* Generate per-route $segment.d.ts files in .timber/types/ mirroring
 * the app/ directory structure. These files are importable via TypeScript's
 * rootDirs feature.
 */
@@ -2016,11 +2029,11 @@ 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) {
+	for (const [fsDir, info] 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")));
+		const segmentFile = join(segmentDir, "$segment.d.ts");
+		const content = generateSegmentDts(info);
+		writes.push(mkdir(segmentDir, { recursive: true }).then(() => writeFile(segmentFile, content, "utf-8")));
 	}
 	await Promise.all(writes);
 }
@@ -2263,7 +2276,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:";
+var SEGMENT_PREFIX = "\0$segment:";
 /**
 * File convention names we track for changes that require manifest regeneration.
 */
@@ -2315,7 +2328,7 @@ function writeCodegen(ctx) {
 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. */
+	/** Maps absolute filesystem directory → segment info for $segment resolution. */
 	let dirToRoute = /* @__PURE__ */ new Map();
 	function rescan() {
 		const appDirWarning = checkAppDirExists(ctx.appDir);
@@ -2352,11 +2365,11 @@ function timberRouting(ctx) {
 			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")) {
+			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}`;
+				const segmentInfo = dirToRoute.get(importerDir);
+				if (segmentInfo !== void 0) return `${SEGMENT_PREFIX}${JSON.stringify(segmentInfo)}`;
 			}
 			return null;
 		},
@@ -2371,8 +2384,12 @@ function timberRouting(ctx) {
 			}
 			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`;
+				const info = JSON.parse(id.slice(10));
+				return [
+					`export const ROUTE = ${JSON.stringify(info.route)};`,
+					`export const SEGMENT_PATH = ${JSON.stringify(info.segmentPath)};`,
+					""
+				].join("\n");
 			}
 			return null;
 		},