@trpc/client 10.0.0-proxy-alpha.72 → 10.0.0-proxy-alpha.73

package/dist/index.js

@@ -163,28 +163,22 @@ class TRPCClient {
         });
         return abortablePromise;
     }
-    query(path, ...args) {
-        // FIXME: Should be inferred from `args`
-        const context = args[1]?.context;
-        const signal = args[1]?.signal;
+    query(path, input, opts) {
         return this.requestAsPromise({
             type: 'query',
             path,
-            input: args[0],
-            context,
-            signal
+            input: input,
+            context: opts?.context,
+            signal: opts?.signal
         });
     }
-    mutation(path, ...args) {
-        // FIXME: Should be inferred from `args`
-        const context = args[1]?.context;
-        const signal = args[1]?.signal;
+    mutation(path, input, opts) {
         return this.requestAsPromise({
             type: 'mutation',
             path,
-            input: args[0],
-            context,
-            signal
+            input: input,
+            context: opts?.context,
+            signal: opts?.signal
         });
     }
     subscription(path, input, opts) {
@@ -223,28 +217,34 @@ class TRPCClient {
             }
             return ()=>({});
         }
-        const transformer = opts.transformer ? 'input' in opts.transformer ? {
-            serialize: opts.transformer.input.serialize,
-            deserialize: opts.transformer.output.deserialize
-        } : opts.transformer : {
-            serialize: (data)=>data,
-            deserialize: (data)=>data
-        };
+        function getTransformer() {
+            if (!opts.transformer) return {
+                serialize: (data)=>data,
+                deserialize: (data)=>data
+            };
+            if ('input' in opts.transformer) return {
+                serialize: opts.transformer.input.serialize,
+                deserialize: opts.transformer.output.deserialize
+            };
+            return opts.transformer;
+        }
         this.runtime = {
             AbortController: AC,
             fetch: _fetch,
             headers: getHeadersFn(),
-            transformer
+            transformer: getTransformer()
         };
-        if ('links' in opts) {
-            this.links = opts.links.map((link)=>link(this.runtime));
-        } else {
-            this.links = [
+        const getLinks = ()=>{
+            if (opts.links) {
+                return opts.links.map((link)=>link(this.runtime));
+            }
+            return [
                 links_httpBatchLink.httpBatchLink({
                     url: opts.url
-                })(this.runtime), 
+                })(this.runtime)
             ];
-        }
+        };
+        this.links = getLinks();
     }
 }
 

package/dist/index.mjs

@@ -162,28 +162,22 @@ class TRPCClient {
         });
         return abortablePromise;
     }
-    query(path, ...args) {
-        // FIXME: Should be inferred from `args`
-        const context = args[1]?.context;
-        const signal = args[1]?.signal;
+    query(path, input, opts) {
         return this.requestAsPromise({
             type: 'query',
             path,
-            input: args[0],
-            context,
-            signal
+            input: input,
+            context: opts?.context,
+            signal: opts?.signal
         });
     }
-    mutation(path, ...args) {
-        // FIXME: Should be inferred from `args`
-        const context = args[1]?.context;
-        const signal = args[1]?.signal;
+    mutation(path, input, opts) {
         return this.requestAsPromise({
             type: 'mutation',
             path,
-            input: args[0],
-            context,
-            signal
+            input: input,
+            context: opts?.context,
+            signal: opts?.signal
         });
     }
     subscription(path, input, opts) {
@@ -222,28 +216,34 @@ class TRPCClient {
             }
             return ()=>({});
         }
-        const transformer = opts.transformer ? 'input' in opts.transformer ? {
-            serialize: opts.transformer.input.serialize,
-            deserialize: opts.transformer.output.deserialize
-        } : opts.transformer : {
-            serialize: (data)=>data,
-            deserialize: (data)=>data
-        };
+        function getTransformer() {
+            if (!opts.transformer) return {
+                serialize: (data)=>data,
+                deserialize: (data)=>data
+            };
+            if ('input' in opts.transformer) return {
+                serialize: opts.transformer.input.serialize,
+                deserialize: opts.transformer.output.deserialize
+            };
+            return opts.transformer;
+        }
         this.runtime = {
             AbortController: AC,
             fetch: _fetch,
             headers: getHeadersFn(),
-            transformer
+            transformer: getTransformer()
         };
-        if ('links' in opts) {
-            this.links = opts.links.map((link)=>link(this.runtime));
-        } else {
-            this.links = [
+        const getLinks = ()=>{
+            if (opts.links) {
+                return opts.links.map((link)=>link(this.runtime));
+            }
+            return [
                 httpBatchLink({
                     url: opts.url
-                })(this.runtime), 
+                })(this.runtime)
             ];
-        }
+        };
+        this.links = getLinks();
     }
 }
 

package/dist/internals/TRPCClient.d.ts

@@ -1,4 +1,4 @@
-import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
+import { AnyRouter, ClientDataTransformerOptions, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
 import { ProcedureRecord } from '@trpc/server';
 import { Unsubscribable } from '@trpc/server/observable';
 import { TRPCClientError } from '../TRPCClientError';
@@ -22,20 +22,6 @@ interface CreateTRPCClientBaseOptions {
      **/
     transformer?: ClientDataTransformerOptions;
 }
-/** @internal */
-export interface CreateTRPCClientWithURLOptions extends CreateTRPCClientBaseOptions {
-    /**
-     * HTTP URL of API
-     **/
-    url: string;
-}
-/** @internal */
-export interface CreateTRPCClientWithLinksOptions<TRouter extends AnyRouter> extends CreateTRPCClientBaseOptions {
-    /**
-     * @link https://trpc.io/docs/links
-     **/
-    links: TRPCLink<TRouter>[];
-}
 export interface TRPCRequestOptions {
     /**
      * Pass additional context to links
@@ -50,8 +36,16 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
     onStopped: () => void;
     onComplete: () => void;
 }
-/** @internal */
-export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateTRPCClientWithLinksOptions<TRouter> | CreateTRPCClientWithURLOptions;
+/**
+ * This type prohibits `url` from being provided along with `links`
+ * @internal
+ */
+export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateTRPCClientBaseOptions & ({
+    links: TRPCLink<TRouter>[];
+} | {
+    url: string;
+    links?: never;
+});
 export declare type AssertType<T, K> = T extends K ? T : never;
 /**
  * @deprecated
@@ -69,14 +63,8 @@ export declare class TRPCClient<TRouter extends AnyRouter> {
     constructor(opts: CreateTRPCClientOptions<TRouter>);
     private $request;
     private requestAsPromise;
-    query<TQueries extends AssertLegacyDef<TRouter>['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [
-        ...inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
-        TRPCRequestOptions?
-    ]): Promise<inferProcedureOutput<TQueries[TPath]>>;
-    mutation<TMutations extends AssertLegacyDef<TRouter>['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [
-        ...inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
-        TRPCRequestOptions?
-    ]): Promise<inferProcedureOutput<TMutations[TPath]>>;
+    query<TQueries extends AssertLegacyDef<TRouter>['queries'], TPath extends string & keyof TQueries, TInput extends inferProcedureInput<AssertType<TQueries, ProcedureRecord>[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferProcedureOutput<TQueries[TPath]>>;
+    mutation<TMutations extends AssertLegacyDef<TRouter>['mutations'], TPath extends string & keyof TMutations, TInput extends inferProcedureInput<AssertType<TMutations, ProcedureRecord>[TPath]>>(path: TPath, input?: TInput, opts?: TRPCRequestOptions): Promise<inferProcedureOutput<TMutations[TPath]>>;
     subscription<TSubscriptions extends AssertLegacyDef<TRouter>['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<AssertType<TSubscriptions, ProcedureRecord>[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
 }
 export {};

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-proxy-alpha.72",
+  "version": "10.0.0-proxy-alpha.73",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -63,13 +63,13 @@
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-proxy-alpha.72"
+    "@trpc/server": "10.0.0-proxy-alpha.73"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-proxy-alpha.72"
+    "@trpc/server": "10.0.0-proxy-alpha.73"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "211511c11992741a1a3a48cc424ebd5870757146"
+  "gitHead": "1ed4127160cf0fcc873494f407de152203bcae01"
 }

package/src/internals/TRPCClient.ts

@@ -2,7 +2,6 @@ import {
   AnyRouter,
   ClientDataTransformerOptions,
   DataTransformer,
-  inferHandlerInput,
   inferProcedureInput,
   inferProcedureOutput,
   inferSubscriptionOutput,
@@ -47,24 +46,6 @@ interface CreateTRPCClientBaseOptions {
   transformer?: ClientDataTransformerOptions;
 }
 
-/** @internal */
-export interface CreateTRPCClientWithURLOptions
-  extends CreateTRPCClientBaseOptions {
-  /**
-   * HTTP URL of API
-   **/
-  url: string;
-}
-
-/** @internal */
-export interface CreateTRPCClientWithLinksOptions<TRouter extends AnyRouter>
-  extends CreateTRPCClientBaseOptions {
-  /**
-   * @link https://trpc.io/docs/links
-   **/
-  links: TRPCLink<TRouter>[];
-}
-
 type TRPCType = 'subscription' | 'query' | 'mutation';
 export interface TRPCRequestOptions {
   /**
@@ -82,10 +63,21 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
   onComplete: () => void;
 }
 
-/** @internal */
+/**
+ * This type prohibits `url` from being provided along with `links`
+ * @internal
+ */
 export type CreateTRPCClientOptions<TRouter extends AnyRouter> =
-  | CreateTRPCClientWithLinksOptions<TRouter>
-  | CreateTRPCClientWithURLOptions;
+  | CreateTRPCClientBaseOptions &
+      (
+        | {
+            links: TRPCLink<TRouter>[];
+          }
+        | {
+            url: string;
+            links?: never;
+          }
+      );
 
 export type AssertType<T, K> = T extends K ? T : never;
 /**
@@ -124,34 +116,35 @@ export class TRPCClient<TRouter extends AnyRouter> {
       return () => ({});
     }
 
-    const transformer: DataTransformer = opts.transformer
-      ? 'input' in opts.transformer
-        ? {
-            serialize: opts.transformer.input.serialize,
-            deserialize: opts.transformer.output.deserialize,
-          }
-        : opts.transformer
-      : {
+    function getTransformer(): DataTransformer {
+      if (!opts.transformer)
+        return {
           serialize: (data) => data,
           deserialize: (data) => data,
         };
+      if ('input' in opts.transformer)
+        return {
+          serialize: opts.transformer.input.serialize,
+          deserialize: opts.transformer.output.deserialize,
+        };
+      return opts.transformer;
+    }
 
     this.runtime = {
       AbortController: AC,
       fetch: _fetch,
       headers: getHeadersFn(),
-      transformer,
+      transformer: getTransformer(),
     };
 
-    if ('links' in opts) {
-      this.links = opts.links.map((link) => link(this.runtime));
-    } else {
-      this.links = [
-        httpBatchLink({
-          url: opts.url,
-        })(this.runtime),
-      ];
-    }
+    const getLinks = (): OperationLink<TRouter>[] => {
+      if (opts.links) {
+        return opts.links.map((link) => link(this.runtime));
+      }
+      return [httpBatchLink({ url: opts.url })(this.runtime)];
+    };
+
+    this.links = getLinks();
   }
 
   private $request<TInput = unknown, TOutput = unknown>({
@@ -205,51 +198,33 @@ export class TRPCClient<TRouter extends AnyRouter> {
   public query<
     TQueries extends AssertLegacyDef<TRouter>['queries'],
     TPath extends string & keyof TQueries,
-  >(
-    path: TPath,
-    ...args: [
-      ...inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
-      TRPCRequestOptions?,
-    ]
-  ) {
-    // FIXME: Should be inferred from `args`
-    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
-    const signal = (args[1] as TRPCRequestOptions | undefined)?.signal;
-
-    return this.requestAsPromise<
-      inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
-      inferProcedureOutput<TQueries[TPath]>
-    >({
+    TInput extends inferProcedureInput<
+      AssertType<TQueries, ProcedureRecord>[TPath]
+    >,
+  >(path: TPath, input?: TInput, opts?: TRPCRequestOptions) {
+    type TOutput = inferProcedureOutput<TQueries[TPath]>;
+    return this.requestAsPromise<TInput, TOutput>({
       type: 'query',
       path,
-      input: args[0] as any,
-      context,
-      signal,
+      input: input as TInput,
+      context: opts?.context,
+      signal: opts?.signal,
     });
   }
   public mutation<
     TMutations extends AssertLegacyDef<TRouter>['mutations'],
     TPath extends string & keyof TMutations,
-  >(
-    path: TPath,
-    ...args: [
-      ...inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
-      TRPCRequestOptions?,
-    ]
-  ) {
-    // FIXME: Should be inferred from `args`
-    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
-    const signal = (args[1] as TRPCRequestOptions | undefined)?.signal;
-
-    return this.requestAsPromise<
-      inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
-      inferProcedureOutput<TMutations[TPath]>
-    >({
+    TInput extends inferProcedureInput<
+      AssertType<TMutations, ProcedureRecord>[TPath]
+    >,
+  >(path: TPath, input?: TInput, opts?: TRPCRequestOptions) {
+    type TOutput = inferProcedureOutput<TMutations[TPath]>;
+    return this.requestAsPromise<TInput, TOutput>({
       type: 'mutation',
       path,
-      input: args[0] as any,
-      context,
-      signal,
+      input: input as TInput,
+      context: opts?.context,
+      signal: opts?.signal,
     });
   }
   public subscription<