@trpc/client 9.17.0 → 10.0.0-alpha.0

package/dist/trpc-client.esm.js

@@ -1,166 +1,18 @@
 import _classCallCheck from '@babel/runtime/helpers/esm/classCallCheck';
 import _createClass from '@babel/runtime/helpers/esm/createClass';
-import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
-import _createForOfIteratorHelper from '@babel/runtime/helpers/esm/createForOfIteratorHelper';
-import { T as TRPCAbortError } from './httpRequest-672ff1f0.esm.js';
 import { httpBatchLink } from '../links/httpBatchLink/dist/trpc-client-links-httpBatchLink.esm.js';
-import { T as TRPCClientError } from './TRPCClientError-09b8a26b.esm.js';
-export { T as TRPCClientError } from './TRPCClientError-09b8a26b.esm.js';
-import '@babel/runtime/helpers/assertThisInitialized';
-import '@babel/runtime/helpers/inherits';
-import '@babel/runtime/helpers/createSuper';
-import '@babel/runtime/helpers/wrapNativeSuper';
-
-function observable() {
-  var listeners = [];
-  var value = null;
-  return {
-    subscribe: function subscribe(callbacks) {
-      var listener = {
-        callbacks: callbacks,
-        unsubscribe: function unsubscribe() {
-          var index = listeners.indexOf(listener);
-
-          if (index !== -1) {
-            var _listener$callbacks$o, _listener$callbacks;
-
-            listeners.splice(index, 1);
-            (_listener$callbacks$o = (_listener$callbacks = listener.callbacks).onDone) === null || _listener$callbacks$o === void 0 ? void 0 : _listener$callbacks$o.call(_listener$callbacks);
-          }
-        }
-      };
-      listeners.push(listener);
-      return function () {
-        listener.unsubscribe();
-      };
-    },
-    next: function next(newValue) {
-      var oldValue = value;
-      value = newValue;
-
-      if (oldValue !== newValue) {
-        var _iterator = _createForOfIteratorHelper(listeners),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var _listener$callbacks$o2, _listener$callbacks2;
-
-            var listener = _step.value;
-            (_listener$callbacks$o2 = (_listener$callbacks2 = listener.callbacks).onNext) === null || _listener$callbacks$o2 === void 0 ? void 0 : _listener$callbacks$o2.call(_listener$callbacks2, newValue);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-    },
-    done: function done() {
-      while (listeners.length) {
-        var _listener$callbacks$o3, _listener$callbacks3;
-
-        var listener = listeners.pop();
-        listener === null || listener === void 0 ? void 0 : (_listener$callbacks$o3 = (_listener$callbacks3 = listener.callbacks).onDone) === null || _listener$callbacks$o3 === void 0 ? void 0 : _listener$callbacks$o3.call(_listener$callbacks3);
-        listener === null || listener === void 0 ? void 0 : listener.unsubscribe();
-      }
-    },
-    error: function (_error) {
-      function error(_x) {
-        return _error.apply(this, arguments);
-      }
-
-      error.toString = function () {
-        return _error.toString();
-      };
-
-      return error;
-    }(function (error) {
-      var _iterator2 = _createForOfIteratorHelper(listeners),
-          _step2;
-
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _listener$callbacks$o4, _listener$callbacks4;
-
-          var listener = _step2.value;
-          (_listener$callbacks$o4 = (_listener$callbacks4 = listener.callbacks).onError) === null || _listener$callbacks$o4 === void 0 ? void 0 : _listener$callbacks$o4.call(_listener$callbacks4, error);
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-    })
-  };
-}
-function observableSubject(initialValue) {
-  var $obs = observable();
-  var value = initialValue;
-  $obs.next(initialValue);
-  return _objectSpread(_objectSpread({}, $obs), {}, {
-    next: function next(v) {
-      value = v;
-      $obs.next(v);
-    },
-    get: function get() {
-      return value;
-    }
-  });
-}
-
-function executeChain(opts) {
-  var $result = observableSubject(null);
-
-  var updateResult = function updateResult(result) {
-    if (result instanceof Error) {
-      $result.error(result);
-
-      if (result.isDone) {
-        $result.done();
-      }
-    } else {
-      $result.next(result);
-    }
-  };
-
-  function walk(_ref) {
-    var index = _ref.index,
-        op = _ref.op,
-        stack = _ref.stack;
-    var link = opts.links[index];
-    var prev = index === 0 ? function (value) {
-      return updateResult(value);
-    } : stack[index - 1];
-    link({
-      op: op,
-      prev: prev,
-      next: function next(op, prevOp) {
-        var prevStack = stack.slice();
-        prevStack[index] = prevOp;
-        walk({
-          index: index + 1,
-          op: op,
-          stack: prevStack
-        });
-      },
-      onDestroy: function onDestroy(callback) {
-        $result.subscribe({
-          onDone: function onDone() {
-            callback();
-          }
-        });
-      }
-    });
-  }
-
-  walk({
-    index: 0,
-    op: opts.op,
-    stack: []
-  });
-  return $result;
-}
+import { c as createChain } from './createChain-e45e6cf2.esm.js';
+import { T as TRPCClientError } from './TRPCClientError-e1da1ef0.esm.js';
+export { T as TRPCClientError } from './TRPCClientError-e1da1ef0.esm.js';
+import { s as share } from './share-ca585761.esm.js';
+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 '@babel/runtime/helpers/createForOfIteratorHelper';
+import './observable-01534ea8.esm.js';
+import './httpUtils-e45c9056.esm.js';
+import '@babel/runtime/helpers/objectSpread2';
 
 function getWindow() {
   if (typeof window !== 'undefined') {
@@ -188,6 +40,87 @@ function getFetch(f) {
   throw new Error('No fetch implementation found');
 }
 
+/** @internal */
+function transformOperationResult(result) {
+  var context = result.context;
+
+  if ('error' in result.data) {
+    var error = TRPCClientError.from(result.data);
+    return {
+      ok: false,
+      error: error,
+      context: context
+    };
+  }
+
+  var data = result.data.result.data;
+  return {
+    ok: true,
+    data: data,
+    context: context
+  };
+}
+
+var ObservableAbortError = /*#__PURE__*/function (_Error) {
+  _inherits(ObservableAbortError, _Error);
+
+  var _super = /*#__PURE__*/_createSuper(ObservableAbortError);
+
+  function ObservableAbortError(message) {
+    var _this;
+
+    _classCallCheck(this, ObservableAbortError);
+
+    _this = _super.call(this, message);
+    _this.name = 'ObservableAbortError';
+    Object.setPrototypeOf(_assertThisInitialized(_this), ObservableAbortError.prototype);
+    return _this;
+  }
+
+  return ObservableAbortError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+/** @internal */
+
+function observableToPromise(observable) {
+  var abort;
+  var promise = new Promise(function (resolve, reject) {
+    var isDone = false;
+
+    function onDone() {
+      if (isDone) {
+        return;
+      }
+
+      isDone = true;
+      reject(new ObservableAbortError('This operation was cancelled.'));
+      obs$.unsubscribe();
+    }
+
+    var obs$ = observable.subscribe({
+      next: function next(data) {
+        isDone = true;
+        resolve(data);
+        onDone();
+      },
+      error: function error(data) {
+        isDone = true;
+        reject(data);
+        onDone();
+      },
+      complete: function complete() {
+        isDone = true;
+        onDone();
+      }
+    });
+    abort = onDone;
+  });
+  return {
+    promise: promise,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    abort: abort
+  };
+}
+
 var idCounter = 0;
 
 function getRequestId() {
@@ -202,17 +135,6 @@ var TRPCClient = /*#__PURE__*/function () {
 
     this.links = void 0;
     this.runtime = void 0;
-    var transformer = opts.transformer ? 'input' in opts.transformer ? {
-      serialize: opts.transformer.input.serialize,
-      deserialize: opts.transformer.output.deserialize
-    } : opts.transformer : {
-      serialize: function serialize(data) {
-        return data;
-      },
-      deserialize: function deserialize(data) {
-        return data;
-      }
-    };
 
     var _fetch = getFetch(opts === null || opts === void 0 ? void 0 : opts.fetch);
 
@@ -232,7 +154,6 @@ var TRPCClient = /*#__PURE__*/function () {
     }
 
     this.runtime = {
-      transformer: transformer,
       AbortController: AC,
       fetch: _fetch,
       headers: getHeadersFn()
@@ -257,7 +178,7 @@ var TRPCClient = /*#__PURE__*/function () {
           path = _ref.path,
           _ref$context = _ref.context,
           context = _ref$context === void 0 ? {} : _ref$context;
-      var $result = executeChain({
+      var chain$ = createChain({
         links: this.links,
         op: {
           id: getRequestId(),
@@ -267,45 +188,33 @@ var TRPCClient = /*#__PURE__*/function () {
           context: context
         }
       });
-      return $result;
+      return chain$.pipe(share());
     }
   }, {
     key: "requestAsPromise",
     value: function requestAsPromise(opts) {
-      var $result = this.$request(opts);
-      var promise = new Promise(function (resolve, reject) {
-        var res = $result.get();
-
-        if ((res === null || res === void 0 ? void 0 : res.type) === 'data') {
-          resolve(res.data);
-          $result.done();
-          return;
-        }
+      var req$ = this.$request(opts);
+
+      var _observableToPromise = observableToPromise(req$),
+          promise = _observableToPromise.promise,
+          abort = _observableToPromise.abort;
+
+      var cancellablePromise = new Promise(function (resolve, reject) {
+        promise.then(function (result) {
+          var transformed = transformOperationResult(result);
 
-        $result.subscribe({
-          onNext: function onNext(result) {
-            if ((result === null || result === void 0 ? void 0 : result.type) !== 'data') {
-              return;
-            }
-
-            resolve(result.data);
-            $result.done();
-          },
-          onError: function onError(err) {
-            reject(err);
-            $result.done();
-          },
-          onDone: function onDone() {
-            reject(TRPCClientError.from(new TRPCAbortError()));
+          if (transformed.ok) {
+            resolve(transformed.data);
+            return;
           }
+
+          reject(transformed.error);
+        }).catch(function (err) {
+          reject(TRPCClientError.from(err));
         });
       });
-
-      promise.cancel = function () {
-        $result.done();
-      };
-
-      return promise;
+      cancellablePromise.cancel = abort;
+      return cancellablePromise;
     }
   }, {
     key: "query",
@@ -336,29 +245,41 @@ var TRPCClient = /*#__PURE__*/function () {
   }, {
     key: "subscription",
     value: function subscription(path, input, opts) {
-      var $res = this.$request({
+      var observable$ = this.$request({
         type: 'subscription',
         path: path,
         input: input,
         context: opts.context
       });
-      $res.subscribe({
-        onNext: function onNext(output) {
-          if (output) {
-            var _opts$onNext;
-
-            (_opts$onNext = opts.onNext) === null || _opts$onNext === void 0 ? void 0 : _opts$onNext.call(opts, output);
+      var observer = observable$.subscribe({
+        next: function next(result) {
+          var _opts$next;
+
+          if ('error' in result.data) {
+            var _opts$error;
+
+            var err = TRPCClientError.from(result.data, {
+              meta: result.context
+            });
+            (_opts$error = opts.error) === null || _opts$error === void 0 ? void 0 : _opts$error.call(opts, err);
+            return;
           }
+
+          (_opts$next = opts.next) === null || _opts$next === void 0 ? void 0 : _opts$next.call(opts, result.data.result);
         },
-        onError: function onError(err) {
-          var _opts$onError;
+        error: function error(err) {
+          var _opts$error2;
 
-          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, err);
+          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
         },
-        onDone: opts.onDone
+        complete: function complete() {
+          var _opts$complete;
+
+          (_opts$complete = opts.complete) === null || _opts$complete === void 0 ? void 0 : _opts$complete.call(opts);
+        }
       });
       return function () {
-        $res.done();
+        observer.unsubscribe();
       };
     }
   }]);

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

@@ -2,16 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
 var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-var httpRequest = require('../../../dist/httpRequest-7bfaf300.cjs.dev.js');
+var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
+var httpUtils = require('../../../dist/httpUtils-a1426e14.cjs.dev.js');
 require('@babel/runtime/helpers/objectSpread2');
-require('@babel/runtime/helpers/classCallCheck');
-require('@babel/runtime/helpers/createClass');
-require('@babel/runtime/helpers/assertThisInitialized');
-require('@babel/runtime/helpers/inherits');
-require('@babel/runtime/helpers/createSuper');
-require('@babel/runtime/helpers/wrapNativeSuper');
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -114,10 +108,8 @@ function dataLoader(fetchMany) {
 }
 
 function httpBatchLink(opts) {
-  var url = opts.url; // initialized config
-
+  var url = opts.url;
   return function (runtime) {
-    // initialized in app
     var fetcher = function fetcher(type) {
       return function (keyInputPairs) {
         var path = keyInputPairs.map(function (op) {
@@ -127,7 +119,7 @@ function httpBatchLink(opts) {
           return op.input;
         });
 
-        var _httpRequest = httpRequest.httpRequest({
+        var _httpRequest = httpUtils.httpRequest({
           url: url,
           inputs: inputs,
           path: path,
@@ -139,13 +131,16 @@ function httpBatchLink(opts) {
 
         return {
           promise: promise.then(function (res) {
-            if (!Array.isArray(res)) {
-              return keyInputPairs.map(function () {
-                return res;
-              });
-            }
-
-            return res;
+            var resJSON = Array.isArray(res.json) ? res.json : keyInputPairs.map(function () {
+              return res.json;
+            });
+            var result = resJSON.map(function (item) {
+              return {
+                meta: res.meta,
+                json: item
+              };
+            });
+            return result;
           }),
           cancel: cancel
         };
@@ -161,39 +156,26 @@ function httpBatchLink(opts) {
       mutation: mutation
     };
     return function (_ref) {
-      var op = _ref.op,
-          prev = _ref.prev,
-          onDestroy = _ref.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 httpRequest.TRPCAbortError(), {
-          isDone: true
-        }));
-        cancel();
-      });
-      promise.then(function (envelope) {
-        prevOnce(httpRequest.transformRPCResponse({
-          envelope: envelope,
-          runtime: runtime
-        }));
-      }).catch(function (cause) {
-        prevOnce(TRPCClientError.TRPCClientError.from(cause));
+      var op = _ref.op;
+      return observable.observable(function (observer) {
+        var loader = loaders[op.type];
+
+        var _loader$load = loader.load(op),
+            promise = _loader$load.promise,
+            cancel = _loader$load.cancel;
+
+        promise.then(function (res) {
+          observer.next({
+            context: res.meta,
+            data: res.json
+          });
+          observer.complete();
+        }).catch(function (err) {
+          return observer.error(err);
+        });
+        return function () {
+          cancel();
+        };
       });
     };
   };

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

@@ -2,16 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
 var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-var httpRequest = require('../../../dist/httpRequest-8c422e7a.cjs.prod.js');
+var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
+var httpUtils = require('../../../dist/httpUtils-299a66f6.cjs.prod.js');
 require('@babel/runtime/helpers/objectSpread2');
-require('@babel/runtime/helpers/classCallCheck');
-require('@babel/runtime/helpers/createClass');
-require('@babel/runtime/helpers/assertThisInitialized');
-require('@babel/runtime/helpers/inherits');
-require('@babel/runtime/helpers/createSuper');
-require('@babel/runtime/helpers/wrapNativeSuper');
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -114,10 +108,8 @@ function dataLoader(fetchMany) {
 }
 
 function httpBatchLink(opts) {
-  var url = opts.url; // initialized config
-
+  var url = opts.url;
   return function (runtime) {
-    // initialized in app
     var fetcher = function fetcher(type) {
       return function (keyInputPairs) {
         var path = keyInputPairs.map(function (op) {
@@ -127,7 +119,7 @@ function httpBatchLink(opts) {
           return op.input;
         });
 
-        var _httpRequest = httpRequest.httpRequest({
+        var _httpRequest = httpUtils.httpRequest({
           url: url,
           inputs: inputs,
           path: path,
@@ -139,13 +131,16 @@ function httpBatchLink(opts) {
 
         return {
           promise: promise.then(function (res) {
-            if (!Array.isArray(res)) {
-              return keyInputPairs.map(function () {
-                return res;
-              });
-            }
-
-            return res;
+            var resJSON = Array.isArray(res.json) ? res.json : keyInputPairs.map(function () {
+              return res.json;
+            });
+            var result = resJSON.map(function (item) {
+              return {
+                meta: res.meta,
+                json: item
+              };
+            });
+            return result;
           }),
           cancel: cancel
         };
@@ -161,39 +156,26 @@ function httpBatchLink(opts) {
       mutation: mutation
     };
     return function (_ref) {
-      var op = _ref.op,
-          prev = _ref.prev,
-          onDestroy = _ref.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 httpRequest.TRPCAbortError(), {
-          isDone: true
-        }));
-        cancel();
-      });
-      promise.then(function (envelope) {
-        prevOnce(httpRequest.transformRPCResponse({
-          envelope: envelope,
-          runtime: runtime
-        }));
-      }).catch(function (cause) {
-        prevOnce(TRPCClientError.TRPCClientError.from(cause));
+      var op = _ref.op;
+      return observable.observable(function (observer) {
+        var loader = loaders[op.type];
+
+        var _loader$load = loader.load(op),
+            promise = _loader$load.promise,
+            cancel = _loader$load.cancel;
+
+        promise.then(function (res) {
+          observer.next({
+            context: res.meta,
+            data: res.json
+          });
+          observer.complete();
+        }).catch(function (err) {
+          return observer.error(err);
+        });
+        return function () {
+          cancel();
+        };
       });
     };
   };