@trpc/next 11.0.0-next.91 → 11.0.0-rc.329

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

@@ -1,29 +1,28 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var client = require('@trpc/client');
-var server = require('@trpc/server');
+var unstableInternals = require('@trpc/client/unstable-internals');
 var observable = require('@trpc/server/observable');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var cache = require('next/cache');
-var shared = require('../../shared-e49b9cdc.js');
-require('@trpc/server/shared');
+var shared = require('../shared.js');
 
 // import "server-only";
 // ts-prune-ignore-next
 function experimental_nextCacheLink(opts) {
-    return (runtime)=>({ op  })=>observable.observable((observer)=>{
+    const transformer = unstableInternals.getTransformer(opts.transformer);
+    return ()=>({ 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 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 (_cachebuster)=>{
                         //   // _cachebuster is not used by us but to make sure
                         //   // that calls with different tags are properly separated
                         //   // @link https://github.com/trpc/trpc/issues/4622
-                        const procedureResult = await server.callProcedure({
+                        const procedureResult = await unstableCoreDoNotImport.callProcedure({
                             procedures: opts.router._def.procedures,
                             path,
                             getRawInput: async ()=>input,
@@ -31,7 +30,7 @@ function experimental_nextCacheLink(opts) {
                             type
                         });
                         // We need to serialize cause the cache only accepts JSON
-                        return runtime.transformer.serialize(procedureResult);
+                        return transformer.input.serialize(procedureResult);
                     };
                     if (type === 'query') {
                         return cache.unstable_cache(callProc, path.split('.'), {
@@ -46,7 +45,7 @@ function experimental_nextCacheLink(opts) {
                     observer.error(client.TRPCClientError.from(cause));
                 });
                 promise.then((data)=>{
-                    const transformedResult = runtime.transformer.deserialize(data);
+                    const transformedResult = transformer.output.deserialize(data);
                     observer.next({
                         result: {
                             data: transformedResult

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

@@ -1,18 +1,19 @@
 import { TRPCClientError } from '@trpc/client';
-import { callProcedure } from '@trpc/server';
+import { getTransformer } from '@trpc/client/unstable-internals';
 import { observable } from '@trpc/server/observable';
+import { callProcedure } from '@trpc/server/unstable-core-do-not-import';
 import { unstable_cache } from 'next/cache';
-import { g as generateCacheTag } from '../../shared-f6996341.mjs';
-import '@trpc/server/shared';
+import { generateCacheTag } from '../shared.mjs';
 
 // import "server-only";
 // ts-prune-ignore-next
 function experimental_nextCacheLink(opts) {
-    return (runtime)=>({ op  })=>observable((observer)=>{
+    const transformer = getTransformer(opts.transformer);
+    return ()=>({ 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 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 (_cachebuster)=>{
@@ -27,7 +28,7 @@ function experimental_nextCacheLink(opts) {
                             type
                         });
                         // We need to serialize cause the cache only accepts JSON
-                        return runtime.transformer.serialize(procedureResult);
+                        return transformer.input.serialize(procedureResult);
                     };
                     if (type === 'query') {
                         return unstable_cache(callProc, path.split('.'), {
@@ -42,7 +43,7 @@ function experimental_nextCacheLink(opts) {
                     observer.error(TRPCClientError.from(cause));
                 });
                 promise.then((data)=>{
-                    const transformedResult = runtime.transformer.deserialize(data);
+                    const transformedResult = transformer.output.deserialize(data);
                     observer.next({
                         result: {
                             data: transformedResult

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

@@ -1,9 +1,15 @@
-import { HTTPBatchLinkOptions, HTTPLinkOptions, TRPCLink } from '@trpc/client';
-import { AnyRouter } from '@trpc/server';
-type NextFetchLinkOptions<TBatch extends boolean> = (TBatch extends true ? HTTPBatchLinkOptions : HTTPLinkOptions) & {
-    batch?: TBatch;
+import type { HTTPBatchLinkOptions, HTTPLinkOptions, TRPCLink } from '@trpc/client';
+import type { AnyRootTypes, AnyRouter } from '@trpc/server/unstable-core-do-not-import';
+interface NextLinkBaseOptions {
     revalidate?: number | false;
+    batch?: boolean;
+}
+type NextLinkSingleOptions<TRoot extends AnyRootTypes> = NextLinkBaseOptions & Omit<HTTPLinkOptions<TRoot>, 'fetch'> & {
+    batch?: false;
 };
-export declare function experimental_nextHttpLink<TRouter extends AnyRouter, TBatch extends boolean>(opts: NextFetchLinkOptions<TBatch>): TRPCLink<TRouter>;
+type NextLinkBatchOptions<TRoot extends AnyRootTypes> = NextLinkBaseOptions & Omit<HTTPBatchLinkOptions<TRoot>, 'fetch'> & {
+    batch: true;
+};
+export declare function experimental_nextHttpLink<TRouter extends AnyRouter>(opts: NextLinkSingleOptions<TRouter['_def']['_config']['$types']> | NextLinkBatchOptions<TRouter['_def']['_config']['$types']>): TRPCLink<TRouter>;
 export {};
 //# sourceMappingURL=nextHttp.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"nextHttp.d.ts","sourceRoot":"","sources":["../../../src/app-dir/links/nextHttp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,QAAQ,EACT,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACV,MAAM,0CAA0C,CAAC;AAGlD,UAAU,mBAAmB;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,KAAK,qBAAqB,CAAC,KAAK,SAAS,YAAY,IAAI,mBAAmB,GAC1E,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IACtC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEJ,KAAK,oBAAoB,CAAC,KAAK,SAAS,YAAY,IAAI,mBAAmB,GACzE,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IAC3C,KAAK,EAAE,IAAI,CAAC;CACb,CAAC;AAGJ,wBAAgB,yBAAyB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EACA,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC3D,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC7D,QAAQ,CAAC,OAAO,CAAC,CAyCnB"}

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

@@ -1,10 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var client = require('@trpc/client');
-var shared = require('../../shared-e49b9cdc.js');
-require('@trpc/server/shared');
+var shared = require('../shared.js');
 
 // ts-prune-ignore-next
 function experimental_nextHttpLink(opts) {
@@ -13,26 +10,28 @@ function experimental_nextHttpLink(opts) {
             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 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);
+            const _fetch = (url, fetchOpts)=>{
+                return fetch(url, {
+                    ...fetchOpts,
+                    // cache: 'no-cache',
+                    next: {
+                        revalidate,
+                        tags: [
+                            cacheTag
+                        ]
+                    }
+                });
+            };
+            const link = opts.batch ? client.httpBatchLink({
+                ...opts,
+                fetch: _fetch
+            }) : client.httpLink({
+                ...opts,
+                fetch: _fetch
+            });
+            return link(runtime)(ctx);
         };
     };
 }

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

@@ -1,6 +1,5 @@
 import { httpBatchLink, httpLink } from '@trpc/client';
-import { g as generateCacheTag } from '../../shared-f6996341.mjs';
-import '@trpc/server/shared';
+import { generateCacheTag } from '../shared.mjs';
 
 // ts-prune-ignore-next
 function experimental_nextHttpLink(opts) {
@@ -9,26 +8,28 @@ function experimental_nextHttpLink(opts) {
             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 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);
+            const _fetch = (url, fetchOpts)=>{
+                return fetch(url, {
+                    ...fetchOpts,
+                    // cache: 'no-cache',
+                    next: {
+                        revalidate,
+                        tags: [
+                            cacheTag
+                        ]
+                    }
+                });
+            };
+            const link = opts.batch ? httpBatchLink({
+                ...opts,
+                fetch: _fetch
+            }) : httpLink({
+                ...opts,
+                fetch: _fetch
+            });
+            return link(runtime)(ctx);
         };
     };
 }

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

@@ -1,25 +1,32 @@
-import { AnyProcedure, AnyRootConfig, AnyRouter, MaybePromise, Simplify } from '@trpc/server';
-import { TRPCResponse } from '@trpc/server/rpc';
-import { ActionHandlerDef, CreateTRPCNextAppRouterOptions, inferActionDef } from './shared';
-import { NextAppDirDecoratedProcedureRecord } from './types';
-export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecoratedProcedureRecord<TRouter["_def"]["_config"], TRouter["_def"]["record"]>;
+import type { AnyProcedure, AnyRootTypes, AnyRouter, ErrorHandlerOptions, inferClientTypes, MaybePromise, RootConfig, Simplify, TRPCResponse } from '@trpc/server/unstable-core-do-not-import';
+import type { ActionHandlerDef, CreateTRPCNextAppRouterOptions, inferActionDef } from './shared';
+import type { NextAppDirDecorateRouterRecord } from './types';
+export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecorateRouterRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
 /**
  * @internal
  */
 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: {
+    _config: RootConfig<AnyRootTypes>;
+}>(t: TInstance, opts: (object extends TInstance['_config']['$types']['ctx'] ? {
+    createContext?: () => MaybePromise<TInstance['_config']['$types']['ctx']>;
+} : {
     createContext: () => MaybePromise<TInstance['_config']['$types']['ctx']>;
+}) & {
     /**
      * Transform form data to a `Record` before passing it to the procedure
      * @default true
      */
     normalizeFormData?: boolean;
-}): <TProc extends AnyProcedure>(proc: TProc) => TRPCActionHandler<{
-    input: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProc>>[0];
-    output: TProc["_def"]["_output_out"];
-    errorShape: TInstance["_config"]["$types"]["errorShape"];
-}>;
+    /**
+     * Called when an error occurs in the handler
+     */
+    onError?: (opts: ErrorHandlerOptions<TInstance['_config']['$types']['ctx']>) => void;
+    /**
+     * Rethrow errors that should be handled by Next.js
+     * @default true
+     */
+    rethrowNextErrors?: boolean;
+}): <TProc extends AnyProcedure>(proc: TProc) => TRPCActionHandler<Simplify<inferActionDef<inferClientTypes<TInstance>, TProc>>>;
 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":"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,6FA2B9C;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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,mBAAmB,EACnB,gBAAgB,EAEhB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,0CAA0C,CAAC;AAalD,OAAO,KAAK,EACV,gBAAgB,EAChB,8BAA8B,EAC9B,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AAG9D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,mGA2B9C;AAWD;;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,UAAU,CAAC,YAAY,CAAC,CAAC;CACnC,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE,CAAC,MAAM,SAAS,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GACvD;IACE,aAAa,CAAC,EAAE,MAAM,YAAY,CAChC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CACtC,CAAC;CACH,GACD;IACE,aAAa,EAAE,MAAM,YAAY,CAC/B,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CACtC,CAAC;CACH,CAAC,GAAG;IACP;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,mBAAmB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAC7D,IAAI,CAAC;IAEV;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,sCAaO,KAAK,KACV,kBACD,SAAS,eAAe,iBAAiB,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC,CAC7D,CAmEF;AAGD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,qBAiBjE"}

package/dist/app-dir/server.js

@@ -1,44 +1,13 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var client = require('@trpc/client');
-var server = require('@trpc/server');
-var shared = require('@trpc/server/shared');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var cache = require('next/cache');
+var notFound = require('next/dist/client/components/not-found');
+var redirect = require('next/dist/client/components/redirect');
 var React = require('react');
-var shared$1 = require('../shared-e49b9cdc.js');
-
-/* eslint-disable @typescript-eslint/no-non-null-assertion */ function set(obj, path, value) {
-    if (typeof path === 'string') {
-        path = path.split(/[\.\[\]]/).filter(Boolean);
-    }
-    if (path.length > 1) {
-        const p = path.shift();
-        const isArrayIndex = /^\d+$/.test(path[0]);
-        obj[p] = obj[p] || (isArrayIndex ? [] : {});
-        set(obj[p], path, value);
-        return;
-    }
-    const p1 = path[0];
-    if (obj[p1] === undefined) {
-        obj[p1] = value;
-    } else if (Array.isArray(obj[p1])) {
-        obj[p1].push(value);
-    } else {
-        obj[p1] = [
-            obj[p1],
-            value
-        ];
-    }
-}
-function formDataToObject(formData) {
-    const obj = {};
-    for (const [key, value] of formData.entries()){
-        set(obj, key, value);
-    }
-    return obj;
-}
+var formDataToObject = require('./formDataToObject.js');
+var shared = require('./shared.js');
 
 /// <reference types="next" />
 // ts-prune-ignore-next
@@ -47,7 +16,7 @@ function experimental_createTRPCNextAppDirServer(opts) {
         const config = opts.config();
         return client.createTRPCUntypedClient(config);
     });
-    return shared.createRecursiveProxy((callOpts)=>{
+    return unstableCoreDoNotImport.createRecursiveProxy((callOpts)=>{
         // lazily initialize client
         const client$1 = getClient();
         const pathCopy = [
@@ -57,7 +26,7 @@ function experimental_createTRPCNextAppDirServer(opts) {
         const action = pathCopy.pop();
         const procedurePath = pathCopy.join('.');
         const procedureType = client.clientCallTypeToProcedureType(action);
-        const cacheTag = shared$1.generateCacheTag(procedurePath, callOpts.args[0]);
+        const cacheTag = shared.generateCacheTag(procedurePath, callOpts.args[0]);
         if (action === 'revalidate') {
             cache.revalidateTag(cacheTag);
             return;
@@ -65,54 +34,69 @@ function experimental_createTRPCNextAppDirServer(opts) {
         return client$1[procedureType](procedurePath, ...callOpts.args);
     });
 }
+/**
+ * Rethrow errors that should be handled by Next.js
+ */ const throwNextErrors = (error)=>{
+    const { cause  } = error;
+    if (redirect.isRedirectError(cause) || notFound.isNotFoundError(cause)) {
+        throw error.cause;
+    }
+};
 function experimental_createServerActionHandler(t, opts) {
     const config = t._config;
-    const { normalizeFormData =true , createContext  } = opts;
+    const { normalizeFormData =true , createContext , rethrowNextErrors =true ,  } = opts;
     const transformer = config.transformer;
     // TODO allow this to take a `TRouter` in addition to a `AnyProcedure`
     return function createServerAction(proc) {
         return async function actionHandler(rawInput) {
-            const ctx = undefined;
+            let ctx = undefined;
             try {
-                const ctx1 = await createContext();
-                if (normalizeFormData && shared$1.isFormData(rawInput)) {
-                    // Normalizes formdata so we can use `z.object({})` etc on the server
+                ctx = await createContext?.() ?? {};
+                if (normalizeFormData && shared.isFormData(rawInput)) {
+                    // Normalizes FormData so we can use `z.object({})` etc on the server
                     try {
-                        rawInput = formDataToObject(rawInput);
+                        rawInput = formDataToObject.formDataToObject(rawInput);
                     } catch  {
-                        throw new server.TRPCError({
+                        throw new unstableCoreDoNotImport.TRPCError({
                             code: 'INTERNAL_SERVER_ERROR',
                             message: 'Failed to convert FormData to an object'
                         });
                     }
-                } else if (rawInput && !shared$1.isFormData(rawInput)) {
+                } else if (rawInput && !shared.isFormData(rawInput)) {
                     rawInput = transformer.input.deserialize(rawInput);
                 }
-                const data = await proc({
+                const data = proc._def.experimental_caller ? await proc(rawInput) : await proc({
                     input: undefined,
-                    ctx: ctx1,
-                    path: 'serverAction',
+                    ctx,
+                    path: '',
                     getRawInput: async ()=>rawInput,
                     type: proc._def.type
                 });
-                const transformedJSON = shared.transformTRPCResponse(config, {
+                const transformedJSON = unstableCoreDoNotImport.transformTRPCResponse(config, {
                     result: {
                         data
                     }
                 });
                 return transformedJSON;
             } catch (cause) {
-                const error = server.getTRPCErrorFromUnknown(cause);
-                const shape = shared.getErrorShape({
+                const error = unstableCoreDoNotImport.getTRPCErrorFromUnknown(cause);
+                opts.onError?.({
+                    ctx,
+                    error,
+                    input: rawInput,
+                    path: '',
+                    type: proc._def.type
+                });
+                rethrowNextErrors && throwNextErrors(error);
+                const shape = unstableCoreDoNotImport.getErrorShape({
                     config,
                     ctx,
                     error,
                     input: rawInput,
-                    path: 'serverAction',
+                    path: '',
                     type: proc._def.type
                 });
-                // TODO: send the right HTTP header?!
-                return shared.transformTRPCResponse(t._config, {
+                return unstableCoreDoNotImport.transformTRPCResponse(t._config, {
                     error: shape
                 });
             }

package/dist/app-dir/server.mjs

@@ -1,40 +1,11 @@
 import { createTRPCUntypedClient, clientCallTypeToProcedureType } from '@trpc/client';
-import { TRPCError, getTRPCErrorFromUnknown } from '@trpc/server';
-import { createRecursiveProxy, transformTRPCResponse, getErrorShape } from '@trpc/server/shared';
+import { createRecursiveProxy, TRPCError, transformTRPCResponse, getTRPCErrorFromUnknown, getErrorShape } from '@trpc/server/unstable-core-do-not-import';
 import { revalidateTag } from 'next/cache';
+import { isNotFoundError } from 'next/dist/client/components/not-found';
+import { isRedirectError } from 'next/dist/client/components/redirect';
 import { cache } from 'react';
-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') {
-        path = path.split(/[\.\[\]]/).filter(Boolean);
-    }
-    if (path.length > 1) {
-        const p = path.shift();
-        const isArrayIndex = /^\d+$/.test(path[0]);
-        obj[p] = obj[p] || (isArrayIndex ? [] : {});
-        set(obj[p], path, value);
-        return;
-    }
-    const p1 = path[0];
-    if (obj[p1] === undefined) {
-        obj[p1] = value;
-    } else if (Array.isArray(obj[p1])) {
-        obj[p1].push(value);
-    } else {
-        obj[p1] = [
-            obj[p1],
-            value
-        ];
-    }
-}
-function formDataToObject(formData) {
-    const obj = {};
-    for (const [key, value] of formData.entries()){
-        set(obj, key, value);
-    }
-    return obj;
-}
+import { formDataToObject } from './formDataToObject.mjs';
+import { generateCacheTag, isFormData } from './shared.mjs';
 
 /// <reference types="next" />
 // ts-prune-ignore-next
@@ -61,18 +32,26 @@ function experimental_createTRPCNextAppDirServer(opts) {
         return client[procedureType](procedurePath, ...callOpts.args);
     });
 }
+/**
+ * Rethrow errors that should be handled by Next.js
+ */ const throwNextErrors = (error)=>{
+    const { cause  } = error;
+    if (isRedirectError(cause) || isNotFoundError(cause)) {
+        throw error.cause;
+    }
+};
 function experimental_createServerActionHandler(t, opts) {
     const config = t._config;
-    const { normalizeFormData =true , createContext  } = opts;
+    const { normalizeFormData =true , createContext , rethrowNextErrors =true ,  } = opts;
     const transformer = config.transformer;
     // TODO allow this to take a `TRouter` in addition to a `AnyProcedure`
     return function createServerAction(proc) {
         return async function actionHandler(rawInput) {
-            const ctx = undefined;
+            let ctx = undefined;
             try {
-                const ctx1 = await createContext();
+                ctx = await createContext?.() ?? {};
                 if (normalizeFormData && isFormData(rawInput)) {
-                    // Normalizes formdata so we can use `z.object({})` etc on the server
+                    // Normalizes FormData so we can use `z.object({})` etc on the server
                     try {
                         rawInput = formDataToObject(rawInput);
                     } catch  {
@@ -84,10 +63,10 @@ function experimental_createServerActionHandler(t, opts) {
                 } else if (rawInput && !isFormData(rawInput)) {
                     rawInput = transformer.input.deserialize(rawInput);
                 }
-                const data = await proc({
+                const data = proc._def.experimental_caller ? await proc(rawInput) : await proc({
                     input: undefined,
-                    ctx: ctx1,
-                    path: 'serverAction',
+                    ctx,
+                    path: '',
                     getRawInput: async ()=>rawInput,
                     type: proc._def.type
                 });
@@ -99,15 +78,22 @@ function experimental_createServerActionHandler(t, opts) {
                 return transformedJSON;
             } catch (cause) {
                 const error = getTRPCErrorFromUnknown(cause);
+                opts.onError?.({
+                    ctx,
+                    error,
+                    input: rawInput,
+                    path: '',
+                    type: proc._def.type
+                });
+                rethrowNextErrors && throwNextErrors(error);
                 const shape = getErrorShape({
                     config,
                     ctx,
                     error,
                     input: rawInput,
-                    path: 'serverAction',
+                    path: '',
                     type: proc._def.type
                 });
-                // TODO: send the right HTTP header?!
                 return transformTRPCResponse(t._config, {
                     error: shape
                 });

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

@@ -1,22 +1,28 @@
-import { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
-import { AnyProcedure, AnyQueryProcedure, AnyRootConfig, AnyRouter, Filter, inferHandlerInput, ProtectedIntersection, ThenArg } from '@trpc/server';
+import type { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
+import type { inferProcedureOutput } from '@trpc/server';
+import type { AnyClientTypes, AnyProcedure, AnyQueryProcedure, AnyRootTypes, AnyRouter, inferProcedureInput, inferTransformedProcedureOutput, ProtectedIntersection, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
 /**
  * @internal
  */
-export type UseProcedureRecord<TRouter extends AnyRouter> = {
-    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['_config'], TRouter['_def']['record'][TKey]>;
+export type UseProcedureRecord<TRoot extends AnyRootTypes, TRecord extends RouterRecord> = {
+    [TKey in keyof TRecord]: TRecord[TKey] extends infer $Value ? $Value extends RouterRecord ? UseProcedureRecord<TRoot, $Value> : $Value extends AnyQueryProcedure ? Resolver<{
+        input: inferProcedureInput<$Value>;
+        output: inferTransformedProcedureOutput<TRoot, $Value>;
+        errorShape: TRoot['errorShape'];
+        transformer: TRoot['transformer'];
+    }> : never : never;
 };
-export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter>;
+export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
 type NextAppRouterUse<TRouter extends AnyRouter> = {
-    <TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter>) => [...TData]): {
-        [TKey in keyof TData]: ThenArg<TData[TKey]>;
+    <TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>) => [...TData]): {
+        [TKey in keyof TData]: Awaited<TData[TKey]>;
     };
-    <TData extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter>) => TData): ThenArg<TData>;
+    <TData extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>) => TData): Awaited<TData>;
 };
 type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
     use: NextAppRouterUse<TRouter>;
 };
-export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = ProtectedIntersection<CreateTRPCNextAppRouterBase<TRouter>, UseProcedureRecord<TRouter>>;
+export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = ProtectedIntersection<CreateTRPCNextAppRouterBase<TRouter>, UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>>;
 /**
  * @internal
  */
@@ -39,10 +45,10 @@ export interface ActionHandlerDef {
 /**
  * @internal
  */
-export type inferActionDef<TConfig extends AnyRootConfig, TProc extends AnyProcedure> = {
-    input: inferHandlerInput<TProc>[0];
-    output: TProc['_def']['_output_out'];
-    errorShape: TConfig['$types']['errorShape'];
+export type inferActionDef<TRoot extends AnyClientTypes, TProc extends AnyProcedure> = {
+    input: inferProcedureInput<TProc>;
+    output: inferProcedureOutput<TProc>;
+    errorShape: TRoot['errorShape'];
 };
 export {};
 //# sourceMappingURL=shared.d.ts.map