@trpc/client 10.0.0-alpha.38 → 10.0.0-alpha.40

package/dist/createTRPCClientProxy.d.ts

@@ -1,10 +1,24 @@
-import type { AnyRouter } from '@trpc/server';
+import type { AnyRouter, OmitNeverKeys, Procedure, ProcedureArgs, ProcedureRouterRecord, inferProcedureOutput } from '@trpc/server';
 import { TRPCClient as Client } from './internals/TRPCClient';
+declare type Resolver<TProcedure extends Procedure<any>> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferProcedureOutput<TProcedure>>;
+declare type DecorateProcedure<TProcedure extends Procedure<any>> = OmitNeverKeys<{
+    query: TProcedure extends {
+        _query: true;
+    } ? Resolver<TProcedure> : never;
+    mutate: TProcedure extends {
+        _mutation: true;
+    } ? Resolver<TProcedure> : never;
+    subscribe: TProcedure extends {
+        _subscription: true;
+    } ? Resolver<TProcedure> : never;
+}>;
+declare type assertProcedure<T> = T extends Procedure<any> ? T : never;
 /**
  * @internal
  */
-export declare type FlattenRouter<TRouter extends AnyRouter> = {
-    [Key in keyof TRouter['_def']['record']]: TRouter['_def']['record'][Key] extends AnyRouter ? FlattenRouter<TRouter['_def']['record'][Key]> : TRouter['_def']['record'][Key];
+declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
+    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']> : DecorateProcedure<assertProcedure<TProcedures[TKey]>>;
 };
-export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): FlattenRouter<TRouter>;
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"]>;
+export {};
 //# sourceMappingURL=createTRPCClientProxy.d.ts.map

package/dist/createTRPCClientProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;GAEG;AACH,oBAAY,aAAa,CAAC,OAAO,SAAS,SAAS,IAAI;KACpD,GAAG,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,SAAS,GACtF,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,GAC7C,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;CACnC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,0BAYxB"}
+{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,aAAK,QAAQ,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,CACjD,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/C,aAAK,iBAAiB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC;IACxE,KAAK,EAAE,UAAU,SAAS;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE1E,MAAM,EAAE,UAAU,SAAS;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE9E,SAAS,EAAE,UAAU,SAAS;QAAE,aAAa,EAAE,IAAI,CAAA;KAAE,GACjD,QAAQ,CAAC,UAAU,CAAC,GACpB,KAAK,CAAC;CACX,CAAC,CAAC;AAEH,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE/D;;GAEG;AACH,aAAK,wBAAwB,CAAC,WAAW,SAAS,qBAAqB,IAAI;KACxE,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC7D,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAQF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,uDAWxB"}

package/dist/index.js

@@ -416,6 +416,11 @@ function createTRPCClient(opts) {
   return client;
 } // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
+var clientCallTypeMap = {
+  query: 'query',
+  mutate: 'mutation',
+  subscribe: 'subscription'
+};
 function createTRPCClientProxy(client) {
   var proxy = shared.createProxy(function (_ref) {
     var _ref2;
@@ -425,14 +430,10 @@ function createTRPCClientProxy(client) {
 
     var pathCopy = _toConsumableArray__default["default"](path);
 
-    var type = pathCopy.pop();
-
-    if (type === 'mutate') {
-      type = 'mutation';
-    }
-
+    var clientCallType = pathCopy.pop();
+    var procedureType = clientCallTypeMap[clientCallType];
     var fullPath = pathCopy.join('.');
-    return (_ref2 = client)[type].apply(_ref2, [fullPath].concat(_toConsumableArray__default["default"](args)));
+    return (_ref2 = client)[procedureType].apply(_ref2, [fullPath].concat(_toConsumableArray__default["default"](args)));
   });
   return proxy;
 }

package/dist/index.mjs

@@ -408,6 +408,11 @@ function createTRPCClient(opts) {
   return client;
 } // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
+var clientCallTypeMap = {
+  query: 'query',
+  mutate: 'mutation',
+  subscribe: 'subscription'
+};
 function createTRPCClientProxy(client) {
   var proxy = createProxy(function (_ref) {
     var _ref2;
@@ -417,14 +422,10 @@ function createTRPCClientProxy(client) {
 
     var pathCopy = _toConsumableArray(path);
 
-    var type = pathCopy.pop();
-
-    if (type === 'mutate') {
-      type = 'mutation';
-    }
-
+    var clientCallType = pathCopy.pop();
+    var procedureType = clientCallTypeMap[clientCallType];
     var fullPath = pathCopy.join('.');
-    return (_ref2 = client)[type].apply(_ref2, [fullPath].concat(_toConsumableArray(args)));
+    return (_ref2 = client)[procedureType].apply(_ref2, [fullPath].concat(_toConsumableArray(args)));
   });
   return proxy;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.38",
+  "version": "10.0.0-alpha.40",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -67,13 +67,13 @@
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.38"
+    "@trpc/server": "10.0.0-alpha.40"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.38"
+    "@trpc/server": "10.0.0-alpha.40"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0c40cb7ebfd8762ef482ff72cc54c2cf3ef4a0a8"
+  "gitHead": "2af7a0070f3bc01b81fe6f14f591e77c549520a7"
 }

package/src/createTRPCClientProxy.ts

@@ -1,17 +1,47 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { AnyRouter } from '@trpc/server';
+import type {
+  AnyRouter,
+  OmitNeverKeys,
+  Procedure,
+  ProcedureArgs,
+  ProcedureRouterRecord,
+  ProcedureType,
+  inferProcedureOutput,
+} from '@trpc/server';
 import { createProxy } from '@trpc/server/shared';
 import { TRPCClient as Client } from './internals/TRPCClient';
 
+type Resolver<TProcedure extends Procedure<any>> = (
+  ...args: ProcedureArgs<TProcedure['_def']>
+) => Promise<inferProcedureOutput<TProcedure>>;
+
+type DecorateProcedure<TProcedure extends Procedure<any>> = OmitNeverKeys<{
+  query: TProcedure extends { _query: true } ? Resolver<TProcedure> : never;
+
+  mutate: TProcedure extends { _mutation: true } ? Resolver<TProcedure> : never;
+
+  subscribe: TProcedure extends { _subscription: true }
+    ? Resolver<TProcedure>
+    : never;
+}>;
+
+type assertProcedure<T> = T extends Procedure<any> ? T : never;
+
 /**
  * @internal
  */
-export type FlattenRouter<TRouter extends AnyRouter> = {
-  [Key in keyof TRouter['_def']['record']]: TRouter['_def']['record'][Key] extends AnyRouter
-    ? FlattenRouter<TRouter['_def']['record'][Key]>
-    : TRouter['_def']['record'][Key];
+type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
+  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
+    ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
+    : DecorateProcedure<assertProcedure<TProcedures[TKey]>>;
+};
+
+const clientCallTypeMap: Record<keyof DecorateProcedure<any>, ProcedureType> = {
+  query: 'query',
+  mutate: 'mutation',
+  subscribe: 'subscription',
 };
 
 export function createTRPCClientProxy<TRouter extends AnyRouter>(
@@ -19,12 +49,11 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
 ) {
   const proxy = createProxy(({ path, args }) => {
     const pathCopy = [...path];
-    let type = pathCopy.pop()!;
-    if (type === 'mutate') {
-      type = 'mutation';
-    }
+    const clientCallType = pathCopy.pop()! as keyof DecorateProcedure<any>;
+    const procedureType = clientCallTypeMap[clientCallType];
+
     const fullPath = pathCopy.join('.');
-    return (client as any)[type](fullPath, ...args);
+    return (client as any)[procedureType](fullPath, ...args);
   });
-  return proxy as FlattenRouter<TRouter>;
+  return proxy as DecoratedProcedureRecord<TRouter['_def']['record']>;
 }