@trpc/client 10.0.0-alpha.36 → 10.0.0-alpha.39

package/README.md

@@ -1,3 +1,60 @@
+<p align="center">
+  <a href="https://trpc.io/"><img src="../../www/static/img/logo-text.svg" alt="tRPC" height="130"/></a>
+</p>
+
+<p align="center">
+  <strong>End-to-end typesafe APIs made easy</strong>
+</p>
+
+<p align="center">
+  <!-- TODO: replace with new version GIF -->
+  <img src="https://storage.googleapis.com/trpc/trpcgif.gif" alt="Demo" />
+</p>
+
 # `@trpc/client`
 
-https://trpc.io
+> Communicate with a tRPC server on the client side.
+
+## Documentation
+
+Full documentation for `@trpc/client` can be found [here](https://trpc.io/docs/vanilla)
+
+## Installation
+
+```bash
+# npm
+npm install @trpc/client
+
+# Yarn
+yarn add @trpc/client
+
+# pnpm
+pnpm add @trpc/client
+```
+
+## Basic Example
+
+```ts
+import { createTRPCClient, createTRPCClientProxy } from '@trpc/client';
+// Importing the router type from the server file
+import type { AppRouter } from './server';
+
+// Initializing the tRPC client
+const client = createTRPCClient<AppRouter>({
+  url: 'http://localhost:2022',
+});
+
+// Creating a proxy, this allows for cmd+click to the backend function.
+const proxy = createTRPCClientProxy(client);
+
+async function main() {
+  // Querying the greeting
+  const helloResponse = await proxy.greeting.query({
+    name: 'world',
+  });
+
+  console.log('helloResponse', helloResponse); // Hello world
+}
+
+main();
+```

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

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var observable = require('@trpc/server/observable');
-var links_wsLink = require('./wsLink-69f5adb8.js');
+var links_wsLink = require('./wsLink-807f4ad9.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/helpers/slicedToArray');
-var links_splitLink = require('./splitLink-8202386e.js');
+var links_splitLink = require('./splitLink-23c5ce5c.js');
 require('@babel/runtime/helpers/assertThisInitialized');
 require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/possibleConstructorReturn');
@@ -70,11 +70,12 @@ function dedupeLink() {
       }
 
       var key = JSON.stringify([op.path, op.input]);
+      var obs$ = pending[key];
 
-      if (pending[key]) {
+      if (obs$) {
         // console.log('hooking into pending', { op });
         return observable.observable(function (observer) {
-          return pending[key].subscribe(observer);
+          return obs$.subscribe(observer);
         });
       }
 
@@ -415,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;
@@ -424,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

@@ -1,14 +1,14 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import { observable, share, observableToPromise } from '@trpc/server/observable';
-import { T as TRPCClientError } from './wsLink-9468a563.mjs';
-export { T as TRPCClientError, c as createWSClient, w as wsLink } from './wsLink-9468a563.mjs';
+import { T as TRPCClientError } from './wsLink-11ee4922.mjs';
+export { T as TRPCClientError, c as createWSClient, w as wsLink } from './wsLink-11ee4922.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import '@babel/runtime/helpers/slicedToArray';
-import { c as createChain } from './splitLink-62ff9db0.mjs';
-export { s as splitLink } from './splitLink-62ff9db0.mjs';
+import { c as createChain } from './splitLink-0202cd7b.mjs';
+export { s as splitLink } from './splitLink-0202cd7b.mjs';
 import '@babel/runtime/helpers/assertThisInitialized';
 import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/possibleConstructorReturn';
@@ -62,11 +62,12 @@ function dedupeLink() {
       }
 
       var key = JSON.stringify([op.path, op.input]);
+      var obs$ = pending[key];
 
-      if (pending[key]) {
+      if (obs$) {
         // console.log('hooking into pending', { op });
         return observable(function (observer) {
-          return pending[key].subscribe(observer);
+          return obs$.subscribe(observer);
         });
       }
 
@@ -407,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;
@@ -416,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/dist/links/dedupeLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA4CrB"}
+{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA6CrB"}

package/dist/links/internals/createChain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createChain.d.ts","sourceRoot":"","sources":["../../../src/links/internals/createChain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE/E,gBAAgB;AAChB,wBAAgB,WAAW,CACzB,OAAO,SAAS,SAAS,EACzB,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,EACjB,IAAI,EAAE;IACN,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACjD,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;CACvB,GAAG,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAkB9C"}
+{"version":3,"file":"createChain.d.ts","sourceRoot":"","sources":["../../../src/links/internals/createChain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE/E,gBAAgB;AAChB,wBAAgB,WAAW,CACzB,OAAO,SAAS,SAAS,EACzB,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,EACjB,IAAI,EAAE;IACN,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACjD,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;CACvB,GAAG,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAuB9C"}

package/dist/links/splitLink.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('@trpc/server/observable');
-var links_splitLink = require('../splitLink-8202386e.js');
+var links_splitLink = require('../splitLink-23c5ce5c.js');
 
 
 

package/dist/links/splitLink.mjs

@@ -1,2 +1,2 @@
 import '@trpc/server/observable';
-export { s as splitLink } from '../splitLink-62ff9db0.mjs';
+export { s as splitLink } from '../splitLink-0202cd7b.mjs';

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

@@ -1 +1 @@
-{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AASpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;CAClC;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBA8LpC,SAAS,6DAA0B,aAAa;;EAgDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoDnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AASpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;CAClC;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBA6LpC,SAAS,6DAA0B,aAAa;;EAgDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoDnB"}

package/dist/links/wsLink.js

@@ -9,8 +9,9 @@ require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');
 require('@babel/runtime/helpers/wrapNativeSuper');
+require('@babel/runtime/helpers/slicedToArray');
 require('@trpc/server/observable');
-var links_wsLink = require('../wsLink-69f5adb8.js');
+var links_wsLink = require('../wsLink-807f4ad9.js');
 require('@babel/runtime/helpers/defineProperty');
 
 

package/dist/links/wsLink.mjs

@@ -5,6 +5,7 @@ import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';
 import '@babel/runtime/helpers/wrapNativeSuper';
+import '@babel/runtime/helpers/slicedToArray';
 import '@trpc/server/observable';
-export { c as createWSClient, w as wsLink } from '../wsLink-9468a563.mjs';
+export { c as createWSClient, w as wsLink } from '../wsLink-11ee4922.mjs';
 import '@babel/runtime/helpers/defineProperty';

package/dist/{splitLink-62ff9db0.mjs → splitLink-0202cd7b.mjs}

@@ -7,6 +7,11 @@ function createChain(opts) {
       var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : opts.op;
       var next = opts.links[index];
+
+      if (!next) {
+        throw new Error('No more links to execute - did you forget to add an ending link?');
+      }
+
       var subscription = next({
         op: op,
         next: function next(nextOp) {

package/dist/{splitLink-8202386e.js → splitLink-23c5ce5c.js}

@@ -9,6 +9,11 @@ function createChain(opts) {
       var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : opts.op;
       var next = opts.links[index];
+
+      if (!next) {
+        throw new Error('No more links to execute - did you forget to add an ending link?');
+      }
+
       var subscription = next({
         op: op,
         next: function next(nextOp) {

package/dist/{wsLink-9468a563.mjs → wsLink-11ee4922.mjs}

@@ -5,6 +5,7 @@ import _inherits from '@babel/runtime/helpers/inherits';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
 import _wrapNativeSuper from '@babel/runtime/helpers/wrapNativeSuper';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { observable } from '@trpc/server/observable';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 
@@ -262,10 +263,12 @@ function createWSClient(opts) {
         tryReconnect();
       }
 
-      for (var key in pendingRequests) {
+      for (var _i2 = 0, _Object$entries = Object.entries(pendingRequests); _i2 < _Object$entries.length; _i2++) {
         var _req$callbacks$error, _req$callbacks2;
 
-        var req = pendingRequests[key];
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
+            key = _Object$entries$_i[0],
+            req = _Object$entries$_i[1];
 
         if (req.ws !== conn) {
           continue;

package/dist/{wsLink-69f5adb8.js → wsLink-807f4ad9.js}

@@ -7,6 +7,7 @@ var _inherits = require('@babel/runtime/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var observable = require('@trpc/server/observable');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 
@@ -19,6 +20,7 @@ var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
 var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
 var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -275,10 +277,12 @@ function createWSClient(opts) {
         tryReconnect();
       }
 
-      for (var key in pendingRequests) {
+      for (var _i2 = 0, _Object$entries = Object.entries(pendingRequests); _i2 < _Object$entries.length; _i2++) {
         var _req$callbacks$error, _req$callbacks2;
 
-        var req = pendingRequests[key];
+        var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i2], 2),
+            key = _Object$entries$_i[0],
+            req = _Object$entries$_i[1];
 
         if (req.ws !== conn) {
           continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.36",
+  "version": "10.0.0-alpha.39",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -67,13 +67,13 @@
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.36"
+    "@trpc/server": "10.0.0-alpha.39"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.36"
+    "@trpc/server": "10.0.0-alpha.39"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c45c7bddde215ec057b2695a5b458cac67451cf3"
+  "gitHead": "a9cde42919d1a6b761fe25f18410c7270cb2cc2e"
 }

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']>;
 }

package/src/internals/dataLoader.ts

@@ -112,8 +112,8 @@ export function dataLoader<TKey, TValue>(
       promise
         .then((result) => {
           for (let i = 0; i < result.length; i++) {
-            const value = result[i];
-            const item = batch.items[i];
+            const value = result[i]!;
+            const item = batch.items[i]!;
             item.resolve(value);
             item.batch = null;
           }

package/src/links/dedupeLink.ts

@@ -17,9 +17,10 @@ export function dedupeLink<
         return next(op);
       }
       const key = JSON.stringify([op.path, op.input]);
-      if (pending[key]) {
+      const obs$ = pending[key];
+      if (obs$) {
         // console.log('hooking into pending', { op });
-        return observable((observer) => pending[key].subscribe(observer));
+        return observable((observer) => obs$.subscribe(observer));
       }
 
       const shared$ = observable((observer) => {

package/src/links/internals/createChain.ts

@@ -14,6 +14,11 @@ export function createChain<
   return observable((observer) => {
     function execute(index = 0, op = opts.op) {
       const next = opts.links[index];
+      if (!next) {
+        throw new Error(
+          'No more links to execute - did you forget to add an ending link?',
+        );
+      }
       const subscription = next({
         op,
         next(nextOp) {

package/src/links/wsLink.ts

@@ -184,8 +184,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
         tryReconnect();
       }
 
-      for (const key in pendingRequests) {
-        const req = pendingRequests[key];
+      for (const [key, req] of Object.entries(pendingRequests)) {
         if (req.ws !== conn) {
           continue;
         }