@timber-js/app 0.2.0-alpha.96 → 0.2.0-alpha.98

package/dist/index.js

@@ -1,6 +1,6 @@
 import { a as __toCommonJS, i as __require, n as __esmMin, o as __toESM, r as __exportAll, t as __commonJSMin } from "./_chunks/chunk-BYIpzuS7.js";
 import { n as setViteServer } from "./_chunks/dev-warnings-DpGRGoDi.js";
-import { i as scanRoutes, n as generateRouteMap, t as collectInterceptionRewrites } from "./_chunks/interception-BsLCA9gk.js";
+import { i as scanRoutes, n as collectInterceptionRewrites, r as generateRouteMap, t as collectLeafRoutes } from "./_chunks/walkers-VOXgavMF.js";
 import { t as formatSize } from "./_chunks/format-CYBGxKtc.js";
 import { dirname, extname, join, normalize, resolve } from "node:path";
 import { createRequire } from "node:module";
@@ -12392,10 +12392,6 @@ var require_acorn = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 * avoiding false positives from regex matching inside string literals,
 * comments, or template expressions.
 *
-* The function-body directive detection (findFunctionsWithDirective) is a
-* general-purpose utility kept for future use. Custom directives like
-* 'use cache' are not currently implemented — see design/06-caching.md.
-*
 * @module
 */
 var import_acorn_jsx = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -12850,10 +12846,10 @@ function lintStatusFileDirectives(tree) {
 }
 function walkNode(node, warnings) {
 	if (node.error) checkFile(node.error.filePath, node.error.extension, "error", warnings);
-	if (node.statusFiles) for (const [code, file] of node.statusFiles) checkFile(file.filePath, file.extension, code, warnings);
-	if (node.legacyStatusFiles) for (const [name, file] of node.legacyStatusFiles) checkFile(file.filePath, file.extension, name, warnings);
+	if (node.statusFiles) for (const [code, file] of Object.entries(node.statusFiles)) checkFile(file.filePath, file.extension, code, warnings);
+	if (node.legacyStatusFiles) for (const [name, file] of Object.entries(node.legacyStatusFiles)) checkFile(file.filePath, file.extension, name, warnings);
 	for (const child of node.children) walkNode(child, warnings);
-	for (const [, slotNode] of node.slots) walkNode(slotNode, warnings);
+	for (const slotNode of Object.values(node.slots)) walkNode(slotNode, warnings);
 }
 function checkFile(filePath, extension, fileType, warnings) {
 	if (!CLIENT_REQUIRED_EXTENSIONS.has(extension)) return;
@@ -12935,7 +12931,7 @@ function checkEmptyApp(root, appDir, warnings) {
 function hasAnyRoutable(node) {
 	if (node.page || node.route) return true;
 	for (const child of node.children) if (hasAnyRoutable(child)) return true;
-	for (const [, slot] of node.slots) if (hasAnyRoutable(slot)) return true;
+	for (const slot of Object.values(node.slots)) if (hasAnyRoutable(slot)) return true;
 	return false;
 }
 /**
@@ -12946,7 +12942,7 @@ function hasAnyRoutable(node) {
 function hasAnyPage(node) {
 	if (node.page) return true;
 	for (const child of node.children) if (hasAnyPage(child)) return true;
-	for (const [, slot] of node.slots) if (hasAnyPage(slot)) return true;
+	for (const slot of Object.values(node.slots)) if (hasAnyPage(slot)) return true;
 	return false;
 }
 /** HTTP methods that route.ts can export. */
@@ -12995,7 +12991,7 @@ function checkRouteExports(node, warnings) {
 		} catch {}
 	}
 	for (const child of node.children) checkRouteExports(child, warnings);
-	for (const [, slot] of node.slots) checkRouteExports(slot, warnings);
+	for (const slot of Object.values(node.slots)) checkRouteExports(slot, warnings);
 }
 /**
 * Warn when the root segment has no layout.tsx.
@@ -13036,7 +13032,7 @@ function checkDefaultExports(node, warnings) {
 	if (node.page && isScriptExtension(node.page.extension)) checkFileDefaultExport(node.page.filePath, "page", warnings);
 	if (node.layout && isScriptExtension(node.layout.extension)) checkFileDefaultExport(node.layout.filePath, "layout", warnings);
 	for (const child of node.children) checkDefaultExports(child, warnings);
-	for (const [, slot] of node.slots) checkDefaultExports(slot, warnings);
+	for (const slot of Object.values(node.slots)) checkDefaultExports(slot, warnings);
 }
 function isScriptExtension(ext) {
 	return ext === "tsx" || ext === "ts" || ext === "jsx" || ext === "js";
@@ -13169,7 +13165,7 @@ function timberRouting(ctx) {
 				segmentType: "static",
 				urlPath: "/",
 				children: [],
-				slots: /* @__PURE__ */ new Map()
+				slots: {}
 			} };
 			return;
 		}
@@ -13293,7 +13289,7 @@ function generateSearchParamsRegistryModule(tree) {
 			});
 		}
 		for (const child of node.children) walk(child);
-		for (const [, slot] of node.slots) walk(slot);
+		for (const slot of Object.values(node.slots)) walk(slot);
 	}
 	walk(tree.root);
 	entries.sort((a, b) => a.urlPath.localeCompare(b.urlPath));
@@ -13395,33 +13391,33 @@ function generateManifestModule(tree, viteRoot) {
 			const v = addImport(node.params);
 			parts.push(`${nextIndent}params: { load: ${v}, filePath: ${JSON.stringify(node.params.filePath)} },`);
 		}
-		if (node.statusFiles && node.statusFiles.size > 0) {
+		if (node.statusFiles && Object.keys(node.statusFiles).length > 0) {
 			const statusEntries = [];
-			for (const [code, file] of node.statusFiles) {
+			for (const [code, file] of Object.entries(node.statusFiles)) {
 				const v = addImport(file);
 				statusEntries.push(`${nextIndent}    ${JSON.stringify(code)}: { load: ${v}, filePath: ${JSON.stringify(file.filePath)} }`);
 			}
 			parts.push(`${nextIndent}statusFiles: {\n${statusEntries.join(",\n")}\n${nextIndent}},`);
 		}
-		if (node.jsonStatusFiles && node.jsonStatusFiles.size > 0) {
+		if (node.jsonStatusFiles && Object.keys(node.jsonStatusFiles).length > 0) {
 			const jsonEntries = [];
-			for (const [code, file] of node.jsonStatusFiles) {
+			for (const [code, file] of Object.entries(node.jsonStatusFiles)) {
 				const v = addImport(file);
 				jsonEntries.push(`${nextIndent}    ${JSON.stringify(code)}: { load: ${v}, filePath: ${JSON.stringify(file.filePath)} }`);
 			}
 			parts.push(`${nextIndent}jsonStatusFiles: {\n${jsonEntries.join(",\n")}\n${nextIndent}},`);
 		}
-		if (node.legacyStatusFiles && node.legacyStatusFiles.size > 0) {
+		if (node.legacyStatusFiles && Object.keys(node.legacyStatusFiles).length > 0) {
 			const legacyEntries = [];
-			for (const [name, file] of node.legacyStatusFiles) {
+			for (const [name, file] of Object.entries(node.legacyStatusFiles)) {
 				const v = addImport(file);
 				legacyEntries.push(`${nextIndent}    ${JSON.stringify(name)}: { load: ${v}, filePath: ${JSON.stringify(file.filePath)} }`);
 			}
 			parts.push(`${nextIndent}legacyStatusFiles: {\n${legacyEntries.join(",\n")}\n${nextIndent}},`);
 		}
-		if (node.metadataRoutes && node.metadataRoutes.size > 0) {
+		if (node.metadataRoutes && Object.keys(node.metadataRoutes).length > 0) {
 			const metaEntries = [];
-			for (const [name, file] of node.metadataRoutes) {
+			for (const [name, file] of Object.entries(node.metadataRoutes)) {
 				const v = addImport(file);
 				metaEntries.push(`${nextIndent}    ${JSON.stringify(name)}: { load: ${v}, filePath: ${JSON.stringify(file.filePath)} }`);
 			}
@@ -13431,9 +13427,13 @@ function generateManifestModule(tree, viteRoot) {
 			const childNodes = node.children.map((c) => serializeNode(c, nextIndent));
 			parts.push(`${nextIndent}children: [\n${childNodes.join(",\n")}\n${nextIndent}],`);
 		} else parts.push(`${nextIndent}children: [],`);
-		if (node.slots.size > 0) {
+		const slotKeys = Object.keys(node.slots);
+		if (slotKeys.length > 0) {
 			const slotEntries = [];
-			for (const [slotName, slotNode] of node.slots) slotEntries.push(`${nextIndent}    ${JSON.stringify(slotName)}: ${serializeNode(slotNode, nextIndent + "  ")}`);
+			for (const slotName of slotKeys) {
+				const slotNode = node.slots[slotName];
+				slotEntries.push(`${nextIndent}    ${JSON.stringify(slotName)}: ${serializeNode(slotNode, nextIndent + "  ")}`);
+			}
 			parts.push(`${nextIndent}slots: {\n${slotEntries.join(",\n")}\n${nextIndent}},`);
 		} else parts.push(`${nextIndent}slots: {},`);
 		return `${indent}{\n${parts.join("\n")}\n${indent}}`;
@@ -16211,32 +16211,22 @@ function green(text) {
 /**
 * Walk the route tree and collect all leaf routes (pages + API endpoints).
 *
-* Parallel slots (`@artists`, `@shows`, etc.) are intentionally skipped —
-* they render alongside the parent page at the same URL and are not
-* separately URL-addressable. Their JS is captured in shared/layout chunks.
+* Wraps the shared `collectLeafRoutes` walker (TIM-848). Parallel slots
+* (`@artists`, `@shows`, etc.) are intentionally skipped — they render
+* alongside the parent page at the same URL and are not separately
+* URL-addressable. Their JS is captured in shared/layout chunks.
 *
 * After collection, entries are deduplicated by URL path so that overlapping
 * route groups (e.g. `(browse)` and `(marketing)` both producing `/`) only
-* appear once. The entry with the largest route-specific size wins.
+* appear once. The entry with the longest segment chain (most specific
+* match) wins.
 */
 function collectRoutes(tree) {
-	const routes = [];
-	function walk(node, chain) {
-		const currentChain = [...chain, node];
-		const path = node.urlPath || "/";
-		if (node.page) routes.push({
-			path,
-			segments: currentChain,
-			entryFilePath: node.page.filePath
-		});
-		if (node.route) routes.push({
-			path,
-			segments: currentChain,
-			entryFilePath: node.route.filePath
-		});
-		for (const child of node.children) walk(child, currentChain);
-	}
-	walk(tree.root, []);
+	const routes = collectLeafRoutes(tree.root).map((leaf) => ({
+		path: leaf.urlPath,
+		segments: leaf.segments,
+		entryFilePath: leaf.page?.filePath ?? leaf.route?.filePath ?? null
+	}));
 	const seen = /* @__PURE__ */ new Map();
 	for (const route of routes) {
 		const existing = seen.get(route.path);
@@ -16645,9 +16635,11 @@ var HOLDING_PAGE_HTML = [
 *
 * Usage (inside Vite plugin):
 * ```ts
-* // In config() hook — earliest point where port is known
+* // In config() hook — earliest point where port is known.
+* // Use bindWithBump() to honor the default-3000 + auto-bump policy
+* // (see ../server/port-resolution.ts and TIM-842).
 * const holding = createHoldingServer();
-* holding.listen(config.server?.port ?? 5173);
+* await bindWithBump((p) => holding.listen(p), { startPort: 3000, autoBump: true });
 *
 * // In last plugin's configureServer() — wrap listen for seamless handoff
 * const originalListen = server.listen.bind(server);
@@ -16701,6 +16693,122 @@ function createHoldingServer() {
 	};
 }
 //#endregion
+//#region src/server/port-resolution.ts
+/**
+* Port resolution for the dev server, Vite preview, and the Node
+* production preview server.
+*
+* Behavior (see TIM-842):
+*
+*   1. Default port is **3000** for both dev and prod.
+*   2. If the user did NOT set an explicit port, auto-bump from 3000
+*      until a free port is found (3000 → 3001 → 3002 → …).
+*   3. If the user DID set an explicit port (via `--port`, `PORT` env
+*      var, or `vite.config.ts` `server.port`), use it as-is and let
+*      the bind fail loudly on conflict (`strictPort: true`).
+*
+* The port-bump probe is performed by binding the **actual** server
+* (e.g. the dev holding server) — not a throwaway probe — so there is
+* no time-of-check / time-of-use race between probing and listening.
+*
+* Design doc: 21-dev-server.md §"Default Port and Auto-Bump".
+*/
+/** Default port used by `timber dev` and `timber preview`. */
+var DEFAULT_PORT = 3e3;
+/**
+* Pure: compute the starting port from config / env / defaults.
+*
+* Performs no I/O — pair with {@link bindWithBump} to actually listen.
+*/
+function resolveStartPort(input) {
+	const defaultPort = input.defaultPort ?? 3e3;
+	if (typeof input.configPort === "number" && Number.isFinite(input.configPort)) return {
+		port: input.configPort,
+		explicit: true
+	};
+	if (input.envPort != null && input.envPort !== "") {
+		const parsed = Number(input.envPort);
+		if (Number.isFinite(parsed) && parsed > 0) return {
+			port: parsed,
+			explicit: true
+		};
+	}
+	return {
+		port: defaultPort,
+		explicit: false
+	};
+}
+/**
+* Bind a server starting at `startPort`, optionally bumping the port
+* on `EADDRINUSE` until a free one is found.
+*
+* Use this with the actual server you intend to keep listening (e.g.
+* the dev holding server). Pairing the probe with the real listen
+* eliminates the TOCTOU race that a throwaway probe would introduce.
+*/
+async function bindWithBump(listen, options) {
+	const maxAttempts = options.autoBump ? options.maxAttempts ?? 100 : 1;
+	let lastErr = null;
+	for (let i = 0; i < maxAttempts; i++) {
+		const port = options.startPort + i;
+		try {
+			return {
+				port: await listen(port),
+				bumped: i > 0
+			};
+		} catch (err) {
+			lastErr = err;
+			if (!isAddrInUse(err)) throw err;
+		}
+	}
+	throw lastErr ?? /* @__PURE__ */ new Error(`Could not bind to a free port starting at ${options.startPort}`);
+}
+/** True if `err` is a Node `EADDRINUSE` error from `server.listen()`. */
+function isAddrInUse(err) {
+	return typeof err === "object" && err !== null && err.code === "EADDRINUSE";
+}
+/**
+* Run the full dev-server port resolution + holding-server bind sequence.
+*
+* Resolves the port from config / env / default, attempts to bind the
+* holding server (auto-bumping when the port came from the default),
+* and logs the chosen URL. On a clean failure for an explicit port, it
+* warns and falls back to the requested port so Vite can surface the
+* conflict via `strictPort: true`.
+*
+* Extracted from `index.ts` so the rootSync `config()` hook stays
+* focused on plugin assembly.
+*/
+async function startDevServerPort(input) {
+	const log = input.log ?? ((msg) => console.log(msg));
+	const warn = input.warn ?? ((msg) => console.warn(msg));
+	const start = resolveStartPort({
+		configPort: input.configPort,
+		envPort: input.envPort,
+		defaultPort: DEFAULT_PORT
+	});
+	try {
+		const result = await bindWithBump(input.listen, {
+			startPort: start.port,
+			autoBump: !start.explicit
+		});
+		if (result.bumped) log(`\n  \x1b[33m[timber]\x1b[0m Port ${start.port} in use, using ${result.port}\n`);
+		log(`\n  \x1b[2m\u{1FAB5} timber.js dev server starting at\x1b[0m \x1b[36mhttp://localhost:${result.port}\x1b[0m\n`);
+		return {
+			port: result.port,
+			explicit: start.explicit,
+			bound: true
+		};
+	} catch (err) {
+		if (start.explicit && isAddrInUse(err)) warn(`\n  \x1b[33m[timber]\x1b[0m Port ${start.port} is already in use. Set PORT (or remove the override) to pick another port.\n`);
+		return {
+			port: start.port,
+			explicit: start.explicit,
+			bound: false
+		};
+	}
+}
+//#endregion
 //#region src/plugin-context.ts
 /**
 * Plugin context — internal types and helpers for timber sub-plugins.
@@ -16942,7 +17050,7 @@ function timber(config) {
 	const earlyFileConfig = loadTimberConfigFile(process.cwd());
 	const rootSync = {
 		name: "timber-root-sync",
-		config(userConfig, { command }) {
+		async config(userConfig, { command, isPreview }) {
 			const viteRoot = resolve(userConfig.root ?? process.cwd());
 			ctx.timer.start("config-load");
 			const fileConfig = loadTimberConfigFile(viteRoot);
@@ -16960,19 +17068,26 @@ function timber(config) {
 				const hadCompilerInEarly = !config?.reactCompiler && earlyFileConfig?.reactCompiler;
 				if (hasCompilerInReloaded && !hadCompilerInEarly) console.warn("[timber] reactCompiler is set in timber.config.ts but could not be registered because the config file is in a non-cwd root directory. Move reactCompiler to the inline timber() config in vite.config.ts, or run vite from the project root directory.");
 			}
-			if (command === "serve") {
-				const port = userConfig.server?.port ?? 5173;
-				try {
-					ctx.holdingServer = createHoldingServer();
-					ctx.holdingServer.listen(port).then((boundPort) => {
-						const url = `http://localhost:${boundPort}`;
-						console.log(`\n  \x1b[2m🪵 timber.js dev server starting at\x1b[0m \x1b[36m${url}\x1b[0m\n`);
-					}, () => {
-						ctx.holdingServer = null;
-					});
-				} catch {
-					ctx.holdingServer = null;
-				}
+			let resolvedDevPort = null;
+			let resolvedDevPortExplicit = false;
+			if (command === "serve" && !isPreview) {
+				ctx.holdingServer = createHoldingServer();
+				const holdingRef = ctx.holdingServer;
+				const result = await startDevServerPort({
+					configPort: typeof userConfig.server?.port === "number" ? userConfig.server.port : void 0,
+					envPort: process.env.PORT,
+					listen: (p) => holdingRef.listen(p)
+				});
+				resolvedDevPort = result.port;
+				resolvedDevPortExplicit = result.explicit;
+				if (!result.bound) ctx.holdingServer = null;
+			} else if (command === "serve" && isPreview) {
+				const start = resolveStartPort({
+					configPort: typeof userConfig.preview?.port === "number" ? userConfig.preview.port : typeof userConfig.server?.port === "number" ? userConfig.server.port : void 0,
+					envPort: process.env.PORT
+				});
+				resolvedDevPort = start.port;
+				resolvedDevPortExplicit = start.explicit;
 			}
 			const buildOutDir = timberBuildDir ? timberBuildDir : viteOutDir && viteOutDir !== "dist" ? viteOutDir : DEFAULT_BUILD_DIR;
 			const envOutDirs = {};
@@ -16986,9 +17101,21 @@ function timber(config) {
 				environments: envOutDirs,
 				oxc: { jsx: { development: false } }
 			};
+			const serverConfig = {};
+			const previewConfig = {};
+			if (resolvedDevPort != null) {
+				if (!isPreview) {
+					serverConfig.port = resolvedDevPort;
+					serverConfig.strictPort = true;
+				}
+				previewConfig.port = resolvedDevPort;
+				previewConfig.strictPort = resolvedDevPortExplicit;
+			}
 			return {
 				build: { outDir: buildOutDir },
-				environments: envOutDirs
+				environments: envOutDirs,
+				server: serverConfig,
+				preview: previewConfig
 			};
 		},
 		configResolved(resolved) {