@trpc/next 10.32.0 → 10.33.1

package/dist/app-dir/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/app-dir/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,EAEL,6BAA6B,EAE7B,6BAA6B,EAE7B,KAAK,mBAAmB,EAExB,KAAK,sBAAsB,GAC5B,MAAM,sBAAsB,CAAC;AAkB9B,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,kCA8D9C"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/app-dir/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,EAEL,6BAA6B,EAE7B,6BAA6B,EAE7B,KAAK,mBAAmB,EAExB,KAAK,sBAAsB,GAC5B,MAAM,sBAAsB,CAAC;AAS9B,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,kCAwC9C"}

package/dist/app-dir/client.js

@@ -7,7 +7,7 @@ var shared$2 = require('@trpc/server/shared');
 var shared$1 = require('@trpc/client/shared');
 var observable = require('@trpc/server/observable');
 var React = require('react');
-var shared = require('../shared-2ca37369.js');
+var shared = require('../shared-e49b9cdc.js');
 
 // ts-prune-ignore-next
 function experimental_serverActionLink() {
@@ -24,7 +24,9 @@ function experimental_serverActionLink() {
                         result: transformed.result
                     });
                     observer.complete();
-                }).catch((cause)=>observer.error(client.TRPCClientError.from(cause)));
+                }).catch((cause)=>{
+                    observer.error(client.TRPCClientError.from(cause));
+                });
             });
 }
 // ts-prune-ignore-next
@@ -107,31 +109,12 @@ function experimental_createTRPCNextAppDirClient(opts) {
     const client$1 = client.createTRPCUntypedClient(opts.config());
     // const useProxy = createUseProxy<TRouter>(client);
     const cache = new Map();
-    // return createFlatProxy<CreateTRPCNextAppRouter<TRouter>>((key) => {
-    // if (key === 'use') {
-    //   return (
-    //     cb: (
-    //       t: UseProcedureRecord<TRouter>,
-    //     ) => Promise<unknown> | Promise<unknown>[],
-    //   ) => {
-    //     const promise = normalizePromiseArray(cb(useProxy));
-    //     throw promise;
-    //     // const [data, setData] = useState<unknown | unknown[]>();
-    //     // useEffect(() => {
-    //     //   const promise = normalizePromiseArray(cb(useProxy));
-    //     //   void promise.then(setData).catch((err) => {
-    //     //     throw err;
-    //     //   });
-    //     //   // eslint-disable-next-line react-hooks/exhaustive-deps
-    //     // }, []);
-    //     // return data;
-    //   };
-    // }
     return shared$2.createRecursiveProxy(({ path , args  })=>{
         // const pathCopy = [key, ...path];
         const pathCopy = [
             ...path
         ];
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const procedureType = client.clientCallTypeToProcedureType(pathCopy.pop());
         if (procedureType === 'query') {
             const queryCacheKey = JSON.stringify([

package/dist/app-dir/client.mjs

@@ -3,7 +3,7 @@ import { createRecursiveProxy } from '@trpc/server/shared';
 import { transformResult } from '@trpc/client/shared';
 import { observable } from '@trpc/server/observable';
 import { useRef, useState, useEffect, useCallback, useMemo } from 'react';
-import { i as isFormData } from '../shared-59b269d5.mjs';
+import { i as isFormData } from '../shared-f6996341.mjs';
 
 // ts-prune-ignore-next
 function experimental_serverActionLink() {
@@ -20,7 +20,9 @@ function experimental_serverActionLink() {
                         result: transformed.result
                     });
                     observer.complete();
-                }).catch((cause)=>observer.error(TRPCClientError.from(cause)));
+                }).catch((cause)=>{
+                    observer.error(TRPCClientError.from(cause));
+                });
             });
 }
 // ts-prune-ignore-next
@@ -103,31 +105,12 @@ function experimental_createTRPCNextAppDirClient(opts) {
     const client = createTRPCUntypedClient(opts.config());
     // const useProxy = createUseProxy<TRouter>(client);
     const cache = new Map();
-    // return createFlatProxy<CreateTRPCNextAppRouter<TRouter>>((key) => {
-    // if (key === 'use') {
-    //   return (
-    //     cb: (
-    //       t: UseProcedureRecord<TRouter>,
-    //     ) => Promise<unknown> | Promise<unknown>[],
-    //   ) => {
-    //     const promise = normalizePromiseArray(cb(useProxy));
-    //     throw promise;
-    //     // const [data, setData] = useState<unknown | unknown[]>();
-    //     // useEffect(() => {
-    //     //   const promise = normalizePromiseArray(cb(useProxy));
-    //     //   void promise.then(setData).catch((err) => {
-    //     //     throw err;
-    //     //   });
-    //     //   // eslint-disable-next-line react-hooks/exhaustive-deps
-    //     // }, []);
-    //     // return data;
-    //   };
-    // }
     return createRecursiveProxy(({ path , args  })=>{
         // const pathCopy = [key, ...path];
         const pathCopy = [
             ...path
         ];
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const procedureType = clientCallTypeToProcedureType(pathCopy.pop());
         if (procedureType === 'query') {
             const queryCacheKey = JSON.stringify([

package/dist/app-dir/create-action-hook.d.ts

@@ -2,7 +2,7 @@ import { CreateTRPCClientOptions, TRPCClientError, TRPCLink } from '@trpc/client
 import { AnyProcedure, AnyRouter, inferHandlerInput, MaybePromise, ProcedureOptions, Simplify } from '@trpc/server';
 import { TRPCActionHandler } from './server';
 import { ActionHandlerDef } from './shared';
-type MutationArgs<TDef extends ActionHandlerDef> = TDef['input'] extends void ? [input?: undefined | void, opts?: ProcedureOptions] : [input: TDef['input'] | FormData, opts?: ProcedureOptions];
+type MutationArgs<TDef extends ActionHandlerDef> = TDef['input'] extends void ? [input?: undefined | void, opts?: ProcedureOptions] : [input: FormData | TDef['input'], opts?: ProcedureOptions];
 interface UseTRPCActionBaseResult<TDef extends ActionHandlerDef> {
     mutate: (...args: MutationArgs<TDef>) => void;
     mutateAsync: (...args: MutationArgs<TDef>) => Promise<TDef['output']>;
@@ -27,7 +27,7 @@ interface UseTRPCActionLoadingResult<TDef extends ActionHandlerDef> extends UseT
     error?: never;
     status: 'loading';
 }
-export type UseTRPCActionResult<TDef extends ActionHandlerDef> = UseTRPCActionSuccessResult<TDef> | UseTRPCActionErrorResult<TDef> | UseTRPCActionIdleResult<TDef> | UseTRPCActionLoadingResult<TDef>;
+export type UseTRPCActionResult<TDef extends ActionHandlerDef> = UseTRPCActionErrorResult<TDef> | UseTRPCActionIdleResult<TDef> | UseTRPCActionLoadingResult<TDef> | UseTRPCActionSuccessResult<TDef>;
 export declare function experimental_serverActionLink<TRouter extends AnyRouter = AnyRouter>(): TRPCLink<TRouter>;
 /**
  * @internal
@@ -38,7 +38,7 @@ export type inferActionResultProps<TProc extends AnyProcedure> = {
     errorShape: TProc['_def']['_config']['$types']['errorShape'];
 };
 interface UseTRPCActionOptions<TDef extends ActionHandlerDef> {
-    onSuccess?: (result: TDef['output']) => void | MaybePromise<void>;
+    onSuccess?: (result: TDef['output']) => MaybePromise<void> | void;
     onError?: (result: TRPCClientError<TDef['errorShape']>) => MaybePromise<void>;
 }
 export declare function experimental_createActionHook<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): <TDef extends ActionHandlerDef>(handler: TRPCActionHandler<TDef>, useActionOpts?: UseTRPCActionOptions<Simplify<TDef>> | undefined) => UseTRPCActionResult<TDef>;

package/dist/app-dir/create-action-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-action-hook.d.ts","sourceRoot":"","sources":["../../src/app-dir/create-action-hook.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAEvB,eAAe,EACf,QAAQ,EAET,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACT,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAc,MAAM,UAAU,CAAC;AAExD,KAAK,YAAY,CAAC,IAAI,SAAS,gBAAgB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,GACzE,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,GACnD,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE/D,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB;IAC7D,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;CACvE;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,UAAU,wBAAwB,CAAC,IAAI,SAAS,gBAAgB,CAC9D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB,CAC7D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAGD,MAAM,MAAM,mBAAmB,CAAC,IAAI,SAAS,gBAAgB,IACzD,0BAA0B,CAAC,IAAI,CAAC,GAChC,wBAAwB,CAAC,IAAI,CAAC,GAC9B,uBAAuB,CAAC,IAAI,CAAC,GAC7B,0BAA0B,CAAC,IAAI,CAAC,CAAC;AAOrC,wBAAgB,6BAA6B,CAC3C,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA2BrB;AAGD;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/D,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC;AAEF,UAAU,oBAAoB,CAAC,IAAI,SAAS,gBAAgB;IAC1D,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAClE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC/E;AAGD,wBAAgB,6BAA6B,CAAC,OAAO,SAAS,SAAS,EACrE,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,oKA6FvC"}
+{"version":3,"file":"create-action-hook.d.ts","sourceRoot":"","sources":["../../src/app-dir/create-action-hook.tsx"],"names":[],"mappings":"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"}

package/dist/app-dir/links/nextCache.d.ts

@@ -0,0 +1,11 @@
+import { TRPCLink } from '@trpc/client';
+import { AnyRouter, inferRouterContext } from '@trpc/server';
+type NextCacheLinkOptions<TRouter extends AnyRouter> = {
+    router: TRouter;
+    createContext: () => Promise<inferRouterContext<TRouter>>;
+    /** how many seconds the cache should hold before revalidating */
+    revalidate?: number | false;
+};
+export declare function experimental_nextCacheLink<TRouter extends AnyRouter>(opts: NextCacheLinkOptions<TRouter>): TRPCLink<TRouter>;
+export {};
+//# sourceMappingURL=nextCache.d.ts.map

package/dist/app-dir/links/nextCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nextCache.d.ts","sourceRoot":"","sources":["../../../src/app-dir/links/nextCache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,QAAQ,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAiB,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAK5E,KAAK,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IACrD,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B,CAAC;AAGF,wBAAgB,0BAA0B,CAAC,OAAO,SAAS,SAAS,EAClE,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CAqDnB"}

package/dist/app-dir/links/nextCache.js

@@ -0,0 +1,59 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var client = require('@trpc/client');
+var server = require('@trpc/server');
+var observable = require('@trpc/server/observable');
+var cache = require('next/cache');
+var shared = require('../../shared-e49b9cdc.js');
+require('@trpc/server/shared');
+
+// import "server-only";
+// ts-prune-ignore-next
+function experimental_nextCacheLink(opts) {
+    return (runtime)=>({ op  })=>observable.observable((observer)=>{
+                const { path , input , type , context  } = op;
+                const cacheTag = shared.generateCacheTag(path, input);
+                // Let per-request revalidate override global revalidate
+                const requestRevalidate = typeof context.revalidate === 'number' || context.revalidate === false ? context.revalidate : undefined;
+                const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+                const promise = opts.createContext().then(async (ctx)=>{
+                    const callProc = async ()=>{
+                        const procedureResult = await server.callProcedure({
+                            procedures: opts.router._def.procedures,
+                            path,
+                            rawInput: input,
+                            ctx: ctx,
+                            type
+                        });
+                        // We need to serialize cause the cache only accepts JSON
+                        return runtime.transformer.serialize(procedureResult);
+                    };
+                    if (type === 'query') {
+                        return cache.unstable_cache(callProc, path.split('.'), {
+                            revalidate,
+                            tags: [
+                                cacheTag
+                            ]
+                        })();
+                    }
+                    return callProc();
+                }).catch((cause)=>{
+                    observer.error(client.TRPCClientError.from(cause));
+                });
+                promise.then((data)=>{
+                    const transformedResult = runtime.transformer.deserialize(data);
+                    observer.next({
+                        result: {
+                            data: transformedResult
+                        }
+                    });
+                    observer.complete();
+                }).catch((cause)=>{
+                    observer.error(client.TRPCClientError.from(cause));
+                });
+            });
+}
+
+exports.experimental_nextCacheLink = experimental_nextCacheLink;

package/dist/app-dir/links/nextCache.mjs

@@ -0,0 +1,55 @@
+import { TRPCClientError } from '@trpc/client';
+import { callProcedure } from '@trpc/server';
+import { observable } from '@trpc/server/observable';
+import { unstable_cache } from 'next/cache';
+import { g as generateCacheTag } from '../../shared-f6996341.mjs';
+import '@trpc/server/shared';
+
+// import "server-only";
+// ts-prune-ignore-next
+function experimental_nextCacheLink(opts) {
+    return (runtime)=>({ op  })=>observable((observer)=>{
+                const { path , input , type , context  } = op;
+                const cacheTag = generateCacheTag(path, input);
+                // Let per-request revalidate override global revalidate
+                const requestRevalidate = typeof context.revalidate === 'number' || context.revalidate === false ? context.revalidate : undefined;
+                const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+                const promise = opts.createContext().then(async (ctx)=>{
+                    const callProc = async ()=>{
+                        const procedureResult = await callProcedure({
+                            procedures: opts.router._def.procedures,
+                            path,
+                            rawInput: input,
+                            ctx: ctx,
+                            type
+                        });
+                        // We need to serialize cause the cache only accepts JSON
+                        return runtime.transformer.serialize(procedureResult);
+                    };
+                    if (type === 'query') {
+                        return unstable_cache(callProc, path.split('.'), {
+                            revalidate,
+                            tags: [
+                                cacheTag
+                            ]
+                        })();
+                    }
+                    return callProc();
+                }).catch((cause)=>{
+                    observer.error(TRPCClientError.from(cause));
+                });
+                promise.then((data)=>{
+                    const transformedResult = runtime.transformer.deserialize(data);
+                    observer.next({
+                        result: {
+                            data: transformedResult
+                        }
+                    });
+                    observer.complete();
+                }).catch((cause)=>{
+                    observer.error(TRPCClientError.from(cause));
+                });
+            });
+}
+
+export { experimental_nextCacheLink };

package/dist/app-dir/links/nextHttp.d.ts

@@ -0,0 +1,9 @@
+import { HTTPBatchLinkOptions, HTTPLinkOptions, TRPCLink } from '@trpc/client';
+import { AnyRouter } from '@trpc/server';
+type NextFetchLinkOptions<TBatch extends boolean> = (TBatch extends true ? HTTPBatchLinkOptions : HTTPLinkOptions) & {
+    batch?: TBatch;
+    revalidate?: number | false;
+};
+export declare function experimental_nextHttpLink<TRouter extends AnyRouter, TBatch extends boolean>(opts: NextFetchLinkOptions<TBatch>): TRPCLink<TRouter>;
+export {};
+//# sourceMappingURL=nextHttp.d.ts.map

package/dist/app-dir/links/nextHttp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nextHttp.d.ts","sourceRoot":"","sources":["../../../src/app-dir/links/nextHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EAEpB,eAAe,EACf,QAAQ,EACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,KAAK,oBAAoB,CAAC,MAAM,SAAS,OAAO,IAAI,CAAC,MAAM,SAAS,IAAI,GACpE,oBAAoB,GACpB,eAAe,CAAC,GAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B,CAAC;AAGF,wBAAgB,yBAAyB,CACvC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,OAAO,EACtB,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAgCvD"}

package/dist/app-dir/links/nextHttp.js

@@ -0,0 +1,40 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var client = require('@trpc/client');
+var shared = require('../../shared-e49b9cdc.js');
+require('@trpc/server/shared');
+
+// ts-prune-ignore-next
+function experimental_nextHttpLink(opts) {
+    return (runtime)=>{
+        return (ctx)=>{
+            const { path , input , context  } = ctx.op;
+            const cacheTag = shared.generateCacheTag(path, input);
+            // Let per-request revalidate override global revalidate
+            const requestRevalidate = typeof context.revalidate === 'number' || context.revalidate === false ? context.revalidate : undefined;
+            const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+            const linkFactory = opts.batch ? client.httpBatchLink : client.httpLink;
+            const link = linkFactory({
+                headers: opts.headers,
+                url: opts.url,
+                fetch: (url, fetchOpts)=>{
+                    return fetch(url, {
+                        ...fetchOpts,
+                        // cache: 'no-cache',
+                        next: {
+                            revalidate,
+                            tags: [
+                                cacheTag
+                            ]
+                        }
+                    });
+                }
+            })(runtime);
+            return link(ctx);
+        };
+    };
+}
+
+exports.experimental_nextHttpLink = experimental_nextHttpLink;

package/dist/app-dir/links/nextHttp.mjs

@@ -0,0 +1,36 @@
+import { httpBatchLink, httpLink } from '@trpc/client';
+import { g as generateCacheTag } from '../../shared-f6996341.mjs';
+import '@trpc/server/shared';
+
+// ts-prune-ignore-next
+function experimental_nextHttpLink(opts) {
+    return (runtime)=>{
+        return (ctx)=>{
+            const { path , input , context  } = ctx.op;
+            const cacheTag = generateCacheTag(path, input);
+            // Let per-request revalidate override global revalidate
+            const requestRevalidate = typeof context.revalidate === 'number' || context.revalidate === false ? context.revalidate : undefined;
+            const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+            const linkFactory = opts.batch ? httpBatchLink : httpLink;
+            const link = linkFactory({
+                headers: opts.headers,
+                url: opts.url,
+                fetch: (url, fetchOpts)=>{
+                    return fetch(url, {
+                        ...fetchOpts,
+                        // cache: 'no-cache',
+                        next: {
+                            revalidate,
+                            tags: [
+                                cacheTag
+                            ]
+                        }
+                    });
+                }
+            })(runtime);
+            return link(ctx);
+        };
+    };
+}
+
+export { experimental_nextHttpLink };

package/dist/app-dir/server.d.ts

@@ -1,12 +1,12 @@
-import { CreateTRPCProxyClient } from '@trpc/client';
 import { AnyProcedure, AnyRootConfig, AnyRouter, MaybePromise, Simplify } from '@trpc/server';
 import { TRPCResponse } from '@trpc/server/rpc';
 import { ActionHandlerDef, CreateTRPCNextAppRouterOptions, inferActionDef } from './shared';
-export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): CreateTRPCProxyClient<TRouter>;
+import { NextAppDirDecoratedProcedureRecord } from './types';
+export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecoratedProcedureRecord<TRouter["_def"]["record"]>;
 /**
  * @internal
  */
-export type TRPCActionHandler<TDef extends ActionHandlerDef> = (input: TDef['input'] | FormData) => Promise<TRPCResponse<TDef['output'], TDef['errorShape']>>;
+export type TRPCActionHandler<TDef extends ActionHandlerDef> = (input: FormData | TDef['input']) => Promise<TRPCResponse<TDef['output'], TDef['errorShape']>>;
 export declare function experimental_createServerActionHandler<TInstance extends {
     _config: AnyRootConfig;
 }>(t: TInstance, opts: {
@@ -21,4 +21,5 @@ export declare function experimental_createServerActionHandler<TInstance extends
     output: TProc["_def"]["_output_out"];
     errorShape: TProc["_def"]["_config"]["$types"]["errorShape"];
 }>;
+export declare function experimental_revalidateEndpoint(req: Request): Promise<Response>;
 //# sourceMappingURL=server.d.ts.map

package/dist/app-dir/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EAIT,YAAY,EACZ,QAAQ,EAET,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAQhD,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAC9B,cAAc,EAEf,MAAM,UAAU,CAAC;AAGlB,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,kCAkB9C;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,gBAAgB,IAAI,CAC7D,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,KAC5B,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAgB,sCAAsC,CACpD,SAAS,SAAS;IAChB,OAAO,EAAE,aAAa,CAAC;CACxB,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;;;;GAgEF"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EAIT,YAAY,EACZ,QAAQ,EAET,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAShD,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAE9B,cAAc,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kCAAkC,EAAE,MAAM,SAAS,CAAC;AAG7D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,iEAwB9C;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,gBAAgB,IAAI,CAC7D,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAC5B,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAgB,sCAAsC,CACpD,SAAS,SAAS;IAChB,OAAO,EAAE,aAAa,CAAC;CACxB,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;;;;GAgEF;AAGD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,qBAiBjE"}

package/dist/app-dir/server.js

@@ -5,8 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var client = require('@trpc/client');
 var server = require('@trpc/server');
 var shared = require('@trpc/server/shared');
+var cache = require('next/cache');
 var React = require('react');
-var shared$1 = require('../shared-2ca37369.js');
+var shared$1 = require('../shared-e49b9cdc.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ function set(obj, path, value) {
     if (typeof path === 'string') {
@@ -52,9 +53,16 @@ function experimental_createTRPCNextAppDirServer(opts) {
         const pathCopy = [
             ...callOpts.path
         ];
-        const procedureType = client.clientCallTypeToProcedureType(pathCopy.pop());
-        const fullPath = pathCopy.join('.');
-        return client$1[procedureType](fullPath, ...callOpts.args);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const action = pathCopy.pop();
+        const procedurePath = pathCopy.join('.');
+        const procedureType = client.clientCallTypeToProcedureType(action);
+        const cacheTag = shared$1.generateCacheTag(procedurePath, callOpts.args[0]);
+        if (action === 'revalidate') {
+            cache.revalidateTag(cacheTag);
+            return;
+        }
+        return client$1[procedureType](procedurePath, ...callOpts.args);
     });
 }
 function experimental_createServerActionHandler(t, opts) {
@@ -111,6 +119,26 @@ function experimental_createServerActionHandler(t, opts) {
         };
     };
 }
+// ts-prune-ignore-next
+async function experimental_revalidateEndpoint(req) {
+    const { cacheTag  } = await req.json();
+    if (typeof cacheTag !== 'string') {
+        return new Response(JSON.stringify({
+            revalidated: false,
+            error: 'cacheTag must be a string'
+        }), {
+            status: 400
+        });
+    }
+    cache.revalidateTag(cacheTag);
+    return new Response(JSON.stringify({
+        revalidated: true,
+        now: Date.now()
+    }), {
+        status: 200
+    });
+}
 
 exports.experimental_createServerActionHandler = experimental_createServerActionHandler;
 exports.experimental_createTRPCNextAppDirServer = experimental_createTRPCNextAppDirServer;
+exports.experimental_revalidateEndpoint = experimental_revalidateEndpoint;

package/dist/app-dir/server.mjs

@@ -1,8 +1,9 @@
 import { createTRPCUntypedClient, clientCallTypeToProcedureType } from '@trpc/client';
 import { TRPCError, getTRPCErrorFromUnknown } from '@trpc/server';
 import { createRecursiveProxy, transformTRPCResponse, getErrorShape } from '@trpc/server/shared';
+import { revalidateTag } from 'next/cache';
 import { cache } from 'react';
-import { i as isFormData } from '../shared-59b269d5.mjs';
+import { g as generateCacheTag, i as isFormData } from '../shared-f6996341.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ function set(obj, path, value) {
     if (typeof path === 'string') {
@@ -48,9 +49,16 @@ function experimental_createTRPCNextAppDirServer(opts) {
         const pathCopy = [
             ...callOpts.path
         ];
-        const procedureType = clientCallTypeToProcedureType(pathCopy.pop());
-        const fullPath = pathCopy.join('.');
-        return client[procedureType](fullPath, ...callOpts.args);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const action = pathCopy.pop();
+        const procedurePath = pathCopy.join('.');
+        const procedureType = clientCallTypeToProcedureType(action);
+        const cacheTag = generateCacheTag(procedurePath, callOpts.args[0]);
+        if (action === 'revalidate') {
+            revalidateTag(cacheTag);
+            return;
+        }
+        return client[procedureType](procedurePath, ...callOpts.args);
     });
 }
 function experimental_createServerActionHandler(t, opts) {
@@ -107,5 +115,24 @@ function experimental_createServerActionHandler(t, opts) {
         };
     };
 }
+// ts-prune-ignore-next
+async function experimental_revalidateEndpoint(req) {
+    const { cacheTag  } = await req.json();
+    if (typeof cacheTag !== 'string') {
+        return new Response(JSON.stringify({
+            revalidated: false,
+            error: 'cacheTag must be a string'
+        }), {
+            status: 400
+        });
+    }
+    revalidateTag(cacheTag);
+    return new Response(JSON.stringify({
+        revalidated: true,
+        now: Date.now()
+    }), {
+        status: 200
+    });
+}
 
-export { experimental_createServerActionHandler, experimental_createTRPCNextAppDirServer };
+export { experimental_createServerActionHandler, experimental_createTRPCNextAppDirServer, experimental_revalidateEndpoint };

package/dist/app-dir/shared.d.ts

@@ -4,7 +4,7 @@ import { AnyProcedure, AnyQueryProcedure, AnyRouter, Filter, inferHandlerInput,
  * @internal
  */
 export type UseProcedureRecord<TRouter extends AnyRouter> = {
-    [TKey in keyof Filter<TRouter['_def']['record'], AnyRouter | AnyQueryProcedure>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['record'][TKey]>;
+    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['record'][TKey]>;
 };
 export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter>;
 type NextAppRouterUse<TRouter extends AnyRouter> = {
@@ -26,6 +26,7 @@ export interface CreateTRPCNextAppRouterOptions<TRouter extends AnyRouter> {
 /**
  * @internal
  */
+export declare function generateCacheTag(procedurePath: string, input: any): string;
 export declare function isFormData(value: unknown): value is FormData;
 /**
  * @internal

package/dist/app-dir/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACR,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI;KACzD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,SAAS,GAAG,iBAAiB,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,SAAS,SAAS,EACtD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,+BAOnC;AAED,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI;IACjD,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,EAC/B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GACjD;SACA,IAAI,IAAI,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IACF,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,KAAK,GAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB,CAAC;AACF,KAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChC,CAAC;AACF,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,qBAAqB,CACnB,2BAA2B,CAAC,OAAO,CAAC,EACpC,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,SAAS;IACvE,MAAM,EAAE,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAM5D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,YAAY,IAAI;IACvD,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACR,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI;KACzD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,iBAAiB,GAAG,SAAS,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,SAAS,SAAS,EACtD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,+BAOnC;AAED,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI;IACjD,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,EAC/B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GACjD;SACA,IAAI,IAAI,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IACF,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,KAAK,GAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB,CAAC;AACF,KAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChC,CAAC;AACF,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,qBAAqB,CACnB,2BAA2B,CAAC,OAAO,CAAC,EACpC,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,SAAS;IACvE,MAAM,EAAE,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,UAIjE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAM5D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,YAAY,IAAI;IACvD,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC"}

package/dist/app-dir/types.d.ts

@@ -0,0 +1,19 @@
+import { Resolver } from '@trpc/client';
+import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRouter, AnySubscriptionProcedure, ProcedureRouterRecord } from '@trpc/server';
+export type DecorateProcedureServer<TProcedure extends AnyProcedure> = TProcedure extends AnyQueryProcedure ? {
+    query: Resolver<TProcedure>;
+    revalidate: (input?: unknown) => Promise<{
+        revalidated: false;
+        error: string;
+    } | {
+        revalidated: true;
+    }>;
+} : TProcedure extends AnyMutationProcedure ? {
+    mutate: Resolver<TProcedure>;
+} : TProcedure extends AnySubscriptionProcedure ? {
+    subscribe: Resolver<TProcedure>;
+} : never;
+export type NextAppDirDecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
+    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? NextAppDirDecoratedProcedureRecord<TProcedures[TKey]['_def']['record']> : TProcedures[TKey] extends AnyProcedure ? DecorateProcedureServer<TProcedures[TKey]> : never;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/app-dir/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/app-dir/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACtB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,uBAAuB,CAAC,UAAU,SAAS,YAAY,IACjE,UAAU,SAAS,iBAAiB,GAChC;IACE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5B,UAAU,EAAE,CACV,KAAK,CAAC,EAAE,OAAO,KACZ,OAAO,CACV;QAAE,WAAW,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,IAAI,CAAA;KAAE,CAC9D,CAAC;CACH,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC9B,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CACjC,GACD,KAAK,CAAC;AAEZ,MAAM,MAAM,kCAAkC,CAC5C,WAAW,SAAS,qBAAqB,IACvC;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,kCAAkC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GACvE,WAAW,CAAC,IAAI,CAAC,SAAS,YAAY,GACtC,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAC1C,KAAK;CACV,CAAC"}

package/dist/index.js

@@ -67,7 +67,7 @@ function withTRPC(opts) {
                 state: hydratedState
             }, /*#__PURE__*/ React__default["default"].createElement(AppOrPage, Object.assign({}, props)))));
         };
-        if (AppOrPage.getInitialProps || opts.ssr) {
+        if (AppOrPage.getInitialProps ?? opts.ssr) {
             WithTRPC.getInitialProps = async (appOrPageCtx)=>{
                 const AppTree = appOrPageCtx.AppTree;
                 // Determine if we are wrapping an App component or a Page component.
@@ -146,8 +146,8 @@ function withTRPC(opts) {
                     ].map((v)=>v.state.error).flatMap((err)=>err instanceof Error && err.name === 'TRPCClientError' ? [
                             err
                         ] : [])
-                }) || {};
-                for (const [key, value] of Object.entries(meta.headers || {})){
+                }) ?? {};
+                for (const [key, value] of Object.entries(meta.headers ?? {})){
                     if (typeof value === 'string') {
                         ctx.res?.setHeader(key, value);
                     }
@@ -158,7 +158,7 @@ function withTRPC(opts) {
                 return appTreeProps;
             };
         }
-        const displayName = AppOrPage.displayName || AppOrPage.name || 'Component';
+        const displayName = AppOrPage.displayName ?? AppOrPage.name ?? 'Component';
         WithTRPC.displayName = `withTRPC(${displayName})`;
         return WithTRPC;
     };

package/dist/index.mjs

@@ -58,7 +58,7 @@ function withTRPC(opts) {
                 state: hydratedState
             }, /*#__PURE__*/ React.createElement(AppOrPage, Object.assign({}, props)))));
         };
-        if (AppOrPage.getInitialProps || opts.ssr) {
+        if (AppOrPage.getInitialProps ?? opts.ssr) {
             WithTRPC.getInitialProps = async (appOrPageCtx)=>{
                 const AppTree = appOrPageCtx.AppTree;
                 // Determine if we are wrapping an App component or a Page component.
@@ -137,8 +137,8 @@ function withTRPC(opts) {
                     ].map((v)=>v.state.error).flatMap((err)=>err instanceof Error && err.name === 'TRPCClientError' ? [
                             err
                         ] : [])
-                }) || {};
-                for (const [key, value] of Object.entries(meta.headers || {})){
+                }) ?? {};
+                for (const [key, value] of Object.entries(meta.headers ?? {})){
                     if (typeof value === 'string') {
                         ctx.res?.setHeader(key, value);
                     }
@@ -149,7 +149,7 @@ function withTRPC(opts) {
                 return appTreeProps;
             };
         }
-        const displayName = AppOrPage.displayName || AppOrPage.name || 'Component';
+        const displayName = AppOrPage.displayName ?? AppOrPage.name ?? 'Component';
         WithTRPC.displayName = `withTRPC(${displayName})`;
         return WithTRPC;
     };

package/dist/shared-642894f4.js

@@ -0,0 +1,19 @@
+import '@trpc/server/shared';
+
+/**
+ * @internal
+ */
+function generateCacheTag(procedurePath, input) {
+    return input
+        ? `${procedurePath}?input=${JSON.stringify(input)}`
+        : procedurePath;
+}
+function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
+
+export { generateCacheTag as g, isFormData as i };

package/dist/{shared-2ca37369.js → shared-e49b9cdc.js}

@@ -4,7 +4,10 @@ require('@trpc/server/shared');
 
 /**
  * @internal
- */ function isFormData(value) {
+ */ function generateCacheTag(procedurePath, input) {
+    return input ? `${procedurePath}?input=${JSON.stringify(input)}` : procedurePath;
+}
+function isFormData(value) {
     if (typeof FormData === 'undefined') {
         // FormData is not supported
         return false;
@@ -12,4 +15,5 @@ require('@trpc/server/shared');
     return value instanceof FormData;
 }
 
+exports.generateCacheTag = generateCacheTag;
 exports.isFormData = isFormData;

package/dist/{shared-7b422d72.js → shared-f6996341.mjs}

@@ -2,7 +2,9 @@ import '@trpc/server/shared';
 
 /**
  * @internal
- */
+ */ function generateCacheTag(procedurePath, input) {
+    return input ? `${procedurePath}?input=${JSON.stringify(input)}` : procedurePath;
+}
 function isFormData(value) {
     if (typeof FormData === 'undefined') {
         // FormData is not supported
@@ -11,4 +13,4 @@ function isFormData(value) {
     return value instanceof FormData;
 }
 
-export { isFormData as i };
+export { generateCacheTag as g, isFormData as i };

package/dist/withTRPC.d.ts

@@ -4,9 +4,9 @@ import { CreateTRPCReactOptions, CreateTRPCReactQueryClientConfig } from '@trpc/
 import type { AnyRouter } from '@trpc/server';
 import type { ResponseMeta } from '@trpc/server/http';
 import { NextComponentType, NextPageContext } from 'next/dist/shared/lib/utils';
-export type WithTRPCConfig<TRouter extends AnyRouter> = CreateTRPCClientOptions<TRouter> & {
+export type WithTRPCConfig<TRouter extends AnyRouter> = CreateTRPCClientOptions<TRouter> & CreateTRPCReactQueryClientConfig & {
     abortOnUnmount?: boolean;
-} & CreateTRPCReactQueryClientConfig;
+};
 interface WithTRPCOptions<TRouter extends AnyRouter> extends CreateTRPCReactOptions<TRouter> {
     config: (info: {
         ctx?: NextPageContext;

package/dist/withTRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAIL,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,gCAAgC,EAEjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,gCAAgC,CAAC;AAEvC,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS,CACjD,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACvC,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA+KxE"}
+{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAIL,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,gCAAgC,EAEjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAC9B,gCAAgC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS,CACjD,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACvC,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA+KxE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.32.0",
+  "version": "10.33.1",
   "description": "The tRPC Next.js library",
   "author": "KATT",
   "license": "MIT",
@@ -44,6 +44,16 @@
       "import": "./dist/app-dir/client.mjs",
       "require": "./dist/app-dir/client.js",
       "default": "./dist/app-dir/client.js"
+    },
+    "./app-dir/links/nextCache": {
+      "import": "./dist/app-dir/links/nextCache.mjs",
+      "require": "./dist/app-dir/links/nextCache.js",
+      "default": "./dist/app-dir/links/nextCache.js"
+    },
+    "./app-dir/links/nextHttp": {
+      "import": "./dist/app-dir/links/nextHttp.mjs",
+      "require": "./dist/app-dir/links/nextHttp.js",
+      "default": "./dist/app-dir/links/nextHttp.js"
     }
   },
   "files": [
@@ -56,9 +66,9 @@
   ],
   "peerDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.32.0",
-    "@trpc/react-query": "10.32.0",
-    "@trpc/server": "10.32.0",
+    "@trpc/client": "10.33.1",
+    "@trpc/react-query": "10.33.1",
+    "@trpc/server": "10.33.1",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
@@ -68,16 +78,16 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.32.0",
-    "@trpc/react-query": "10.32.0",
-    "@trpc/server": "10.32.0",
+    "@trpc/client": "10.33.1",
+    "@trpc/react-query": "10.33.1",
+    "@trpc/server": "10.33.1",
     "@types/express": "^4.17.17",
     "@types/node": "^18.16.16",
     "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.4",
     "eslint": "^8.40.0",
     "express": "^4.17.1",
-    "next": "^13.4.3",
+    "next": "^13.4.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "^2.79.1",
@@ -90,5 +100,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "f8cf27c773b97dedb5eb95ca548cee7acb55c92a"
+  "gitHead": "403be02df05c29a9c3a77256805674baf6b6b125"
 }

package/src/app-dir/client.ts

@@ -18,15 +18,6 @@ export {
   type inferActionResultProps,
 } from './create-action-hook';
 
-// function normalizePromiseArray<TValue>(
-//   promise: Promise<TValue> | Promise<TValue>[],
-// ) {
-//   if (Array.isArray(promise)) {
-//     return Promise.all(promise);
-//   }
-//   return promise;
-// }
-
 type QueryResult = {
   data?: unknown;
   error?: unknown;
@@ -41,33 +32,11 @@ export function experimental_createTRPCNextAppDirClient<
   // const useProxy = createUseProxy<TRouter>(client);
 
   const cache = new Map<string, QueryResult>();
-  // return createFlatProxy<CreateTRPCNextAppRouter<TRouter>>((key) => {
-  // if (key === 'use') {
-  //   return (
-  //     cb: (
-  //       t: UseProcedureRecord<TRouter>,
-  //     ) => Promise<unknown> | Promise<unknown>[],
-  //   ) => {
-  //     const promise = normalizePromiseArray(cb(useProxy));
-  //     throw promise;
-  //     // const [data, setData] = useState<unknown | unknown[]>();
-
-  //     // useEffect(() => {
-  //     //   const promise = normalizePromiseArray(cb(useProxy));
-
-  //     //   void promise.then(setData).catch((err) => {
-  //     //     throw err;
-  //     //   });
-  //     //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  //     // }, []);
-
-  //     // return data;
-  //   };
-  // }
 
   return createRecursiveProxy(({ path, args }) => {
     // const pathCopy = [key, ...path];
     const pathCopy = [...path];
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
 
     if (procedureType === 'query') {

package/src/app-dir/create-action-hook.tsx

@@ -21,7 +21,7 @@ import { ActionHandlerDef, isFormData } from './shared';
 
 type MutationArgs<TDef extends ActionHandlerDef> = TDef['input'] extends void
   ? [input?: undefined | void, opts?: ProcedureOptions]
-  : [input: TDef['input'] | FormData, opts?: ProcedureOptions];
+  : [input: FormData | TDef['input'], opts?: ProcedureOptions];
 
 interface UseTRPCActionBaseResult<TDef extends ActionHandlerDef> {
   mutate: (...args: MutationArgs<TDef>) => void;
@@ -58,10 +58,10 @@ interface UseTRPCActionLoadingResult<TDef extends ActionHandlerDef>
 
 // ts-prune-ignore-next
 export type UseTRPCActionResult<TDef extends ActionHandlerDef> =
-  | UseTRPCActionSuccessResult<TDef>
   | UseTRPCActionErrorResult<TDef>
   | UseTRPCActionIdleResult<TDef>
-  | UseTRPCActionLoadingResult<TDef>;
+  | UseTRPCActionLoadingResult<TDef>
+  | UseTRPCActionSuccessResult<TDef>;
 
 type ActionContext = {
   _action: (...args: any[]) => Promise<any>;
@@ -95,7 +95,9 @@ export function experimental_serverActionLink<
             });
             observer.complete();
           })
-          .catch((cause) => observer.error(TRPCClientError.from(cause)));
+          .catch((cause) => {
+            observer.error(TRPCClientError.from(cause));
+          });
       });
 }
 
@@ -110,7 +112,7 @@ export type inferActionResultProps<TProc extends AnyProcedure> = {
 };
 
 interface UseTRPCActionOptions<TDef extends ActionHandlerDef> {
-  onSuccess?: (result: TDef['output']) => void | MaybePromise<void>;
+  onSuccess?: (result: TDef['output']) => MaybePromise<void> | void;
   onError?: (result: TRPCClientError<TDef['errorShape']>) => MaybePromise<void>;
 }
 

package/src/app-dir/formDataToObject.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function set(
   obj: Record<string, any>,
-  path: string | string[],
+  path: string[] | string,
   value: unknown,
 ): void {
   if (typeof path === 'string') {

package/src/app-dir/links/nextCache.ts

@@ -0,0 +1,72 @@
+// import "server-only";
+
+import { TRPCClientError, TRPCLink } from '@trpc/client';
+import { AnyRouter, callProcedure, inferRouterContext } from '@trpc/server';
+import { observable } from '@trpc/server/observable';
+import { unstable_cache } from 'next/cache';
+import { generateCacheTag } from '../shared';
+
+type NextCacheLinkOptions<TRouter extends AnyRouter> = {
+  router: TRouter;
+  createContext: () => Promise<inferRouterContext<TRouter>>;
+  /** how many seconds the cache should hold before revalidating */
+  revalidate?: number | false;
+};
+
+// ts-prune-ignore-next
+export function experimental_nextCacheLink<TRouter extends AnyRouter>(
+  opts: NextCacheLinkOptions<TRouter>,
+): TRPCLink<TRouter> {
+  return (runtime) =>
+    ({ op }) =>
+      observable((observer) => {
+        const { path, input, type, context } = op;
+
+        const cacheTag = generateCacheTag(path, input);
+        // Let per-request revalidate override global revalidate
+        const requestRevalidate =
+          typeof context.revalidate === 'number' || context.revalidate === false
+            ? context.revalidate
+            : undefined;
+        const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+
+        const promise = opts
+          .createContext()
+          .then(async (ctx) => {
+            const callProc = async () => {
+              const procedureResult = await callProcedure({
+                procedures: opts.router._def.procedures,
+                path,
+                rawInput: input,
+                ctx: ctx,
+                type,
+              });
+
+              // We need to serialize cause the cache only accepts JSON
+              return runtime.transformer.serialize(procedureResult);
+            };
+
+            if (type === 'query') {
+              return unstable_cache(callProc, path.split('.'), {
+                revalidate,
+                tags: [cacheTag],
+              })();
+            }
+
+            return callProc();
+          })
+          .catch((cause) => {
+            observer.error(TRPCClientError.from(cause));
+          });
+
+        promise
+          .then((data) => {
+            const transformedResult = runtime.transformer.deserialize(data);
+            observer.next({ result: { data: transformedResult } });
+            observer.complete();
+          })
+          .catch((cause) => {
+            observer.error(TRPCClientError.from(cause));
+          });
+      });
+}

package/src/app-dir/links/nextHttp.ts

@@ -0,0 +1,54 @@
+import {
+  httpBatchLink,
+  HTTPBatchLinkOptions,
+  httpLink,
+  HTTPLinkOptions,
+  TRPCLink,
+} from '@trpc/client';
+import { AnyRouter } from '@trpc/server';
+import { generateCacheTag } from '../shared';
+
+type NextFetchLinkOptions<TBatch extends boolean> = (TBatch extends true
+  ? HTTPBatchLinkOptions
+  : HTTPLinkOptions) & {
+  batch?: TBatch;
+  revalidate?: number | false;
+};
+
+// ts-prune-ignore-next
+export function experimental_nextHttpLink<
+  TRouter extends AnyRouter,
+  TBatch extends boolean,
+>(opts: NextFetchLinkOptions<TBatch>): TRPCLink<TRouter> {
+  return (runtime) => {
+    return (ctx) => {
+      const { path, input, context } = ctx.op;
+      const cacheTag = generateCacheTag(path, input);
+
+      // Let per-request revalidate override global revalidate
+      const requestRevalidate =
+        typeof context.revalidate === 'number' || context.revalidate === false
+          ? context.revalidate
+          : undefined;
+      const revalidate = requestRevalidate ?? opts.revalidate ?? false;
+
+      const linkFactory = opts.batch ? httpBatchLink : httpLink;
+      const link = linkFactory({
+        headers: opts.headers as any,
+        url: opts.url,
+        fetch: (url, fetchOpts) => {
+          return fetch(url, {
+            ...fetchOpts,
+            // cache: 'no-cache',
+            next: {
+              revalidate,
+              tags: [cacheTag],
+            },
+          });
+        },
+      })(runtime);
+
+      return link(ctx);
+    };
+  };
+}

package/src/app-dir/server.ts

@@ -1,7 +1,6 @@
 /// <reference types="next" />
 import {
   clientCallTypeToProcedureType,
-  CreateTRPCProxyClient,
   createTRPCUntypedClient,
 } from '@trpc/client';
 import {
@@ -21,14 +20,17 @@ import {
   getErrorShape,
   transformTRPCResponse,
 } from '@trpc/server/shared';
+import { revalidateTag } from 'next/cache';
 import { cache } from 'react';
 import { formDataToObject } from './formDataToObject';
 import {
   ActionHandlerDef,
   CreateTRPCNextAppRouterOptions,
+  generateCacheTag,
   inferActionDef,
   isFormData,
 } from './shared';
+import { NextAppDirDecoratedProcedureRecord } from './types';
 
 // ts-prune-ignore-next
 export function experimental_createTRPCNextAppDirServer<
@@ -44,20 +46,26 @@ export function experimental_createTRPCNextAppDirServer<
     const client = getClient();
 
     const pathCopy = [...callOpts.path];
-    const procedureType = clientCallTypeToProcedureType(
-      pathCopy.pop() as string,
-    );
-    const fullPath = pathCopy.join('.');
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const action = pathCopy.pop()!;
+    const procedurePath = pathCopy.join('.');
+    const procedureType = clientCallTypeToProcedureType(action);
+    const cacheTag = generateCacheTag(procedurePath, callOpts.args[0]);
+
+    if (action === 'revalidate') {
+      revalidateTag(cacheTag);
+      return;
+    }
 
-    return (client[procedureType] as any)(fullPath, ...callOpts.args);
-  }) as CreateTRPCProxyClient<TRouter>;
+    return (client[procedureType] as any)(procedurePath, ...callOpts.args);
+  }) as NextAppDirDecoratedProcedureRecord<TRouter['_def']['record']>;
 }
 
 /**
  * @internal
  */
 export type TRPCActionHandler<TDef extends ActionHandlerDef> = (
-  input: TDef['input'] | FormData,
+  input: FormData | TDef['input'],
 ) => Promise<TRPCResponse<TDef['output'], TDef['errorShape']>>;
 
 export function experimental_createServerActionHandler<
@@ -85,9 +93,9 @@ export function experimental_createServerActionHandler<
     proc: TProc,
   ): TRPCActionHandler<Simplify<inferActionDef<TProc>>> {
     return async function actionHandler(
-      rawInput: inferProcedureInput<TProc> | FormData,
+      rawInput: FormData | inferProcedureInput<TProc>,
     ) {
-      const ctx: undefined | TInstance['_config']['$types']['ctx'] = undefined;
+      const ctx: TInstance['_config']['$types']['ctx'] | undefined = undefined;
       try {
         const ctx = await createContext();
         if (normalizeFormData && isFormData(rawInput)) {
@@ -138,3 +146,23 @@ export function experimental_createServerActionHandler<
     } as TRPCActionHandler<inferActionDef<TProc>>;
   };
 }
+
+// ts-prune-ignore-next
+export async function experimental_revalidateEndpoint(req: Request) {
+  const { cacheTag } = await req.json();
+
+  if (typeof cacheTag !== 'string') {
+    return new Response(
+      JSON.stringify({
+        revalidated: false,
+        error: 'cacheTag must be a string',
+      }),
+      { status: 400 },
+    );
+  }
+
+  revalidateTag(cacheTag);
+  return new Response(JSON.stringify({ revalidated: true, now: Date.now() }), {
+    status: 200,
+  });
+}

package/src/app-dir/shared.ts

@@ -20,7 +20,7 @@ import { createRecursiveProxy } from '@trpc/server/shared';
 export type UseProcedureRecord<TRouter extends AnyRouter> = {
   [TKey in keyof Filter<
     TRouter['_def']['record'],
-    AnyRouter | AnyQueryProcedure
+    AnyQueryProcedure | AnyRouter
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? UseProcedureRecord<TRouter['_def']['record'][TKey]>
     : Resolver<TRouter['_def']['record'][TKey]>;
@@ -65,6 +65,12 @@ export interface CreateTRPCNextAppRouterOptions<TRouter extends AnyRouter> {
 /**
  * @internal
  */
+export function generateCacheTag(procedurePath: string, input: any) {
+  return input
+    ? `${procedurePath}?input=${JSON.stringify(input)}`
+    : procedurePath;
+}
+
 export function isFormData(value: unknown): value is FormData {
   if (typeof FormData === 'undefined') {
     // FormData is not supported

package/src/app-dir/types.ts

@@ -0,0 +1,39 @@
+import { Resolver } from '@trpc/client';
+import {
+  AnyMutationProcedure,
+  AnyProcedure,
+  AnyQueryProcedure,
+  AnyRouter,
+  AnySubscriptionProcedure,
+  ProcedureRouterRecord,
+} from '@trpc/server';
+
+export type DecorateProcedureServer<TProcedure extends AnyProcedure> =
+  TProcedure extends AnyQueryProcedure
+    ? {
+        query: Resolver<TProcedure>;
+        revalidate: (
+          input?: unknown,
+        ) => Promise<
+          { revalidated: false; error: string } | { revalidated: true }
+        >;
+      }
+    : TProcedure extends AnyMutationProcedure
+    ? {
+        mutate: Resolver<TProcedure>;
+      }
+    : TProcedure extends AnySubscriptionProcedure
+    ? {
+        subscribe: Resolver<TProcedure>;
+      }
+    : never;
+
+export type NextAppDirDecoratedProcedureRecord<
+  TProcedures extends ProcedureRouterRecord,
+> = {
+  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
+    ? NextAppDirDecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
+    : TProcedures[TKey] extends AnyProcedure
+    ? DecorateProcedureServer<TProcedures[TKey]>
+    : never;
+};

package/src/withTRPC.tsx

@@ -36,8 +36,8 @@ import ssrPrepass from 'react-ssr-prepass';
 
 function transformQueryOrMutationCacheErrors<
   TState extends
-    | DehydratedState['queries'][0]
-    | DehydratedState['mutations'][0],
+    | DehydratedState['mutations'][0]
+    | DehydratedState['queries'][0],
 >(result: TState): TState {
   const error = result.state.error as Maybe<TRPCClientError<any>>;
   if (error instanceof Error && error.name === 'TRPCClientError') {
@@ -57,9 +57,10 @@ function transformQueryOrMutationCacheErrors<
   return result;
 }
 export type WithTRPCConfig<TRouter extends AnyRouter> =
-  CreateTRPCClientOptions<TRouter> & {
-    abortOnUnmount?: boolean;
-  } & CreateTRPCReactQueryClientConfig;
+  CreateTRPCClientOptions<TRouter> &
+    CreateTRPCReactQueryClientConfig & {
+      abortOnUnmount?: boolean;
+    };
 
 interface WithTRPCOptions<TRouter extends AnyRouter>
   extends CreateTRPCReactOptions<TRouter> {
@@ -142,7 +143,7 @@ export function withTRPC<
       );
     };
 
-    if (AppOrPage.getInitialProps || opts.ssr) {
+    if (AppOrPage.getInitialProps ?? opts.ssr) {
       WithTRPC.getInitialProps = async (appOrPageCtx: AppContextType) => {
         const AppTree = appOrPageCtx.AppTree;
 
@@ -248,9 +249,9 @@ export function withTRPC<
                   ? [err as TRPCClientError<TRouter>]
                   : [],
               ),
-          }) || {};
+          }) ?? {};
 
-        for (const [key, value] of Object.entries(meta.headers || {})) {
+        for (const [key, value] of Object.entries(meta.headers ?? {})) {
           if (typeof value === 'string') {
             ctx.res?.setHeader(key, value);
           }
@@ -262,7 +263,7 @@ export function withTRPC<
       };
     }
 
-    const displayName = AppOrPage.displayName || AppOrPage.name || 'Component';
+    const displayName = AppOrPage.displayName ?? AppOrPage.name ?? 'Component';
     WithTRPC.displayName = `withTRPC(${displayName})`;
 
     return WithTRPC as any;

package/dist/shared-59b269d5.mjs

@@ -1,13 +0,0 @@
-import '@trpc/server/shared';
-
-/**
- * @internal
- */ function isFormData(value) {
-    if (typeof FormData === 'undefined') {
-        // FormData is not supported
-        return false;
-    }
-    return value instanceof FormData;
-}
-
-export { isFormData as i };