@trpc/client 10.0.0-alpha.2 → 10.0.0-alpha.22

package/links/wsLink/dist/trpc-client-links-wsLink.cjs.prod.js

@@ -2,15 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var _createClass = require('@babel/runtime/helpers/createClass');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var _createSuper = require('@babel/runtime/helpers/createSuper');
 var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
-var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
-var TRPCClientError = require('../../../dist/TRPCClientError-ea7d89b2.cjs.prod.js');
-require('@babel/runtime/helpers/objectSpread2');
-require('@babel/runtime/helpers/createClass');
+var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
 
 /* istanbul ignore next */
 var retryDelay = function retryDelay(attemptIndex) {
@@ -149,19 +148,24 @@ function createWSClient(opts) {
       }
     };
 
-    var handleIncomingResponse = function handleIncomingResponse(data) {
-      var _req$callbacks$next, _req$callbacks;
+    var handleIncomingResponse = function handleIncomingResponse(res) {
+      var _req$callbacks$onNext, _req$callbacks2;
 
-      var req = data.id !== null && pendingRequests[data.id];
+      var req = res.id !== null && pendingRequests[res.id];
 
       if (!req) {
         // do something?
         return;
       }
 
-      (_req$callbacks$next = (_req$callbacks = req.callbacks).next) === null || _req$callbacks$next === void 0 ? void 0 : _req$callbacks$next.call(_req$callbacks, {
-        data: data
-      });
+      if ('error' in res) {
+        var _req$callbacks$onErro, _req$callbacks;
+
+        (_req$callbacks$onErro = (_req$callbacks = req.callbacks).onError) === null || _req$callbacks$onErro === void 0 ? void 0 : _req$callbacks$onErro.call(_req$callbacks, res);
+        return;
+      }
+
+      (_req$callbacks$onNext = (_req$callbacks2 = req.callbacks).onNext) === null || _req$callbacks$onNext === void 0 ? void 0 : _req$callbacks$onNext.call(_req$callbacks2, res.result);
 
       if (req.ws !== activeConnection && conn === activeConnection) {
         var oldWs = req.ws; // gracefully replace old connection with this
@@ -170,8 +174,10 @@ function createWSClient(opts) {
         closeIfNoPending(oldWs);
       }
 
-      if ('result' in data && data.result.type === 'stopped' && conn === activeConnection) {
-        req.callbacks.complete();
+      if (res.result.type === 'stopped' && conn === activeConnection) {
+        var _req$callbacks$onDone, _req$callbacks3;
+
+        (_req$callbacks$onDone = (_req$callbacks3 = req.callbacks).onDone) === null || _req$callbacks$onDone === void 0 ? void 0 : _req$callbacks$onDone.call(_req$callbacks3);
       }
     };
 
@@ -197,7 +203,7 @@ function createWSClient(opts) {
       }
 
       for (var key in pendingRequests) {
-        var _req$callbacks$error, _req$callbacks2;
+        var _req$callbacks$onErro2, _req$callbacks4;
 
         var req = pendingRequests[key];
 
@@ -205,13 +211,13 @@ function createWSClient(opts) {
           continue;
         }
 
-        (_req$callbacks$error = (_req$callbacks2 = req.callbacks).error) === null || _req$callbacks$error === void 0 ? void 0 : _req$callbacks$error.call(_req$callbacks2, TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
+        (_req$callbacks$onErro2 = (_req$callbacks4 = req.callbacks).onError) === null || _req$callbacks$onErro2 === void 0 ? void 0 : _req$callbacks$onErro2.call(_req$callbacks4, TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
 
         if (req.type !== 'subscription') {
-          var _req$callbacks$comple, _req$callbacks3;
+          var _req$callbacks$onDone2, _req$callbacks5;
 
           delete pendingRequests[key];
-          (_req$callbacks$comple = (_req$callbacks3 = req.callbacks).complete) === null || _req$callbacks$comple === void 0 ? void 0 : _req$callbacks$comple.call(_req$callbacks3);
+          (_req$callbacks$onDone2 = (_req$callbacks5 = req.callbacks).onDone) === null || _req$callbacks$onDone2 === void 0 ? void 0 : _req$callbacks$onDone2.call(_req$callbacks5);
         } else if (state !== 'closed') {
           // request restart of sub with next connection
           resumeSubscriptionOnReconnect(req);
@@ -245,14 +251,14 @@ function createWSClient(opts) {
     outgoing.push(envelope);
     dispatch();
     return function () {
-      var _pendingRequests$id, _callbacks$complete;
+      var _pendingRequests$id, _callbacks$onDone;
 
       var callbacks = (_pendingRequests$id = pendingRequests[id]) === null || _pendingRequests$id === void 0 ? void 0 : _pendingRequests$id.callbacks;
       delete pendingRequests[id];
       outgoing = outgoing.filter(function (msg) {
         return msg.id !== id;
       });
-      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$complete = callbacks.complete) === null || _callbacks$complete === void 0 ? void 0 : _callbacks$complete.call(callbacks);
+      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onDone = callbacks.onDone) === null || _callbacks$onDone === void 0 ? void 0 : _callbacks$onDone.call(callbacks);
 
       if (op.type === 'subscription') {
         outgoing.push({
@@ -293,7 +299,7 @@ var TRPCWebSocketClosedError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return TRPCWebSocketClosedError;
+  return _createClass(TRPCWebSocketClosedError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
@@ -312,56 +318,74 @@ var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
     return _this2;
   }
 
-  return TRPCSubscriptionEndedError;
+  return _createClass(TRPCSubscriptionEndedError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 function wsLink(opts) {
-  return function () {
+  // initialized config
+  return function (rt) {
     var client = opts.client;
     return function (_ref2) {
-      var op = _ref2.op;
-      return observable.observable(function (observer) {
-        var type = op.type,
-            input = op.input,
-            path = op.path,
-            id = op.id,
-            context = op.context;
-        var isDone = false;
-        var unsub = client.request({
-          type: type,
-          path: path,
-          input: input,
-          id: id,
-          context: context
-        }, {
-          error: function error(err) {
+      var op = _ref2.op,
+          prev = _ref2.prev,
+          onDestroy = _ref2.onDestroy;
+      var type = op.type,
+          rawInput = op.input,
+          path = op.path,
+          id = op.id;
+      var input = rt.transformer.serialize(rawInput);
+      var isDone = false;
+      var unsub = client.request({
+        type: type,
+        path: path,
+        input: input,
+        id: id
+      }, {
+        onNext: function onNext(result) {
+          if (isDone) {
+            return;
+          }
+
+          if ('data' in result) {
+            var data = rt.transformer.deserialize(result.data);
+            prev({
+              type: 'data',
+              data: data
+            });
+          } else {
+            prev(result);
+          }
+
+          if (op.type !== 'subscription') {
+            // if it isn't a subscription we don't care about next response
             isDone = true;
-            observer.error(err);
             unsub();
-          },
-          complete: function complete() {
-            if (!isDone) {
-              isDone = true;
-              observer.error(TRPCClientError.TRPCClientError.from(new TRPCSubscriptionEndedError('Operation ended prematurely')));
-            } else {
-              observer.complete();
-            }
-          },
-          next: function next(result) {
-            observer.next(result);
-
-            if (op.type !== 'subscription') {
-              // if it isn't a subscription we don't care about next response
-              isDone = true;
-              unsub();
-              observer.complete();
-            }
           }
-        });
-        return function () {
+        },
+        onError: function onError(err) {
+          if (isDone) {
+            return;
+          }
+
+          prev(err instanceof Error ? err : TRPCClientError.TRPCClientError.from(_objectSpread(_objectSpread({}, err), {}, {
+            error: rt.transformer.deserialize(err.error)
+          })));
+        },
+        onDone: function onDone() {
+          if (isDone) {
+            return;
+          }
+
+          var result = new TRPCSubscriptionEndedError('Operation ended prematurely');
+          prev(TRPCClientError.TRPCClientError.from(result, {
+            isDone: true
+          }));
           isDone = true;
-          unsub();
-        };
+        }
+      });
+      onDestroy(function () {
+        isDone = true;
+        unsub();
       });
     };
   };

package/links/wsLink/dist/trpc-client-links-wsLink.esm.js

@@ -1,12 +1,11 @@
+import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
+import _createClass from '@babel/runtime/helpers/esm/createClass';
 import _classCallCheck from '@babel/runtime/helpers/esm/classCallCheck';
 import _assertThisInitialized from '@babel/runtime/helpers/esm/assertThisInitialized';
 import _inherits from '@babel/runtime/helpers/esm/inherits';
 import _createSuper from '@babel/runtime/helpers/esm/createSuper';
 import _wrapNativeSuper from '@babel/runtime/helpers/esm/wrapNativeSuper';
-import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
-import { T as TRPCClientError } from '../../../dist/TRPCClientError-e1da1ef0.esm.js';
-import '@babel/runtime/helpers/objectSpread2';
-import '@babel/runtime/helpers/createClass';
+import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
 
 /* istanbul ignore next */
 var retryDelay = function retryDelay(attemptIndex) {
@@ -145,19 +144,24 @@ function createWSClient(opts) {
       }
     };
 
-    var handleIncomingResponse = function handleIncomingResponse(data) {
-      var _req$callbacks$next, _req$callbacks;
+    var handleIncomingResponse = function handleIncomingResponse(res) {
+      var _req$callbacks$onNext, _req$callbacks2;
 
-      var req = data.id !== null && pendingRequests[data.id];
+      var req = res.id !== null && pendingRequests[res.id];
 
       if (!req) {
         // do something?
         return;
       }
 
-      (_req$callbacks$next = (_req$callbacks = req.callbacks).next) === null || _req$callbacks$next === void 0 ? void 0 : _req$callbacks$next.call(_req$callbacks, {
-        data: data
-      });
+      if ('error' in res) {
+        var _req$callbacks$onErro, _req$callbacks;
+
+        (_req$callbacks$onErro = (_req$callbacks = req.callbacks).onError) === null || _req$callbacks$onErro === void 0 ? void 0 : _req$callbacks$onErro.call(_req$callbacks, res);
+        return;
+      }
+
+      (_req$callbacks$onNext = (_req$callbacks2 = req.callbacks).onNext) === null || _req$callbacks$onNext === void 0 ? void 0 : _req$callbacks$onNext.call(_req$callbacks2, res.result);
 
       if (req.ws !== activeConnection && conn === activeConnection) {
         var oldWs = req.ws; // gracefully replace old connection with this
@@ -166,8 +170,10 @@ function createWSClient(opts) {
         closeIfNoPending(oldWs);
       }
 
-      if ('result' in data && data.result.type === 'stopped' && conn === activeConnection) {
-        req.callbacks.complete();
+      if (res.result.type === 'stopped' && conn === activeConnection) {
+        var _req$callbacks$onDone, _req$callbacks3;
+
+        (_req$callbacks$onDone = (_req$callbacks3 = req.callbacks).onDone) === null || _req$callbacks$onDone === void 0 ? void 0 : _req$callbacks$onDone.call(_req$callbacks3);
       }
     };
 
@@ -193,7 +199,7 @@ function createWSClient(opts) {
       }
 
       for (var key in pendingRequests) {
-        var _req$callbacks$error, _req$callbacks2;
+        var _req$callbacks$onErro2, _req$callbacks4;
 
         var req = pendingRequests[key];
 
@@ -201,13 +207,13 @@ function createWSClient(opts) {
           continue;
         }
 
-        (_req$callbacks$error = (_req$callbacks2 = req.callbacks).error) === null || _req$callbacks$error === void 0 ? void 0 : _req$callbacks$error.call(_req$callbacks2, TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
+        (_req$callbacks$onErro2 = (_req$callbacks4 = req.callbacks).onError) === null || _req$callbacks$onErro2 === void 0 ? void 0 : _req$callbacks$onErro2.call(_req$callbacks4, TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
 
         if (req.type !== 'subscription') {
-          var _req$callbacks$comple, _req$callbacks3;
+          var _req$callbacks$onDone2, _req$callbacks5;
 
           delete pendingRequests[key];
-          (_req$callbacks$comple = (_req$callbacks3 = req.callbacks).complete) === null || _req$callbacks$comple === void 0 ? void 0 : _req$callbacks$comple.call(_req$callbacks3);
+          (_req$callbacks$onDone2 = (_req$callbacks5 = req.callbacks).onDone) === null || _req$callbacks$onDone2 === void 0 ? void 0 : _req$callbacks$onDone2.call(_req$callbacks5);
         } else if (state !== 'closed') {
           // request restart of sub with next connection
           resumeSubscriptionOnReconnect(req);
@@ -241,14 +247,14 @@ function createWSClient(opts) {
     outgoing.push(envelope);
     dispatch();
     return function () {
-      var _pendingRequests$id, _callbacks$complete;
+      var _pendingRequests$id, _callbacks$onDone;
 
       var callbacks = (_pendingRequests$id = pendingRequests[id]) === null || _pendingRequests$id === void 0 ? void 0 : _pendingRequests$id.callbacks;
       delete pendingRequests[id];
       outgoing = outgoing.filter(function (msg) {
         return msg.id !== id;
       });
-      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$complete = callbacks.complete) === null || _callbacks$complete === void 0 ? void 0 : _callbacks$complete.call(callbacks);
+      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onDone = callbacks.onDone) === null || _callbacks$onDone === void 0 ? void 0 : _callbacks$onDone.call(callbacks);
 
       if (op.type === 'subscription') {
         outgoing.push({
@@ -289,7 +295,7 @@ var TRPCWebSocketClosedError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return TRPCWebSocketClosedError;
+  return _createClass(TRPCWebSocketClosedError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
@@ -308,56 +314,74 @@ var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
     return _this2;
   }
 
-  return TRPCSubscriptionEndedError;
+  return _createClass(TRPCSubscriptionEndedError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 function wsLink(opts) {
-  return function () {
+  // initialized config
+  return function (rt) {
     var client = opts.client;
     return function (_ref2) {
-      var op = _ref2.op;
-      return observable(function (observer) {
-        var type = op.type,
-            input = op.input,
-            path = op.path,
-            id = op.id,
-            context = op.context;
-        var isDone = false;
-        var unsub = client.request({
-          type: type,
-          path: path,
-          input: input,
-          id: id,
-          context: context
-        }, {
-          error: function error(err) {
+      var op = _ref2.op,
+          prev = _ref2.prev,
+          onDestroy = _ref2.onDestroy;
+      var type = op.type,
+          rawInput = op.input,
+          path = op.path,
+          id = op.id;
+      var input = rt.transformer.serialize(rawInput);
+      var isDone = false;
+      var unsub = client.request({
+        type: type,
+        path: path,
+        input: input,
+        id: id
+      }, {
+        onNext: function onNext(result) {
+          if (isDone) {
+            return;
+          }
+
+          if ('data' in result) {
+            var data = rt.transformer.deserialize(result.data);
+            prev({
+              type: 'data',
+              data: data
+            });
+          } else {
+            prev(result);
+          }
+
+          if (op.type !== 'subscription') {
+            // if it isn't a subscription we don't care about next response
             isDone = true;
-            observer.error(err);
             unsub();
-          },
-          complete: function complete() {
-            if (!isDone) {
-              isDone = true;
-              observer.error(TRPCClientError.from(new TRPCSubscriptionEndedError('Operation ended prematurely')));
-            } else {
-              observer.complete();
-            }
-          },
-          next: function next(result) {
-            observer.next(result);
-
-            if (op.type !== 'subscription') {
-              // if it isn't a subscription we don't care about next response
-              isDone = true;
-              unsub();
-              observer.complete();
-            }
           }
-        });
-        return function () {
+        },
+        onError: function onError(err) {
+          if (isDone) {
+            return;
+          }
+
+          prev(err instanceof Error ? err : TRPCClientError.from(_objectSpread(_objectSpread({}, err), {}, {
+            error: rt.transformer.deserialize(err.error)
+          })));
+        },
+        onDone: function onDone() {
+          if (isDone) {
+            return;
+          }
+
+          var result = new TRPCSubscriptionEndedError('Operation ended prematurely');
+          prev(TRPCClientError.from(result, {
+            isDone: true
+          }));
           isDone = true;
-          unsub();
-        };
+        }
+      });
+      onDestroy(function () {
+        isDone = true;
+        unsub();
       });
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.2",
+  "version": "10.0.0-alpha.22",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -10,41 +10,44 @@
     "url": "git+https://github.com/trpc/trpc.git",
     "directory": "packages/client"
   },
-  "preconstruct": {
-    "entrypoints": [
-      "index.ts",
-      "links/httpBatchLink.ts",
-      "links/httpLink.ts",
-      "links/loggerLink.ts",
-      "links/splitLink.ts",
-      "links/transformerLink.ts",
-      "links/wsLink.ts",
-      "rx/index.ts",
-      "rx/operators/index.ts"
-    ]
-  },
-  "scripts": {},
-  "main": "dist/trpc-client.cjs.js",
-  "module": "dist/trpc-client.esm.js",
-  "typings": "dist/trpc-client.cjs.d.ts",
+  "eslintConfig": {
+    "rules": {
+      "no-restricted-imports": [
+        "error",
+        "@trpc/client"
+      ]
+    }
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "typings": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
+    }
+  },
   "files": [
     "README.md",
     "dist",
     "links",
-    "src",
-    "rx"
+    "src"
   ],
+  "scripts": {
+    "build": "rollup -c"
+  },
   "dependencies": {
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.2"
+    "@trpc/server": "10.0.0-alpha.22"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.2"
+    "@trpc/server": "10.0.0-alpha.22"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4d72f1922cfb8a74e2bb03a29b39903418312728"
+  "gitHead": "d720eb2215f0fad6e70f4172a1bf084225d4d6de"
 }

package/src/TRPCClientError.ts

@@ -1,4 +1,4 @@
-import { AnyRouter, inferRouterError, Maybe } from '@trpc/server';
+import { AnyRouter, Maybe, inferRouterError } from '@trpc/server';
 import { TRPCErrorResponse } from '@trpc/server/rpc';
 
 export interface TRPCClientErrorLike<TRouter extends AnyRouter> {
@@ -11,10 +11,6 @@ export class TRPCClientError<TRouter extends AnyRouter>
   extends Error
   implements TRPCClientErrorLike<TRouter>
 {
-  /**
-   * @deprecated use `cause`
-   */
-  public readonly originalError;
   public readonly cause;
   public readonly shape: Maybe<inferRouterError<TRouter>>;
   public readonly data: Maybe<inferRouterError<TRouter>['data']>;
@@ -24,15 +20,11 @@ export class TRPCClientError<TRouter extends AnyRouter>
     message: string,
     opts?: {
       result: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
-      /**
-       * @deprecated use `cause`
-       **/
-      originalError?: Maybe<Error>;
       cause?: Maybe<Error>;
       meta?: Record<string, unknown>;
     },
   ) {
-    const cause = opts?.cause ?? opts?.originalError;
+    const cause = opts?.cause;
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore https://github.com/tc39/proposal-error-cause
@@ -40,7 +32,7 @@ export class TRPCClientError<TRouter extends AnyRouter>
 
     this.meta = opts?.meta;
 
-    this.cause = this.originalError = cause;
+    this.cause = cause;
     this.shape = opts?.result?.error;
     this.data = opts?.result?.error.data;
     this.name = 'TRPCClientError';

package/src/createTRPCClient.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { AnyRouter } from '@trpc/server';
 import {
-  CreateTRPCClientOptions,
   TRPCClient as Client,
+  CreateTRPCClientOptions,
 } from './internals/TRPCClient';
 
 export function createTRPCClient<TRouter extends AnyRouter>(

package/src/index.ts

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