@trpc/client 10.0.0-alpha.34 → 10.0.0-alpha.35

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> & import("./createTRPCClientProxy").FlattenRouter<TRouter>;
+export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter>;
 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":"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,8EAIvC;AAID,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;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,mBAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,GACX,MAAM,wBAAwB,CAAC"}

package/dist/createTRPCClientProxy.d.ts

@@ -1,7 +1,10 @@
 import type { AnyRouter } from '@trpc/server';
 import { TRPCClient as Client } from './internals/TRPCClient';
+/**
+ * @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];
 };
-export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): Client<TRouter> & FlattenRouter<TRouter>;
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): FlattenRouter<TRouter>;
 //# 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;AAC9C,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,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;AAyCF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,4CAGxB"}
+{"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"}

package/dist/index.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var observable = require('@trpc/server/observable');
@@ -16,64 +15,18 @@ require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');
 require('@babel/runtime/helpers/wrapNativeSuper');
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+var shared = require('@trpc/server/shared');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 require('./httpUtils-a0169eef.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 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);
-}
+var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 
 function getWindow() {
   if (typeof window !== 'undefined') {
@@ -459,9 +412,30 @@ var TRPCClient = /*#__PURE__*/function () {
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createTRPCClient(opts) {
   var client = new TRPCClient(opts);
-  return createTRPCClientProxy(client);
+  return client;
 } // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
+function createTRPCClientProxy(client) {
+  var proxy = shared.createProxy(function (_ref) {
+    var _ref2;
+
+    var path = _ref.path,
+        args = _ref.args;
+
+    var pathCopy = _toConsumableArray__default["default"](path);
+
+    var type = pathCopy.pop();
+
+    if (type === 'mutate') {
+      type = 'mutation';
+    }
+
+    var fullPath = pathCopy.join('.');
+    return (_ref2 = client)[type].apply(_ref2, [fullPath].concat(_toConsumableArray__default["default"](args)));
+  });
+  return proxy;
+}
+
 exports.TRPCClientError = links_wsLink.TRPCClientError;
 exports.createWSClient = links_wsLink.createWSClient;
 exports.wsLink = links_wsLink.wsLink;

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import { observable, share, observableToPromise } from '@trpc/server/observable';
@@ -15,58 +14,12 @@ import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';
 import '@babel/runtime/helpers/wrapNativeSuper';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import { createProxy } from '@trpc/server/shared';
 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;
@@ -451,7 +404,28 @@ var TRPCClient = /*#__PURE__*/function () {
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createTRPCClient(opts) {
   var client = new TRPCClient(opts);
-  return createTRPCClientProxy(client);
+  return client;
 } // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
 
+function createTRPCClientProxy(client) {
+  var proxy = createProxy(function (_ref) {
+    var _ref2;
+
+    var path = _ref.path,
+        args = _ref.args;
+
+    var pathCopy = _toConsumableArray(path);
+
+    var type = pathCopy.pop();
+
+    if (type === 'mutate') {
+      type = 'mutation';
+    }
+
+    var fullPath = pathCopy.join('.');
+    return (_ref2 = client)[type].apply(_ref2, [fullPath].concat(_toConsumableArray(args)));
+  });
+  return proxy;
+}
+
 export { createTRPCClient, createTRPCClientProxy, dedupeLink, getFetch, retryLink };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.34",
+  "version": "10.0.0-alpha.35",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -67,13 +67,13 @@
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.34"
+    "@trpc/server": "10.0.0-alpha.35"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.34"
+    "@trpc/server": "10.0.0-alpha.35"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "533e9ced4859aa20e72da44a7cdafc95736dd1e5"
+  "gitHead": "4295407b073ffa1359f1d16315d6a95af25fd496"
 }

package/src/createTRPCClient.ts

@@ -2,7 +2,6 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { AnyRouter } from '@trpc/server';
-import { createTRPCClientProxy } from './createTRPCClientProxy';
 import {
   TRPCClient as Client,
   CreateTRPCClientOptions,
@@ -12,7 +11,7 @@ export function createTRPCClient<TRouter extends AnyRouter>(
   opts: CreateTRPCClientOptions<TRouter>,
 ) {
   const client = new Client<TRouter>(opts);
-  return createTRPCClientProxy(client);
+  return client;
 }
 
 // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`

package/src/createTRPCClientProxy.ts

@@ -2,55 +2,29 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { AnyRouter } from '@trpc/server';
+import { createProxy } from '@trpc/server/shared';
 import { TRPCClient as Client } from './internals/TRPCClient';
 
+/**
+ * @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];
 };
 
-function makeProxy<TRouter extends AnyRouter>(
-  client: Client<TRouter>,
-  ...path: string[]
-) {
-  const proxy: any = new Proxy(
-    function () {
-      // noop
-    },
-    {
-      get(_obj, name) {
-        if (name in client && !path.length) {
-          return client[name as keyof typeof client];
-        }
-        if (typeof name === 'string') {
-          return makeProxy(client, ...path, name);
-        }
-
-        return client;
-      },
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      apply(_1, _2, args) {
-        const pathCopy = [...path];
-        let type = pathCopy.pop()!;
-        if (type === 'mutate') {
-          type = 'mutation';
-        }
-        const fullPath = pathCopy.join('.');
-
-        if (type.startsWith('use')) {
-          throw new Error(`Invalid hook call`);
-        }
-
-        return (client as any)[type](fullPath, ...args);
-      },
-    },
-  );
-
-  return proxy as typeof client & FlattenRouter<TRouter>;
-}
 export function createTRPCClientProxy<TRouter extends AnyRouter>(
   client: Client<TRouter>,
 ) {
-  return makeProxy(client);
+  const proxy = createProxy(({ path, args }) => {
+    const pathCopy = [...path];
+    let type = pathCopy.pop()!;
+    if (type === 'mutate') {
+      type = 'mutation';
+    }
+    const fullPath = pathCopy.join('.');
+    return (client as any)[type](fullPath, ...args);
+  });
+  return proxy as FlattenRouter<TRouter>;
 }