@timber-js/app 0.2.0-alpha.120 → 0.2.0-alpha.122

package/dist/index.js

@@ -1,17 +1,17 @@
 import { n as setViteServer } from "./_chunks/warnings-B30wpfaS.js";
+import { a as isDynamicMetadataExtension, o as isMetadataRouteServePath } from "./_chunks/metadata-routes-DESG8uk5.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-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-q2wB0DyJ.js";
-import { t as formatSize } from "./_chunks/format-CR6v1pWE.js";
-import { dirname, extname, join, normalize, resolve } from "node:path";
+import { a as DEFAULT_BUILD_DIR, c as mergeFileConfig, d as resolveClientJavascript, f as createNoopTimer, l as resolveAppDir, o as createPluginContext, p as scanRoutes, s as loadTimberConfigFile, u as resolveBuildDir } from "./_chunks/cli-schema-sync-VcCf1TFY.js";
+import { a as generateRouteMap, i as collectInterceptionRewrites, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-tkw7sDlj.js";
+import { t as formatSize } from "./_chunks/format-BjN9HLu9.js";
+import { basename, dirname, extname, join, normalize, resolve } from "node:path";
 import { createRequire } from "node:module";
 import react, { reactCompilerPreset } from "@vitejs/plugin-react";
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { constants, createGzip, gzipSync } from "node:zlib";
 import { Readable } from "node:stream";
-import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
+import { copyFile, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { parseAst } from "vite";
 import http from "node:http";
@@ -1413,7 +1413,7 @@ function createTimberMiddleware(server, projectRoot) {
 			next();
 			return;
 		}
-		if (isAssetRequest(url)) {
+		if (isAssetRequest(url) && !isMetadataRouteServePath(url)) {
 			next();
 			return;
 		}
@@ -2280,7 +2280,7 @@ var SEGMENT_PREFIX = "\0$segment:";
 /**
 * File convention names we track for changes that require manifest regeneration.
 */
-var ROUTE_FILE_PATTERNS = /\/(page|layout|middleware|access|route|error|global-error|default|denied|params|schema|\d{3}|[45]xx|not-found|forbidden|unauthorized|sitemap|robots|manifest|favicon|icon|opengraph-image|twitter-image|apple-icon)\./;
+var ROUTE_FILE_PATTERNS = /\/(page|layout|middleware|access|route|error|global-error|default|denied|params|schema|\d{3}|[45]xx|not-found|forbidden|unauthorized|sitemap|robots|manifest|favicon|icon|opengraph-image|apple-icon)\./;
 /**
 * Create the timber-routing Vite plugin.
 *
@@ -2349,7 +2349,7 @@ function timberRouting(ctx) {
 		ctx.timer.end("route-scan");
 		dirToRoute = buildDirToRouteMap(ctx.routeTree, ctx.appDir);
 		writeCodegen(ctx);
-		warnUnregisteredSegments(ctx);
+		warnSchemaValidation(ctx);
 		const newConventionWarnings = lintConventions(ctx.routeTree, ctx.appDir).filter((w) => !warnedFiles.has(w.id));
 		if (newConventionWarnings.length > 0) {
 			for (const w of newConventionWarnings) warnedFiles.add(w.id);
@@ -2443,22 +2443,32 @@ function timberRouting(ctx) {
 * When the route tree changes, any environment that has imported the manifest
 * needs to be invalidated so the next request/transform picks up the new tree.
 */
-/** Set of segments we've already warned about — avoid repeating on every rescan. */
-var _warnedSegments = /* @__PURE__ */ new Set();
+/** Set of warning keys we've already emitted — avoid repeating on every rescan. */
+var _warnedKeys = /* @__PURE__ */ new Set();
 /**
-* Warn about dynamic segments not registered in app/schema.ts.
-* Only fires when a schema file exists. Logs once per segment per session.
+* Validate schema keys against the filesystem route tree.
+* Warns on stale keys, bracket form mismatches, and missing keys.
+* Uses the already-scanned route tree instead of re-scanning.
 */
-function warnUnregisteredSegments(ctx) {
-	const schemaPath = findSchemaFile(ctx.appDir);
-	if (!schemaPath) return;
-	const filesystemSegments = collectDynamicSegments(ctx.appDir);
-	if (filesystemSegments.length === 0) return;
-	const existingKeys = parseExistingSchemaKeys(readFileSync(schemaPath, "utf-8"));
-	const missing = filesystemSegments.filter((seg) => !existingKeys.includes(seg) && !_warnedSegments.has(seg));
-	if (missing.length === 0) return;
-	for (const seg of missing) _warnedSegments.add(seg);
-	console.warn(`[timber] New segment${missing.length > 1 ? "s" : ""} not in schema: ${missing.join(", ")}\n  Run: timber schema sync`);
+function warnSchemaValidation(ctx) {
+	if (!ctx.routeTree) return;
+	const warnings = validateSchemaAgainstRoutes(ctx.routeTree, ctx.appDir);
+	for (const w of warnings) {
+		const warnKey = `${w.type}:${w.key}`;
+		if (_warnedKeys.has(warnKey)) continue;
+		_warnedKeys.add(warnKey);
+		switch (w.type) {
+			case "stale-key":
+				console.warn(`[timber] ${w.message}`);
+				break;
+			case "bracket-mismatch":
+				console.warn(`[timber] ${w.message}`);
+				break;
+			case "missing-key":
+				console.warn(`[timber] ${w.message}`);
+				break;
+		}
+	}
 }
 function invalidateManifest(server) {
 	for (const envName of Object.keys(server.environments)) {
@@ -5693,7 +5703,8 @@ function buildManifestFromBundle(bundle, base, root) {
 		css,
 		js,
 		modulepreload,
-		fonts: {}
+		fonts: {},
+		metadataRouteHashes: {}
 	};
 }
 /**
@@ -5715,6 +5726,27 @@ function collectTransitiveBundleDeps(chunk, chunksByFileName, base) {
 	return result;
 }
 /**
+* Walk the route tree and compute short content hashes for metadata route files
+* (opengraph-image, icon, apple-icon) used for cache-busting
+* the auto-linked URLs in <head>.
+*/
+function computeMetadataRouteHashes(node) {
+	const hashes = {};
+	if (node.metadataRoutes) for (const [baseName, file] of Object.entries(node.metadataRoutes)) if (!isDynamicMetadataExtension(baseName, file.extension)) try {
+		const content = readFileSync(file.filePath);
+		const hash = createHash("sha256").update(content).digest("hex").slice(0, 8);
+		hashes[file.filePath] = hash;
+	} catch {}
+	else try {
+		const content = readFileSync(file.filePath);
+		const hash = createHash("sha256").update(content).digest("hex").slice(0, 8);
+		hashes[file.filePath] = hash;
+	} catch {}
+	for (const child of node.children) Object.assign(hashes, computeMetadataRouteHashes(child));
+	for (const slot of Object.values(node.slots)) Object.assign(hashes, computeMetadataRouteHashes(slot));
+	return hashes;
+}
+/**
 * Create the timber-build-manifest Vite plugin.
 *
 * Hooks: configResolved, resolveId, load, generateBundle (client env only)
@@ -5741,7 +5773,7 @@ function timberBuildManifest(ctx) {
 				"// Auto-generated build manifest — do not edit.",
 				"// Dev mode: empty manifest (Vite HMR handles CSS/JS).",
 				"",
-				"const manifest = { css: {}, js: {}, modulepreload: {}, fonts: {} };",
+				"const manifest = { css: {}, js: {}, modulepreload: {}, fonts: {}, metadataRouteHashes: {} };",
 				"",
 				"export default manifest;"
 			].join("\n");
@@ -5749,7 +5781,7 @@ function timberBuildManifest(ctx) {
 				"// Auto-generated build manifest — do not edit.",
 				"// Production: reads manifest from globalThis (set by _timber-manifest-init.js).",
 				"",
-				"const manifest = globalThis.__TIMBER_BUILD_MANIFEST__ ?? { css: {}, js: {}, modulepreload: {}, fonts: {} };",
+				"const manifest = globalThis.__TIMBER_BUILD_MANIFEST__ ?? { css: {}, js: {}, modulepreload: {}, fonts: {}, metadataRouteHashes: {} };",
 				"",
 				"export default manifest;"
 			].join("\n");
@@ -5758,6 +5790,7 @@ function timberBuildManifest(ctx) {
 			if (isDev) return;
 			if (this.environment?.name === "client") {
 				ctx.buildManifest = buildManifestFromBundle(bundle, resolvedBase, ctx.root);
+				if (ctx.routeTree) ctx.buildManifest.metadataRouteHashes = computeMetadataRouteHashes(ctx.routeTree.root);
 				if (ctx.clientJavascript.disabled) {
 					ctx.buildManifest.js = {};
 					ctx.buildManifest.modulepreload = {};
@@ -6289,6 +6322,73 @@ function timberServerBundle() {
 	];
 }
 //#endregion
+//#region src/plugins/cloudflare-wasm.ts
+/**
+* timber-cloudflare-wasm — Handle WASM modules for Cloudflare Workers builds.
+*
+* Cloudflare Workers can natively import `.wasm` files as compiled
+* WebAssembly.Module. But Rolldown can't load `.wasm` files at build time.
+*
+* This plugin bridges the gap:
+* 1. Adds the `workerd` resolve condition so libraries like @takumi-rs/wasm
+*    resolve to their Cloudflare-native entry (bare `.wasm` import)
+* 2. Externalizes `.wasm` imports so Rolldown skips them
+* 3. Copies the WASM files to the build output so wrangler can find them
+*
+* Only active for Cloudflare adapter production builds.
+*/
+function isCloudflareAdapter(ctx) {
+	return ctx.config.adapter?.name === "cloudflare";
+}
+function timberCloudflareWasm(ctx) {
+	const wasmFiles = /* @__PURE__ */ new Map();
+	return [{
+		name: "timber-cloudflare-wasm",
+		configResolved(resolved) {
+			if (resolved.command !== "build") return;
+			if (!isCloudflareAdapter(ctx)) return;
+			for (const envName of ["rsc", "ssr"]) {
+				const env = resolved.environments[envName];
+				if (!env) continue;
+				const conditions = env.resolve.conditions;
+				if (!conditions.includes("workerd")) conditions.unshift("workerd");
+			}
+		},
+		resolveId: {
+			order: "pre",
+			async handler(source, importer) {
+				if (!source.endsWith(".wasm")) return;
+				let absolutePath;
+				if (source.startsWith(".") && importer) absolutePath = resolve(dirname(importer), source);
+				else return;
+				const filename = basename(absolutePath);
+				wasmFiles.set(filename, absolutePath);
+				return {
+					id: "./" + filename,
+					external: true
+				};
+			}
+		},
+		async writeBundle(options, bundle) {
+			if (wasmFiles.size === 0) return;
+			const outDir = options.dir;
+			if (!outDir) return;
+			const targetDirs = /* @__PURE__ */ new Set();
+			for (const chunk of Object.values(bundle)) {
+				if (chunk.type !== "chunk") continue;
+				for (const filename of wasmFiles.keys()) if (chunk.code.includes(filename)) targetDirs.add(dirname(resolve(outDir, chunk.fileName)));
+			}
+			if (targetDirs.size === 0) return;
+			const copies = [];
+			for (const dir of targetDirs) {
+				await mkdir(dir, { recursive: true });
+				for (const [filename, absolutePath] of wasmFiles) copies.push(copyFile(absolutePath, resolve(dir, filename)));
+			}
+			await Promise.all(copies);
+		}
+	}];
+}
+//#endregion
 //#region src/plugins/adapter-build.ts
 function timberAdapterBuild(ctx) {
 	return {
@@ -7130,6 +7230,7 @@ function timber(config) {
 		timberMdx(ctx),
 		timberContent(ctx),
 		timberServerBundle(),
+		timberCloudflareWasm(ctx),
 		timberChunks(),
 		timberBuildReport(ctx),
 		timberAdapterBuild(ctx),