@timber-js/app 0.1.12 → 0.1.14

package/dist/plugins/shims.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA6DhD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAuGvD"}
+{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA6DhD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAkIvD"}

package/dist/server/slot-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slot-resolver.d.ts","sourceRoot":"","sources":["../../src/server/slot-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,KAAK,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,KAAK,CAAC,YAAY,CAAC;AAElE;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,UAAU,EACjB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EACzD,CAAC,EAAE,eAAe,EAClB,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAiKpC"}
+{"version":3,"file":"slot-resolver.d.ts","sourceRoot":"","sources":["../../src/server/slot-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,KAAK,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,KAAK,CAAC,YAAY,CAAC;AAElE;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,UAAU,EACjB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EACzD,CAAC,EAAE,eAAe,EAClB,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAkKpC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Vite-native React framework for Cloudflare Workers — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/client/error-boundary.tsx

@@ -71,6 +71,13 @@ export interface TimberErrorBoundaryProps {
    * 400 = any 4xx, 500 = any 5xx, specific number = exact match.
    */
   status?: number;
+  /**
+   * When true, catching a DenySignal sets _denyHandledByBoundary on the
+   * nav context to prevent page-level deny promotion. Only slot catch-all
+   * boundaries should set this — segment boundaries (403.tsx, 4xx.tsx,
+   * error.tsx) must NOT, otherwise normal page denies get swallowed.
+   */
+  isSlotBoundary?: boolean;
   children: ReactNode;
 }
 
@@ -99,26 +106,6 @@ export class TimberErrorBoundary extends Component<
       return { hasError: false, error: null };
     }
 
-    // Report DenySignal handling to prevent page-level promotion.
-    // When a slot's error boundary catches a DenySignal, the RSC onError
-    // callback has already tracked it globally. Setting this flag tells
-    // the RSC entry not to promote the denial to page-level (which would
-    // replace the entire SSR response). See LOCAL-298.
-    const digest = (error as { digest?: string }).digest;
-    if (typeof digest === 'string') {
-      try {
-        const parsed = JSON.parse(digest);
-        if (parsed?.type === 'deny') {
-          const ssrData = getSsrData();
-          if (ssrData?._navContext) {
-            ssrData._navContext._denyHandledByBoundary = true;
-          }
-        }
-      } catch {
-        // Not a JSON digest — ignore
-      }
-    }
-
     return { hasError: true, error };
   }
 
@@ -161,6 +148,20 @@ export class TimberErrorBoundary extends Component<
       }
     }
 
+    // Report DenySignal handling to prevent page-level promotion — but only
+    // for slot boundaries. Segment boundaries (403.tsx, 4xx.tsx, error.tsx)
+    // must NOT set this flag, otherwise normal page/hold-window denies get
+    // swallowed as 200 with boundary HTML instead of the intended 4xx.
+    // Runs here in render() (not getDerivedStateFromError) so the status
+    // filter has already been applied — non-matching boundaries re-threw above.
+    // See LOCAL-298.
+    if (parsed?.type === 'deny' && this.props.isSlotBoundary) {
+      const ssrData = getSsrData();
+      if (ssrData?._navContext) {
+        ssrData._navContext._denyHandledByBoundary = true;
+      }
+    }
+
     // Render the fallback component with the right props shape.
     if (parsed?.type === 'deny') {
       return createElement(this.props.fallbackComponent as never, {

package/src/client/use-router.ts

@@ -9,6 +9,7 @@
  * AppRouterInstance shape that ecosystem libraries expect.
  */
 
+import { startTransition } from 'react';
 import { getRouter } from './router-ref.js';
 
 export interface AppRouterInstance {
@@ -56,13 +57,24 @@ export function useRouter(): AppRouterInstance {
 
   return {
     push(href: string, options?: { scroll?: boolean }) {
-      void router.navigate(href, { scroll: options?.scroll });
+      // Wrap in startTransition so React 19 tracks the async navigation.
+      // React 19's startTransition accepts async callbacks — it keeps
+      // isPending=true until the returned promise resolves. This means
+      // useTransition's isPending reflects the full RSC fetch + render
+      // lifecycle when wrapping router.push() in startTransition.
+      startTransition(async () => {
+        await router.navigate(href, { scroll: options?.scroll });
+      });
     },
     replace(href: string, options?: { scroll?: boolean }) {
-      void router.navigate(href, { scroll: options?.scroll, replace: true });
+      startTransition(async () => {
+        await router.navigate(href, { scroll: options?.scroll, replace: true });
+      });
     },
     refresh() {
-      void router.refresh();
+      startTransition(async () => {
+        await router.refresh();
+      });
     },
     back() {
       window.history.back();

package/src/plugins/shims.ts

@@ -177,11 +177,38 @@ export function timberShims(_ctx: PluginContext): Plugin {
       // Server modules must never be bundled into the browser — if this
       // module is reached, there is a broken import chain that needs fixing.
       if (id === '\0timber:server-empty') {
-        return `throw new Error(
-  "[timber] @timber-js/app/server was imported from client code. " +
+        // Export named stubs instead of throwing at evaluation time.
+        // Throwing at eval breaks the module system — the browser can't
+        // resolve named imports like `import { notFound } from '...'`.
+        // Instead, each stub throws at call time with a clear message.
+        return `
+const msg = "[timber] @timber-js/app/server was imported from client code. " +
   "Server modules (headers, cookies, redirect, deny, etc.) cannot be used in client components. " +
-  "If you need these APIs, move the import to a server component or middleware."
-);`;
+  "If you need these APIs, move the import to a server component or middleware.";
+function stub() { throw new Error(msg); }
+export const headers = stub;
+export const cookies = stub;
+export const searchParams = stub;
+export const deny = stub;
+export const notFound = stub;
+export const redirect = stub;
+export const permanentRedirect = stub;
+export const redirectExternal = stub;
+export const waitUntil = stub;
+export const RenderError = stub;
+export const RedirectType = {};
+export const DenySignal = stub;
+export const RedirectSignal = stub;
+export const createPipeline = stub;
+export const revalidatePath = stub;
+export const revalidateTag = stub;
+export const createActionClient = stub;
+export const ActionError = stub;
+export const validated = stub;
+export const getFormFlash = stub;
+export const parseFormData = stub;
+export const coerce = stub;
+`;
       }
     },
   };

package/src/server/slot-resolver.ts

@@ -186,6 +186,7 @@ export async function resolveSlotElement(
       // See design/02-rendering-pipeline.md §"Slot Access Failure = Graceful Degradation"
       element = h(TimberErrorBoundary, {
         fallbackComponent: SlotErrorFallback,
+        isSlotBoundary: true,
         children: element,
       });
 
@@ -257,6 +258,12 @@ function findSlotMatch(slotNode: ManifestSegmentNode, match: RouteMatch): SlotMa
     if (slotNode.page) {
       return { page: slotNode.page, chain: [slotNode] };
     }
+    // Check for optional-catch-all child — [[...slug]] matches zero segments
+    for (const child of slotNode.children ?? []) {
+      if (child.segmentType === 'optional-catch-all' && child.page) {
+        return { page: child.page, chain: [slotNode, child] };
+      }
+    }
     return null;
   }
 
@@ -280,11 +287,27 @@ function findSlotMatch(slotNode: ManifestSegmentNode, match: RouteMatch): SlotMa
     // Try dynamic segments if no static match
     if (!found) {
       for (const child of directChildren) {
-        if (child.segmentType === 'dynamic' || child.segmentType === 'catch-all') {
+        if (child.segmentType === 'dynamic') {
+          found = child;
+          break;
+        }
+      }
+    }
+
+    // Try catch-all segments — these consume ALL remaining URL segments,
+    // so we break out of the outer loop immediately.
+    if (!found) {
+      for (const child of directChildren) {
+        if (child.segmentType === 'catch-all' || child.segmentType === 'optional-catch-all') {
           found = child;
           break;
         }
       }
+      if (found) {
+        chain.push(found);
+        currentNode = found;
+        break;
+      }
     }
 
     // Try group children (transparent)