refactor(app-router): remove dead intercept match helper (#2971)

Author: james-elicx

packages/vinext/src/server/app-page-request.ts

@@ -108,7 +108,12 @@ type AppPageInterceptMatch<TPage = unknown> = {
   targetRouteGraphId?: string | null;
 };
 
-type ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {
+type AppPageInterceptState<TRoute, TPage> =
+  | { kind: "none" }
+  | { kind: "current-route"; intercept: AppPageInterceptMatch<TPage> }
+  | { kind: "source-route"; intercept: AppPageInterceptMatch<TPage>; sourceRoute: TRoute };
+
+type ResolveAppPageInterceptStateOptions<TRoute, TPage, TInterceptOpts> = {
   cleanPathname: string;
   currentRoute: TRoute;
   findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;
@@ -118,18 +123,6 @@ type ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {
   toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;
 };
 
-type ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> = {
-  interceptOpts: TInterceptOpts;
-  matchedParams: AppPageParams;
-  sourceParams: AppPageParams;
-  sourceRoute: TRoute;
-};
-
-type AppPageInterceptState<TRoute, TPage> =
-  | { kind: "none" }
-  | { kind: "current-route"; intercept: AppPageInterceptMatch<TPage> }
-  | { kind: "source-route"; intercept: AppPageInterceptMatch<TPage>; sourceRoute: TRoute };
-
 type ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOpts> = {
   cleanPathname: string;
   currentParams: AppPageParams;
@@ -625,43 +618,8 @@ export async function validateAppPageDynamicParams(
   return null;
 }
 
-/**
- * Pure: decides whether the incoming request should re-render an intercepted
- * source-route tree, and if so returns the source route, the source-route's
- * param slice, the full matched param set (the URL params the client sees),
- * and an opaque `interceptOpts` bag for the caller's render pipeline.
- *
- * Returns `null` in three decision-fallthrough cases:
- *   - non-RSC requests (server rendering the direct page for a full HTML load)
- *   - no intercepting route matches the path
- *   - the match's source route IS the current route (the same branch today
- *     returns `interceptOpts` for the direct render)
- *
- * Shared by both the GET path (resolveAppPageIntercept, which layers on
- * `setNavigationContext` + element build + Response wrap) and the server-action
- * POST path (entries/app-rsc-entry.ts), which runs its own response pipeline.
- */
-export async function resolveAppPageInterceptMatch<TRoute, TPage, TInterceptOpts>(
-  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,
-): Promise<ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> | null> {
-  const interceptState = await resolveAppPageInterceptState(options);
-  if (interceptState.kind !== "source-route") {
-    return null;
-  }
-
-  return {
-    interceptOpts: options.toInterceptOpts(interceptState.intercept),
-    matchedParams: interceptState.intercept.matchedParams,
-    sourceParams: pickRouteParams(
-      interceptState.intercept.sourceMatchedParams ?? interceptState.intercept.matchedParams,
-      options.getRouteParamNames(interceptState.sourceRoute),
-    ),
-    sourceRoute: interceptState.sourceRoute,
-  };
-}
-
 async function resolveAppPageInterceptState<TRoute, TPage, TInterceptOpts>(
-  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,
+  options: ResolveAppPageInterceptStateOptions<TRoute, TPage, TInterceptOpts>,
 ): Promise<AppPageInterceptState<TRoute, TPage>> {
   if (!options.isRscRequest) {
     return { kind: "none" };

tests/app-page-request.test.ts

@@ -4,7 +4,7 @@ import {
   buildAppPageElement,
   resolveAppPageActionRerenderTarget,
   resolveAppPageIntercept,
-  resolveAppPageInterceptMatch,
+  resolveAppPageInterceptionRerenderTarget,
   resolveAppPageGenerateStaticParamsSources,
   validateAppPageDynamicParams,
 } from "../packages/vinext/src/server/app-page-request.js";
@@ -681,7 +681,7 @@ describe("app page request helpers", () => {
   });
 });
 
-describe("resolveAppPageInterceptMatch", () => {
+describe("resolveAppPageInterceptionRerenderTarget intercept loading", () => {
   const sourceRoute = { params: [], pattern: "/feed" };
   const currentRoute = { params: ["id"], pattern: "/photos/[id]" };
 
@@ -695,56 +695,7 @@ describe("resolveAppPageInterceptMatch", () => {
     interceptSlotKey: intercept.slotKey,
   });
 
-  it("returns null on non-RSC requests", async () => {
-    const result = await resolveAppPageInterceptMatch({
-      cleanPathname: "/photos/123",
-      currentRoute,
-      findIntercept() {
-        throw new Error("should not look up intercepts on non-RSC requests");
-      },
-      getRouteParamNames: (route) => route.params,
-      getSourceRoute: () => sourceRoute,
-      isRscRequest: false,
-      toInterceptOpts,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it("returns null when findIntercept returns nothing", async () => {
-    const result = await resolveAppPageInterceptMatch({
-      cleanPathname: "/photos/123",
-      currentRoute,
-      findIntercept: () => null,
-      getRouteParamNames: (route) => route.params,
-      getSourceRoute: () => sourceRoute,
-      isRscRequest: true,
-      toInterceptOpts,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it("returns null when the source route is the current route", async () => {
-    const result = await resolveAppPageInterceptMatch({
-      cleanPathname: "/photos/123",
-      currentRoute,
-      findIntercept: () => ({
-        matchedParams: { id: "123" },
-        page: { default: "modal-page" },
-        slotKey: "modal@app/photos/@modal",
-        sourceRouteIndex: 0,
-      }),
-      getRouteParamNames: (route) => route.params,
-      getSourceRoute: () => currentRoute,
-      isRscRequest: true,
-      toInterceptOpts,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it("returns sourceRoute, sourceParams, matchedParams, and interceptOpts when an intercept applies", async () => {
+  it("returns the source route, params, navigation params, and intercept options", async () => {
     const matchedParams = { id: "123" };
     const intercept = {
       matchedParams,
@@ -753,8 +704,9 @@ describe("resolveAppPageInterceptMatch", () => {
       sourceRouteIndex: 0,
     };
 
-    const result = await resolveAppPageInterceptMatch({
+    const result = await resolveAppPageInterceptionRerenderTarget({
       cleanPathname: "/photos/123",
+      currentParams: matchedParams,
       currentRoute,
       findIntercept: () => intercept,
       getRouteParamNames: (route) => route.params,
@@ -763,13 +715,12 @@ describe("resolveAppPageInterceptMatch", () => {
       toInterceptOpts,
     });
 
-    expect(result).not.toBeNull();
-    expect(result?.sourceRoute).toBe(sourceRoute);
-    expect(result?.matchedParams).toBe(matchedParams);
+    expect(result.route).toBe(sourceRoute);
+    expect(result.navigationParams).toEqual(matchedParams);
     // sourceParams keeps only the params declared by the source route.
     // /feed has no dynamic params, so the slice is empty.
-    expect(result?.sourceParams).toEqual({});
-    expect(result?.interceptOpts).toEqual(toInterceptOpts(intercept));
+    expect(result.params).toEqual({});
+    expect(result.interceptOpts).toEqual(toInterceptOpts(intercept));
   });
 
   it("deduplicates concurrent intercept page and layout loads", async () => {
@@ -794,6 +745,7 @@ describe("resolveAppPageInterceptMatch", () => {
     };
     const options = {
       cleanPathname: "/photos/123",
+      currentParams: { id: "123" },
       currentRoute,
       findIntercept: () => ({ ...intercept, page: sharedLoadState.page }),
       getRouteParamNames: (route: { params: string[] }) => route.params,
@@ -803,8 +755,8 @@ describe("resolveAppPageInterceptMatch", () => {
     };
 
     await Promise.all([
-      resolveAppPageInterceptMatch(options),
-      resolveAppPageInterceptMatch(options),
+      resolveAppPageInterceptionRerenderTarget(options),
+      resolveAppPageInterceptionRerenderTarget(options),
     ]);
 
     expect(__pageLoader).toHaveBeenCalledTimes(1);
@@ -845,8 +797,9 @@ describe("resolveAppPageInterceptMatch", () => {
 
     const liveCookie = await runWithRequestContext(requestContext, async () => {
       const live = (await cookies()).get("session")?.value;
-      await resolveAppPageInterceptMatch({
+      await resolveAppPageInterceptionRerenderTarget({
         cleanPathname: "/photos/123",
+        currentParams: { id: "123" },
         currentRoute,
         findIntercept: () => intercept,
         getRouteParamNames: (route: { params: string[] }) => route.params,
@@ -869,8 +822,9 @@ describe("resolveAppPageInterceptMatch", () => {
     const categorySourceRoute = { params: ["category"], pattern: "/feed/[category]" };
     const matchedParams = { category: "nature", id: "123" };
 
-    const result = await resolveAppPageInterceptMatch({
+    const result = await resolveAppPageInterceptionRerenderTarget({
       cleanPathname: "/photos/123",
+      currentParams: matchedParams,
       currentRoute,
       findIntercept: () => ({
         matchedParams,
@@ -885,8 +839,8 @@ describe("resolveAppPageInterceptMatch", () => {
       toInterceptOpts,
     });
 
-    expect(result?.sourceParams).toEqual({ category: "nature" });
-    expect(result?.matchedParams).toEqual({ category: "nature", id: "123" });
+    expect(result.params).toEqual({ category: "nature" });
+    expect(result.navigationParams).toEqual({ category: "nature", tab: "recent", id: "123" });
   });
 });