@trpc/client 9.17.0 → 10.0.0-alpha.0

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

@@ -1,10 +1,11 @@
-import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 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 { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
+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';
 
 /* istanbul ignore next */
@@ -144,24 +145,19 @@ function createWSClient(opts) {
       }
     };
 
-    var handleIncomingResponse = function handleIncomingResponse(res) {
-      var _req$callbacks$onNext, _req$callbacks2;
+    var handleIncomingResponse = function handleIncomingResponse(data) {
+      var _req$callbacks$next, _req$callbacks;
 
-      var req = res.id !== null && pendingRequests[res.id];
+      var req = data.id !== null && pendingRequests[data.id];
 
       if (!req) {
         // do something?
         return;
       }
 
-      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);
+      (_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 (req.ws !== activeConnection && conn === activeConnection) {
         var oldWs = req.ws; // gracefully replace old connection with this
@@ -170,10 +166,8 @@ function createWSClient(opts) {
         closeIfNoPending(oldWs);
       }
 
-      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);
+      if ('result' in data && data.result.type === 'stopped' && conn === activeConnection) {
+        req.callbacks.complete();
       }
     };
 
@@ -199,7 +193,7 @@ function createWSClient(opts) {
       }
 
       for (var key in pendingRequests) {
-        var _req$callbacks$onErro2, _req$callbacks4;
+        var _req$callbacks$error, _req$callbacks2;
 
         var req = pendingRequests[key];
 
@@ -207,13 +201,13 @@ function createWSClient(opts) {
           continue;
         }
 
-        (_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')));
+        (_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')));
 
         if (req.type !== 'subscription') {
-          var _req$callbacks$onDone2, _req$callbacks5;
+          var _req$callbacks$comple, _req$callbacks3;
 
           delete pendingRequests[key];
-          (_req$callbacks$onDone2 = (_req$callbacks5 = req.callbacks).onDone) === null || _req$callbacks$onDone2 === void 0 ? void 0 : _req$callbacks$onDone2.call(_req$callbacks5);
+          (_req$callbacks$comple = (_req$callbacks3 = req.callbacks).complete) === null || _req$callbacks$comple === void 0 ? void 0 : _req$callbacks$comple.call(_req$callbacks3);
         } else if (state !== 'closed') {
           // request restart of sub with next connection
           resumeSubscriptionOnReconnect(req);
@@ -247,14 +241,14 @@ function createWSClient(opts) {
     outgoing.push(envelope);
     dispatch();
     return function () {
-      var _pendingRequests$id, _callbacks$onDone;
+      var _pendingRequests$id, _callbacks$complete;
 
       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$onDone = callbacks.onDone) === null || _callbacks$onDone === void 0 ? void 0 : _callbacks$onDone.call(callbacks);
+      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$complete = callbacks.complete) === null || _callbacks$complete === void 0 ? void 0 : _callbacks$complete.call(callbacks);
 
       if (op.type === 'subscription') {
         outgoing.push({
@@ -318,70 +312,51 @@ var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 function wsLink(opts) {
-  // initialized config
-  return function (rt) {
+  return function () {
     var client = opts.client;
     return function (_ref2) {
-      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
+      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) {
             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();
+            }
           }
-        },
-        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;
-        }
-      });
-      onDestroy(function () {
-        isDone = true;
-        unsub();
+        });
+        return function () {
+          unsub();
+        };
       });
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "9.17.0",
+  "version": "10.0.0-alpha.0",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -13,11 +13,14 @@
   "preconstruct": {
     "entrypoints": [
       "index.ts",
-      "links/httpLink.ts",
       "links/httpBatchLink.ts",
-      "links/splitLink.ts",
+      "links/httpLink.ts",
       "links/loggerLink.ts",
-      "links/wsLink.ts"
+      "links/splitLink.ts",
+      "links/transformerLink.ts",
+      "links/wsLink.ts",
+      "rx/index.ts",
+      "rx/operators/index.ts"
     ]
   },
   "scripts": {},
@@ -28,19 +31,20 @@
     "README.md",
     "dist",
     "links",
-    "src"
+    "src",
+    "rx"
   ],
   "dependencies": {
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "9.17.0"
+    "@trpc/server": "10.0.0-alpha.0"
   },
   "devDependencies": {
-    "@trpc/server": "9.17.0"
+    "@trpc/server": "10.0.0-alpha.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f76b20aaa2db2fa8f4d51d4c47dfe37228badb91"
+  "gitHead": "ec10cf19bd153946e9211a32e3e2b511e37e6325"
 }

package/rx/dist/trpc-client-rx.cjs.d.ts

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

package/rx/dist/trpc-client-rx.cjs.dev.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var observable = require('../../dist/observable-9aad8c3e.cjs.dev.js');
+
+
+
+exports.observable = observable.observable;

package/rx/dist/trpc-client-rx.cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./trpc-client-rx.cjs.prod.js");
+} else {
+  module.exports = require("./trpc-client-rx.cjs.dev.js");
+}

package/rx/dist/trpc-client-rx.cjs.prod.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var observable = require('../../dist/observable-ccb54234.cjs.prod.js');
+
+
+
+exports.observable = observable.observable;

package/rx/dist/trpc-client-rx.esm.js

@@ -0,0 +1 @@
+export { o as observable } from '../../dist/observable-01534ea8.esm.js';

package/rx/operators/dist/trpc-client-rx-operators.cjs.d.ts

@@ -0,0 +1 @@
+export * from "../../../dist/declarations/src/rx/operators/index";

package/rx/operators/dist/trpc-client-rx-operators.cjs.dev.js

@@ -0,0 +1,39 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var share = require('../../../dist/share-f2ac9332.cjs.dev.js');
+var tap = require('../../../dist/tap-2d565250.cjs.dev.js');
+require('@babel/runtime/helpers/createForOfIteratorHelper');
+
+function map(project) {
+  return function (originalObserver) {
+    return {
+      subscribe: function subscribe(observer) {
+        var index = 0;
+        var subscription = originalObserver.subscribe({
+          next: function next(value) {
+            var _observer$next;
+
+            (_observer$next = observer.next) === null || _observer$next === void 0 ? void 0 : _observer$next.call(observer, project(value, index++));
+          },
+          error: function error(_error) {
+            var _observer$error;
+
+            (_observer$error = observer.error) === null || _observer$error === void 0 ? void 0 : _observer$error.call(observer, _error);
+          },
+          complete: function complete() {
+            var _observer$complete;
+
+            (_observer$complete = observer.complete) === null || _observer$complete === void 0 ? void 0 : _observer$complete.call(observer);
+          }
+        });
+        return subscription;
+      }
+    };
+  };
+}
+
+exports.share = share.share;
+exports.tap = tap.tap;
+exports.map = map;

package/rx/operators/dist/trpc-client-rx-operators.cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./trpc-client-rx-operators.cjs.prod.js");
+} else {
+  module.exports = require("./trpc-client-rx-operators.cjs.dev.js");
+}

package/rx/operators/dist/trpc-client-rx-operators.cjs.prod.js

@@ -0,0 +1,39 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var share = require('../../../dist/share-5a8c2543.cjs.prod.js');
+var tap = require('../../../dist/tap-d907998d.cjs.prod.js');
+require('@babel/runtime/helpers/createForOfIteratorHelper');
+
+function map(project) {
+  return function (originalObserver) {
+    return {
+      subscribe: function subscribe(observer) {
+        var index = 0;
+        var subscription = originalObserver.subscribe({
+          next: function next(value) {
+            var _observer$next;
+
+            (_observer$next = observer.next) === null || _observer$next === void 0 ? void 0 : _observer$next.call(observer, project(value, index++));
+          },
+          error: function error(_error) {
+            var _observer$error;
+
+            (_observer$error = observer.error) === null || _observer$error === void 0 ? void 0 : _observer$error.call(observer, _error);
+          },
+          complete: function complete() {
+            var _observer$complete;
+
+            (_observer$complete = observer.complete) === null || _observer$complete === void 0 ? void 0 : _observer$complete.call(observer);
+          }
+        });
+        return subscription;
+      }
+    };
+  };
+}
+
+exports.share = share.share;
+exports.tap = tap.tap;
+exports.map = map;

package/rx/operators/dist/trpc-client-rx-operators.esm.js

@@ -0,0 +1,33 @@
+export { s as share } from '../../../dist/share-ca585761.esm.js';
+export { t as tap } from '../../../dist/tap-606957cb.esm.js';
+import '@babel/runtime/helpers/createForOfIteratorHelper';
+
+function map(project) {
+  return function (originalObserver) {
+    return {
+      subscribe: function subscribe(observer) {
+        var index = 0;
+        var subscription = originalObserver.subscribe({
+          next: function next(value) {
+            var _observer$next;
+
+            (_observer$next = observer.next) === null || _observer$next === void 0 ? void 0 : _observer$next.call(observer, project(value, index++));
+          },
+          error: function error(_error) {
+            var _observer$error;
+
+            (_observer$error = observer.error) === null || _observer$error === void 0 ? void 0 : _observer$error.call(observer, _error);
+          },
+          complete: function complete() {
+            var _observer$complete;
+
+            (_observer$complete = observer.complete) === null || _observer$complete === void 0 ? void 0 : _observer$complete.call(observer);
+          }
+        });
+        return subscription;
+      }
+    };
+  };
+}
+
+export { map };

package/rx/operators/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/trpc-client-rx-operators.cjs.js",
+  "module": "dist/trpc-client-rx-operators.esm.js"
+}

package/rx/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/trpc-client-rx.cjs.js",
+  "module": "dist/trpc-client-rx.esm.js"
+}

package/src/TRPCClientError.ts

@@ -18,58 +18,54 @@ export class TRPCClientError<TRouter extends AnyRouter>
   public readonly cause;
   public readonly shape: Maybe<inferRouterError<TRouter>>;
   public readonly data: Maybe<inferRouterError<TRouter>['data']>;
-  /**
-   * Fatal error - expect no more results after this error
-   * Used for when WebSockets disconnect prematurely.
-   */
-  public readonly isDone: boolean;
+  public readonly meta;
 
   constructor(
     message: string,
-    opts: {
+    opts?: {
       result: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
       /**
-       * @deprecated use cause
+       * @deprecated use `cause`
        **/
       originalError?: Maybe<Error>;
       cause?: Maybe<Error>;
-      isDone?: boolean;
+      meta?: Record<string, unknown>;
     },
   ) {
-    const cause = opts.cause ?? opts.originalError;
+    const cause = opts?.cause ?? opts?.originalError;
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore https://github.com/tc39/proposal-error-cause
     super(message, { cause });
 
-    this.isDone = opts.isDone ?? false;
+    this.meta = opts?.meta;
 
     this.cause = this.originalError = cause;
-    this.shape = opts.result?.error;
-    this.data = opts.result?.error.data;
+    this.shape = opts?.result?.error;
+    this.data = opts?.result?.error.data;
     this.name = 'TRPCClientError';
 
     Object.setPrototypeOf(this, TRPCClientError.prototype);
   }
 
   public static from<TRouter extends AnyRouter>(
-    result: Error | TRPCErrorResponse<any>,
-    opts: { isDone?: boolean } = {},
+    cause: Error | TRPCErrorResponse<any>,
+    opts: { meta?: Record<string, unknown> } = {},
   ): TRPCClientError<TRouter> {
-    if (!(result instanceof Error)) {
-      return new TRPCClientError<TRouter>((result.error as any).message ?? '', {
+    if (!(cause instanceof Error)) {
+      return new TRPCClientError<TRouter>((cause.error as any).message ?? '', {
         ...opts,
         cause: null,
-        result: result,
+        result: cause,
       });
     }
-    if (result.name === 'TRPCClientError') {
-      return result as TRPCClientError<any>;
+    if (cause.name === 'TRPCClientError') {
+      return cause as TRPCClientError<any>;
     }
 
-    return new TRPCClientError<TRouter>(result.message, {
+    return new TRPCClientError<TRouter>(cause.message, {
       ...opts,
-      cause: result,
+      cause,
       result: null,
     });
   }

package/src/createTRPCClient.ts

@@ -11,8 +11,9 @@ export function createTRPCClient<TRouter extends AnyRouter>(
   return new Client<TRouter>(opts);
 }
 
-export type { CreateTRPCClientOptions } from './internals/TRPCClient';
-
 export type TRPCClient<TRouter extends AnyRouter> = Client<TRouter>;
 
-export type { TRPCRequestOptions } from './internals/TRPCClient';
+export type {
+  TRPCRequestOptions,
+  CreateTRPCClientOptions,
+} from './internals/TRPCClient';

package/src/index.ts

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