vinext 0.0.49 → 0.0.51

package/dist/build/report.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { parseSync } from "vite";
 //#region src/build/report.ts
 /**
 * Build report — prints a Next.js-style route table after `vinext build`.
@@ -11,9 +12,9 @@ import path from "node:path";
 *   ?  Unknown  — no explicit config; likely dynamic but not confirmed
 *   λ  API      — API route handler
 *
-* Classification uses regex-based static source analysis (no module
-* execution). Vite's parseAst() is NOT used because it doesn't handle
-* TypeScript syntax.
+* Classification uses AST-based static source analysis (no module execution).
+* Runtime/prerender results are still treated as stronger evidence where
+* available; AST analysis only reads top-level static exports.
 *
 * Limitation: without running the build, we cannot detect dynamic API usage
 * (headers(), cookies(), connection(), etc.) that implicitly forces a route
@@ -28,42 +29,113 @@ function getAppRouteRenderEntryPath(route) {
 	for (const slot of route.parallelSlots) if (slot.defaultPath) return slot.defaultPath;
 	return null;
 }
+function parseRouteModuleWithLang(code, lang) {
+	try {
+		const result = parseSync(`vinext-route.${lang}`, code, {
+			astType: "ts",
+			lang,
+			sourceType: "module"
+		});
+		return result.errors.some((error) => error.severity === "Error") ? null : result.program;
+	} catch {
+		return null;
+	}
+}
+function parseRouteModule(code) {
+	return parseRouteModuleWithLang(code, "tsx") ?? parseRouteModuleWithLang(code, "ts");
+}
+function moduleExportNameValue(name) {
+	if (name.type === "Identifier") return name.name;
+	if (name.type === "Literal" && typeof name.value === "string") return name.value;
+	return null;
+}
+function bindingName(pattern) {
+	return pattern.type === "Identifier" ? pattern.name : null;
+}
+function declarationHasBindingName(declaration, name) {
+	if (declaration === null) return false;
+	if (declaration.type === "FunctionDeclaration") return declaration.id?.name === name;
+	if (declaration.type !== "VariableDeclaration") return false;
+	return declaration.declarations.some((declaration) => bindingName(declaration.id) === name);
+}
 /**
-* Returns true if the source code contains a named export with the given name.
+* Returns true if the source code contains an export declaration with the given name.
+* For re-export specifiers, this intentionally follows Next.js' static analyzer
+* and checks the local/original binding name.
 * Handles all three common export forms:
 *   export function foo() {}
 *   export const foo = ...
 *   export { foo }
 */
 function hasNamedExport(code, name) {
-	if (new RegExp(`(?:^|\\n)\\s*export\\s+(?:async\\s+)?function\\s+${name}\\b`).test(code)) return true;
-	if (new RegExp(`(?:^|\\n)\\s*export\\s+(?:const|let|var)\\s+${name}\\s*[=:]`).test(code)) return true;
-	if (new RegExp(`export\\s*\\{[^}]*\\b${name}\\b[^}]*\\}`).test(code)) return true;
+	const program = parseRouteModule(code);
+	if (!program) return false;
+	return hasNamedExportInProgram(program, name);
+}
+function hasNamedExportInProgram(program, name) {
+	for (const node of program.body) {
+		if (node.type !== "ExportNamedDeclaration") continue;
+		if (declarationHasBindingName(node.declaration, name)) return true;
+		for (const specifier of node.specifiers) if (moduleExportNameValue(specifier.local) === name) return true;
+	}
 	return false;
 }
+function unwrapStaticExpression(expression) {
+	let current = expression;
+	while (current.type === "ParenthesizedExpression" || current.type === "TSAsExpression" || current.type === "TSSatisfiesExpression" || current.type === "TSTypeAssertion" || current.type === "TSNonNullExpression") current = current.expression;
+	return current;
+}
+function findExportedConstInitializer(code, name) {
+	const program = parseRouteModule(code);
+	if (!program) return null;
+	return findExportedConstInitializerInProgram(program, name);
+}
+function findExportedConstInitializerInProgram(program, name) {
+	for (const node of program.body) {
+		if (node.type !== "ExportNamedDeclaration") continue;
+		const declaration = node.declaration;
+		if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") continue;
+		for (const declarator of declaration.declarations) if (bindingName(declarator.id) === name) return declarator.init;
+	}
+	return null;
+}
 /**
 * Extracts the string value of `export const <name> = "value"`.
-* Handles optional TypeScript type annotations:
-*   export const dynamic: string = "force-dynamic"
+* Handles TypeScript annotations/assertions and no-substitution template literals.
 * Returns null if the export is absent or not a string literal.
 */
 function extractExportConstString(code, name) {
-	const m = new RegExp(`^\\s*export\\s+const\\s+${name}\\s*(?::[^=]+)?\\s*=\\s*['"]([^'"]+)['"]`, "m").exec(code);
-	return m ? m[1] : null;
+	return extractStringFromConstInitializer(findExportedConstInitializer(code, name));
+}
+function extractExportConstStringFromProgram(program, name) {
+	return extractStringFromConstInitializer(findExportedConstInitializerInProgram(program, name));
+}
+function extractStringFromConstInitializer(initializer) {
+	if (initializer === null) return null;
+	const expression = unwrapStaticExpression(initializer);
+	if (expression.type === "Literal" && typeof expression.value === "string") return expression.value;
+	if (expression.type === "TemplateLiteral" && expression.expressions.length === 0) return expression.quasis[0]?.value.cooked ?? expression.quasis[0]?.value.raw ?? null;
+	return null;
 }
 /**
 * Extracts the numeric value of `export const <name> = <number|false>`.
 * Supports integers, decimals, negative values, `Infinity`, and `false`.
 * `false` is returned as `Infinity` because `export const revalidate = false`
 * means "cache indefinitely" in Next.js segment config.
-* Handles optional TypeScript type annotations.
+* Handles TypeScript annotations/assertions and JavaScript numeric separators.
 * Returns null if the export is absent or not a number/`false`.
 */
 function extractExportConstNumber(code, name) {
-	const m = new RegExp(`^\\s*export\\s+const\\s+${name}\\s*(?::[^=]+)?\\s*=\\s*(-?\\d+(?:\\.\\d+)?|Infinity|false)(?![\\w$])`, "m").exec(code);
-	if (!m) return null;
-	if (m[1] === "Infinity" || m[1] === "false") return Infinity;
-	return parseFloat(m[1]);
+	return extractNumberFromConstInitializer(findExportedConstInitializer(code, name));
+}
+function extractExportConstNumberFromProgram(program, name) {
+	return extractNumberFromConstInitializer(findExportedConstInitializerInProgram(program, name));
+}
+function extractNumberFromConstInitializer(initializer) {
+	if (initializer === null) return null;
+	const value = extractStaticNumberValue(initializer);
+	if (value === null) return null;
+	return value === false ? Infinity : value;
 }
 /**
 * Extracts the `revalidate` value from inside a `getStaticProps` return object.
@@ -77,345 +149,118 @@ function extractExportConstNumber(code, name) {
 *   null     — no `revalidate` key found (fully static)
 */
 function extractGetStaticPropsRevalidate(code) {
-	const returnObjects = extractGetStaticPropsReturnObjects(code);
-	if (returnObjects) {
-		for (const searchSpace of returnObjects) {
-			const revalidate = extractTopLevelRevalidateValue(searchSpace);
-			if (revalidate !== null) return revalidate;
-		}
+	const program = parseRouteModule(code);
+	if (!program) return extractWrappedGetStaticPropsRevalidate(code);
+	return extractGetStaticPropsRevalidateFromProgram(program, code);
+}
+function extractGetStaticPropsRevalidateFromProgram(program, fallbackCode) {
+	const getStaticProps = findExportedGetStaticProps(program);
+	if (getStaticProps === "external") return null;
+	if (getStaticProps === null) return extractWrappedGetStaticPropsRevalidate(fallbackCode);
+	return extractFunctionRevalidate(getStaticProps);
+}
+function extractStaticNumberValue(expression) {
+	const unwrapped = unwrapStaticExpression(expression);
+	if (unwrapped.type === "Literal") {
+		if (typeof unwrapped.value === "number") return unwrapped.value;
+		if (unwrapped.value === false) return false;
 		return null;
 	}
-	const m = /\brevalidate\s*:\s*(-?\d+(?:\.\d+)?|Infinity|false)\b/.exec(code);
-	if (!m) return null;
-	if (m[1] === "false") return false;
-	if (m[1] === "Infinity") return Infinity;
-	return parseFloat(m[1]);
-}
-function extractTopLevelRevalidateValue(code) {
-	let braceDepth = 0;
-	let parenDepth = 0;
-	let bracketDepth = 0;
-	let quote = null;
-	let inLineComment = false;
-	let inBlockComment = false;
-	for (let i = 0; i < code.length; i++) {
-		const char = code[i];
-		const next = code[i + 1];
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-		if (quote) {
-			if (char === "\\") {
-				i++;
-				continue;
-			}
-			if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-		if (char === "\"" || char === "'" || char === "`") {
-			quote = char;
-			continue;
-		}
-		if (char === "{") {
-			braceDepth++;
-			continue;
-		}
-		if (char === "}") {
-			braceDepth--;
-			continue;
-		}
-		if (char === "(") {
-			parenDepth++;
-			continue;
-		}
-		if (char === ")") {
-			parenDepth--;
-			continue;
-		}
-		if (char === "[") {
-			bracketDepth++;
-			continue;
-		}
-		if (char === "]") {
-			bracketDepth--;
-			continue;
+	if (unwrapped.type === "Identifier" && unwrapped.name === "Infinity") return Infinity;
+	if (unwrapped.type === "UnaryExpression") {
+		const argument = extractStaticNumberValue(unwrapped.argument);
+		if (typeof argument !== "number") return null;
+		if (unwrapped.operator === "-") return -argument;
+		if (unwrapped.operator === "+") return argument;
+		return null;
+	}
+	return null;
+}
+function findExportedGetStaticProps(program) {
+	let hasLocalGetStaticPropsExport = false;
+	for (const node of program.body) {
+		if (node.type !== "ExportNamedDeclaration") continue;
+		const declaration = node.declaration;
+		if (declaration?.type === "FunctionDeclaration" && declaration.id?.name === "getStaticProps") return declaration;
+		if (declaration?.type === "VariableDeclaration") {
+			const direct = findFunctionLikeVariable(declaration.declarations, "getStaticProps");
+			if (direct) return direct;
+		}
+		for (const specifier of node.specifiers) {
+			if (moduleExportNameValue(specifier.local) !== "getStaticProps") continue;
+			if (node.source !== null) return "external";
+			hasLocalGetStaticPropsExport = true;
 		}
-		if (braceDepth === 1 && parenDepth === 0 && bracketDepth === 0 && matchesKeywordAt(code, i, "revalidate")) {
-			const colonIndex = findNextNonWhitespaceIndex(code, i + 10);
-			if (colonIndex === -1 || code[colonIndex] !== ":") continue;
-			const valueStart = findNextNonWhitespaceIndex(code, colonIndex + 1);
-			if (valueStart === -1) return null;
-			const valueMatch = /^(-?\d+(?:\.\d+)?|Infinity|false)\b/.exec(code.slice(valueStart));
-			if (!valueMatch) return null;
-			if (valueMatch[1] === "false") return false;
-			if (valueMatch[1] === "Infinity") return Infinity;
-			return parseFloat(valueMatch[1]);
+	}
+	if (!hasLocalGetStaticPropsExport) return null;
+	for (const node of program.body) {
+		if (node.type === "FunctionDeclaration" && node.id?.name === "getStaticProps") return node;
+		if (node.type === "VariableDeclaration") {
+			const local = findFunctionLikeVariable(node.declarations, "getStaticProps");
+			if (local) return local;
 		}
 	}
 	return null;
 }
-function extractGetStaticPropsReturnObjects(code) {
-	const declarationMatch = /(?:^|\n)\s*(?:export\s+)?(?:async\s+)?function\s+getStaticProps\b|(?:^|\n)\s*(?:export\s+)?(?:const|let|var)\s+getStaticProps\b/.exec(code);
-	if (!declarationMatch) {
-		if (/(?:^|\n)\s*export\s*\{[^}]*\bgetStaticProps\b[^}]*\}\s*from\b/.test(code)) return [];
-		return null;
+function findFunctionLikeVariable(declarations, name) {
+	for (const declaration of declarations) {
+		if (bindingName(declaration.id) !== name || declaration.init === null) continue;
+		const initializer = unwrapStaticExpression(declaration.init);
+		if (initializer.type === "FunctionExpression" || initializer.type === "ArrowFunctionExpression") return initializer;
 	}
-	const declaration = extractGetStaticPropsDeclaration(code, declarationMatch);
-	if (declaration === null) return [];
-	const returnObjects = declaration.trimStart().startsWith("{") ? collectReturnObjectsFromFunctionBody(declaration) : [];
-	if (returnObjects.length > 0) return returnObjects;
-	const arrowMatch = declaration.search(/=>\s*\(\s*\{/);
-	if (arrowMatch === -1) return [];
-	const braceStart = declaration.indexOf("{", arrowMatch);
-	if (braceStart === -1) return [];
-	const braceEnd = findMatchingBrace(declaration, braceStart);
-	if (braceEnd === -1) return [];
-	return [declaration.slice(braceStart, braceEnd + 1)];
-}
-function extractGetStaticPropsDeclaration(code, declarationMatch) {
-	const declarationStart = declarationMatch.index;
-	const declarationText = declarationMatch[0];
-	const declarationTail = code.slice(declarationStart);
-	if (declarationText.includes("function getStaticProps")) return extractFunctionBody(code, declarationStart + declarationText.length);
-	const functionExpressionMatch = /(?:async\s+)?function\b/.exec(declarationTail);
-	if (functionExpressionMatch) return extractFunctionBody(declarationTail, functionExpressionMatch.index);
-	const blockBodyMatch = /=>\s*\{/.exec(declarationTail);
-	if (blockBodyMatch) {
-		const braceStart = declarationTail.indexOf("{", blockBodyMatch.index);
-		if (braceStart === -1) return null;
-		const braceEnd = findMatchingBrace(declarationTail, braceStart);
-		if (braceEnd === -1) return null;
-		return declarationTail.slice(braceStart, braceEnd + 1);
-	}
-	const implicitArrowMatch = declarationTail.search(/=>\s*\(\s*\{/);
-	if (implicitArrowMatch === -1) return null;
-	const implicitBraceStart = declarationTail.indexOf("{", implicitArrowMatch);
-	if (implicitBraceStart === -1) return null;
-	const implicitBraceEnd = findMatchingBrace(declarationTail, implicitBraceStart);
-	if (implicitBraceEnd === -1) return null;
-	return declarationTail.slice(0, implicitBraceEnd + 1);
-}
-function extractFunctionBody(code, functionStart) {
-	const bodyEnd = findFunctionBodyEnd(code, functionStart);
-	if (bodyEnd === -1) return null;
-	const paramsStart = code.indexOf("(", functionStart);
-	if (paramsStart === -1) return null;
-	const paramsEnd = findMatchingParen(code, paramsStart);
-	if (paramsEnd === -1) return null;
-	const bodyStart = code.indexOf("{", paramsEnd + 1);
-	if (bodyStart === -1) return null;
-	return code.slice(bodyStart, bodyEnd + 1);
-}
-function collectReturnObjectsFromFunctionBody(code) {
-	const returnObjects = [];
-	let quote = null;
-	let inLineComment = false;
-	let inBlockComment = false;
-	for (let i = 0; i < code.length; i++) {
-		const char = code[i];
-		const next = code[i + 1];
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-		if (quote) {
-			if (char === "\\") {
-				i++;
-				continue;
-			}
-			if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-		if (char === "\"" || char === "'" || char === "`") {
-			quote = char;
-			continue;
-		}
-		if (matchesKeywordAt(code, i, "function")) {
-			const nestedBodyEnd = findFunctionBodyEnd(code, i);
-			if (nestedBodyEnd !== -1) i = nestedBodyEnd;
-			continue;
-		}
-		if (matchesKeywordAt(code, i, "class")) {
-			const classBodyEnd = findClassBodyEnd(code, i);
-			if (classBodyEnd !== -1) i = classBodyEnd;
-			continue;
-		}
-		if (char === "=" && next === ">") {
-			const nestedBodyEnd = findArrowFunctionBodyEnd(code, i);
-			if (nestedBodyEnd !== -1) i = nestedBodyEnd;
-			continue;
-		}
-		if (char >= "A" && char <= "Z" || char >= "a" && char <= "z" || char === "_" || char === "$" || char === "*") {
-			const methodBodyEnd = findObjectMethodBodyEnd(code, i);
-			if (methodBodyEnd !== -1) {
-				i = methodBodyEnd;
-				continue;
-			}
-		}
-		if (matchesKeywordAt(code, i, "return")) {
-			const braceStart = findNextNonWhitespaceIndex(code, i + 6);
-			if (braceStart === -1 || code[braceStart] !== "{") continue;
-			const braceEnd = findMatchingBrace(code, braceStart);
-			if (braceEnd === -1) continue;
-			returnObjects.push(code.slice(braceStart, braceEnd + 1));
-			i = braceEnd;
-		}
+	return null;
+}
+function extractWrappedGetStaticPropsRevalidate(code) {
+	const program = parseRouteModule(`function __vinextGetStaticProps() {\n${code}\n}`);
+	if (!program) return null;
+	for (const node of program.body) if (node.type === "FunctionDeclaration" && node.id?.name === "__vinextGetStaticProps") return extractFunctionRevalidate(node);
+	return null;
+}
+function extractFunctionRevalidate(fn) {
+	if (fn.type === "ArrowFunctionExpression" && fn.body.type !== "BlockStatement") {
+		const expression = unwrapStaticExpression(fn.body);
+		return expression.type === "ObjectExpression" ? extractObjectRevalidate(expression) : null;
 	}
-	return returnObjects;
-}
-function findFunctionBodyEnd(code, functionStart) {
-	const paramsStart = code.indexOf("(", functionStart);
-	if (paramsStart === -1) return -1;
-	const paramsEnd = findMatchingParen(code, paramsStart);
-	if (paramsEnd === -1) return -1;
-	const bodyStart = code.indexOf("{", paramsEnd + 1);
-	if (bodyStart === -1) return -1;
-	return findMatchingBrace(code, bodyStart);
-}
-function findClassBodyEnd(code, classStart) {
-	const bodyStart = code.indexOf("{", classStart + 5);
-	if (bodyStart === -1) return -1;
-	return findMatchingBrace(code, bodyStart);
-}
-function findArrowFunctionBodyEnd(code, arrowIndex) {
-	const bodyStart = findNextNonWhitespaceIndex(code, arrowIndex + 2);
-	if (bodyStart === -1 || code[bodyStart] !== "{") return -1;
-	return findMatchingBrace(code, bodyStart);
-}
-function findObjectMethodBodyEnd(code, start) {
-	let i = start;
-	if (matchesKeywordAt(code, i, "async")) {
-		const afterAsync = findNextNonWhitespaceIndex(code, i + 5);
-		if (afterAsync === -1) return -1;
-		if (code[afterAsync] !== "(") i = afterAsync;
+	if (!fn.body || fn.body.type !== "BlockStatement") return null;
+	return extractBlockRevalidate(fn.body);
+}
+function extractBlockRevalidate(block) {
+	for (const statement of block.body) {
+		const result = extractStatementRevalidate(statement);
+		if (result !== null) return result;
 	}
-	if (code[i] === "*") {
-		i = findNextNonWhitespaceIndex(code, i + 1);
-		if (i === -1) return -1;
+	return null;
+}
+function extractStatementRevalidate(statement) {
+	if (statement.type === "ReturnStatement") {
+		if (!statement.argument) return null;
+		const argument = unwrapStaticExpression(statement.argument);
+		return argument.type === "ObjectExpression" ? extractObjectRevalidate(argument) : null;
 	}
-	if (!/[A-Za-z_$]/.test(code[i] ?? "")) return -1;
-	const nameStart = i;
-	while (/[A-Za-z0-9_$]/.test(code[i] ?? "")) i++;
-	const name = code.slice(nameStart, i);
-	if (name === "if" || name === "for" || name === "while" || name === "switch" || name === "catch" || name === "function" || name === "return" || name === "const" || name === "let" || name === "var" || name === "new") return -1;
-	if (name === "get" || name === "set") {
-		const afterAccessor = findNextNonWhitespaceIndex(code, i);
-		if (afterAccessor === -1) return -1;
-		if (code[afterAccessor] !== "(") {
-			i = afterAccessor;
-			if (!/[A-Za-z_$]/.test(code[i] ?? "")) return -1;
-			while (/[A-Za-z0-9_$]/.test(code[i] ?? "")) i++;
+	if (statement.type === "BlockStatement") return extractBlockRevalidate(statement);
+	if (statement.type === "IfStatement") return extractStatementRevalidate(statement.consequent) ?? (statement.alternate ? extractStatementRevalidate(statement.alternate) : null);
+	if (statement.type === "ForStatement" || statement.type === "ForInStatement" || statement.type === "ForOfStatement" || statement.type === "WhileStatement" || statement.type === "DoWhileStatement" || statement.type === "WithStatement" || statement.type === "LabeledStatement") return extractStatementRevalidate(statement.body);
+	if (statement.type === "SwitchStatement") {
+		for (const switchCase of statement.cases) for (const consequent of switchCase.consequent) {
+			const result = extractStatementRevalidate(consequent);
+			if (result !== null) return result;
 		}
+		return null;
 	}
-	const paramsStart = findNextNonWhitespaceIndex(code, i);
-	if (paramsStart === -1 || code[paramsStart] !== "(") return -1;
-	const paramsEnd = findMatchingParen(code, paramsStart);
-	if (paramsEnd === -1) return -1;
-	const bodyStart = findNextNonWhitespaceIndex(code, paramsEnd + 1);
-	if (bodyStart === -1 || code[bodyStart] !== "{") return -1;
-	return findMatchingBrace(code, bodyStart);
-}
-function findNextNonWhitespaceIndex(code, start) {
-	for (let i = start; i < code.length; i++) if (!/\s/.test(code[i])) return i;
-	return -1;
-}
-function matchesKeywordAt(code, index, keyword) {
-	const before = index === 0 ? "" : code[index - 1];
-	const after = code[index + keyword.length] ?? "";
-	return code.startsWith(keyword, index) && (before === "" || !/[A-Za-z0-9_$]/.test(before)) && (after === "" || !/[A-Za-z0-9_$]/.test(after));
-}
-function findMatchingBrace(code, start) {
-	return findMatchingToken(code, start, "{", "}");
-}
-function findMatchingParen(code, start) {
-	return findMatchingToken(code, start, "(", ")");
-}
-function findMatchingToken(code, start, openToken, closeToken) {
-	let depth = 0;
-	let quote = null;
-	let inLineComment = false;
-	let inBlockComment = false;
-	for (let i = start; i < code.length; i++) {
-		const char = code[i];
-		const next = code[i + 1];
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-		if (quote) {
-			if (char === "\\") {
-				i++;
-				continue;
-			}
-			if (char === quote) quote = null;
-			continue;
-		}
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-		if (char === "\"" || char === "'" || char === "`") {
-			quote = char;
-			continue;
-		}
-		if (char === openToken) {
-			depth++;
-			continue;
-		}
-		if (char === closeToken) {
-			depth--;
-			if (depth === 0) return i;
-		}
+	if (statement.type === "TryStatement") return extractBlockRevalidate(statement.block) ?? (statement.handler ? extractBlockRevalidate(statement.handler.body) : null) ?? (statement.finalizer ? extractBlockRevalidate(statement.finalizer) : null);
+	return null;
+}
+function extractObjectRevalidate(object) {
+	for (const property of object.properties) {
+		if (property.type !== "Property" || property.computed || propertyName(property.key) !== "revalidate") continue;
+		return extractStaticNumberValue(property.value);
 	}
-	return -1;
+	return null;
+}
+function propertyName(key) {
+	if (key.type === "Identifier") return key.name;
+	if (key.type === "Literal" && typeof key.value === "string") return key.value;
+	return null;
 }
 /**
 * Classifies a layout file by its segment config exports (`dynamic`, `revalidate`).
@@ -430,7 +275,8 @@ function findMatchingToken(code, start, openToken, closeToken) {
 * (`revalidate = 0` → dynamic, `revalidate = Infinity` → static) are decisive.
 */
 function classifyLayoutSegmentConfig(code) {
-	const dynamicValue = extractExportConstString(code, "dynamic");
+	const program = parseRouteModule(code);
+	const dynamicValue = program ? extractExportConstStringFromProgram(program, "dynamic") : null;
 	if (dynamicValue === "force-dynamic") return {
 		kind: "dynamic",
 		reason: {
@@ -447,7 +293,7 @@ function classifyLayoutSegmentConfig(code) {
 			value: dynamicValue
 		}
 	};
-	const revalidateValue = extractExportConstNumber(code, "revalidate");
+	const revalidateValue = program ? extractExportConstNumberFromProgram(program, "revalidate") : null;
 	if (revalidateValue === Infinity) return {
 		kind: "static",
 		reason: {
@@ -480,9 +326,10 @@ function classifyPagesRoute(filePath) {
 	} catch {
 		return { type: "unknown" };
 	}
-	if (hasNamedExport(code, "getServerSideProps")) return { type: "ssr" };
-	if (hasNamedExport(code, "getStaticProps")) {
-		const revalidate = extractGetStaticPropsRevalidate(code);
+	const program = parseRouteModule(code);
+	if (program && hasNamedExportInProgram(program, "getServerSideProps")) return { type: "ssr" };
+	if (program && hasNamedExportInProgram(program, "getStaticProps")) {
+		const revalidate = extractGetStaticPropsRevalidateFromProgram(program, code);
 		if (revalidate === null || revalidate === false || revalidate === Infinity) return { type: "static" };
 		if (revalidate === 0) return { type: "ssr" };
 		return {
@@ -509,10 +356,11 @@ function classifyAppRoute(pagePath, routePath, isDynamic) {
 	} catch {
 		return { type: "unknown" };
 	}
-	const dynamicValue = extractExportConstString(code, "dynamic");
+	const program = parseRouteModule(code);
+	const dynamicValue = program ? extractExportConstStringFromProgram(program, "dynamic") : null;
 	if (dynamicValue === "force-dynamic") return { type: "ssr" };
 	if (dynamicValue === "force-static" || dynamicValue === "error") return { type: "static" };
-	const revalidateValue = extractExportConstNumber(code, "revalidate");
+	const revalidateValue = program ? extractExportConstNumberFromProgram(program, "revalidate") : null;
 	if (revalidateValue !== null) {
 		if (revalidateValue === Infinity) return { type: "static" };
 		if (revalidateValue === 0) return { type: "ssr" };