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

package/README.md

@@ -24,16 +24,16 @@ Full documentation for `@trpc/client` can be found [here](https://trpc.io/docs/v
 
 ```bash
 # npm
-npm install @trpc/client
+npm install @trpc/client@next
 
 # Yarn
-yarn add @trpc/client
+yarn add @trpc/client@next
 
 # pnpm
-pnpm add @trpc/client
+pnpm add @trpc/client@next
 
 # Bun
-bun add @trpc/client
+bun add @trpc/client@next
 ```
 
 ## Basic Example

package/dist/TRPCClientError.d.ts

@@ -1,13 +1,13 @@
-import { DefaultErrorShape, Maybe } from '@trpc/server';
-import { TRPCErrorResponse } from '@trpc/server/rpc';
-import { inferErrorShape, TRPCInferrable } from '@trpc/server/shared';
+import type { inferClientTypes, InferrableClientTypes, Maybe, TRPCErrorResponse } from '@trpc/server/unstable-core-do-not-import';
+import { type DefaultErrorShape } from '@trpc/server/unstable-core-do-not-import';
+type inferErrorShape<TInferrable extends InferrableClientTypes> = inferClientTypes<TInferrable>['errorShape'];
 export interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {
     readonly message: string;
     readonly shape: Maybe<TShape>;
     readonly data: Maybe<TShape['data']>;
 }
-export type TRPCClientErrorLike<TInferrable extends TRPCInferrable> = TRPCClientErrorBase<inferErrorShape<TInferrable>>;
-export declare class TRPCClientError<TRouterOrProcedure extends TRPCInferrable> extends Error implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>> {
+export type TRPCClientErrorLike<TInferrable extends InferrableClientTypes> = TRPCClientErrorBase<inferErrorShape<TInferrable>>;
+export declare class TRPCClientError<TRouterOrProcedure extends InferrableClientTypes> extends Error implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>> {
     readonly cause: Error | undefined;
     readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
     readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
@@ -17,12 +17,13 @@ export declare class TRPCClientError<TRouterOrProcedure extends TRPCInferrable>
      */
     meta: Record<string, unknown> | undefined;
     constructor(message: string, opts?: {
-        result?: Maybe<inferErrorShape<TRouterOrProcedure>>;
+        result?: Maybe<TRPCErrorResponse<inferErrorShape<TRouterOrProcedure>>>;
         cause?: Error;
         meta?: Record<string, unknown>;
     });
-    static from<TRouterOrProcedure extends TRPCInferrable>(_cause: Error | TRPCErrorResponse<any>, opts?: {
+    static from<TRouterOrProcedure extends InferrableClientTypes>(_cause: Error | TRPCErrorResponse<any>, opts?: {
         meta?: Record<string, unknown>;
     }): TRPCClientError<TRouterOrProcedure>;
 }
+export {};
 //# sourceMappingURL=TRPCClientError.d.ts.map

package/dist/TRPCClientError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGtE,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,cAAc,IAChE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAsBpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,cAAc,CACpE,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAEnE,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACpD,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,cAAc,EAC1D,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA+BvC"}
+{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,KAAK,eAAe,CAAC,WAAW,SAAS,qBAAqB,IAC5D,gBAAgB,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,qBAAqB,IACvE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAsBpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,qBAAqB,CAC3E,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAInE,SAAyB,KAAK,oBAAC;IAC/B,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,qBAAqB,EACjE,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA+BvC"}

package/dist/{TRPCClientError-e224e397.js → TRPCClientError.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var transformResult = require('./transformResult-dfce8f15.js');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 
 function isTRPCClientError(cause) {
     return cause instanceof TRPCClientError || /**
@@ -9,7 +9,7 @@ function isTRPCClientError(cause) {
      */ cause instanceof Error && cause.name === 'TRPCClientError';
 }
 function isTRPCErrorResponse(obj) {
-    return transformResult.isObject(obj) && transformResult.isObject(obj.error) && typeof obj.error.code === 'number' && typeof obj.error.message === 'string';
+    return unstableCoreDoNotImport.isObject(obj) && unstableCoreDoNotImport.isObject(obj['error']) && typeof obj['error']['code'] === 'number' && typeof obj['error']['message'] === 'string';
 }
 class TRPCClientError extends Error {
     static from(_cause, opts = {}) {
@@ -38,7 +38,7 @@ class TRPCClientError extends Error {
         }
         return new TRPCClientError(cause.message, {
             ...opts,
-            cause
+            cause: unstableCoreDoNotImport.getCauseFromUnknown(cause)
         });
     }
     constructor(message, opts){

package/dist/{TRPCClientError-0de4d231.mjs → TRPCClientError.mjs}

@@ -1,4 +1,4 @@
-import { i as isObject } from './transformResult-ace864b8.mjs';
+import { getCauseFromUnknown, isObject } from '@trpc/server/unstable-core-do-not-import';
 
 function isTRPCClientError(cause) {
     return cause instanceof TRPCClientError || /**
@@ -7,7 +7,7 @@ function isTRPCClientError(cause) {
      */ cause instanceof Error && cause.name === 'TRPCClientError';
 }
 function isTRPCErrorResponse(obj) {
-    return isObject(obj) && isObject(obj.error) && typeof obj.error.code === 'number' && typeof obj.error.message === 'string';
+    return isObject(obj) && isObject(obj['error']) && typeof obj['error']['code'] === 'number' && typeof obj['error']['message'] === 'string';
 }
 class TRPCClientError extends Error {
     static from(_cause, opts = {}) {
@@ -36,7 +36,7 @@ class TRPCClientError extends Error {
         }
         return new TRPCClientError(cause.message, {
             ...opts,
-            cause
+            cause: getCauseFromUnknown(cause)
         });
     }
     constructor(message, opts){
@@ -55,4 +55,4 @@ class TRPCClientError extends Error {
     }
 }
 
-export { TRPCClientError as T };
+export { TRPCClientError };

package/dist/bundle-analysis.json

@@ -1,37 +1,37 @@
 {
-  "bundleSize": 46443,
-  "bundleOrigSize": 63682,
-  "bundleReduction": 27.07,
+  "bundleSize": 46703,
+  "bundleOrigSize": 65934,
+  "bundleReduction": 29.17,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
-      "size": 10573,
-      "origSize": 11192,
+      "size": 12058,
+      "origSize": 13652,
       "renderedExports": [
         "createWSClient",
         "wsLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 22.77,
-      "reduction": 5.53
+      "percent": 25.82,
+      "reduction": 11.68
     },
     {
       "id": "/src/links/loggerLink.ts",
-      "size": 5236,
-      "origSize": 6433,
+      "size": 5545,
+      "origSize": 6496,
       "renderedExports": [
         "loggerLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.27,
-      "reduction": 18.61
+      "percent": 11.87,
+      "reduction": 14.64
     },
     {
       "id": "/src/internals/dataLoader.ts",
       "size": 4409,
-      "origSize": 4761,
+      "origSize": 4766,
       "renderedExports": [
         "dataLoader"
       ],
@@ -39,13 +39,13 @@
       "dependents": [
         "/src/links/internals/createHTTPBatchLink.ts"
       ],
-      "percent": 9.49,
-      "reduction": 7.39
+      "percent": 9.44,
+      "reduction": 7.49
     },
     {
       "id": "/src/links/internals/parseJSONStream.ts",
       "size": 4007,
-      "origSize": 4925,
+      "origSize": 5037,
       "renderedExports": [
         "parseJSONStream",
         "streamingJsonHttpRequester"
@@ -54,28 +54,13 @@
       "dependents": [
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 8.63,
-      "reduction": 18.64
-    },
-    {
-      "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 3250,
-      "origSize": 6234,
-      "renderedExports": [
-        "TRPCUntypedClient"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/createTRPCUntypedClient.ts",
-        "/src/createTRPCClient.ts"
-      ],
-      "percent": 7,
-      "reduction": 47.87
+      "percent": 8.58,
+      "reduction": 20.45
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
-      "size": 3074,
-      "origSize": 5144,
+      "size": 3464,
+      "origSize": 6007,
       "renderedExports": [
         "resolveHTTPLinkOptions",
         "getUrl",
@@ -86,34 +71,49 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/internals/parseJSONStream.ts",
-        "/src/links/httpFormDataLink.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/httpFormDataLink.ts",
         "/src/links/internals/createHTTPBatchLink.ts",
-        "/src/links/httpBatchLink.ts"
+        "/src/links/internals/parseJSONStream.ts"
       ],
-      "percent": 6.62,
-      "reduction": 40.24
+      "percent": 7.42,
+      "reduction": 42.33
     },
     {
       "id": "/src/links/internals/createHTTPBatchLink.ts",
-      "size": 2912,
-      "origSize": 3488,
+      "size": 2944,
+      "origSize": 3711,
       "renderedExports": [
         "createHTTPBatchLink"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/httpBatchStreamLink.ts",
-        "/src/links/httpBatchLink.ts"
+        "/src/links/httpBatchLink.ts",
+        "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 6.27,
-      "reduction": 16.51
+      "percent": 6.3,
+      "reduction": 20.67
+    },
+    {
+      "id": "/src/internals/TRPCUntypedClient.ts",
+      "size": 2299,
+      "origSize": 4207,
+      "renderedExports": [
+        "TRPCUntypedClient"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/createTRPCUntypedClient.ts",
+        "/src/createTRPCClient.ts"
+      ],
+      "percent": 4.92,
+      "reduction": 45.35
     },
     {
       "id": "/src/links/httpLink.ts",
-      "size": 2172,
-      "origSize": 2502,
+      "size": 2169,
+      "origSize": 2753,
       "renderedExports": [
         "httpLinkFactory",
         "httpLink"
@@ -122,129 +122,126 @@
       "dependents": [
         "/src/links/httpFormDataLink.ts"
       ],
-      "percent": 4.68,
-      "reduction": 13.19
+      "percent": 4.64,
+      "reduction": 21.21
     },
     {
       "id": "/src/TRPCClientError.ts",
-      "size": 1783,
-      "origSize": 2971,
+      "size": 1866,
+      "origSize": 3437,
       "renderedExports": [
         "TRPCClientError"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/internals/TRPCUntypedClient.ts",
         "/src/index.ts",
         "/src/links/httpLink.ts",
         "/src/links/wsLink.ts",
-        "/src/links/internals/httpUtils.ts",
-        "/src/links/internals/createHTTPBatchLink.ts"
+        "/src/internals/TRPCUntypedClient.ts",
+        "/src/links/internals/createHTTPBatchLink.ts",
+        "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.84,
-      "reduction": 39.99
+      "percent": 4,
+      "reduction": 45.71
     },
     {
-      "id": "/src/shared/transformResult.ts",
-      "size": 1545,
-      "origSize": 2244,
+      "id": "/src/links/httpBatchStreamLink.ts",
+      "size": 1340,
+      "origSize": 2176,
       "renderedExports": [
-        "transformResult"
+        "unstable_httpBatchStreamLink"
       ],
       "removedExports": [],
-      "dependents": [
-        "/src/links/httpLink.ts",
-        "/src/links/wsLink.ts",
-        "/src/shared/index.ts",
-        "/src/links/internals/createHTTPBatchLink.ts"
-      ],
-      "percent": 3.33,
-      "reduction": 31.15
+      "dependents": [],
+      "percent": 2.87,
+      "reduction": 38.42
     },
     {
-      "id": "/src/links/httpBatchStreamLink.ts",
-      "size": 1309,
-      "origSize": 1971,
+      "id": "/src/createTRPCClient.ts",
+      "size": 1206,
+      "origSize": 4369,
       "renderedExports": [
-        "unstable_httpBatchStreamLink"
+        "clientCallTypeToProcedureType",
+        "createTRPCClientProxy",
+        "createTRPCClient",
+        "getUntypedClient"
       ],
       "removedExports": [],
-      "dependents": [],
-      "percent": 2.82,
-      "reduction": 33.59
+      "dependents": [
+        "/src/index.ts"
+      ],
+      "percent": 2.58,
+      "reduction": 72.4
     },
     {
       "id": "/src/links/httpBatchLink.ts",
-      "size": 1185,
-      "origSize": 1365,
+      "size": 1205,
+      "origSize": 1527,
       "renderedExports": [
         "httpBatchLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.55,
-      "reduction": 13.19
+      "percent": 2.58,
+      "reduction": 21.09
     },
     {
-      "id": "/src/createTRPCClient.ts",
-      "size": 1154,
-      "origSize": 4313,
+      "id": "/src/links/httpFormDataLink.ts",
+      "size": 703,
+      "origSize": 772,
       "renderedExports": [
-        "clientCallTypeToProcedureType",
-        "createTRPCClientProxy",
-        "createTRPCClient",
-        "getUntypedClient"
+        "experimental_formDataLink"
       ],
       "removedExports": [],
-      "dependents": [
-        "/src/index.ts"
-      ],
-      "percent": 2.48,
-      "reduction": 73.24
+      "dependents": [],
+      "percent": 1.51,
+      "reduction": 8.94
     },
     {
       "id": "/src/links/internals/createChain.ts",
       "size": 690,
-      "origSize": 981,
+      "origSize": 1026,
       "renderedExports": [
         "createChain"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/internals/TRPCUntypedClient.ts",
-        "/src/links/splitLink.ts"
+        "/src/links/splitLink.ts",
+        "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.49,
-      "reduction": 29.66
+      "percent": 1.48,
+      "reduction": 32.75
     },
     {
-      "id": "/src/links/httpFormDataLink.ts",
-      "size": 663,
-      "origSize": 735,
+      "id": "/src/links/splitLink.ts",
+      "size": 610,
+      "origSize": 1108,
       "renderedExports": [
-        "experimental_formDataLink"
+        "splitLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.43,
-      "reduction": 9.8
+      "percent": 1.31,
+      "reduction": 44.95
     },
     {
-      "id": "/src/links/splitLink.ts",
-      "size": 598,
-      "origSize": 1070,
+      "id": "/src/internals/transformer.ts",
+      "size": 565,
+      "origSize": 1699,
       "renderedExports": [
-        "splitLink"
+        "getTransformer"
       ],
       "removedExports": [],
-      "dependents": [],
-      "percent": 1.29,
-      "reduction": 44.11
+      "dependents": [
+        "/src/unstable-internals.ts"
+      ],
+      "percent": 1.21,
+      "reduction": 66.75
     },
     {
       "id": "/src/links/internals/getTextDecoder.ts",
       "size": 553,
-      "origSize": 629,
+      "origSize": 634,
       "renderedExports": [
         "getTextDecoder"
       ],
@@ -252,13 +249,13 @@
       "dependents": [
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 1.19,
-      "reduction": 12.08
+      "percent": 1.18,
+      "reduction": 12.78
     },
     {
       "id": "/src/internals/getAbortController.ts",
       "size": 542,
-      "origSize": 672,
+      "origSize": 710,
       "renderedExports": [
         "getAbortController"
       ],
@@ -266,13 +263,13 @@
       "dependents": [
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 1.17,
-      "reduction": 19.35
+      "percent": 1.16,
+      "reduction": 23.66
     },
     {
       "id": "/src/getFetch.ts",
       "size": 428,
-      "origSize": 639,
+      "origSize": 644,
       "renderedExports": [
         "getFetch"
       ],
@@ -282,41 +279,12 @@
         "/src/links/internals/httpUtils.ts"
       ],
       "percent": 0.92,
-      "reduction": 33.02
-    },
-    {
-      "id": "/src/internals/retryDelay.ts",
-      "size": 142,
-      "origSize": 162,
-      "renderedExports": [
-        "retryDelay"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/links/wsLink.ts"
-      ],
-      "percent": 0.31,
-      "reduction": 12.35
-    },
-    {
-      "id": "/src/internals/isObject.ts",
-      "size": 136,
-      "origSize": 183,
-      "renderedExports": [
-        "isObject"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/TRPCClientError.ts",
-        "/src/shared/transformResult.ts"
-      ],
-      "percent": 0.29,
-      "reduction": 25.68
+      "reduction": 33.54
     },
     {
       "id": "/src/createTRPCUntypedClient.ts",
-      "size": 82,
-      "origSize": 493,
+      "size": 100,
+      "origSize": 574,
       "renderedExports": [
         "createTRPCUntypedClient"
       ],
@@ -324,13 +292,13 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 0.18,
-      "reduction": 83.37
+      "percent": 0.21,
+      "reduction": 82.58
     },
     {
       "id": "/src/index.ts",
       "size": 0,
-      "origSize": 540,
+      "origSize": 588,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -338,15 +306,18 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared/index.ts",
+      "id": "/src/unstable-internals.ts",
       "size": 0,
-      "origSize": 35,
+      "origSize": 41,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [],
+      "dependents": [
+        "/src/links/wsLink.ts",
+        "/src/links/internals/httpUtils.ts"
+      ],
       "percent": 0,
       "reduction": 100
     }
   ],
-  "moduleCount": 24
+  "moduleCount": 22
 }

package/dist/createTRPCClient.d.ts

@@ -1,38 +1,46 @@
-import type { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRootConfig, AnyRouter, AnySubscriptionProcedure, IntersectionError, ProcedureArgs, ProcedureRouterRecord, ProcedureType } from '@trpc/server';
 import type { Unsubscribable } from '@trpc/server/observable';
-import { inferTransformedProcedureOutput, inferTransformedSubscriptionOutput } from '@trpc/server/shared';
-import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
-import { TRPCSubscriptionObserver, TRPCUntypedClient, UntypedClientProperties } from './internals/TRPCUntypedClient';
-import { TRPCClientError } from './TRPCClientError';
+import type { AnyProcedure, AnyRouter, inferClientTypes, inferProcedureInput, inferTransformedProcedureOutput, IntersectionError, ProcedureOptions, ProcedureType, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
+import type { CreateTRPCClientOptions } from './createTRPCUntypedClient';
+import type { TRPCSubscriptionObserver, UntypedClientProperties } from './internals/TRPCUntypedClient';
+import { TRPCUntypedClient } from './internals/TRPCUntypedClient';
+import type { TRPCClientError } from './TRPCClientError';
 /**
  * @public
  **/
 export type inferRouterClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<TRouter, TRouter['_def']['record']>;
+type ResolverDef = {
+    input: any;
+    output: any;
+    transformer: boolean;
+    errorShape: any;
+};
 /** @internal */
-export type Resolver<TConfig extends AnyRootConfig, TProcedure extends AnyProcedure> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferTransformedProcedureOutput<TConfig, TProcedure>>;
-type SubscriptionResolver<TConfig extends AnyRootConfig, TProcedure extends AnyProcedure> = (...args: [
-    input: ProcedureArgs<TProcedure['_def']>[0],
-    opts: Partial<TRPCSubscriptionObserver<inferTransformedSubscriptionOutput<TConfig, TProcedure>, TRPCClientError<TConfig>>> & ProcedureArgs<TProcedure['_def']>[1]
-]) => Unsubscribable;
-type DecorateProcedure<TConfig extends AnyRootConfig, TProcedure extends AnyProcedure> = TProcedure extends AnyQueryProcedure ? {
-    query: Resolver<TConfig, TProcedure>;
-} : TProcedure extends AnyMutationProcedure ? {
-    mutate: Resolver<TConfig, TProcedure>;
-} : TProcedure extends AnySubscriptionProcedure ? {
-    subscribe: SubscriptionResolver<TConfig, TProcedure>;
+export type Resolver<TDef extends ResolverDef> = (input: TDef['input'], opts?: ProcedureOptions) => Promise<TDef['output']>;
+type SubscriptionResolver<TDef extends ResolverDef> = (input: TDef['input'], opts?: Partial<TRPCSubscriptionObserver<TDef['output'], TRPCClientError<TDef>>> & ProcedureOptions) => Unsubscribable;
+type DecorateProcedure<TType extends ProcedureType, TDef extends ResolverDef> = TType extends 'query' ? {
+    query: Resolver<TDef>;
+} : TType extends 'mutation' ? {
+    mutate: Resolver<TDef>;
+} : TType extends 'subscription' ? {
+    subscribe: SubscriptionResolver<TDef>;
 } : never;
 /**
  * @internal
  */
-type DecoratedProcedureRecord<TRouter extends AnyRouter, TProcedures extends ProcedureRouterRecord> = {
-    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TRouter, TProcedures[TKey]['_def']['record']> : TProcedures[TKey] extends AnyProcedure ? DecorateProcedure<TRouter['_def']['_config'], TProcedures[TKey]> : never;
+type DecoratedProcedureRecord<TRouter extends AnyRouter, TRecord extends RouterRecord> = {
+    [TKey in keyof TRecord]: TRecord[TKey] extends infer $Value ? $Value extends RouterRecord ? DecoratedProcedureRecord<TRouter, $Value> : $Value extends AnyProcedure ? DecorateProcedure<$Value['_def']['type'], {
+        input: inferProcedureInput<$Value>;
+        output: inferTransformedProcedureOutput<inferClientTypes<TRouter>, $Value>;
+        errorShape: inferClientTypes<TRouter>['errorShape'];
+        transformer: inferClientTypes<TRouter>['transformer'];
+    }> : never : never;
 };
 /** @internal */
 export declare const clientCallTypeToProcedureType: (clientCallType: string) => ProcedureType;
 /**
  * Creates a proxy client and shows type errors if you have query names that collide with built-in properties
  */
-export type CreateTRPCClient<TRouter extends AnyRouter> = inferRouterClient<TRouter> extends infer $ProcedureRecord ? UntypedClientProperties & keyof $ProcedureRecord extends never ? inferRouterClient<TRouter> : IntersectionError<UntypedClientProperties & keyof $ProcedureRecord> : never;
+export type CreateTRPCClient<TRouter extends AnyRouter> = inferRouterClient<TRouter> extends infer $Value ? UntypedClientProperties & keyof $Value extends never ? inferRouterClient<TRouter> : IntersectionError<UntypedClientProperties & keyof $Value> : never;
 /**
  * @internal
  */