@trpc/client 11.0.0-rc.789 → 11.0.0-rc.795

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 75600,
-  "bundleOrigSize": 94551,
-  "bundleReduction": 20.04,
+  "bundleSize": 75585,
+  "bundleOrigSize": 94308,
+  "bundleReduction": 19.85,
   "modules": [
     {
       "id": "/src/links/wsLink/wsClient/wsClient.ts",
@@ -44,7 +44,7 @@
     {
       "id": "/src/links/wsLink/wsClient/wsConnection.ts",
       "size": 5861,
-      "origSize": 6218,
+      "origSize": 6205,
       "renderedExports": [
         "WsConnection",
         "backwardCompatibility"
@@ -54,7 +54,7 @@
         "/src/links/wsLink/wsClient/wsClient.ts"
       ],
       "percent": 7.75,
-      "reduction": 5.74
+      "reduction": 5.54
     },
     {
       "id": "/src/links/loggerLink.ts",
@@ -141,13 +141,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.35,
+      "percent": 4.36,
       "reduction": 12.56
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
       "size": 3158,
-      "origSize": 4578,
+      "origSize": 4417,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -157,7 +157,7 @@
         "/src/createTRPCClient.ts"
       ],
       "percent": 4.18,
-      "reduction": 31.02
+      "reduction": 28.5
     },
     {
       "id": "/src/TRPCClientError.ts",
@@ -230,8 +230,8 @@
     },
     {
       "id": "/src/createTRPCClient.ts",
-      "size": 1185,
-      "origSize": 4694,
+      "size": 1170,
+      "origSize": 4737,
       "renderedExports": [
         "clientCallTypeToProcedureType",
         "createTRPCClientProxy",
@@ -242,8 +242,8 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 1.57,
-      "reduction": 74.76
+      "percent": 1.55,
+      "reduction": 75.3
     },
     {
       "id": "/src/links/wsLink/wsLink.ts",
@@ -405,7 +405,7 @@
     {
       "id": "/src/index.ts",
       "size": 0,
-      "origSize": 652,
+      "origSize": 540,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],

package/dist/createTRPCClient.d.ts

@@ -1,14 +1,30 @@
 import type { Unsubscribable } from '@trpc/server/observable';
-import type { AnyProcedure, AnyRouter, inferClientTypes, inferProcedureInput, inferTransformedProcedureOutput, IntersectionError, ProcedureType, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyProcedure, AnyRouter, inferClientTypes, inferProcedureInput, InferrableClientTypes, inferTransformedProcedureOutput, ProcedureType, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
 import type { CreateTRPCClientOptions } from './createTRPCUntypedClient';
-import type { TRPCSubscriptionObserver, UntypedClientProperties } from './internals/TRPCUntypedClient';
+import type { TRPCSubscriptionObserver } from './internals/TRPCUntypedClient';
 import { TRPCUntypedClient } from './internals/TRPCUntypedClient';
 import type { TRPCProcedureOptions } from './internals/types';
 import type { TRPCClientError } from './TRPCClientError';
 /**
  * @public
+ * @deprecated use {@link TRPCClient} instead, will be removed in v12
  **/
-export type inferRouterClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<TRouter, TRouter['_def']['record']>;
+export type inferRouterClient<TRouter extends AnyRouter> = TRPCClient<TRouter>;
+/**
+ * @public
+ * @deprecated use {@link TRPCClient} instead, will be removed in v12
+ **/
+export type CreateTRPCClient<TRouter extends AnyRouter> = TRPCClient<TRouter>;
+declare const untypedClientSymbol: unique symbol;
+/**
+ * @public
+ **/
+export type TRPCClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<{
+    transformer: TRouter['_def']['_config']['$types']['transformer'];
+    errorShape: TRouter['_def']['_config']['$types']['errorShape'];
+}, TRouter['_def']['record']> & {
+    [untypedClientSymbol]: TRPCUntypedClient<TRouter>;
+};
 type ResolverDef = {
     input: any;
     output: any;
@@ -29,29 +45,25 @@ type DecorateProcedure<TType extends ProcedureType, TDef extends ResolverDef> =
 /**
  * @internal
  */
-type DecoratedProcedureRecord<TRouter extends AnyRouter, TRecord extends RouterRecord> = {
+type DecoratedProcedureRecord<TRoot extends InferrableClientTypes, TRecord extends RouterRecord> = {
     [TKey in keyof TRecord]: TRecord[TKey] extends infer $Value ? $Value extends AnyProcedure ? DecorateProcedure<$Value['_def']['type'], {
         input: inferProcedureInput<$Value>;
-        output: inferTransformedProcedureOutput<inferClientTypes<TRouter>, $Value>;
-        errorShape: inferClientTypes<TRouter>['errorShape'];
-        transformer: inferClientTypes<TRouter>['transformer'];
-    }> : $Value extends RouterRecord ? DecoratedProcedureRecord<TRouter, $Value> : never : never;
+        output: inferTransformedProcedureOutput<inferClientTypes<TRoot>, $Value>;
+        errorShape: inferClientTypes<TRoot>['errorShape'];
+        transformer: inferClientTypes<TRoot>['transformer'];
+    }> : $Value extends RouterRecord ? DecoratedProcedureRecord<TRoot, $Value> : 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 $Value ? UntypedClientProperties & keyof $Value extends never ? inferRouterClient<TRouter> : IntersectionError<UntypedClientProperties & keyof $Value> : never;
 /**
  * @internal
  */
-export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): CreateTRPCClient<TRouter>;
-export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): CreateTRPCClient<TRouter>;
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): TRPCClient<TRouter>;
+export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): TRPCClient<TRouter>;
 /**
  * Get an untyped client from a proxy client
  * @internal
  */
-export declare function getUntypedClient<TRouter extends AnyRouter>(client: inferRouterClient<TRouter>): TRPCUntypedClient<TRouter>;
+export declare function getUntypedClient<TRouter extends AnyRouter>(client: TRPCClient<TRouter>): TRPCUntypedClient<TRouter>;
 export {};
 //# sourceMappingURL=createTRPCClient.d.ts.map

package/dist/createTRPCClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACnB,+BAA+B,EAC/B,iBAAiB,EACjB,aAAa,EACb,YAAY,EACb,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;IAEI;AACJ,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE/D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,KAAK,8BAA8B,CAAC,CAAC,IACnC,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,EAAE,MAAM,OAAO,EAAE,MAAM,KAAK,CAAC,GAC1D,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,GACjC,CAAC,CAAC;AAER,gBAAgB;AAChB,MAAM,MAAM,QAAQ,CAAC,IAAI,SAAS,WAAW,IAAI,CAC/C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EACpB,IAAI,CAAC,EAAE,oBAAoB,KACxB,OAAO,CAAC,8BAA8B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAE7D,KAAK,oBAAoB,CAAC,IAAI,SAAS,WAAW,IAAI,CACpD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EACpB,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAChE,GACC,oBAAoB,KACnB,cAAc,CAAC;AAEpB,KAAK,iBAAiB,CACpB,KAAK,SAAS,aAAa,EAC3B,IAAI,SAAS,WAAW,IACtB,KAAK,SAAS,OAAO,GACrB;IACE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACvB,GACD,KAAK,SAAS,UAAU,GACtB;IACE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACxB,GACD,KAAK,SAAS,cAAc,GAC1B;IACE,SAAS,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;CACvC,GACD,KAAK,CAAC;AAEd;;GAEG;AACH,KAAK,wBAAwB,CAC3B,OAAO,SAAS,SAAS,EACzB,OAAO,SAAS,YAAY,IAC1B;KACD,IAAI,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,GACvD,MAAM,SAAS,YAAY,GACzB,iBAAiB,CACf,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACtB;QACE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,EAAE,+BAA+B,CACrC,gBAAgB,CAAC,OAAO,CAAC,EACzB,MAAM,CACP,CAAC;QACF,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC;QACpD,WAAW,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;KACvD,CACF,GACD,MAAM,SAAS,YAAY,GACzB,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,GACzC,KAAK,GACT,KAAK;CACV,CAAC;AAWF,gBAAgB;AAChB,eAAO,MAAM,6BAA6B,mBACxB,MAAM,KACrB,aAEF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,SAAS,IACpD,iBAAiB,CAAC,OAAO,CAAC,SAAS,MAAM,MAAM,GAC3C,uBAAuB,GAAG,MAAM,MAAM,SAAS,KAAK,GAClD,iBAAiB,CAAC,OAAO,CAAC,GAC1B,iBAAiB,CAAC,uBAAuB,GAAG,MAAM,MAAM,CAAC,GAC3D,KAAK,CAAC;AAEZ;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACjC,gBAAgB,CAAC,OAAO,CAAC,CAoB3B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACrC,gBAAgB,CAAC,OAAO,CAAC,CAI3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACjC,iBAAiB,CAAC,OAAO,CAAC,CAE5B"}
+{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"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"}

package/dist/createTRPCClient.js

@@ -3,6 +3,7 @@
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var TRPCUntypedClient = require('./internals/TRPCUntypedClient.js');
 
+const untypedClientSymbol = Symbol.for('trpc_untypedClient');
 const clientCallTypeMap = {
     query: 'query',
     mutate: 'mutation',
@@ -23,10 +24,7 @@ const clientCallTypeMap = {
         return client[procedureType](fullPath, ...args);
     });
     return unstableCoreDoNotImport.createFlatProxy((key)=>{
-        if (client.hasOwnProperty(key)) {
-            return client[key];
-        }
-        if (key === '__untypedClient') {
+        if (key === untypedClientSymbol) {
             return client;
         }
         return proxy[key];
@@ -41,7 +39,7 @@ function createTRPCClient(opts) {
  * Get an untyped client from a proxy client
  * @internal
  */ function getUntypedClient(client) {
-    return client.__untypedClient;
+    return client[untypedClientSymbol];
 }
 
 exports.clientCallTypeToProcedureType = clientCallTypeToProcedureType;

package/dist/createTRPCClient.mjs

@@ -1,6 +1,7 @@
 import { createRecursiveProxy, createFlatProxy } from '@trpc/server/unstable-core-do-not-import';
 import { TRPCUntypedClient } from './internals/TRPCUntypedClient.mjs';
 
+const untypedClientSymbol = Symbol.for('trpc_untypedClient');
 const clientCallTypeMap = {
     query: 'query',
     mutate: 'mutation',
@@ -21,10 +22,7 @@ const clientCallTypeMap = {
         return client[procedureType](fullPath, ...args);
     });
     return createFlatProxy((key)=>{
-        if (client.hasOwnProperty(key)) {
-            return client[key];
-        }
-        if (key === '__untypedClient') {
+        if (key === untypedClientSymbol) {
             return client;
         }
         return proxy[key];
@@ -39,7 +37,7 @@ function createTRPCClient(opts) {
  * Get an untyped client from a proxy client
  * @internal
  */ function getUntypedClient(client) {
-    return client.__untypedClient;
+    return client[untypedClientSymbol];
 }
 
 export { clientCallTypeToProcedureType, createTRPCClient, createTRPCClientProxy, getUntypedClient };

package/dist/index.d.ts

@@ -8,10 +8,6 @@ export {
  * @deprecated - use `createTRPCClient` instead
  */
 createTRPCClient as createTRPCProxyClient, 
-/**
- * @deprecated - use `CreateTRPCClient` instead
- */
-type CreateTRPCClient as CreateTRPCProxyClient, 
 /**
  * @deprecated - use `inferRouterClient` instead
  */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC;AAExB,OAAO;AACL;;GAEG;AACH,gBAAgB,IAAI,qBAAqB;AACzC;;GAEG;AACH,KAAK,gBAAgB,IAAI,qBAAqB;AAC9C;;GAEG;AACH,KAAK,iBAAiB,IAAI,sBAAsB,GACjD,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC;AAExB,OAAO;AACL;;GAEG;AACH,gBAAgB,IAAI,qBAAqB;AACzC;;GAEG;AACH,KAAK,iBAAiB,IAAI,sBAAsB,GACjD,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/internals/TRPCUntypedClient.d.ts

@@ -25,13 +25,11 @@ export type CreateTRPCClientOptions<TRouter extends InferrableClientTypes> = {
     links: TRPCLink<TRouter>[];
     transformer?: TypeError<'The transformer property has moved to httpLink/httpBatchLink/wsLink'>;
 };
-/** @internal */
-export type UntypedClientProperties = '$request' | 'links' | 'mutation' | 'query' | 'requestAsPromise' | 'requestId' | 'runtime' | 'subscription';
-export declare class TRPCUntypedClient<TRouter extends AnyRouter> {
+export declare class TRPCUntypedClient<TInferrable extends InferrableClientTypes> {
     private readonly links;
     readonly runtime: TRPCClientRuntime;
     private requestId;
-    constructor(opts: CreateTRPCClientOptions<TRouter>);
+    constructor(opts: CreateTRPCClientOptions<TInferrable>);
     private $request;
     private requestAsPromise;
     query(path: string, input?: unknown, opts?: TRPCRequestOptions): Promise<unknown>;

package/dist/internals/TRPCUntypedClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,uBAAuB,EACvB,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,uBAAuB,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;CACvE;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;YAkBF,gBAAgB;IAkBvB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CAwClB"}
+{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,uBAAuB,EACvB,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,uBAAuB,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;CACvE;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,qBAAa,iBAAiB,CAAC,WAAW,SAAS,qBAAqB;IACtE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IACrD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,WAAW,CAAC;IAStD,OAAO,CAAC,QAAQ;YAkBF,gBAAgB;IAkBvB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CAwClB"}

package/dist/links/wsLink/wsClient/wsConnection.d.ts

@@ -1,4 +1,4 @@
-import type { UrlOptionsWithConnectionParams } from '@trpc/client/links/internals/urlWithConnectionParams';
+import type { UrlOptionsWithConnectionParams } from '../../internals/urlWithConnectionParams';
 interface PingPongOptions {
     /**
      * The interval (in milliseconds) between "PING" messages.

package/dist/links/wsLink/wsClient/wsConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsConnection.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sDAAsD,CAAC;AAqB3G,UAAU,eAAe;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAuDD,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,EAAE,OAAO,SAAS,CAAC;IACrC,UAAU,EAAE,8BAA8B,CAAC;IAC3C,SAAS,EAAE,eAAe,GAAG;QAC3B,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,SAAK;IACjB,EAAE,SAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,SAAgB,YAAY,sEAA2C;gBAE3D,IAAI,EAAE,0BAA0B;IAY5C,IAAW,EAAE,qBAEZ;IAED,OAAO,KAAK,EAAE,QAEb;IAED;;OAEG;IACI,MAAM,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAI1C;;OAEG;IACI,QAAQ,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAQ5C;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAA8B;IACpC,IAAI;IAgCjB;;;OAGG;IACU,KAAK;CAOnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,YAAY;;;;;;;;;;;;SA0B7D"}
+{"version":3,"file":"wsConnection.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/wsConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAoB9F,UAAU,eAAe;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAuDD,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,EAAE,OAAO,SAAS,CAAC;IACrC,UAAU,EAAE,8BAA8B,CAAC;IAC3C,SAAS,EAAE,eAAe,GAAG;QAC3B,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,SAAK;IACjB,EAAE,SAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,SAAgB,YAAY,sEAA2C;gBAE3D,IAAI,EAAE,0BAA0B;IAY5C,IAAW,EAAE,qBAEZ;IAED,OAAO,KAAK,EAAE,QAEb;IAED;;OAEG;IACI,MAAM,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAI1C;;OAEG;IACI,QAAQ,IAAI,IAAI,IAAI;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAQ5C;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAA8B;IACpC,IAAI;IAgCjB;;;OAGG;IACU,KAAK;CAOnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,YAAY;;;;;;;;;;;;SA0B7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.789+47682c48d",
+  "version": "11.0.0-rc.795+394b0f5cc",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -77,11 +77,11 @@
     "!**/__tests__"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.789+47682c48d",
+    "@trpc/server": "11.0.0-rc.795+394b0f5cc",
     "typescript": ">=5.7.2"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.789+47682c48d",
+    "@trpc/server": "11.0.0-rc.795+394b0f5cc",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^22.9.0",
     "eslint": "^9.13.0",
@@ -99,5 +99,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "47682c48de9eff643263cceb570f2d335bf9aec9"
+  "gitHead": "394b0f5cc328937156cc75a772b3280231d4a2e2"
 }

package/src/createTRPCClient.ts

@@ -5,8 +5,8 @@ import type {
   AnyRouter,
   inferClientTypes,
   inferProcedureInput,
+  InferrableClientTypes,
   inferTransformedProcedureOutput,
-  IntersectionError,
   ProcedureType,
   RouterRecord,
 } from '@trpc/server/unstable-core-do-not-import';
@@ -15,19 +15,37 @@ import {
   createRecursiveProxy,
 } from '@trpc/server/unstable-core-do-not-import';
 import type { CreateTRPCClientOptions } from './createTRPCUntypedClient';
-import type {
-  TRPCSubscriptionObserver,
-  UntypedClientProperties,
-} from './internals/TRPCUntypedClient';
+import type { TRPCSubscriptionObserver } from './internals/TRPCUntypedClient';
 import { TRPCUntypedClient } from './internals/TRPCUntypedClient';
 import type { TRPCProcedureOptions } from './internals/types';
 import type { TRPCClientError } from './TRPCClientError';
 
 /**
  * @public
+ * @deprecated use {@link TRPCClient} instead, will be removed in v12
+ **/
+export type inferRouterClient<TRouter extends AnyRouter> = TRPCClient<TRouter>;
+
+/**
+ * @public
+ * @deprecated use {@link TRPCClient} instead, will be removed in v12
  **/
-export type inferRouterClient<TRouter extends AnyRouter> =
-  DecoratedProcedureRecord<TRouter, TRouter['_def']['record']>;
+export type CreateTRPCClient<TRouter extends AnyRouter> = TRPCClient<TRouter>;
+
+const untypedClientSymbol = Symbol.for('trpc_untypedClient');
+
+/**
+ * @public
+ **/
+export type TRPCClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<
+  {
+    transformer: TRouter['_def']['_config']['$types']['transformer'];
+    errorShape: TRouter['_def']['_config']['$types']['errorShape'];
+  },
+  TRouter['_def']['record']
+> & {
+  [untypedClientSymbol]: TRPCUntypedClient<TRouter>;
+};
 
 type ResolverDef = {
   input: any;
@@ -76,7 +94,7 @@ type DecorateProcedure<
  * @internal
  */
 type DecoratedProcedureRecord<
-  TRouter extends AnyRouter,
+  TRoot extends InferrableClientTypes,
   TRecord extends RouterRecord,
 > = {
   [TKey in keyof TRecord]: TRecord[TKey] extends infer $Value
@@ -86,15 +104,15 @@ type DecoratedProcedureRecord<
           {
             input: inferProcedureInput<$Value>;
             output: inferTransformedProcedureOutput<
-              inferClientTypes<TRouter>,
+              inferClientTypes<TRoot>,
               $Value
             >;
-            errorShape: inferClientTypes<TRouter>['errorShape'];
-            transformer: inferClientTypes<TRouter>['transformer'];
+            errorShape: inferClientTypes<TRoot>['errorShape'];
+            transformer: inferClientTypes<TRoot>['transformer'];
           }
         >
       : $Value extends RouterRecord
-        ? DecoratedProcedureRecord<TRouter, $Value>
+        ? DecoratedProcedureRecord<TRoot, $Value>
         : never
     : never;
 };
@@ -115,37 +133,22 @@ export const clientCallTypeToProcedureType = (
   return clientCallTypeMap[clientCallType as keyof typeof clientCallTypeMap];
 };
 
-/**
- * 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 $Value
-    ? UntypedClientProperties & keyof $Value extends never
-      ? inferRouterClient<TRouter>
-      : IntersectionError<UntypedClientProperties & keyof $Value>
-    : never;
-
 /**
  * @internal
  */
 export function createTRPCClientProxy<TRouter extends AnyRouter>(
   client: TRPCUntypedClient<TRouter>,
-): CreateTRPCClient<TRouter> {
-  const proxy = createRecursiveProxy<CreateTRPCClient<TRouter>>(
-    ({ path, args }) => {
-      const pathCopy = [...path];
-      const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
-
-      const fullPath = pathCopy.join('.');
-
-      return (client as any)[procedureType](fullPath, ...args);
-    },
-  );
-  return createFlatProxy<CreateTRPCClient<TRouter>>((key) => {
-    if (client.hasOwnProperty(key)) {
-      return (client as any)[key as any];
-    }
-    if (key === '__untypedClient') {
+): TRPCClient<TRouter> {
+  const proxy = createRecursiveProxy<TRPCClient<TRouter>>(({ path, args }) => {
+    const pathCopy = [...path];
+    const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
+
+    const fullPath = pathCopy.join('.');
+
+    return (client[procedureType] as any)(fullPath, ...(args as any));
+  });
+  return createFlatProxy<TRPCClient<TRouter>>((key) => {
+    if (key === untypedClientSymbol) {
       return client;
     }
     return proxy[key];
@@ -154,7 +157,7 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
 
 export function createTRPCClient<TRouter extends AnyRouter>(
   opts: CreateTRPCClientOptions<TRouter>,
-): CreateTRPCClient<TRouter> {
+): TRPCClient<TRouter> {
   const client = new TRPCUntypedClient(opts);
   const proxy = createTRPCClientProxy<TRouter>(client);
   return proxy;
@@ -165,7 +168,7 @@ export function createTRPCClient<TRouter extends AnyRouter>(
  * @internal
  */
 export function getUntypedClient<TRouter extends AnyRouter>(
-  client: inferRouterClient<TRouter>,
+  client: TRPCClient<TRouter>,
 ): TRPCUntypedClient<TRouter> {
-  return (client as any).__untypedClient;
+  return client[untypedClientSymbol];
 }

package/src/index.ts

@@ -11,10 +11,6 @@ export {
    * @deprecated - use `createTRPCClient` instead
    */
   createTRPCClient as createTRPCProxyClient,
-  /**
-   * @deprecated - use `CreateTRPCClient` instead
-   */
-  type CreateTRPCClient as CreateTRPCProxyClient,
   /**
    * @deprecated - use `inferRouterClient` instead
    */

package/src/internals/TRPCUntypedClient.ts

@@ -44,23 +44,12 @@ export type CreateTRPCClientOptions<TRouter extends InferrableClientTypes> = {
   transformer?: TypeError<'The transformer property has moved to httpLink/httpBatchLink/wsLink'>;
 };
 
-/** @internal */
-export type UntypedClientProperties =
-  | '$request'
-  | 'links'
-  | 'mutation'
-  | 'query'
-  | 'requestAsPromise'
-  | 'requestId'
-  | 'runtime'
-  | 'subscription';
-
-export class TRPCUntypedClient<TRouter extends AnyRouter> {
-  private readonly links: OperationLink<AnyRouter>[];
+export class TRPCUntypedClient<TInferrable extends InferrableClientTypes> {
+  private readonly links: OperationLink<TInferrable>[];
   public readonly runtime: TRPCClientRuntime;
   private requestId: number;
 
-  constructor(opts: CreateTRPCClientOptions<TRouter>) {
+  constructor(opts: CreateTRPCClientOptions<TInferrable>) {
     this.requestId = 0;
 
     this.runtime = {};

package/src/links/wsLink/wsClient/wsConnection.ts

@@ -1,5 +1,5 @@
-import type { UrlOptionsWithConnectionParams } from '@trpc/client/links/internals/urlWithConnectionParams';
 import { behaviorSubject } from '@trpc/server/observable';
+import type { UrlOptionsWithConnectionParams } from '../../internals/urlWithConnectionParams';
 import { prepareUrl, withResolvers } from './utils';
 
 /**