@trpc/client 10.0.0-alpha.29 → 10.0.0-alpha.31

package/dist/createTRPCClient.d.ts

@@ -1,5 +1,5 @@
 import type { AnyRouter } from '@trpc/server';
 import { TRPCClient as Client, CreateTRPCClientOptions } from './internals/TRPCClient';
-export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter>;
+export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter> & (TRouter["_def"]["record"] extends infer T ? { [Key in keyof T]: TRouter["_def"]["record"][Key] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"] extends infer T_1 ? { [Key_1 in keyof T_1]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"] extends infer T_2 ? { [Key_2 in keyof T_2]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"] extends infer T_3 ? { [Key_3 in keyof T_3]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"] extends infer T_4 ? { [Key_4 in keyof T_4]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"] extends infer T_5 ? { [Key_5 in keyof T_5]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"] extends infer T_6 ? { [Key_6 in keyof T_6]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"] extends infer T_7 ? { [Key_7 in keyof T_7]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"] extends infer T_8 ? { [Key_8 in keyof T_8]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"] extends infer T_9 ? { [Key_9 in keyof T_9]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"][Key_9] extends AnyRouter ? TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"][Key_9]["_def"]["record"] extends infer T_10 ? { [Key_10 in keyof T_10]: TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"][Key_9]["_def"]["record"][Key_10] extends AnyRouter ? any : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"][Key_9]["_def"]["record"][Key_10]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]["_def"]["record"][Key_9]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]["_def"]["record"][Key_8]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]["_def"]["record"][Key_7]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]["_def"]["record"][Key_6]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]["_def"]["record"][Key_5]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]["_def"]["record"][Key_4]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]["_def"]["record"][Key_3]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]["_def"]["record"][Key_2]; } : never : TRouter["_def"]["record"][Key]["_def"]["record"][Key_1]; } : never : TRouter["_def"]["record"][Key]; } : never);
 export type { TRPCRequestOptions, CreateTRPCClientOptions, TRPCClient, } from './internals/TRPCClient';
 //# 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,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAGvC;AAED,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,GACX,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,0zLAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,GACX,MAAM,wBAAwB,CAAC"}

package/dist/createTRPCClientProxy.d.ts

@@ -0,0 +1,8 @@
+import type { AnyRouter } from '@trpc/server';
+import { TRPCClient as Client } from './internals/TRPCClient';
+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];
+};
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): Client<TRouter> & FlattenRouter<TRouter>;
+export {};
+//# sourceMappingURL=createTRPCClientProxy.d.ts.map

package/dist/createTRPCClientProxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,aAAK,aAAa,CAAC,OAAO,SAAS,SAAS,IAAI;KAC7C,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;AAyCF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,4CAGxB"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './createTRPCClient';
+export * from './createTRPCClientProxy';
 export * from './getFetch';
 export * from './TRPCClientError';
 export * from './links';

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,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,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -27,6 +27,54 @@ var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallChec
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function makeProxy(client) {
+  for (var _len = arguments.length, path = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    path[_key - 1] = arguments[_key];
+  }
+
+  var proxy = new Proxy(function () {// noop
+  }, {
+    get: function get(_obj, name) {
+      if (name in client && !path.length) {
+        return client[name];
+      }
+
+      if (typeof name === 'string') {
+        return makeProxy.apply(void 0, [client].concat(path, [name]));
+      }
+
+      return client;
+    },
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    apply: function apply(_1, _2, args) {
+      var _ref;
+
+      var pathCopy = [].concat(path);
+      var type = pathCopy.pop();
+
+      if (type === 'mutate') {
+        type = 'mutation';
+      }
+
+      var fullPath = pathCopy.join('.');
+
+      if (type.startsWith('use')) {
+        throw new Error("Invalid hook call");
+      }
+
+      return (_ref = client)[type].apply(_ref, [fullPath].concat(_toConsumableArray__default["default"](args)));
+    }
+  });
+  return proxy;
+}
+
+function createTRPCClientProxy(client) {
+  return makeProxy(client);
+}
+
 function getWindow() {
   if (typeof window !== 'undefined') {
     return window;
@@ -229,22 +277,6 @@ function getRequestId() {
   return ++idCounter;
 }
 
-function createRouterProxy(callback) {
-  return new Proxy({}, {
-    get: function get(_, path) {
-      return function () {
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-
-        return callback.apply(void 0, [path].concat(args));
-      };
-    }
-  });
-}
-/** @internal */
-
-
 var TRPCClient = /*#__PURE__*/function () {
   function TRPCClient(opts) {
     var _this = this;
@@ -253,8 +285,6 @@ var TRPCClient = /*#__PURE__*/function () {
 
     this.links = void 0;
     this.runtime = void 0;
-    this.queries = void 0;
-    this.mutations = void 0;
 
     var _fetch = getFetch(opts === null || opts === void 0 ? void 0 : opts.fetch);
 
@@ -300,21 +330,6 @@ var TRPCClient = /*#__PURE__*/function () {
         url: opts.url
       })(this.runtime)];
     }
-
-    this.queries = createRouterProxy(function (path) {
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
-      }
-
-      return _this.query.apply(_this, [path].concat(_toConsumableArray__default["default"](args)));
-    });
-    this.mutations = createRouterProxy(function (path) {
-      for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-        args[_key3 - 1] = arguments[_key3];
-      }
-
-      return _this.mutation.apply(_this, [path].concat(_toConsumableArray__default["default"](args)));
-    });
   }
 
   _createClass__default["default"](TRPCClient, [{
@@ -370,8 +385,8 @@ var TRPCClient = /*#__PURE__*/function () {
     value: function query(path) {
       var _args$;
 
-      for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        args[_key4 - 1] = arguments[_key4];
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
       }
 
       var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.context;
@@ -387,8 +402,8 @@ var TRPCClient = /*#__PURE__*/function () {
     value: function mutation(path) {
       var _args$2;
 
-      for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
-        args[_key5 - 1] = arguments[_key5];
+      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
       }
 
       var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.context;
@@ -441,10 +456,11 @@ var TRPCClient = /*#__PURE__*/function () {
   return TRPCClient;
 }();
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createTRPCClient(opts) {
-  return new TRPCClient(opts);
-}
+  var client = new TRPCClient(opts);
+  return createTRPCClientProxy(client);
+} // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
 exports.TRPCClientError = links_wsLink.TRPCClientError;
 exports.createWSClient = links_wsLink.createWSClient;
@@ -454,6 +470,7 @@ exports.splitLink = links_splitLink.splitLink;
 exports.httpLink = links_httpLink.httpLink;
 exports.loggerLink = links_loggerLink.loggerLink;
 exports.createTRPCClient = createTRPCClient;
+exports.createTRPCClientProxy = createTRPCClientProxy;
 exports.dedupeLink = dedupeLink;
 exports.getFetch = getFetch;
 exports.retryLink = retryLink;

package/dist/index.mjs

@@ -19,6 +19,54 @@ export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 import './httpUtils-089853f6.mjs';
 
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function makeProxy(client) {
+  for (var _len = arguments.length, path = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    path[_key - 1] = arguments[_key];
+  }
+
+  var proxy = new Proxy(function () {// noop
+  }, {
+    get: function get(_obj, name) {
+      if (name in client && !path.length) {
+        return client[name];
+      }
+
+      if (typeof name === 'string') {
+        return makeProxy.apply(void 0, [client].concat(path, [name]));
+      }
+
+      return client;
+    },
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    apply: function apply(_1, _2, args) {
+      var _ref;
+
+      var pathCopy = [].concat(path);
+      var type = pathCopy.pop();
+
+      if (type === 'mutate') {
+        type = 'mutation';
+      }
+
+      var fullPath = pathCopy.join('.');
+
+      if (type.startsWith('use')) {
+        throw new Error("Invalid hook call");
+      }
+
+      return (_ref = client)[type].apply(_ref, [fullPath].concat(_toConsumableArray(args)));
+    }
+  });
+  return proxy;
+}
+
+function createTRPCClientProxy(client) {
+  return makeProxy(client);
+}
+
 function getWindow() {
   if (typeof window !== 'undefined') {
     return window;
@@ -221,22 +269,6 @@ function getRequestId() {
   return ++idCounter;
 }
 
-function createRouterProxy(callback) {
-  return new Proxy({}, {
-    get: function get(_, path) {
-      return function () {
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-
-        return callback.apply(void 0, [path].concat(args));
-      };
-    }
-  });
-}
-/** @internal */
-
-
 var TRPCClient = /*#__PURE__*/function () {
   function TRPCClient(opts) {
     var _this = this;
@@ -245,8 +277,6 @@ var TRPCClient = /*#__PURE__*/function () {
 
     this.links = void 0;
     this.runtime = void 0;
-    this.queries = void 0;
-    this.mutations = void 0;
 
     var _fetch = getFetch(opts === null || opts === void 0 ? void 0 : opts.fetch);
 
@@ -292,21 +322,6 @@ var TRPCClient = /*#__PURE__*/function () {
         url: opts.url
       })(this.runtime)];
     }
-
-    this.queries = createRouterProxy(function (path) {
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
-      }
-
-      return _this.query.apply(_this, [path].concat(_toConsumableArray(args)));
-    });
-    this.mutations = createRouterProxy(function (path) {
-      for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-        args[_key3 - 1] = arguments[_key3];
-      }
-
-      return _this.mutation.apply(_this, [path].concat(_toConsumableArray(args)));
-    });
   }
 
   _createClass(TRPCClient, [{
@@ -362,8 +377,8 @@ var TRPCClient = /*#__PURE__*/function () {
     value: function query(path) {
       var _args$;
 
-      for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        args[_key4 - 1] = arguments[_key4];
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
       }
 
       var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.context;
@@ -379,8 +394,8 @@ var TRPCClient = /*#__PURE__*/function () {
     value: function mutation(path) {
       var _args$2;
 
-      for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
-        args[_key5 - 1] = arguments[_key5];
+      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
       }
 
       var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.context;
@@ -433,9 +448,10 @@ var TRPCClient = /*#__PURE__*/function () {
   return TRPCClient;
 }();
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createTRPCClient(opts) {
-  return new TRPCClient(opts);
-}
+  var client = new TRPCClient(opts);
+  return createTRPCClientProxy(client);
+} // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
-export { createTRPCClient, dedupeLink, getFetch, retryLink };
+export { createTRPCClient, createTRPCClientProxy, dedupeLink, getFetch, retryLink };

package/dist/internals/TRPCClient.d.ts

@@ -1,4 +1,4 @@
-import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferSubscriptionOutput } from '@trpc/server';
+import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
 import { Observer, Unsubscribable } from '@trpc/server/observable';
 import { TRPCResultMessage } from '@trpc/server/rpc';
 import { CancelFn } from '..';
@@ -51,13 +51,11 @@ export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateT
 export declare class TRPCClient<TRouter extends AnyRouter> {
     private readonly links;
     readonly runtime: TRPCClientRuntime;
-    readonly queries: TRouter['queries'];
-    readonly mutations: TRouter['mutations'];
     constructor(opts: CreateTRPCClientOptions<TRouter>);
     private $request;
     private requestAsPromise;
-    query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [...inferHandlerInput<TQueries[TPath]>, TRPCRequestOptions?]): CancellablePromise<import("@trpc/server").ThenArg<ReturnType<TQueries[TPath]>>>;
-    mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [...inferHandlerInput<TMutations[TPath]>, TRPCRequestOptions?]): CancellablePromise<import("@trpc/server").ThenArg<ReturnType<TMutations[TPath]>>>;
+    query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [...inferHandlerInput<TQueries[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<TQueries[TPath]>>;
+    mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [...inferHandlerInput<TMutations[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<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<Observer<TRPCResultMessage<TOutput>, TRPCClientError<TRouter>>>): Unsubscribable;
 }
 export {};

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

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

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.d.ts

@@ -0,0 +1 @@
+export * from "../../../dist/declarations/src/links/httpBatchLink";

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.dev.js

@@ -0,0 +1,280 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
+var _regeneratorRuntime = require('@babel/runtime/regenerator');
+require('@babel/runtime/helpers/classCallCheck');
+require('@babel/runtime/helpers/createClass');
+var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
+var transformRPCResponse = require('../../../dist/transformRPCResponse-c6cc4677.cjs.dev.js');
+var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
+require('@babel/runtime/helpers/assertThisInitialized');
+require('@babel/runtime/helpers/inherits');
+require('@babel/runtime/helpers/createSuper');
+require('@babel/runtime/helpers/wrapNativeSuper');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefault(_regeneratorRuntime);
+
+/**
+ * Dataloader that's very inspired by https://github.com/graphql/dataloader
+ * Less configuration, no caching, and allows you to cancel requests
+ * When cancelling a single fetch the whole batch will be cancelled only when _all_ items are cancelled
+ */
+function dataLoader(fetchMany, opts) {
+  var batch = null;
+  var dispatchTimer = null;
+
+  var destroyTimerAndBatch = function destroyTimerAndBatch() {
+    clearTimeout(dispatchTimer);
+    dispatchTimer = null;
+    batch = null;
+  };
+
+  function dispatch() {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    var batchCopy = batch;
+    destroyTimerAndBatch();
+
+    var _fetchMany = fetchMany(batchCopy.items.map(function (v) {
+      return v.key;
+    })),
+        promise = _fetchMany.promise,
+        cancel = _fetchMany.cancel;
+
+    batchCopy.cancel = cancel;
+    promise.then(function (result) {
+      for (var i = 0; i < result.length; i++) {
+        var _value = result[i];
+        batchCopy.items[i].resolve(_value);
+      }
+    }).catch(function (cause) {
+      var _iterator = _createForOfIteratorHelper(batchCopy.items),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          item.reject(cause);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    });
+  }
+
+  function load(key) {
+    var batchItem = {
+      cancelled: false,
+      key: key
+    };
+
+    if (!batch) {
+      batch = {
+        items: [],
+        cancel: function cancel() {
+          destroyTimerAndBatch();
+        }
+      };
+    }
+
+    var thisBatch = batch;
+    var promise = new Promise(function (resolve, reject) {
+      var item = batchItem;
+      item.reject = reject;
+      item.resolve = resolve;
+      thisBatch.items.push(item);
+
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.maxBatchSize) !== 'undefined' && thisBatch.items.length >= opts.maxBatchSize) {
+        dispatch();
+        return;
+      }
+    });
+
+    if (!dispatchTimer) {
+      dispatchTimer = setTimeout(dispatch);
+    }
+
+    var cancel = function cancel() {
+      batchItem.cancelled = true;
+
+      if (thisBatch.items.some(function (item) {
+        return !item.cancelled;
+      })) {
+        // there are still things that can be resolved
+        return;
+      }
+
+      thisBatch.cancel();
+    };
+
+    return {
+      promise: promise,
+      cancel: cancel
+    };
+  }
+
+  return {
+    load: load
+  };
+}
+
+function httpBatchLink(opts) {
+  var url = opts.url,
+      maxBatchSize = opts.maxBatchSize; // initialized config
+
+  return function (runtime) {
+    // initialized in app
+    var getHeaders = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(arg1) {
+        var val;
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                val = opts.headers;
+                _context.t0 = _objectSpread;
+                _context.t1 = _objectSpread;
+                _context.t2 = {};
+                _context.next = 6;
+                return runtime.headers();
+
+              case 6:
+                _context.t3 = _context.sent;
+                _context.t4 = (0, _context.t1)(_context.t2, _context.t3);
+
+                if (!(typeof val === 'function')) {
+                  _context.next = 14;
+                  break;
+                }
+
+                _context.next = 11;
+                return val(arg1);
+
+              case 11:
+                _context.t5 = _context.sent;
+                _context.next = 15;
+                break;
+
+              case 14:
+                _context.t5 = val;
+
+              case 15:
+                _context.t6 = _context.t5;
+                return _context.abrupt("return", (0, _context.t0)(_context.t4, _context.t6));
+
+              case 17:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function getHeaders(_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    var fetcher = function fetcher(type) {
+      return function (pairs) {
+        var _opts$fetch, _opts$AbortController;
+
+        var path = pairs.map(function (op) {
+          return op.path;
+        }).join(',');
+        var inputs = pairs.map(function (op) {
+          return op.input;
+        });
+
+        var _httpRequest = transformRPCResponse.httpRequest({
+          url: url,
+          inputs: inputs,
+          path: path,
+          type: type,
+          fetch: transformRPCResponse.getFetch((_opts$fetch = opts.fetch) !== null && _opts$fetch !== void 0 ? _opts$fetch : runtime.fetch),
+          AbortController: transformRPCResponse.getAbortController((_opts$AbortController = opts.AbortController) !== null && _opts$AbortController !== void 0 ? _opts$AbortController : runtime.AbortController),
+          headers: function headers() {
+            return getHeaders({
+              operations: pairs
+            });
+          },
+          transformer: runtime.transformer
+        }),
+            promise = _httpRequest.promise,
+            cancel = _httpRequest.cancel;
+
+        return {
+          promise: promise.then(function (res) {
+            if (!Array.isArray(res)) {
+              return pairs.map(function () {
+                return res;
+              });
+            }
+
+            return res;
+          }),
+          cancel: cancel
+        };
+      };
+    };
+
+    var query = dataLoader(fetcher('query'), {
+      maxBatchSize: maxBatchSize
+    });
+    var mutation = dataLoader(fetcher('mutation'), {
+      maxBatchSize: maxBatchSize
+    });
+    var subscription = dataLoader(fetcher('subscription'), {
+      maxBatchSize: maxBatchSize
+    });
+    var loaders = {
+      query: query,
+      subscription: subscription,
+      mutation: mutation
+    };
+    return function (_ref2) {
+      var op = _ref2.op,
+          prev = _ref2.prev,
+          onDestroy = _ref2.onDestroy;
+      var loader = loaders[op.type];
+
+      var _loader$load = loader.load(op),
+          promise = _loader$load.promise,
+          cancel = _loader$load.cancel;
+
+      var isDone = false;
+
+      var prevOnce = function prevOnce(result) {
+        if (isDone) {
+          return;
+        }
+
+        isDone = true;
+        prev(result);
+      };
+
+      onDestroy(function () {
+        prevOnce(TRPCClientError.TRPCClientError.from(new transformRPCResponse.TRPCAbortError(), {
+          isDone: true
+        }));
+        cancel();
+      });
+      promise.then(function (envelope) {
+        prevOnce(transformRPCResponse.transformRPCResponse({
+          envelope: envelope,
+          runtime: runtime
+        }));
+      }).catch(function (cause) {
+        prevOnce(TRPCClientError.TRPCClientError.from(cause));
+      });
+    };
+  };
+}
+
+exports.httpBatchLink = httpBatchLink;