feat(next/app-dir): contextCache to control context values to add to cacheTag

examples/.experimental/next-app-dir/src/trpc/server-invoker.ts

@@ -13,9 +13,8 @@ export const api = experimental_createTRPCNextAppDirServer<typeof appRouter>({
     return {
       createContext: () => createContext('invoke'),
       contextSelector: (ctx, callOpts) => {
-        if (callOpts.path[0] === 'privateGreeting')
-          return [ctx.session?.user.id, ctx._userIdMock];
-        return [];
+        if (!['privateGreeting'].includes(callOpts.path[0])) return [];
+        return [ctx.session?.user.id, ctx._userIdMock];
       },
       links: [
         loggerLink({

packages/next/src/app-dir/server.ts

@@ -11,7 +11,6 @@ import type {
   inferClientTypes,
   inferProcedureInput,
   MaybePromise,
-  ProxyCallbackOptions,
   RootConfig,
   Simplify,
   TRPCResponse,
@@ -24,7 +23,6 @@ import {
   TRPCError,
 } from '@trpc/server/unstable-core-do-not-import';
 import { revalidateTag } from 'next/cache';
-import { cache } from 'react';
 import { formDataToObject } from './formDataToObject';
 import type {
   ActionHandlerDef,
@@ -41,21 +39,14 @@ import type {
 export function experimental_createTRPCNextAppDirServer<
   TRouter extends AnyRouter,
 >(opts: CreateTRPCNextAppRouterServerOptions<TRouter>) {
-  const getClient = cache(async (callOpts: ProxyCallbackOptions) => {
+  return createRecursiveProxy(async (callOpts) => {
     const config = opts.config();
     const client = createTRPCUntypedClient(config);
-    const runtime = client.runtime as NextAppDirRuntime<TRouter>;
-
     const ctx = await config.createContext();
-    runtime.ctx = ctx;
-    runtime.cacheTagSeparators = config.contextSelector?.(ctx, callOpts) ?? [];
-    return client;
-  });
 
-  return createRecursiveProxy(async (callOpts) => {
-    // lazily initialize client
-    const client = await getClient(callOpts);
     const runtime = client.runtime as NextAppDirRuntime<TRouter>;
+    runtime.ctx = ctx;
+    runtime.cacheTagSeparators = config.contextSelector?.(ctx, callOpts) ?? [];
 
     const pathCopy = [...callOpts.path];
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion