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

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/observable/index.d.ts

@@ -0,0 +1 @@
+export * from '../dist/observable';

package/observable/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/observable/index');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.2",
+  "version": "10.0.0-alpha.20",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -10,41 +10,42 @@
     "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"
-    ]
+  "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"
+    },
+    "./observable": {
+      "import": "./dist/observable/index.mjs",
+      "require": "./dist/observable/index.js",
+      "default": "./dist/observable/index.js"
+    }
   },
-  "scripts": {},
-  "main": "dist/trpc-client.cjs.js",
-  "module": "dist/trpc-client.esm.js",
-  "typings": "dist/trpc-client.cjs.d.ts",
   "files": [
     "README.md",
     "dist",
     "links",
     "src",
-    "rx"
+    "observable"
   ],
+  "scripts": {
+    "build": "rollup -c"
+  },
   "dependencies": {
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.2"
+    "@trpc/server": "10.0.0-alpha.20"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.2"
+    "@trpc/server": "10.0.0-alpha.20"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4d72f1922cfb8a74e2bb03a29b39903418312728"
+  "gitHead": "b1d41d19a79b71045bf92dd6a5b8370a9f4f017c"
 }

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

package/src/internals/TRPCClient.ts

@@ -7,8 +7,9 @@ import {
 } from '@trpc/server';
 import { TRPCResult } from '@trpc/server/rpc';
 import { CancelFn } from '..';
+import { TRPCClientError } from '../TRPCClientError';
 import { getFetch } from '../getFetch';
-import { httpBatchLink } from '../links/httpBatchLink';
+import { httpBatchLink } from '../links';
 import { createChain } from '../links/internals/createChain';
 import { transformOperationResult } from '../links/internals/transformOperationResult';
 import {
@@ -18,25 +19,19 @@ import {
   OperationLink,
   TRPCLink,
 } from '../links/types';
-import { UnsubscribeFn } from '../rx';
-import { inferObservableValue } from '../rx/observable';
-import { share } from '../rx/operators';
-import { Observer } from '../rx/types';
-import { observableToPromise } from '../rx/util/observableToPromise';
-import { TRPCClientError } from '../TRPCClientError';
+import {
+  Observer,
+  Unsubscribable,
+  inferObservableValue,
+  share,
+} from '../observable';
+import { observableToPromise } from '../observable/internals/observableToPromise';
 import { getAbortController } from './fetchHelpers';
 
 type CancellablePromise<T = unknown> = Promise<T> & {
   cancel: CancelFn;
 };
 
-/**
- * @deprecated no longer used
- */
-export interface FetchOptions {
-  fetch?: typeof fetch;
-  AbortController?: typeof AbortController;
-}
 let idCounter = 0;
 function getRequestId() {
   return ++idCounter;
@@ -218,14 +213,14 @@ export class TRPCClient<TRouter extends AnyRouter> {
     input: TInput,
     opts: TRPCRequestOptions &
       Partial<Observer<TRPCResult<TOutput>, TRPCClientError<TRouter>>>,
-  ): UnsubscribeFn {
+  ): Unsubscribable {
     const observable$ = this.$request<TInput, TOutput>({
       type: 'subscription',
       path,
       input,
       context: opts.context,
     });
-    const observer = observable$.subscribe({
+    return observable$.subscribe({
       next(result) {
         if ('error' in result.data) {
           const err = TRPCClientError.from(result.data, {
@@ -244,8 +239,5 @@ export class TRPCClient<TRouter extends AnyRouter> {
         opts.complete?.();
       },
     });
-    return () => {
-      observer.unsubscribe();
-    };
   }
 }

package/src/internals/dataLoader.ts

@@ -20,7 +20,10 @@ type BatchLoadFn<TKey, TValue> = (keys: TKey[]) => {
  * 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
  */
-export function dataLoader<TKey, TValue>(fetchMany: BatchLoadFn<TKey, TValue>) {
+export function dataLoader<TKey, TValue>(
+  fetchMany: BatchLoadFn<TKey, TValue>,
+  opts?: { maxBatchSize?: number },
+) {
   let batch: Batch<TKey, TValue> | null = null;
   let dispatchTimer: NodeJS.Timer | number | null = null;
 
@@ -69,7 +72,16 @@ export function dataLoader<TKey, TValue>(fetchMany: BatchLoadFn<TKey, TValue>) {
       item.reject = reject;
       item.resolve = resolve;
       thisBatch.items.push(item);
+
+      if (
+        typeof opts?.maxBatchSize !== 'undefined' &&
+        thisBatch.items.length >= opts.maxBatchSize
+      ) {
+        dispatch();
+        return;
+      }
     });
+
     if (!dispatchTimer) {
       dispatchTimer = setTimeout(dispatch);
     }

package/src/links/dedupeLink.test.ts

@@ -1,7 +1,7 @@
 import { waitFor } from '@testing-library/dom';
 import { AnyRouter } from '@trpc/server';
 import { OperationLink } from '..';
-import { observable } from '../rx/observable';
+import { observable } from '../observable';
 import { dedupeLink } from './dedupeLink';
 import { createChain } from './internals/createChain';
 

package/src/links/dedupeLink.ts

@@ -1,7 +1,6 @@
 import { AnyRouter } from '@trpc/server';
-import { observable } from '../rx/observable';
-import { share } from '../rx/operators';
-import { Observable } from '../rx/types';
+import { observable, share } from '../observable';
+import { Observable } from '../observable/types';
 import { TRPCLink } from './types';
 
 export function dedupeLink<
@@ -28,7 +27,7 @@ export function dedupeLink<
         function reset() {
           delete pending[key];
         }
-        const next$ = next(op).subscribe({
+        const subscription = next(op).subscribe({
           next(v) {
             observer.next(v);
           },
@@ -43,7 +42,7 @@ export function dedupeLink<
         });
         return () => {
           reset();
-          next$.unsubscribe();
+          subscription.unsubscribe();
         };
       }).pipe(share());
       pending[key] = shared$;

package/src/links/httpBatchLink.ts

@@ -1,15 +1,24 @@
 import { AnyRouter, ProcedureType } from '@trpc/server';
 import { dataLoader } from '../internals/dataLoader';
-import { observable } from '../rx/observable';
+import { observable } from '../observable';
+import {
+  HTTPLinkOptions,
+  ResponseShape,
+  httpRequest,
+} from './internals/httpUtils';
 import { TRPCLink } from './types';
-import { HTTPLinkOptions, httpRequest, ResponseShape } from './httpUtils';
 
+export interface HttpBatchLinkOptions extends HTTPLinkOptions {
+  maxBatchSize?: number;
+}
 export function httpBatchLink<TRouter extends AnyRouter>(
-  opts: HTTPLinkOptions,
+  opts: HttpBatchLinkOptions,
 ): TRPCLink<TRouter> {
   const { url } = opts;
+  // initialized config
   return (runtime) => {
     type Key = { id: number; path: string; input: unknown };
+
     const fetcher = (type: ProcedureType) => (keyInputPairs: Key[]) => {
       const path = keyInputPairs.map((op) => op.path).join(',');
       const inputs = keyInputPairs.map((op) => op.input);
@@ -38,10 +47,11 @@ export function httpBatchLink<TRouter extends AnyRouter>(
         cancel,
       };
     };
-    const query = dataLoader<Key, ResponseShape>(fetcher('query'));
-    const mutation = dataLoader<Key, ResponseShape>(fetcher('mutation'));
+    const query = dataLoader<Key, ResponseShape>(fetcher('query'), opts);
+    const mutation = dataLoader<Key, ResponseShape>(fetcher('mutation'), opts);
     const subscription = dataLoader<Key, ResponseShape>(
       fetcher('subscription'),
+      opts,
     );
 
     const loaders = { query, subscription, mutation };

package/src/links/httpLink.ts

@@ -1,7 +1,7 @@
 import { AnyRouter } from '@trpc/server';
-import { observable } from '../rx/observable';
+import { observable } from '../observable';
+import { HTTPLinkOptions, httpRequest } from './internals/httpUtils';
 import { TRPCLink } from './types';
-import { HTTPLinkOptions, httpRequest } from './httpUtils';
 
 export function httpLink<TRouter extends AnyRouter>(
   opts: HTTPLinkOptions,

package/src/links/index.ts

@@ -0,0 +1,10 @@
+export * from './dedupeLink';
+export * from './httpBatchLink';
+export * from './httpLink';
+export * from './loggerLink';
+export * from './loggerLink';
+export * from './retryLink';
+export * from './splitLink';
+export * from './transformerLink';
+export * from './wsLink';
+export * from './types';

package/src/links/internals/createChain.test.ts

@@ -1,6 +1,6 @@
 import { AnyRouter } from '@trpc/server/src';
+import { observable } from '../../observable';
 import { createChain } from './createChain';
-import { observable } from '../../rx/observable';
 
 describe('chain', () => {
   test('trivial', () => {
@@ -8,9 +8,9 @@ describe('chain', () => {
       links: [
         ({ next, op }) => {
           return observable((observer) => {
-            const next$ = next(op).subscribe(observer);
+            const subscription = next(op).subscribe(observer);
             return () => {
-              next$.unsubscribe();
+              subscription.unsubscribe();
             };
           });
         },
@@ -62,9 +62,9 @@ describe('chain', () => {
                 },
               },
             });
-            const next$ = next(op).subscribe(observer);
+            const subscription = next(op).subscribe(observer);
             return () => {
-              next$.unsubscribe();
+              subscription.unsubscribe();
             };
           });
         },

package/src/links/internals/createChain.ts

@@ -1,5 +1,5 @@
 import { AnyRouter } from '@trpc/server';
-import { observable } from '../../rx/observable';
+import { observable } from '../../observable/observable';
 import { Operation, OperationLink, OperationResultObservable } from '../types';
 
 /** @internal */
@@ -14,7 +14,7 @@ export function createChain<
   return observable((observer) => {
     function execute(index = 0, op = opts.op) {
       const next = opts.links[index];
-      const next$ = next({
+      const subscription = next({
         op,
         next(nextOp) {
           const nextObserver = execute(index + 1, nextOp);
@@ -22,7 +22,7 @@ export function createChain<
           return nextObserver;
         },
       });
-      return next$;
+      return subscription;
     }
 
     const obs$ = execute();

package/src/links/{httpUtils.ts → internals/httpUtils.ts}

@@ -1,5 +1,6 @@
 import { ProcedureType } from '@trpc/server';
-import { LinkRuntime, PromiseAndCancel } from './types';
+import { LinkRuntime, PromiseAndCancel } from '../types';
+
 export interface HTTPLinkOptions {
   url: string;
 }

package/src/links/loggerLink.ts

@@ -1,7 +1,6 @@
 import { AnyRouter } from '@trpc/server';
 import { TRPCClientError } from '..';
-import { observable } from '../rx/observable';
-import { tap } from '../rx/operators';
+import { observable, tap } from '../observable';
 import { Operation, OperationResult, TRPCLink } from './types';
 
 type ConsoleEsque = {