@timber-js/app 0.2.0-alpha.146 → 0.2.0-alpha.148

package/dist/_chunks/{cli-schema-sync-D2IpXicg.js → cli-schema-sync-DJDdyEae.js}

@@ -1,10 +1,9 @@
-import { a as isDynamicMetadataExtension, n as classifyMetadataRoute } from "./metadata-routes-BjepjefT.js";
+import { a as classifyMetadataRoute, c as isDynamicMetadataExtension, n as NULL_BYTE_RE, t as ENCODED_SEPARATOR_RE } from "./canonicalize-P41GR6tY.js";
 import { r as DEFAULT_PAGE_EXTENSIONS, t as classifySegment } from "./segment-classify-CDDRVKs7.js";
-import { h as swallow } from "./logger-Dt-jQaBO.js";
+import { h as swallow } from "./logger-CM0clugc.js";
+import { o as resolveAppDir } from "./plugin-context-GfDWsdd2.js";
 import { basename, extname, join } from "node:path";
-import { createRequire } from "node:module";
 import { existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
-import { performance } from "node:perf_hooks";
 //#region src/routing/scanner.ts
 /**
 * Route discovery scanner.
@@ -16,17 +15,6 @@ import { performance } from "node:perf_hooks";
 * is discovery only.
 */
 /**
-* Pattern matching encoded path delimiters that must be rejected during route discovery.
-* %2F / %2f (forward slash) and %5C / %5c (backslash) can cause route collisions
-* when decoded. See design/13-security.md §"Encoded separators rejected".
-*/
-var ENCODED_SEPARATOR_PATTERN = /%(?:2[fF]|5[cC])/;
-/**
-* Pattern matching encoded null bytes (%00) that must be rejected.
-* See design/13-security.md §"Null bytes rejected".
-*/
-var ENCODED_NULL_PATTERN = /%00/;
-/**
 * File convention names that use pageExtensions (can be .tsx, .ts, .jsx, .js, .mdx, etc.)
 */
 var PAGE_EXT_CONVENTIONS = new Set([
@@ -127,48 +115,23 @@ function scanSegmentFiles(dirPath, node, extSet) {
 		const ext = extname(entry).slice(1);
 		const name = basename(entry, `.${ext}`);
 		if (PAGE_EXT_CONVENTIONS.has(name) && extSet.has(ext)) {
-			const file = {
+			const key = name;
+			const existing = node[key];
+			if (existing) throwDuplicateConvention(name, existing.filePath, fullPath);
+			node[key] = {
 				filePath: fullPath,
 				extension: ext
 			};
-			switch (name) {
-				case "page":
-					node.page = file;
-					break;
-				case "layout":
-					node.layout = file;
-					break;
-				case "error":
-					node.error = file;
-					break;
-				case "default":
-					node.default = file;
-					break;
-				case "denied":
-					node.denied = file;
-					break;
-			}
 			continue;
 		}
-		if (FIXED_CONVENTIONS.has(name) && /\.?[jt]sx?$/.test(ext)) {
-			const file = {
+		if (FIXED_CONVENTIONS.has(name) && /^[jt]sx?$/.test(ext)) {
+			const key = name;
+			const existing = node[key];
+			if (existing) throwDuplicateConvention(name, existing.filePath, fullPath);
+			node[key] = {
 				filePath: fullPath,
 				extension: ext
 			};
-			switch (name) {
-				case "middleware":
-					node.middleware = file;
-					break;
-				case "access":
-					node.access = file;
-					break;
-				case "route":
-					node.route = file;
-					break;
-				case "params":
-					node.params = file;
-					break;
-			}
 			continue;
 		}
 		if (STATUS_CODE_PATTERN.test(name) && ext === "json") {
@@ -181,6 +144,8 @@ function scanSegmentFiles(dirPath, node, extSet) {
 		}
 		if (STATUS_CODE_PATTERN.test(name) && extSet.has(ext)) {
 			if (!node.statusFiles) node.statusFiles = {};
+			const existing = node.statusFiles[name];
+			if (existing) throwDuplicateConvention(name, existing.filePath, fullPath);
 			node.statusFiles[name] = {
 				filePath: fullPath,
 				extension: ext
@@ -189,6 +154,8 @@ function scanSegmentFiles(dirPath, node, extSet) {
 		}
 		if (name in LEGACY_STATUS_FILES && extSet.has(ext)) {
 			if (!node.legacyStatusFiles) node.legacyStatusFiles = {};
+			const existing = node.legacyStatusFiles[name];
+			if (existing) throwDuplicateConvention(name, existing.filePath, fullPath);
 			node.legacyStatusFiles[name] = {
 				filePath: fullPath,
 				extension: ext
@@ -200,7 +167,9 @@ function scanSegmentFiles(dirPath, node, extSet) {
 			const existing = node.metadataRoutes[name];
 			if (existing) {
 				const existingIsDynamic = isDynamicMetadataExtension(name, existing.extension);
-				if (isDynamicMetadataExtension(name, ext) || !existingIsDynamic) node.metadataRoutes[name] = {
+				const newIsDynamic = isDynamicMetadataExtension(name, ext);
+				if (existingIsDynamic === newIsDynamic) throwDuplicateConvention(name, existing.filePath, fullPath);
+				if (newIsDynamic) node.metadataRoutes[name] = {
 					filePath: fullPath,
 					extension: ext
 				};
@@ -213,6 +182,16 @@ function scanSegmentFiles(dirPath, node, extSet) {
 	if (node.route && node.page) throw new Error(`Build error: route.ts and page.* cannot coexist in the same segment.\n  route.ts: ${node.route.filePath}\n  page:     ${node.page.filePath}\nA URL is either an API endpoint or a rendered page, not both.`);
 }
 /**
+* Throw a build error for two files claiming the same convention slot in
+* one segment (e.g. page.tsx + page.jsx). Which file readdir returns first
+* is platform-dependent (APFS sorts entries, ext4 does not) — silently
+* picking one would let macOS dev and Linux CI serve different
+* implementations of the same route.
+*/
+function throwDuplicateConvention(convention, firstPath, secondPath) {
+	throw new Error(`Build error: duplicate '${convention}' files in the same route segment.\n  File 1: ${firstPath}\n  File 2: ${secondPath}\nEach segment may define '${convention}' at most once. Remove one of the files.`);
+}
+/**
 * Recursively scan child directories and build the segment tree.
 */
 function scanChildren(dirPath, parentNode, extSet) {
@@ -230,8 +209,8 @@ function scanChildren(dirPath, parentNode, extSet) {
 		} catch {
 			continue;
 		}
-		if (ENCODED_SEPARATOR_PATTERN.test(entry)) throw new Error(`Build error: directory name contains an encoded path delimiter (%%2F or %%5C).\n  Directory: ${fullPath}\nEncoded separators in directory names cause route collisions when decoded. Rename the directory to remove the encoded delimiter.`);
-		if (ENCODED_NULL_PATTERN.test(entry)) throw new Error(`Build error: directory name contains an encoded null byte (%%00).\n  Directory: ${fullPath}\nEncoded null bytes in directory names are not allowed. Rename the directory to remove the null byte encoding.`);
+		if (ENCODED_SEPARATOR_RE.test(entry)) throw new Error(`Build error: directory name contains an encoded path delimiter (%2F or %5C).\n  Directory: ${fullPath}\nEncoded separators in directory names cause route collisions when decoded. Rename the directory to remove the encoded delimiter.`);
+		if (NULL_BYTE_RE.test(entry)) throw new Error(`Build error: directory name contains an encoded null byte (%00).\n  Directory: ${fullPath}\nEncoded null bytes in directory names are not allowed. Rename the directory to remove the null byte encoding.`);
 		const { type, paramName, interceptionMarker, interceptedSegmentName } = classifySegment(entry);
 		if (type === "private") continue;
 		const childNode = createSegmentNode(entry, type, computeUrlPath(parentNode.urlPath, entry, type), paramName, interceptionMarker, interceptedSegmentName);
@@ -249,32 +228,34 @@ function scanChildren(dirPath, parentNode, extSet) {
 * Two route groups like (auth)/login/page.tsx and (marketing)/login/page.tsx both claim
 * /login — the scanner must detect and reject this at build time.
 *
-* Parallel slots are excluded from collision detection — they intentionally coexist at
-* the same URL path as their parent (that's the whole point of parallel routes).
+* Each parallel slot is validated as its OWN collision space: a slot's pages
+* intentionally share URL paths with the parent tree (that's the point of
+* parallel routes), but two route groups INSIDE one slot claiming the same
+* URL — e.g. @side/(a)/x/page.tsx + @side/(b)/x/page.tsx — still collide.
 */
 function validateRouteGroupCollisions(root) {
-	collectRoutableLeaves(root, /* @__PURE__ */ new Map(), "", false);
+	collectRoutableLeaves(root, /* @__PURE__ */ new Map(), "");
 }
 /**
 * Walk the segment tree and collect all routable leaves (page or route files),
-* throwing on collision. Slots are tracked in their own collision space since
-* they are parallel routes that intentionally share URL paths with their parent.
+* throwing on collision. Each slot recurses with a FRESH collision map —
+* slots are parallel routes that intentionally share URL paths with their
+* parent tree, but collisions within a single slot are real errors.
 */
-function collectRoutableLeaves(node, seen, segmentPath, insideSlot) {
+function collectRoutableLeaves(node, seen, segmentPath) {
+	if (node.segmentType === "intercepting") return;
 	const currentPath = segmentPath ? `${segmentPath}/${node.segmentName}` : node.segmentName || "(root)";
-	if (!insideSlot) {
-		const routableFile = node.page ?? node.route;
-		if (routableFile) {
-			const existing = seen.get(node.urlPath);
-			if (existing) throw new Error(`Build error: route collision — multiple route groups produce a page/route at the same URL path.\n  URL path: ${node.urlPath}\n  File 1:   ${existing.filePath} (via ${existing.segmentPath})\n  File 2:   ${routableFile.filePath} (via ${currentPath})\nEach URL path must map to exactly one page or route handler. Rename or move one of the conflicting files.`);
-			seen.set(node.urlPath, {
-				filePath: routableFile.filePath,
-				segmentPath: currentPath
-			});
-		}
+	const routableFile = node.page ?? node.route;
+	if (routableFile) {
+		const existing = seen.get(node.urlPath);
+		if (existing) throw new Error(`Build error: route collision — multiple route groups produce a page/route at the same URL path.\n  URL path: ${node.urlPath}\n  File 1:   ${existing.filePath} (via ${existing.segmentPath})\n  File 2:   ${routableFile.filePath} (via ${currentPath})\nEach URL path must map to exactly one page or route handler. Rename or move one of the conflicting files.`);
+		seen.set(node.urlPath, {
+			filePath: routableFile.filePath,
+			segmentPath: currentPath
+		});
 	}
-	for (const child of node.children) collectRoutableLeaves(child, seen, currentPath, insideSlot);
-	for (const slotNode of Object.values(node.slots)) collectRoutableLeaves(slotNode, seen, currentPath, true);
+	for (const child of node.children) collectRoutableLeaves(child, seen, currentPath);
+	for (const slotNode of Object.values(node.slots)) collectRoutableLeaves(slotNode, /* @__PURE__ */ new Map(), currentPath);
 }
 /**
 * Validate that no route chain contains duplicate dynamic param names.
@@ -369,225 +350,6 @@ function findPageExtFile(dirPath, name, extSet) {
 	}
 }
 //#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.now());
-		},
-		end(phase) {
-			const startMs = pending.get(phase);
-			if (startMs === void 0) return 0;
-			pending.delete(phase);
-			const durationMs = performance.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/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/cli-schema-sync.ts
 /**
 * `timber schema sync` — scan filesystem for dynamic segments, append
@@ -612,14 +374,98 @@ function walkSegments(node, segments) {
 	for (const slot of Object.values(node.slots)) walkSegments(slot, segments);
 }
 /**
+* Replace comment bodies (and optionally string contents) with spaces,
+* preserving length and newlines so every index maps 1:1 to the original.
+* Lets the structural scanning below ignore `segmentParams` mentions and
+* braces inside comments/strings without a TS parser (fine pre-alpha,
+* see TIM-1066).
+*
+* With `maskStrings`, string contents are blanked too — except literal
+* 'segmentParams' strings, kept so a quoted property key stays findable.
+*/
+function maskSource(content, maskStrings) {
+	const out = content.split("");
+	const n = content.length;
+	let i = 0;
+	const blank = (from, to) => {
+		for (let j = from; j < to; j++) if (content[j] !== "\n") out[j] = " ";
+	};
+	while (i < n) {
+		const ch = content[i];
+		const next = content[i + 1];
+		if (ch === "/" && next === "/") {
+			const start = i;
+			while (i < n && content[i] !== "\n") i++;
+			blank(start, i);
+		} else if (ch === "/" && next === "*") {
+			const start = i;
+			i += 2;
+			while (i < n && !(content[i] === "*" && content[i + 1] === "/")) i++;
+			i = Math.min(i + 2, n);
+			blank(start, i);
+		} else if (ch === "\"" || ch === "'" || ch === "`") {
+			const start = i;
+			i++;
+			while (i < n && content[i] !== ch) {
+				if (content[i] === "\\") i++;
+				i++;
+			}
+			const end = i;
+			if (maskStrings && content.slice(start + 1, end) !== "segmentParams") blank(start + 1, end);
+			i++;
+		} else i++;
+	}
+	return out.join("");
+}
+/**
+* Locate the `segmentParams: { ... }` block in a schema file.
+* Returns the indices of the opening and matching closing brace, or null
+* if no segmentParams property is found. Comments and strings are masked
+* first, so a JSDoc example mentioning `segmentParams: { ... }` above the
+* real defineSchema call is not mistaken for the block, and braces inside
+* comments/strings don't skew the depth count. The search is anchored to
+* the `defineSchema(` call when present, so helper objects with their own
+* segmentParams property earlier in the file are skipped.
+*/
+function findSegmentParamsBlock(content) {
+	const masked = maskSource(content, true);
+	const defineCall = /\bdefineSchema\s*\(/.exec(masked);
+	const keyRe = /(['"]?)segmentParams\1\s*:\s*\{/g;
+	keyRe.lastIndex = defineCall ? defineCall.index + defineCall[0].length : 0;
+	const keyMatch = keyRe.exec(masked);
+	if (!keyMatch) return null;
+	const openBrace = keyMatch.index + keyMatch[0].length - 1;
+	let depth = 1;
+	let i = openBrace + 1;
+	while (i < masked.length && depth > 0) {
+		if (masked[i] === "{") depth++;
+		else if (masked[i] === "}") depth--;
+		i++;
+	}
+	if (depth > 0) return null;
+	return {
+		openBrace,
+		closeBrace: i - 1
+	};
+}
+/**
 * Parse existing bracket keys from an app/schema.ts file.
-* Uses regex to find keys in segmentParams: { '[key]': ... } blocks.
+* Scoped to the segmentParams: { ... } block — bracket keys elsewhere in
+* the file (unrelated objects, comments above defineSchema) are ignored.
+* Comments inside the block are masked, so a commented-out entry does not
+* count as registered.
+*
+* The key charset matches the route classifier (segment-classify.ts):
+* any character except `]`, so hyphenated params like '[my-param]' parse.
 */
 function parseExistingSchemaKeys(content) {
+	const block = findSegmentParamsBlock(content);
+	if (!block) return [];
+	const blockContent = maskSource(content, false).slice(block.openBrace, block.closeBrace);
 	const keys = [];
-	const re = /['"](\[{1,2}(?:\.{3})?\w+\]{1,2})['"]\s*:/g;
+	const re = /['"](\[{1,2}(?:\.{3})?[^\]]+\]{1,2})['"]\s*:/g;
 	let m;
-	while ((m = re.exec(content)) !== null) keys.push(m[1]);
+	while ((m = re.exec(blockContent)) !== null) keys.push(m[1]);
 	return keys;
 }
 /** Schema file extensions to check. */
@@ -678,18 +524,9 @@ function ensureCodecImport(content) {
 }
 function appendToSchema(content, newSegments) {
 	content = ensureCodecImport(content);
-	const spIndex = content.indexOf("segmentParams");
-	if (spIndex === -1) throw new Error("[timber] Could not find segmentParams in schema file. Expected a defineSchema({ segmentParams: { ... } }) call.");
-	const openBrace = content.indexOf("{", spIndex + 13);
-	if (openBrace === -1) throw new Error("[timber] Could not find opening brace for segmentParams.");
-	let depth = 1;
-	let i = openBrace + 1;
-	while (i < content.length && depth > 0) {
-		if (content[i] === "{") depth++;
-		else if (content[i] === "}") depth--;
-		i++;
-	}
-	const closeBrace = i - 1;
+	const block = findSegmentParamsBlock(content);
+	if (!block) throw new Error("[timber] Could not find segmentParams in schema file. Expected a defineSchema({ segmentParams: { ... } }) call.");
+	const { openBrace, closeBrace } = block;
 	const existingLine = content.slice(openBrace, closeBrace).match(/^(\s+)['"]\[/m);
 	const indent = existingLine ? existingLine[1] : "    ";
 	const insertion = newSegments.map((seg) => `${indent}'${seg}': ${defaultCodecForSegment(seg)},`).join("\n");
@@ -699,20 +536,26 @@ function appendToSchema(content, newSegments) {
 }
 /**
 * Remove entries from the segmentParams block whose keys match `staleSegments`.
-* Removes the entire line including trailing comma/whitespace.
+* Removes the entire entry including trailing comma/whitespace. Scoped to
+* the segmentParams block — identical keys in unrelated objects elsewhere
+* in the file are left untouched.
 */
 function removeFromSchema(content, staleSegments) {
+	const block = findSegmentParamsBlock(content);
+	if (!block) return content;
+	let blockContent = content.slice(block.openBrace, block.closeBrace);
+	let blockMasked = maskSource(blockContent, false);
 	for (const seg of staleSegments) {
 		const escaped = seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 		const keyRe = new RegExp(`^[ \t]*['"]${escaped}['"][ \t]*:`, "gm");
 		let m;
-		while ((m = keyRe.exec(content)) !== null) {
+		while ((m = keyRe.exec(blockMasked)) !== null) {
 			const start = m.index;
 			let i = m.index + m[0].length;
 			let depth = 0;
 			let inString = null;
-			while (i < content.length) {
-				const ch = content[i];
+			while (i < blockMasked.length) {
+				const ch = blockMasked[i];
 				if (inString) {
 					if (ch === "\\") i++;
 					else if (ch === inString) inString = null;
@@ -725,12 +568,13 @@ function removeFromSchema(content, staleSegments) {
 				} else if (depth === 0 && (ch === "\n" || ch === "}")) break;
 				i++;
 			}
-			if (i < content.length && content[i] === "\n") i++;
-			content = content.slice(0, start) + content.slice(i);
+			if (i < blockMasked.length && blockMasked[i] === "\n") i++;
+			blockContent = blockContent.slice(0, start) + blockContent.slice(i);
+			blockMasked = blockMasked.slice(0, start) + blockMasked.slice(i);
 			keyRe.lastIndex = start;
 		}
 	}
-	return content;
+	return content.slice(0, block.openBrace) + blockContent + content.slice(block.closeBrace);
 }
 /**
 * Run the schema sync: scan filesystem, diff against schema, append missing.
@@ -780,6 +624,6 @@ function runSchemaSync(projectRoot) {
 	};
 }
 //#endregion
-export { runSchemaSync as a, loadTimberConfigFile as c, resolveBuildDir as d, resolveClientJavascript as f, parseExistingSchemaKeys as i, mergeFileConfig as l, scanRoutes as m, defaultCodecForSegment as n, DEFAULT_BUILD_DIR as o, createNoopTimer as p, findSchemaFile as r, createPluginContext as s, collectDynamicSegments as t, resolveAppDir as u };
+export { parseExistingSchemaKeys as a, findSegmentParamsBlock as i, defaultCodecForSegment as n, runSchemaSync as o, findSchemaFile as r, scanRoutes as s, collectDynamicSegments as t };
 
-//# sourceMappingURL=cli-schema-sync-D2IpXicg.js.map
+//# sourceMappingURL=cli-schema-sync-DJDdyEae.js.map