@timber-js/app 0.2.0-alpha.1 → 0.2.0-alpha.2

package/dist/client/browser-entry.d.ts

@@ -12,8 +12,7 @@
  * 3. Setting up client-side navigation for subsequent page transitions
  *
  * After hydration, the browser entry:
- * - Intercepts clicks on <a data-timber-link> for SPA navigation
- * - Listens for mouseenter on <a data-timber-prefetch> for hover prefetch
+ * - Link click handling is per-component (Link's onClick), not global delegation
  * - Listens for popstate events for back/forward navigation
  *
  * Design docs: 18-build-system.md §"Entry Files", 19-client-navigation.md

package/dist/client/browser-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-entry.d.ts","sourceRoot":"","sources":["../../src/client/browser-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG"}
+{"version":3,"file":"browser-entry.d.ts","sourceRoot":"","sources":["../../src/client/browser-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG"}

package/dist/client/index.d.ts

@@ -1,7 +1,7 @@
 export type { JsonSerializable, RenderErrorDigest } from './types';
 export { Link, interpolateParams, resolveHref, validateLinkHref, buildLinkProps } from './link';
 export type { LinkProps, LinkPropsWithHref, LinkPropsWithParams } from './link';
-export type { OnNavigateHandler, OnNavigateEvent } from './link-navigate-interceptor';
+export type { OnNavigateHandler, OnNavigateEvent } from './link';
 export { createRouter } from './router';
 export type { RouterInstance, NavigationOptions, RouterDeps, RscDecoder, RootRenderer, } from './router';
 export { useNavigationPending } from './use-navigation-pending';

package/dist/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAGA,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGnE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChG,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAChF,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,YAAY,GACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACrE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAGpG,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACvE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC9D,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACtE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGtE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAClE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,YAAY,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAGA,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGnE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChG,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAChF,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,YAAY,GACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACrE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAGpG,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACvE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC9D,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACtE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGtE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAClE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,YAAY,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/client/index.js

@@ -3,35 +3,8 @@ import { a as _setCurrentParams, c as cachedSearchParams, i as _setCachedSearch,
 import { n as useQueryStates, t as bindUseQueryStates } from "../_chunks/use-query-states-DAhgj8Gx.js";
 import { t as useCookie } from "../_chunks/use-cookie-dDbpCTx-.js";
 import { TimberErrorBoundary } from "./error-boundary.js";
-import React, { cloneElement, createContext, createElement, isValidElement, useActionState as useActionState$1, useContext, useEffect, useMemo, useRef, useSyncExternalStore, useTransition } from "react";
+import React, { cloneElement, createContext, createElement, isValidElement, useActionState as useActionState$1, useContext, useMemo, useSyncExternalStore, useTransition } from "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/client/link-navigate-interceptor.tsx
-/** Symbol used to store the onNavigate callback on anchor elements. */
-var ON_NAVIGATE_KEY = "__timberOnNavigate";
-/**
-* Client component rendered inside <Link> that attaches the onNavigate
-* callback to the closest <a> ancestor via a DOM property. The callback
-* is cleaned up on unmount.
-*
-* Renders no extra DOM — just a transparent wrapper.
-*/
-function LinkNavigateInterceptor({ onNavigate, children }) {
-	const ref = useRef(null);
-	useEffect(() => {
-		const anchor = ref.current?.closest("a");
-		if (!anchor) return;
-		anchor[ON_NAVIGATE_KEY] = onNavigate;
-		return () => {
-			delete anchor[ON_NAVIGATE_KEY];
-		};
-	}, [onNavigate]);
-	return /* @__PURE__ */ jsx("span", {
-		ref,
-		style: { display: "contents" },
-		children
-	});
-}
-//#endregion
 //#region src/client/use-link-status.ts
 /**
 * React context provided by <Link>. Holds the pending status
@@ -93,9 +66,15 @@ function useLinkStatus() {
 * that depend on these APIs are safe to call from any environment —
 * they return null or no-op when the APIs aren't available.
 *
-* Singleton guarantee: With the simplified chunking strategy (LOCAL-337),
-* this module lives in exactly one client chunk. The previous globalThis +
-* Symbol.for workaround for cross-chunk duplication is no longer needed.
+* SINGLETON GUARANTEE: All shared mutable state uses globalThis via
+* Symbol.for keys. The RSC client bundler can duplicate this module
+* across chunks (browser-entry graph + client-reference graph). With
+* ESM output, each chunk gets its own module scope — module-level
+* variables would create separate singleton instances per chunk.
+* globalThis guarantees a single instance regardless of duplication.
+*
+* This workaround will be removed when Rolldown ships `format: 'app'`
+* (module registry format that deduplicates like webpack/Turbopack).
 * See design/27-chunking-strategy.md.
 *
 * See design/19-client-navigation.md §"NavigationContext"
@@ -104,14 +83,25 @@ function useLinkStatus() {
 * The context is created lazily to avoid calling createContext at module
 * level. In the RSC environment, React.createContext doesn't exist —
 * calling it at import time would crash the server.
+*
+* Context instances are stored on globalThis (NOT in module-level
+* variables) because the ESM bundler can duplicate this module across
+* chunks. Module-level variables would create separate instances per
+* chunk — the provider in TransitionRoot (index chunk) would use
+* context A while the consumer in LinkStatusProvider (shared chunk)
+* reads from context B. globalThis guarantees a single instance.
+*
+* See design/27-chunking-strategy.md §"Singleton Safety"
 */
-var _navCtx;
-var _pendingNavCtx;
+var NAV_CTX_KEY = Symbol.for("__timber_nav_ctx");
+var PENDING_CTX_KEY = Symbol.for("__timber_pending_nav_ctx");
 function getOrCreateContext() {
-	if (_navCtx !== void 0) return _navCtx;
+	const existing = globalThis[NAV_CTX_KEY];
+	if (existing !== void 0) return existing;
 	if (typeof React.createContext === "function") {
-		_navCtx = React.createContext(null);
-		return _navCtx;
+		const ctx = React.createContext(null);
+		globalThis[NAV_CTX_KEY] = ctx;
+		return ctx;
 	}
 }
 /**
@@ -144,27 +134,42 @@ function NavigationProvider({ value, children }) {
 * NavigationProvider with the correct params/pathname.
 *
 * This is NOT used by hooks directly — hooks read from React context.
+*
+* Stored on globalThis (like the context instances above) because the
+* router lives in one chunk while renderRoot lives in another. Module-
+* level variables would be separate per chunk.
 */
-var _navState = {
-	params: {},
-	pathname: "/"
-};
+var NAV_STATE_KEY = Symbol.for("__timber_nav_state");
+function _getNavStateStore() {
+	const g = globalThis;
+	if (!g[NAV_STATE_KEY]) g[NAV_STATE_KEY] = { current: {
+		params: {},
+		pathname: "/"
+	} };
+	return g[NAV_STATE_KEY];
+}
 function setNavigationState(state) {
-	_navState = state;
+	_getNavStateStore().current = state;
 }
 function getNavigationState() {
-	return _navState;
+	return _getNavStateStore().current;
 }
 /**
 * Separate context for the in-flight navigation URL. Provided by
 * TransitionRoot (urgent useState), consumed by LinkStatusProvider
 * and useNavigationPending.
+*
+* Uses globalThis via Symbol.for for the same reason as NavigationContext
+* above — the bundler may duplicate this module across chunks, and module-
+* level variables would create separate context instances.
 */
 function getOrCreatePendingContext() {
-	if (_pendingNavCtx !== void 0) return _pendingNavCtx;
+	const existing = globalThis[PENDING_CTX_KEY];
+	if (existing !== void 0) return existing;
 	if (typeof React.createContext === "function") {
-		_pendingNavCtx = React.createContext(null);
-		return _pendingNavCtx;
+		const ctx = React.createContext(null);
+		globalThis[PENDING_CTX_KEY] = ctx;
+		return ctx;
 	}
 }
 /**
@@ -194,6 +199,30 @@ function LinkStatusProvider({ href, children }) {
 	});
 }
 //#endregion
+//#region src/client/router-ref.ts
+/**
+* Set the global router instance. Called once during bootstrap.
+*/
+function setGlobalRouter(router) {
+	_setGlobalRouter(router);
+}
+/**
+* Get the global router instance. Throws if called before bootstrap.
+* Used by client-side hooks (useNavigationPending, etc.)
+*/
+function getRouter() {
+	if (!globalRouter) throw new Error("[timber] Router not initialized. getRouter() was called before bootstrap().");
+	return globalRouter;
+}
+/**
+* Get the global router instance or null if not yet initialized.
+* Used by useRouter() methods to avoid silent failures — callers
+* can log a meaningful warning instead of silently no-oping.
+*/
+function getRouterOrNull() {
+	return globalRouter;
+}
+//#endregion
 //#region src/client/link.tsx
 /**
 * Reject dangerous URL schemes that could execute script.
@@ -263,44 +292,81 @@ function resolveHref(href, params, searchParams) {
 function buildLinkProps(props) {
 	const resolvedHref = resolveHref(props.href, props.params, props.searchParams);
 	validateLinkHref(resolvedHref);
-	const output = { href: resolvedHref };
-	if (isInternalHref(resolvedHref)) {
-		output["data-timber-link"] = true;
-		if (props.prefetch) output["data-timber-prefetch"] = true;
-		if (props.scroll === false) output["data-timber-scroll"] = "false";
-	}
-	return output;
+	return { href: resolvedHref };
+}
+/**
+* Should this click be intercepted for SPA navigation?
+*
+* Returns false (pass through to browser) when:
+* - Modified keys are held (Ctrl, Meta, Shift, Alt) — open in new tab
+* - The click is not the primary button
+* - The event was already prevented by a parent handler
+* - The link has target="_blank" or similar
+* - The link has a download attribute
+* - The href is external
+*/
+function shouldInterceptClick(event, resolvedHref) {
+	if (event.button !== 0) return false;
+	if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return false;
+	if (event.defaultPrevented) return false;
+	const anchor = event.currentTarget;
+	if (anchor.target && anchor.target !== "_self") return false;
+	if (anchor.hasAttribute("download")) return false;
+	if (!isInternalHref(resolvedHref)) return false;
+	return true;
 }
 /**
 * Navigation link with progressive enhancement.
 *
 * Renders as a plain `<a>` tag — works without JavaScript. When the client
-* runtime is active, it intercepts clicks on links marked with
-* `data-timber-link` to perform RSC-based client navigation.
+* runtime is active, the Link's onClick handler triggers RSC-based client
+* navigation via the router. No global event delegation — each Link owns
+* its own click handling.
 *
 * Supports typed routes via codegen overloads. At runtime:
 * - `params` prop interpolates dynamic segments in the href pattern
 * - `searchParams` prop serializes query parameters via a SearchParamsDefinition
 */
-function Link({ href, prefetch, scroll, params, searchParams, onNavigate, children, ...rest }) {
-	const linkProps = buildLinkProps({
+function Link({ href, prefetch, scroll, params, searchParams, onNavigate, onClick: userOnClick, onMouseEnter: userOnMouseEnter, children, ...rest }) {
+	const { href: resolvedHref } = buildLinkProps({
 		href,
-		prefetch,
-		scroll,
 		params,
 		searchParams
 	});
-	const inner = /* @__PURE__ */ jsx(LinkStatusProvider, {
-		href: linkProps.href,
-		children
-	});
+	const internal = isInternalHref(resolvedHref);
+	const handleClick = internal ? (event) => {
+		userOnClick?.(event);
+		if (!shouldInterceptClick(event, resolvedHref)) return;
+		if (onNavigate) {
+			let prevented = false;
+			onNavigate({ preventDefault: () => {
+				prevented = true;
+			} });
+			if (prevented) {
+				event.preventDefault();
+				return;
+			}
+		}
+		const router = getRouterOrNull();
+		if (!router) return;
+		event.preventDefault();
+		const shouldScroll = scroll !== false;
+		router.navigate(resolvedHref, { scroll: shouldScroll });
+	} : userOnClick;
+	const handleMouseEnter = internal && prefetch ? (event) => {
+		userOnMouseEnter?.(event);
+		const router = getRouterOrNull();
+		if (router) router.prefetch(resolvedHref);
+	} : userOnMouseEnter;
 	return /* @__PURE__ */ jsx("a", {
 		...rest,
-		...linkProps,
-		children: onNavigate ? /* @__PURE__ */ jsx(LinkNavigateInterceptor, {
-			onNavigate,
-			children: inner
-		}) : inner
+		href: resolvedHref,
+		onClick: handleClick,
+		onMouseEnter: handleMouseEnter,
+		children: /* @__PURE__ */ jsx(LinkStatusProvider, {
+			href: resolvedHref,
+			children
+		})
 	});
 }
 //#endregion
@@ -1105,30 +1171,6 @@ function useNavigationPending() {
 	return usePendingNavigationUrl() !== null;
 }
 //#endregion
-//#region src/client/router-ref.ts
-/**
-* Set the global router instance. Called once during bootstrap.
-*/
-function setGlobalRouter(router) {
-	_setGlobalRouter(router);
-}
-/**
-* Get the global router instance. Throws if called before bootstrap.
-* Used by client-side hooks (useNavigationPending, etc.)
-*/
-function getRouter() {
-	if (!globalRouter) throw new Error("[timber] Router not initialized. getRouter() was called before bootstrap().");
-	return globalRouter;
-}
-/**
-* Get the global router instance or null if not yet initialized.
-* Used by useRouter() methods to avoid silent failures — callers
-* can log a meaningful warning instead of silently no-oping.
-*/
-function getRouterOrNull() {
-	return globalRouter;
-}
-//#endregion
 //#region src/client/use-router.ts
 /**
 * useRouter() — client-side hook for programmatic navigation.