@trpc/client 10.7.0 → 10.8.1

package/dist/createTRPCClient.d.ts

@@ -1,8 +1,20 @@
-import type { AnyRouter } from '@trpc/server';
-import { TRPCClient as Client, CreateTRPCClientOptions } from './internals/TRPCClient';
+import type { AnyRouter, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
+import { Unsubscribable } from '@trpc/server/observable';
+import { inferTransformedProcedureOutput } from '@trpc/server/shared';
+import { TRPCClientError } from './TRPCClientError';
+import { CreateTRPCClientOptions, TRPCRequestOptions, TRPCSubscriptionObserver } from './internals/TRPCUntypedClient';
+import { TRPCClientRuntime } from './links';
+/**
+ * @deprecated
+ */
+export interface TRPCClient<TRouter extends AnyRouter> {
+    readonly runtime: TRPCClientRuntime;
+    query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries, TInput extends inferProcedureInput<TQueries[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferProcedureOutput<TQueries[TPath]>>;
+    mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations, TInput extends inferProcedureInput<TMutations[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferTransformedProcedureOutput<TMutations[TPath]>>;
+    subscription<TSubscriptions extends TRouter['_def']['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<TSubscriptions[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
+}
 /**
  * @deprecated use `createTRPCProxyClient` instead
  */
-export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter>;
-export type { CreateTRPCClientOptions, TRPCClient, TRPCRequestOptions, } from './internals/TRPCClient';
+export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): TRPCClient<TRouter>;
 //# 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":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAavC;AAID,YAAY,EACV,uBAAuB,EACvB,UAAU,EACV,kBAAkB,GACnB,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,SAAS;IACnD,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,KAAK,CACH,QAAQ,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAC3C,KAAK,SAAS,MAAM,GAAG,MAAM,QAAQ,EACrC,MAAM,SAAS,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAEnD,IAAI,EAAE,KAAK,EACX,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAElD,QAAQ,CACN,UAAU,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,EAC/C,KAAK,SAAS,MAAM,GAAG,MAAM,UAAU,EACvC,MAAM,SAAS,mBAAmB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAErD,IAAI,EAAE,KAAK,EACX,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,+BAA+B,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE/D,YAAY,CACV,cAAc,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,EACvD,KAAK,SAAS,MAAM,GAAG,MAAM,cAAc,EAE3C,OAAO,SAAS,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,EACvD,MAAM,SAAS,mBAAmB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAEzD,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,kBAAkB,GACtB,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,GACrE,cAAc,CAAC;CACnB;AACD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,uBAIvC"}

package/dist/createTRPCClientProxy.d.ts

@@ -2,8 +2,9 @@ import type { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRouter,
 import type { Unsubscribable } from '@trpc/server/observable';
 import { inferTransformedProcedureOutput, inferTransformedSubscriptionOutput } from '@trpc/server/shared';
 import { TRPCClientError } from './TRPCClientError';
-import { CreateTRPCClientOptions } from './createTRPCClient';
-import { TRPCClient, TRPCSubscriptionObserver } from './internals/TRPCClient';
+import { TRPCClient } from './createTRPCClient';
+import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
+import { TRPCSubscriptionObserver } from './internals/TRPCUntypedClient';
 export declare type inferRouterProxyClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
 declare type Resolver<TProcedure extends AnyProcedure> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferTransformedProcedureOutput<TProcedure>>;
 declare type SubscriptionResolver<TProcedure extends AnyProcedure, TRouter extends AnyRouter> = (...args: [

package/dist/createTRPCClientProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAGL,+BAA+B,EAC/B,kCAAkC,EACnC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,oBAAY,sBAAsB,CAAC,OAAO,SAAS,SAAS,IAC1D,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;AAE/D,aAAK,QAAQ,CAAC,UAAU,SAAS,YAAY,IAAI,CAC/C,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC,CAAC;AAE1D,aAAK,oBAAoB,CACvB,UAAU,SAAS,YAAY,EAC/B,OAAO,SAAS,SAAS,IACvB,CACF,GAAG,IAAI,EAAE;IACP,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CACL,wBAAwB,CACtB,kCAAkC,CAAC,UAAU,CAAC,EAC9C,eAAe,CAAC,OAAO,CAAC,CACzB,CACF;CACJ,KACE,cAAc,CAAC;AAEpB,aAAK,iBAAiB,CACpB,UAAU,SAAS,YAAY,EAC/B,OAAO,SAAS,SAAS,IACvB,UAAU,SAAS,iBAAiB,GACpC;IACE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC7B,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC9B,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;CACtD,GACD,KAAK,CAAC;AAEV;;GAEG;AACH,aAAK,wBAAwB,CAC3B,WAAW,SAAS,qBAAqB,EACzC,OAAO,SAAS,SAAS,IACvB;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CACtB,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACnC,WAAW,CAAC,IAAI,CAAC,CAClB,GACD,WAAW,CAAC,IAAI,CAAC,SAAS,YAAY,GACtC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAC7C,KAAK;CACV,CAAC;AAWF,oBAAY,qBAAqB,CAAC,OAAO,SAAS,SAAS,IACzD,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAElC;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,gEAoB5B;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,gEAKvC"}
+{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAGL,+BAA+B,EAC/B,kCAAkC,EACnC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EACL,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,oBAAY,sBAAsB,CAAC,OAAO,SAAS,SAAS,IAC1D,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;AAE/D,aAAK,QAAQ,CAAC,UAAU,SAAS,YAAY,IAAI,CAC/C,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC,CAAC;AAE1D,aAAK,oBAAoB,CACvB,UAAU,SAAS,YAAY,EAC/B,OAAO,SAAS,SAAS,IACvB,CACF,GAAG,IAAI,EAAE;IACP,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CACL,wBAAwB,CACtB,kCAAkC,CAAC,UAAU,CAAC,EAC9C,eAAe,CAAC,OAAO,CAAC,CACzB,CACF;CACJ,KACE,cAAc,CAAC;AAEpB,aAAK,iBAAiB,CACpB,UAAU,SAAS,YAAY,EAC/B,OAAO,SAAS,SAAS,IACvB,UAAU,SAAS,iBAAiB,GACpC;IACE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC7B,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC9B,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;CACtD,GACD,KAAK,CAAC;AAEV;;GAEG;AACH,aAAK,wBAAwB,CAC3B,WAAW,SAAS,qBAAqB,EACzC,OAAO,SAAS,SAAS,IACvB;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CACtB,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACnC,WAAW,CAAC,IAAI,CAAC,CAClB,GACD,WAAW,CAAC,IAAI,CAAC,SAAS,YAAY,GACtC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAC7C,KAAK;CACV,CAAC;AAWF,oBAAY,qBAAqB,CAAC,OAAO,SAAS,SAAS,IACzD,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAElC;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,gEAoB5B;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,gEAKvC"}

package/dist/createTRPCUntypedClient.d.ts

@@ -0,0 +1,5 @@
+import { AnyRouter } from '@trpc/server';
+import { CreateTRPCClientOptions, TRPCUntypedClient } from './internals/TRPCUntypedClient';
+export declare function createTRPCUntypedClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): TRPCUntypedClient<AnyRouter>;
+export type { CreateTRPCClientOptions, TRPCRequestOptions, TRPCUntypedClient, } from './internals/TRPCUntypedClient';
+//# sourceMappingURL=createTRPCUntypedClient.d.ts.map

package/dist/createTRPCUntypedClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createTRPCUntypedClient.d.ts","sourceRoot":"","sources":["../src/createTRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAC/D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,gCAIvC;AAED,YAAY,EACV,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,+BAA+B,CAAC"}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from './createTRPCUntypedClient';
 export * from './createTRPCClient';
 export * from './createTRPCClientProxy';
 export * from './getFetch';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var observable = require('@trpc/server/observable');
 var transformResult = require('./transformResult-e7a1e69e.js');
 var links_splitLink = require('./splitLink-f29e84be.js');
-var links_httpBatchLink = require('./links/httpBatchLink.js');
 var shared = require('@trpc/server/shared');
 var httpUtils = require('./httpUtils-277fd63a.js');
+var links_httpBatchLink = require('./links/httpBatchLink.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');
 
-class TRPCClient {
+class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {
         const chain$ = links_splitLink.createChain({
             links: this.links,
@@ -43,7 +43,7 @@ class TRPCClient {
         return this.requestAsPromise({
             type: 'query',
             path,
-            input: input,
+            input,
             context: opts?.context,
             signal: opts?.signal
         });
@@ -52,7 +52,7 @@ class TRPCClient {
         return this.requestAsPromise({
             type: 'mutation',
             path,
-            input: input,
+            input,
             context: opts?.context,
             signal: opts?.signal
         });
@@ -85,21 +85,16 @@ class TRPCClient {
     constructor(opts){
         this.requestId = 0;
         function getTransformer() {
-            if (!opts.transformer || typeof opts.transformer === 'string') return {
+            const transformer = opts.transformer;
+            if (!transformer) return {
                 serialize: (data)=>data,
                 deserialize: (data)=>data
             };
-            // Type guard for `opts.transformer` because it can be `any`
-            function isTransformer(obj) {
-                return true;
-            }
-            if (isTransformer(opts.transformer)) {
-                if ('input' in opts.transformer) return {
-                    serialize: opts.transformer.input.serialize,
-                    deserialize: opts.transformer.output.deserialize
-                };
-            }
-            return opts.transformer;
+            if ('input' in transformer) return {
+                serialize: transformer.input.serialize,
+                deserialize: transformer.output.deserialize
+            };
+            return transformer;
         }
         this.runtime = {
             transformer: getTransformer()
@@ -109,21 +104,15 @@ class TRPCClient {
     }
 }
 
+function createTRPCUntypedClient(opts) {
+    const client = new TRPCUntypedClient(opts);
+    return client;
+}
+
 /**
  * @deprecated use `createTRPCProxyClient` instead
  */ function createTRPCClient(opts) {
-    const getLinks = ()=>{
-        if ('links' in opts) {
-            return opts.links;
-        }
-        return [
-            links_httpBatchLink.httpBatchLink(opts)
-        ];
-    };
-    const client = new TRPCClient({
-        ...opts,
-        links: getLinks()
-    });
+    const client = new TRPCUntypedClient(opts);
     return client;
 }
 
@@ -153,15 +142,15 @@ const clientCallTypeMap = {
     });
 }
 function createTRPCProxyClient(opts) {
-    const client = new TRPCClient(opts);
+    const client = new TRPCUntypedClient(opts);
     const proxy = createTRPCClientProxy(client);
     return proxy;
 }
 
 exports.TRPCClientError = transformResult.TRPCClientError;
 exports.splitLink = links_splitLink.splitLink;
-exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
 exports.getFetch = httpUtils.getFetch;
+exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
 exports.httpLink = links_httpLink.httpLink;
 exports.loggerLink = links_loggerLink.loggerLink;
 exports.createWSClient = links_wsLink.createWSClient;
@@ -169,3 +158,4 @@ exports.wsLink = links_wsLink.wsLink;
 exports.createTRPCClient = createTRPCClient;
 exports.createTRPCClientProxy = createTRPCClientProxy;
 exports.createTRPCProxyClient = createTRPCProxyClient;
+exports.createTRPCUntypedClient = createTRPCUntypedClient;

package/dist/index.mjs

@@ -3,15 +3,14 @@ import { T as TRPCClientError } from './transformResult-6fb67924.mjs';
 export { T as TRPCClientError } from './transformResult-6fb67924.mjs';
 import { c as createChain } from './splitLink-4c75f7be.mjs';
 export { s as splitLink } from './splitLink-4c75f7be.mjs';
-import { httpBatchLink } from './links/httpBatchLink.mjs';
-export { httpBatchLink } from './links/httpBatchLink.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
 export { g as getFetch } from './httpUtils-939364d7.mjs';
+export { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 export { createWSClient, wsLink } from './links/wsLink.mjs';
 
-class TRPCClient {
+class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {
         const chain$ = createChain({
             links: this.links,
@@ -42,7 +41,7 @@ class TRPCClient {
         return this.requestAsPromise({
             type: 'query',
             path,
-            input: input,
+            input,
             context: opts?.context,
             signal: opts?.signal
         });
@@ -51,7 +50,7 @@ class TRPCClient {
         return this.requestAsPromise({
             type: 'mutation',
             path,
-            input: input,
+            input,
             context: opts?.context,
             signal: opts?.signal
         });
@@ -84,21 +83,16 @@ class TRPCClient {
     constructor(opts){
         this.requestId = 0;
         function getTransformer() {
-            if (!opts.transformer || typeof opts.transformer === 'string') return {
+            const transformer = opts.transformer;
+            if (!transformer) return {
                 serialize: (data)=>data,
                 deserialize: (data)=>data
             };
-            // Type guard for `opts.transformer` because it can be `any`
-            function isTransformer(obj) {
-                return true;
-            }
-            if (isTransformer(opts.transformer)) {
-                if ('input' in opts.transformer) return {
-                    serialize: opts.transformer.input.serialize,
-                    deserialize: opts.transformer.output.deserialize
-                };
-            }
-            return opts.transformer;
+            if ('input' in transformer) return {
+                serialize: transformer.input.serialize,
+                deserialize: transformer.output.deserialize
+            };
+            return transformer;
         }
         this.runtime = {
             transformer: getTransformer()
@@ -108,21 +102,15 @@ class TRPCClient {
     }
 }
 
+function createTRPCUntypedClient(opts) {
+    const client = new TRPCUntypedClient(opts);
+    return client;
+}
+
 /**
  * @deprecated use `createTRPCProxyClient` instead
  */ function createTRPCClient(opts) {
-    const getLinks = ()=>{
-        if ('links' in opts) {
-            return opts.links;
-        }
-        return [
-            httpBatchLink(opts)
-        ];
-    };
-    const client = new TRPCClient({
-        ...opts,
-        links: getLinks()
-    });
+    const client = new TRPCUntypedClient(opts);
     return client;
 }
 
@@ -152,9 +140,9 @@ const clientCallTypeMap = {
     });
 }
 function createTRPCProxyClient(opts) {
-    const client = new TRPCClient(opts);
+    const client = new TRPCUntypedClient(opts);
     const proxy = createTRPCClientProxy(client);
     return proxy;
 }
 
-export { createTRPCClient, createTRPCClientProxy, createTRPCProxyClient };
+export { createTRPCClient, createTRPCClientProxy, createTRPCProxyClient, createTRPCUntypedClient };

package/dist/internals/{TRPCClient.d.ts → TRPCUntypedClient.d.ts}

@@ -1,6 +1,5 @@
-import { AnyRouter, ClientDataTransformerOptions, CombinedDataTransformer, DataTransformerOptions, DefaultDataTransformer, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
+import { AnyRouter, ClientDataTransformerOptions, CombinedDataTransformer, DataTransformerOptions, DefaultDataTransformer } from '@trpc/server';
 import { Unsubscribable } from '@trpc/server/observable';
-import { inferTransformedProcedureOutput } from '@trpc/server/shared';
 import { TRPCClientError } from '../TRPCClientError';
 import { OperationContext, TRPCClientRuntime, TRPCLink } from '../links/types';
 declare type CreateTRPCClientBaseOptions<TRouter extends AnyRouter> = TRouter['_def']['_config']['transformer'] extends DefaultDataTransformer ? {
@@ -46,16 +45,16 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
 export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateTRPCClientBaseOptions<TRouter> & {
     links: TRPCLink<TRouter>[];
 };
-export declare class TRPCClient<TRouter extends AnyRouter> {
+export declare class TRPCUntypedClient<TRouter extends AnyRouter> {
     private readonly links;
     readonly runtime: TRPCClientRuntime;
     private requestId;
     constructor(opts: CreateTRPCClientOptions<TRouter>);
     private $request;
     private requestAsPromise;
-    query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries, TInput extends inferProcedureInput<TQueries[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferProcedureOutput<TQueries[TPath]>>;
-    mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations, TInput extends inferProcedureInput<TMutations[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferTransformedProcedureOutput<TMutations[TPath]>>;
-    subscription<TSubscriptions extends TRouter['_def']['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<TSubscriptions[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
+    query(path: string, input?: unknown, opts?: TRPCRequestOptions): Promise<unknown>;
+    mutation(path: string, input?: unknown, opts?: TRPCRequestOptions): Promise<unknown>;
+    subscription(path: string, input: unknown, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<unknown, TRPCClientError<AnyRouter>>>): Unsubscribable;
 }
 export {};
-//# sourceMappingURL=TRPCClient.d.ts.map
+//# sourceMappingURL=TRPCUntypedClient.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,4BAA4B,EAC5B,uBAAuB,EAEvB,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EAIf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EACL,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,aAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IACxD,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,SAAS,sBAAsB,GACpE;IACE;;;;;QAKI;IACJ,WAAW,CAAC,EAAE,kDAAkD,CAAC;CAClE,GACD,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,SAAS,sBAAsB,GACxE;IACE;;;;;QAKI;IACJ,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,SAAS,uBAAuB,GAClF,sBAAsB,GACtB,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;CAC/C,GACD;IACE;;;;;QAKI;IACJ,WAAW,CAAC,EAAE,4BAA4B,CAAC;CAC5C,CAAC;AAGR,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,MAAM,IAAI,CAAC;IACtB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,oBAAY,uBAAuB,CAAC,OAAO,SAAS,SAAS,IACzD,2BAA2B,CAAC,OAAO,CAAC,GAAG;IACrC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;CAC5B,CAAC;AAEN,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;IA4BlD,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,gBAAgB;IAyBjB,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,kBAAkB,GACtB,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,GACvE,cAAc;CAyBlB"}

package/dist/links/wsLink.js

@@ -191,7 +191,7 @@ function createWSClient(opts) {
             delete pendingRequests[id];
             outgoing = outgoing.filter((msg)=>msg.id !== id);
             callbacks?.complete?.();
-            if (activeConnection.readyState === WebSocket.OPEN && op.type === 'subscription') {
+            if (activeConnection.readyState === WebSocketImpl.OPEN && op.type === 'subscription') {
                 outgoing.push({
                     id,
                     method: 'subscription.stop'

package/dist/links/wsLink.mjs

@@ -187,7 +187,7 @@ function createWSClient(opts) {
             delete pendingRequests[id];
             outgoing = outgoing.filter((msg)=>msg.id !== id);
             callbacks?.complete?.();
-            if (activeConnection.readyState === WebSocket.OPEN && op.type === 'subscription') {
+            if (activeConnection.readyState === WebSocketImpl.OPEN && op.type === 'subscription') {
                 outgoing.push({
                     id,
                     method: 'subscription.stop'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.7.0",
+  "version": "10.8.1",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -25,6 +25,7 @@
     "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
     "codegen:entrypoints": "tsx entrypoints.script.ts",
+    "lint": "eslint --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "exports": {
@@ -66,17 +67,18 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.7.0"
+    "@trpc/server": "10.8.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.18.1",
-    "@trpc/server": "10.7.0",
+    "@trpc/server": "10.8.1",
     "@types/node": "^18.7.20",
+    "eslint": "^8.30.0",
     "rollup": "^2.79.1",
     "tsx": "^3.9.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd8e424c0f0d3a43b6c6cb0356c4ac1b8199c4d0"
+  "gitHead": "2a130c7cac7557ee740a687bade81a3f5747cf56"
 }

package/src/createTRPCClient.ts

@@ -1,33 +1,64 @@
-import type { AnyRouter } from '@trpc/server';
+import type {
+  AnyRouter,
+  inferProcedureInput,
+  inferProcedureOutput,
+  inferSubscriptionOutput,
+} from '@trpc/server';
+import { Unsubscribable } from '@trpc/server/observable';
+import { inferTransformedProcedureOutput } from '@trpc/server/shared';
+import { TRPCClientError } from './TRPCClientError';
 import {
-  TRPCClient as Client,
   CreateTRPCClientOptions,
-} from './internals/TRPCClient';
-import { httpBatchLink } from './links';
+  TRPCRequestOptions,
+  TRPCSubscriptionObserver,
+  TRPCUntypedClient,
+} from './internals/TRPCUntypedClient';
+import { TRPCClientRuntime } from './links';
+
+/**
+ * @deprecated
+ */
+export interface TRPCClient<TRouter extends AnyRouter> {
+  readonly runtime: TRPCClientRuntime;
+  query<
+    TQueries extends TRouter['_def']['queries'],
+    TPath extends string & keyof TQueries,
+    TInput extends inferProcedureInput<TQueries[TPath]>,
+  >(
+    path: TPath,
+    input?: TInput,
+    opts?: TRPCRequestOptions,
+  ): Promise<inferProcedureOutput<TQueries[TPath]>>;
+
+  mutation<
+    TMutations extends TRouter['_def']['mutations'],
+    TPath extends string & keyof TMutations,
+    TInput extends inferProcedureInput<TMutations[TPath]>,
+  >(
+    path: TPath,
+    input?: TInput,
+    opts?: TRPCRequestOptions,
+  ): Promise<inferTransformedProcedureOutput<TMutations[TPath]>>;
 
+  subscription<
+    TSubscriptions extends TRouter['_def']['subscriptions'],
+    TPath extends string & keyof TSubscriptions,
+    // TODO - this should probably be updated to use inferTransformedProcedureOutput but this is only hit for legacy clients
+    TOutput extends inferSubscriptionOutput<TRouter, TPath>,
+    TInput extends inferProcedureInput<TSubscriptions[TPath]>,
+  >(
+    path: TPath,
+    input: TInput,
+    opts: TRPCRequestOptions &
+      Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>,
+  ): Unsubscribable;
+}
 /**
  * @deprecated use `createTRPCProxyClient` instead
  */
 export function createTRPCClient<TRouter extends AnyRouter>(
   opts: CreateTRPCClientOptions<TRouter>,
 ) {
-  const getLinks = () => {
-    if ('links' in opts) {
-      return opts.links;
-    }
-    return [httpBatchLink(opts)];
-  };
-  const client = new Client<TRouter>({
-    ...opts,
-    links: getLinks(),
-  });
-  return client;
+  const client = new TRPCUntypedClient(opts);
+  return client as TRPCClient<TRouter>;
 }
-
-// Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
-
-export type {
-  CreateTRPCClientOptions,
-  TRPCClient,
-  TRPCRequestOptions,
-} from './internals/TRPCClient';

package/src/createTRPCClientProxy.ts

@@ -1,6 +1,4 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import type {
   AnyMutationProcedure,
   AnyProcedure,
@@ -19,8 +17,12 @@ import {
   inferTransformedSubscriptionOutput,
 } from '@trpc/server/shared';
 import { TRPCClientError } from './TRPCClientError';
-import { CreateTRPCClientOptions } from './createTRPCClient';
-import { TRPCClient, TRPCSubscriptionObserver } from './internals/TRPCClient';
+import { TRPCClient } from './createTRPCClient';
+import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
+import {
+  TRPCSubscriptionObserver,
+  TRPCUntypedClient,
+} from './internals/TRPCUntypedClient';
 
 export type inferRouterProxyClient<TRouter extends AnyRouter> =
   DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
@@ -121,7 +123,7 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
 export function createTRPCProxyClient<TRouter extends AnyRouter>(
   opts: CreateTRPCClientOptions<TRouter>,
 ) {
-  const client = new TRPCClient<TRouter>(opts);
-  const proxy = createTRPCClientProxy(client);
+  const client = new TRPCUntypedClient(opts);
+  const proxy = createTRPCClientProxy(client as TRPCClient<TRouter>);
   return proxy;
 }

package/src/createTRPCUntypedClient.ts

@@ -0,0 +1,18 @@
+import { AnyRouter } from '@trpc/server';
+import {
+  CreateTRPCClientOptions,
+  TRPCUntypedClient,
+} from './internals/TRPCUntypedClient';
+
+export function createTRPCUntypedClient<TRouter extends AnyRouter>(
+  opts: CreateTRPCClientOptions<TRouter>,
+) {
+  const client = new TRPCUntypedClient(opts);
+  return client;
+}
+
+export type {
+  CreateTRPCClientOptions,
+  TRPCRequestOptions,
+  TRPCUntypedClient,
+} from './internals/TRPCUntypedClient';

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from './createTRPCUntypedClient';
 export * from './createTRPCClient';
 export * from './createTRPCClientProxy';
 export * from './getFetch';

package/src/internals/{TRPCClient.ts → TRPCUntypedClient.ts}

@@ -5,9 +5,6 @@ import {
   DataTransformer,
   DataTransformerOptions,
   DefaultDataTransformer,
-  inferProcedureInput,
-  inferProcedureOutput,
-  inferSubscriptionOutput,
 } from '@trpc/server';
 import {
   Unsubscribable,
@@ -15,7 +12,6 @@ import {
   observableToPromise,
   share,
 } from '@trpc/server/observable';
-import { inferTransformedProcedureOutput } from '@trpc/server/shared';
 import { TRPCClientError } from '../TRPCClientError';
 import { createChain } from '../links/internals/createChain';
 import {
@@ -81,8 +77,8 @@ export type CreateTRPCClientOptions<TRouter extends AnyRouter> =
       links: TRPCLink<TRouter>[];
     };
 
-export class TRPCClient<TRouter extends AnyRouter> {
-  private readonly links: OperationLink<TRouter>[];
+export class TRPCUntypedClient<TRouter extends AnyRouter> {
+  private readonly links: OperationLink<AnyRouter>[];
   public readonly runtime: TRPCClientRuntime;
   private requestId: number;
 
@@ -90,23 +86,21 @@ export class TRPCClient<TRouter extends AnyRouter> {
     this.requestId = 0;
 
     function getTransformer(): DataTransformer {
-      if (!opts.transformer || typeof opts.transformer === 'string')
+      const transformer = opts.transformer as
+        | ClientDataTransformerOptions
+        | undefined;
+      if (!transformer)
         return {
           serialize: (data) => data,
           deserialize: (data) => data,
         };
-      // Type guard for `opts.transformer` because it can be `any`
-      function isTransformer(obj: any): obj is ClientDataTransformerOptions {
-        return true;
-      }
-      if (isTransformer(opts.transformer)) {
-        if ('input' in opts.transformer)
-          return {
-            serialize: opts.transformer.input.serialize,
-            deserialize: opts.transformer.output.deserialize,
-          };
-      }
-      return opts.transformer;
+
+      if ('input' in transformer)
+        return {
+          serialize: transformer.input.serialize,
+          deserialize: transformer.output.deserialize,
+        };
+      return transformer;
     }
 
     this.runtime = {
@@ -127,7 +121,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
     path: string;
     context?: OperationContext;
   }) {
-    const chain$ = createChain<TRouter, TInput, TOutput>({
+    const chain$ = createChain<AnyRouter, TInput, TOutput>({
       links: this.links as OperationLink<any, any, any>[],
       op: {
         id: ++this.requestId,
@@ -164,47 +158,31 @@ export class TRPCClient<TRouter extends AnyRouter> {
 
     return abortablePromise;
   }
-  public query<
-    TQueries extends TRouter['_def']['queries'],
-    TPath extends string & keyof TQueries,
-    TInput extends inferProcedureInput<TQueries[TPath]>,
-  >(path: TPath, input?: TInput, opts?: TRPCRequestOptions) {
-    type TOutput = inferProcedureOutput<TQueries[TPath]>;
-    return this.requestAsPromise<TInput, TOutput>({
+  public query(path: string, input?: unknown, opts?: TRPCRequestOptions) {
+    return this.requestAsPromise<unknown, unknown>({
       type: 'query',
       path,
-      input: input as TInput,
+      input,
       context: opts?.context,
       signal: opts?.signal,
     });
   }
-  public mutation<
-    TMutations extends TRouter['_def']['mutations'],
-    TPath extends string & keyof TMutations,
-    TInput extends inferProcedureInput<TMutations[TPath]>,
-  >(path: TPath, input?: TInput, opts?: TRPCRequestOptions) {
-    type TOutput = inferTransformedProcedureOutput<TMutations[TPath]>;
-    return this.requestAsPromise<TInput, TOutput>({
+  public mutation(path: string, input?: unknown, opts?: TRPCRequestOptions) {
+    return this.requestAsPromise<unknown, unknown>({
       type: 'mutation',
       path,
-      input: input as TInput,
+      input,
       context: opts?.context,
       signal: opts?.signal,
     });
   }
-  public subscription<
-    TSubscriptions extends TRouter['_def']['subscriptions'],
-    TPath extends string & keyof TSubscriptions,
-    // TODO - this should probably be updated to use inferTransformedProcedureOutput but this is only hit for legacy clients
-    TOutput extends inferSubscriptionOutput<TRouter, TPath>,
-    TInput extends inferProcedureInput<TSubscriptions[TPath]>,
-  >(
-    path: TPath,
-    input: TInput,
+  public subscription(
+    path: string,
+    input: unknown,
     opts: TRPCRequestOptions &
-      Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>,
+      Partial<TRPCSubscriptionObserver<unknown, TRPCClientError<AnyRouter>>>,
   ): Unsubscribable {
-    const observable$ = this.$request<TInput, TOutput>({
+    const observable$ = this.$request({
       type: 'subscription',
       path,
       input,

package/src/links/splitLink.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
 import { observable } from '@trpc/server/observable';
 import { splitLink } from '../';
 import { OperationLink, TRPCLink } from '../';

package/src/links/wsLink.ts

@@ -265,7 +265,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
 
       callbacks?.complete?.();
       if (
-        activeConnection.readyState === WebSocket.OPEN &&
+        activeConnection.readyState === WebSocketImpl.OPEN &&
         op.type === 'subscription'
       ) {
         outgoing.push({

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

@@ -1 +0,0 @@
-{"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}