@timber-js/app 0.2.0-alpha.165 → 0.2.0-alpha.167

package/dist/index.js

@@ -1,12 +1,13 @@
 import { a as __esmMin, o as __exportAll, s as __toCommonJS } from "./_chunks/dist-BA3u1z3W.js";
 import { c as isDynamicMetadataExtension, l as isMetadataRouteServePath, r as canonicalize } from "./_chunks/canonicalize-P41GR6tY.js";
 import { t as matchUrlParts } from "./_chunks/tree-match-D2l830j2.js";
-import { h as swallow } from "./_chunks/logger-B_O6-mdJ.js";
-import { i as scanRoutes } from "./_chunks/cli-schema-sync-mGfRbjh2.js";
-import { a as generateRouteMap, c as fileHasDirective, d as getPrerenderExport, i as validateSchemaAgainstRoutes, l as fileHasExport, n as collectInterceptionRewrites, o as fileHasAnyExport, s as fileHasDefaultExport, t as collectLeafRoutes, u as fileHasStarExport } from "./_chunks/walkers-BL3MCMgO.js";
-import { a as resolveAppDir, c as createNoopTimer, n as loadTimberConfigFile, o as resolveBuildDir, r as mergeFileConfig, s as resolveClientJavascript, t as createPluginContext } from "./_chunks/plugin-context-BnaiU_cF.js";
+import { h as swallow } from "./_chunks/logger-t3uxAmbX.js";
+import { i as scanRoutes } from "./_chunks/cli-schema-sync-wX-i90Og.js";
+import { a as generateRouteMap, c as fileHasDirective, d as getPrerenderExport, i as validateSchemaAgainstRoutes, l as fileHasExport, n as collectInterceptionRewrites, o as fileHasAnyExport, s as fileHasDefaultExport, t as collectLeafRoutes, u as fileHasStarExport } from "./_chunks/walkers-Cfwvl-UC.js";
+import { a as resolveAppDir, c as createNoopTimer, n as loadTimberConfigFile, o as resolveBuildDir, r as mergeFileConfig, s as resolveClientJavascript, t as createPluginContext } from "./_chunks/plugin-context---kTF5v8.js";
 import { t as fnv1aHash } from "./_chunks/fast-hash-D6hIVt1Y.js";
 import { t as formatSize } from "./_chunks/format-CfwjgPz9.js";
+import { createLogger, parseAst } from "vite";
 import { basename, dirname, extname, join, normalize, relative, resolve, win32 } from "node:path";
 import { builtinModules, createRequire } from "node:module";
 import react, { reactCompilerPreset } from "@vitejs/plugin-react";
@@ -21,7 +22,6 @@ import { styleText } from "node:util";
 import { constants, createGzip, gzipSync } from "node:zlib";
 import { copyFile, mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
-import { parseAst } from "vite";
 //#region src/plugins/content.ts
 var CONFIG_FILE_NAMES$1 = [
 	"content-collections.ts",
@@ -6453,6 +6453,76 @@ function timberBuildManifest(ctx) {
 }
 //#endregion
 //#region src/dev-tools/logs.ts
+/**
+* Snapshot of the original console methods, captured at module load time
+* (before any patching). Used as Vite's `customLogger` console so that
+* forwardConsole output bypasses our patch entirely — eliminating the
+* server→browser→server forwarding loop without string matching.
+*/
+var originalConsole = {
+	log: console.log.bind(console),
+	warn: console.warn.bind(console),
+	error: console.error.bind(console),
+	debug: console.debug.bind(console),
+	info: console.info.bind(console)
+};
+/**
+* Wrap a Vite Logger so its output methods route through `originalConsole`
+* instead of the global (potentially patched) console. This prevents the
+* server→browser→server forwarding loop even when the user supplies their
+* own `customLogger` that internally calls console methods.
+*/
+function wrapLoggerWithOriginalConsole(logger) {
+	function withOriginals(fn) {
+		const saved = {
+			log: console.log,
+			warn: console.warn,
+			error: console.error,
+			debug: console.debug,
+			info: console.info
+		};
+		console.log = originalConsole.log;
+		console.warn = originalConsole.warn;
+		console.error = originalConsole.error;
+		console.debug = originalConsole.debug;
+		console.info = originalConsole.info;
+		try {
+			return fn();
+		} finally {
+			console.log = saved.log;
+			console.warn = saved.warn;
+			console.error = saved.error;
+			console.debug = saved.debug;
+			console.info = saved.info;
+		}
+	}
+	return {
+		get hasWarned() {
+			return logger.hasWarned;
+		},
+		set hasWarned(v) {
+			logger.hasWarned = v;
+		},
+		info(msg, opts) {
+			withOriginals(() => logger.info(msg, opts));
+		},
+		warn(msg, opts) {
+			withOriginals(() => logger.warn(msg, opts));
+		},
+		warnOnce(msg, opts) {
+			withOriginals(() => logger.warnOnce(msg, opts));
+		},
+		error(msg, opts) {
+			withOriginals(() => logger.error(msg, opts));
+		},
+		clearScreen(type) {
+			logger.clearScreen(type);
+		},
+		hasErrorLogged(error) {
+			return logger.hasErrorLogged(error);
+		}
+	};
+}
 var LOG_LEVELS = [
 	"log",
 	"warn",
@@ -6575,28 +6645,37 @@ function isFrameworkInternalCaller() {
 * 3. Sends via server.hot.send() — dropped if no clients connected
 */
 function patchConsole(server, projectRoot) {
-	const originals = /* @__PURE__ */ new Map();
+	const prevConsole = /* @__PURE__ */ new Map();
+	const patchingLevel = /* @__PURE__ */ new Set();
 	for (const level of LOG_LEVELS) {
-		originals.set(level, console[level].bind(console));
+		prevConsole.set(level, console[level].bind(console));
 		console[level] = (...args) => {
-			originals.get(level)(...args);
-			if (isFrameworkInternalCaller()) return;
-			if (typeof args[0] === "string" && args[0].includes("[console.")) return;
+			if (patchingLevel.has(level)) {
+				prevConsole.get(level)(...args);
+				return;
+			}
+			patchingLevel.add(level);
 			try {
-				const payload = {
-					level,
-					args: args.map((arg) => serializeArg(arg)),
-					location: extractCallerLocation(projectRoot),
-					timestamp: Date.now()
-				};
-				server.hot.send("timber:server-log", payload);
-			} catch (e) {
-				originals.get("debug")("[timber] server log forwarding failed:", e instanceof Error ? e.message : e);
+				prevConsole.get(level)(...args);
+				if (isFrameworkInternalCaller()) return;
+				try {
+					const payload = {
+						level,
+						args: args.map((arg) => serializeArg(arg)),
+						location: extractCallerLocation(projectRoot),
+						timestamp: Date.now()
+					};
+					server.hot.send("timber:server-log", payload);
+				} catch (e) {
+					originalConsole.debug("[timber] server log forwarding failed:", e instanceof Error ? e.message : e);
+				}
+			} finally {
+				patchingLevel.delete(level);
 			}
 		};
 	}
 	return () => {
-		for (const [level, original] of originals) console[level] = original;
+		for (const [level, prev] of prevConsole) console[level] = prev;
 	};
 }
 /**
@@ -7304,14 +7383,14 @@ function generateStableCallsiteId(relativeModulePath, kind, statementText, callS
 //#region src/plugins/cache.ts
 /**
 * timber-cache-transform — Vite plugin that injects stable callsite IDs
-* into `cache()` calls imported from `@timber-js/app/cache`.
+* into `cache.data()` calls imported from `@timber-js/app/cache`.
 *
 * Detected callsite forms (TIM-1054):
-*   - named imports, including aliases: `import { cache as c }` + `c(fn, opts)`
-*   - namespace imports: `import * as ns` + `ns.cache(fn, opts)`
+*   - named imports, including aliases: `import { cache as c }` + `c.data(fn, opts)`
+*   - namespace imports: `import * as ns` + `ns.cache.data(fn, opts)`
 * Forms a per-module transform cannot trace — local variable aliases
 * (`const c = cache`), user re-export wrapper modules, computed access
-* (`ns['cache']`) — fall back to the runtime fnId derived from
+* (`cache['data']`) — fall back to the runtime fnId derived from
 * fnv1a(fn.toString()) (see cache/timber-cache.ts), which is deterministic
 * across instances and cold starts of the same build. Without either
 * mechanism, an ordinal counter would collide across instances with a shared
@@ -7319,8 +7398,8 @@ function generateStableCallsiteId(relativeModulePath, kind, statementText, callS
 * data to another.
 *
 * The plugin transforms:
-*   cache(fn, opts)      →  cache(fn, opts, "stable-id")
-*   ns.cache(fn, opts)   →  ns.cache(fn, opts, "stable-id")
+*   cache.data(fn, opts)          →  cache.data(fn, opts, "stable-id")
+*   ns.cache.data(fn, opts)       →  ns.cache.data(fn, opts, "stable-id")
 *
 * where stable-id =
 *   fnv1a(relPath + ":cache:" + fnv1a(stmtText) + ":" + fnv1a(callSpanText) + ":" + occurrence)
@@ -7338,9 +7417,9 @@ function generateStableCallsiteId(relativeModulePath, kind, statementText, callS
 * unrelated edits, while a changed call gets a fresh ID — which is exactly
 * when invalidation is wanted.
 *
-* The enclosing-statement text is included so that byte-identical cache()
+* The enclosing-statement text is included so that byte-identical cache.data()
 * calls in different scopes — e.g. two factory helpers that each `return
-* cache(fn, { ttl: 60 })` — get distinct, insertion-stable IDs: their
+* cache.data(fn, { ttl: 60 })` — get distinct, insertion-stable IDs: their
 * enclosing declarations differ by name/body even when the call spans are
 * identical. Without it, a source-order occurrence counter alone would shift
 * when an identical span is inserted above, reassigning IDs across deploys.
@@ -7357,32 +7436,40 @@ function generateStableCallsiteId(relativeModulePath, kind, statementText, callS
 * See TIM-997, TIM-1053, design/06-caching.md §"Cache Key Security".
 */
 /**
-* Is this callee a reference to the imported `cache` function — either a bare
-* identifier bound by a named import, or `ns.cache` on a namespace import?
-* Computed access (`ns['cache']`) is deliberately not matched; it falls back
+* Is this callee a `cache.data(...)` call? Matches two forms:
+*   - Named import: `cache.data(fn, opts)` where `cache` is the imported binding
+*   - Namespace import: `ns.cache.data(fn, opts)` where `ns` is the namespace
+* Computed access (`cache['data']`) is deliberately not matched; it falls back
 * to the runtime fnId derivation.
 */
-function isCacheCallee(callee, bindings) {
-	if (callee.type === "Identifier") return bindings.named.has(callee.name);
-	if (callee.type === "MemberExpression") {
-		const member = callee;
-		return !member.computed && member.object.type === "Identifier" && bindings.namespaces.has(member.object.name) && member.property.type === "Identifier" && member.property.name === "cache";
+function isCacheDataCallee(callee, bindings) {
+	if (callee.type !== "MemberExpression") return false;
+	const member = callee;
+	if (member.computed) return false;
+	if (member.property.type !== "Identifier" || member.property.name !== "data") return false;
+	const obj = member.object;
+	if (obj.type === "Identifier") return bindings.named.has(obj.name);
+	if (obj.type === "MemberExpression") {
+		const outer = obj;
+		return !outer.computed && outer.object.type === "Identifier" && bindings.namespaces.has(outer.object.name) && outer.property.type === "Identifier" && outer.property.name === "cache";
 	}
 	return false;
 }
 /**
-* Extract the local binding name that a cache callee resolves to — the
-* identifier for named imports, or the namespace object for `ns.cache()`.
+* Extract the local binding name that a cache.data callee resolves to — the
+* `cache` identifier for named imports, or the namespace object for `ns.cache.data()`.
 */
 function calleeBindingName(callee, bindings) {
-	if (callee.type === "Identifier") {
-		const name = callee.name;
+	if (callee.type !== "MemberExpression") return null;
+	const obj = callee.object;
+	if (obj.type === "Identifier") {
+		const name = obj.name;
 		return bindings.named.has(name) ? name : null;
 	}
-	if (callee.type === "MemberExpression") {
-		const member = callee;
-		if (member.object.type === "Identifier") {
-			const name = member.object.name;
+	if (obj.type === "MemberExpression") {
+		const outer = obj;
+		if (outer.object.type === "Identifier") {
+			const name = outer.object.name;
 			return bindings.namespaces.has(name) ? name : null;
 		}
 	}
@@ -7420,7 +7507,7 @@ function timberCacheTransform(ctx) {
 			const callSites = [];
 			for (const stmt of program.body) {
 				const calls = [];
-				findCallSites(stmt, (call) => call.arguments.length === 2 && isCacheCallee(call.callee, cacheBindings) && !isCalleeShadowed(call), calls);
+				findCallSites(stmt, (call) => call.arguments.length === 2 && isCacheDataCallee(call.callee, cacheBindings) && !isCalleeShadowed(call), calls);
 				for (const call of calls) callSites.push({
 					call,
 					stmt
@@ -8571,6 +8658,7 @@ function timberAdapterBuild(ctx) {
 				}
 				if (ctx.clientJavascript.disabled) await stripJsFromRscAssetsManifests(buildDir);
 				const adapterConfig = {
+					root: ctx.root,
 					output: ctx.config.output ?? "server",
 					clientJavascriptDisabled: ctx.clientJavascript.disabled,
 					manifestInit
@@ -9545,10 +9633,15 @@ function timber(config) {
 				previewConfig.strictPort = resolvedDevPortExplicit;
 			}
 			serverConfig.forwardConsole = resolveForwardConsole(ctx.config.devBrowserLogs);
+			const customLogger = userConfig.customLogger ? wrapLoggerWithOriginalConsole(userConfig.customLogger) : createLogger(userConfig.logLevel ?? "info", {
+				allowClearScreen: userConfig.clearScreen ?? true,
+				console: originalConsole
+			});
 			return {
 				build: { outDir: buildOutDir },
 				environments: envOutDirs,
 				optimizeDeps: { exclude: timberOptimizeDepsExclude },
+				customLogger,
 				server: serverConfig,
 				preview: previewConfig
 			};