@trpc/client 10.0.0-alpha.4 → 10.0.0-alpha.42

package/dist/index.js

@@ -4,28 +4,29 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
+var observable = require('@trpc/server/observable');
+var links_wsLink = require('./wsLink-44703a83.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
-var createChain = require('./createChain-864dbb30.js');
-var TRPCClientError = require('./TRPCClientError-ec6bd2ca.js');
-var share = require('./share-4d79dc49.js');
-var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
-var _inherits = require('@babel/runtime/helpers/inherits');
-var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
-var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
-var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
-require('./observable-85669100.js');
-require('./httpUtils-1f9e4e3c.js');
-require('@babel/runtime/helpers/defineProperty');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('@babel/runtime/helpers/slicedToArray');
+var links_splitLink = require('./splitLink-23c5ce5c.js');
+require('@babel/runtime/helpers/assertThisInitialized');
+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 _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
-var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
-var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
-var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
-var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
-var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 
 function getWindow() {
   if (typeof window !== 'undefined') {
@@ -53,12 +54,134 @@ function getFetch(f) {
   throw new Error('No fetch implementation found');
 }
 
+function dedupeLink() {
+  // initialized config
+  return function () {
+    // initialized in app
+    var pending = {};
+    return function (_ref) {
+      var op = _ref.op,
+          next = _ref.next;
+
+      // initialized for request
+      if (op.type !== 'query') {
+        // pass through
+        return next(op);
+      }
+
+      var key = JSON.stringify([op.path, op.input]);
+      var obs$ = pending[key];
+
+      if (obs$) {
+        // console.log('hooking into pending', { op });
+        return observable.observable(function (observer) {
+          return obs$.subscribe(observer);
+        });
+      }
+
+      var shared$ = observable.observable(function (observer) {
+        function reset() {
+          delete pending[key];
+        }
+
+        var subscription = next(op).subscribe({
+          next: function next(v) {
+            observer.next(v);
+          },
+          error: function error(e) {
+            reset();
+            observer.error(e);
+          },
+          complete: function complete() {
+            reset();
+            observer.complete();
+          }
+        });
+        return function () {
+          reset();
+          subscription.unsubscribe();
+        };
+      }).pipe(observable.share());
+      pending[key] = shared$;
+      return shared$;
+    };
+  };
+}
+
+function retryLink(opts) {
+  // initialized config
+  return function () {
+    // initialized in app
+    return function (_ref) {
+      var op = _ref.op,
+          next = _ref.next;
+      // initialized for request
+      return observable.observable(function (observer) {
+        var next$ = null;
+        var attempts = 0;
+        var isDone = false;
+
+        function attempt() {
+          var _next$;
+
+          attempts++;
+          (_next$ = next$) === null || _next$ === void 0 ? void 0 : _next$.unsubscribe();
+          next$ = next(op).subscribe({
+            error: function error(_error) {
+              if (attempts >= opts.attempts) {
+                observer.error(_error);
+                return;
+              }
+
+              attempt();
+            },
+            next: function next(result) {
+              if ('result' in result.data) {
+                isDone = true;
+                observer.next(result);
+                return;
+              }
+
+              if (attempts >= opts.attempts) {
+                isDone = true;
+                observer.next(result);
+                return;
+              }
+
+              attempt();
+            },
+            complete: function complete() {
+              if (isDone) {
+                observer.complete();
+              }
+            }
+          });
+        }
+
+        attempt();
+        return function () {
+          var _next$2;
+
+          isDone = true;
+          (_next$2 = next$) === null || _next$2 === void 0 ? void 0 : _next$2.unsubscribe();
+        };
+      });
+    };
+  };
+}
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 /** @internal */
-function transformOperationResult(result) {
+function transformOperationResult(result, runtime) {
   var context = result.context;
 
   if ('error' in result.data) {
-    var error = TRPCClientError.TRPCClientError.from(result.data);
+    var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
+      error: runtime.transformer.deserialize(result.data.error)
+    }));
     return {
       ok: false,
       error: error,
@@ -66,75 +189,39 @@ function transformOperationResult(result) {
     };
   }
 
-  var data = result.data.result.data;
+  var data = runtime.transformer.deserialize(result.data.result.data);
   return {
     ok: true,
     data: data,
     context: context
   };
 }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var ObservableAbortError = /*#__PURE__*/function (_Error) {
-  _inherits__default["default"](ObservableAbortError, _Error);
-
-  var _super = /*#__PURE__*/_createSuper(ObservableAbortError);
-
-  function ObservableAbortError(message) {
-    var _this;
-
-    _classCallCheck__default["default"](this, ObservableAbortError);
-
-    _this = _super.call(this, message);
-    _this.name = 'ObservableAbortError';
-    Object.setPrototypeOf(_assertThisInitialized__default["default"](_this), ObservableAbortError.prototype);
-    return _this;
-  }
-
-  return ObservableAbortError;
-}( /*#__PURE__*/_wrapNativeSuper__default["default"](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();
-    }
+function transformSubscriptionOperationResult(result, runtime) {
+  var context = result.context;
 
-    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();
-      }
+  if ('error' in result.data) {
+    var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
+      error: runtime.transformer.deserialize(result.data.error)
+    }), {
+      meta: context
     });
-    abort = onDone;
+    return {
+      ok: false,
+      error: error,
+      context: context
+    };
+  }
+
+  var data = _objectSpread(_objectSpread({}, result.data.result), result.data.result.type === 'data' && {
+    data: runtime.transformer.deserialize(result.data.result.data)
   });
+
   return {
-    promise: promise,
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    abort: abort
+    ok: true,
+    data: data,
+    context: context
   };
 }
 
@@ -170,10 +257,22 @@ var TRPCClient = /*#__PURE__*/function () {
       };
     }
 
+    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;
+      }
+    };
     this.runtime = {
       AbortController: AC,
       fetch: _fetch,
-      headers: getHeadersFn()
+      headers: getHeadersFn(),
+      transformer: transformer
     };
 
     if ('links' in opts) {
@@ -195,7 +294,7 @@ var TRPCClient = /*#__PURE__*/function () {
           path = _ref.path,
           _ref$context = _ref.context,
           context = _ref$context === void 0 ? {} : _ref$context;
-      var chain$ = createChain.createChain({
+      var chain$ = links_splitLink.createChain({
         links: this.links,
         op: {
           id: getRequestId(),
@@ -205,20 +304,22 @@ var TRPCClient = /*#__PURE__*/function () {
           context: context
         }
       });
-      return chain$.pipe(share.share());
+      return chain$.pipe(observable.share());
     }
   }, {
     key: "requestAsPromise",
     value: function requestAsPromise(opts) {
+      var _this2 = this;
+
       var req$ = this.$request(opts);
 
-      var _observableToPromise = observableToPromise(req$),
+      var _observableToPromise = observable.observableToPromise(req$),
           promise = _observableToPromise.promise,
           abort = _observableToPromise.abort;
 
       var cancellablePromise = new Promise(function (resolve, reject) {
         promise.then(function (result) {
-          var transformed = transformOperationResult(result);
+          var transformed = transformOperationResult(result, _this2.runtime);
 
           if (transformed.ok) {
             resolve(transformed.data);
@@ -227,7 +328,7 @@ var TRPCClient = /*#__PURE__*/function () {
 
           reject(transformed.error);
         }).catch(function (err) {
-          reject(TRPCClientError.TRPCClientError.from(err));
+          reject(links_wsLink.TRPCClientError.from(err));
         });
       });
       cancellablePromise.cancel = abort;
@@ -236,26 +337,34 @@ var TRPCClient = /*#__PURE__*/function () {
   }, {
     key: "query",
     value: function query(path) {
-      var _ref2;
+      var _args$;
 
-      var context = (_ref2 = arguments.length <= 2 ? undefined : arguments[2]) === null || _ref2 === void 0 ? void 0 : _ref2.context;
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.requestContext;
       return this.requestAsPromise({
         type: 'query',
         path: path,
-        input: arguments.length <= 1 ? undefined : arguments[1],
+        input: args[0],
         context: context
       });
     }
   }, {
     key: "mutation",
     value: function mutation(path) {
-      var _ref3;
+      var _args$2;
+
+      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
+      }
 
-      var context = (_ref3 = arguments.length <= 2 ? undefined : arguments[2]) === null || _ref3 === void 0 ? void 0 : _ref3.context;
+      var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.requestContext;
       return this.requestAsPromise({
         type: 'mutation',
         path: path,
-        input: arguments.length <= 1 ? undefined : arguments[1],
+        input: args[0],
         context: context
       });
     }
@@ -266,49 +375,89 @@ var TRPCClient = /*#__PURE__*/function () {
         type: 'subscription',
         path: path,
         input: input,
-        context: opts.context
+        context: opts.requestContext
       });
-      var observer = observable$.subscribe({
+      var runtime = this.runtime;
+      return observable$.subscribe({
         next: function next(result) {
-          var _opts$next;
+          var _opts$onError;
 
-          if ('error' in result.data) {
-            var _opts$error;
+          var transformed = transformSubscriptionOperationResult(result, runtime);
+
+          if (transformed.ok) {
+            if (transformed.data.type === 'started') {
+              var _opts$onStarted;
+
+              (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
+            } else if (transformed.data.type === 'stopped') {
+              var _opts$onStopped;
+
+              (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
+            } else if (transformed.data.type === 'data') {
+              var _opts$onData;
+
+              (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, transformed.data.data);
+            }
 
-            var err = TRPCClientError.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);
+          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, transformed.error);
         },
         error: function error(err) {
-          var _opts$error2;
+          var _opts$onError2;
 
-          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
+          (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, err);
         },
         complete: function complete() {
-          var _opts$complete;
+          var _opts$onComplete;
 
-          (_opts$complete = opts.complete) === null || _opts$complete === void 0 ? void 0 : _opts$complete.call(opts);
+          (_opts$onComplete = opts.onComplete) === null || _opts$onComplete === void 0 ? void 0 : _opts$onComplete.call(opts);
         }
       });
-      return function () {
-        observer.unsubscribe();
-      };
     }
   }]);
 
   return TRPCClient;
 }();
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createTRPCClient(opts) {
-  return new TRPCClient(opts);
+  var client = new TRPCClient(opts);
+  return client;
+} // Also the client created above needs to somehow be like `TRPCClient<Router> & Omit<Router, 'createCaller' | 'createProcedure' | '_def' | 'transformer' | 'errorFormatter' | 'getErrorShape>`
+
+var clientCallTypeMap = {
+  query: 'query',
+  mutate: 'mutation',
+  subscribe: 'subscription'
+};
+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 clientCallType = pathCopy.pop();
+    var procedureType = clientCallTypeMap[clientCallType];
+    var fullPath = pathCopy.join('.');
+    return (_ref2 = client)[procedureType].apply(_ref2, [fullPath].concat(_toConsumableArray__default["default"](args)));
+  });
+  return proxy;
 }
 
-exports.TRPCClientError = TRPCClientError.TRPCClientError;
+exports.TRPCClientError = links_wsLink.TRPCClientError;
+exports.createWSClient = links_wsLink.createWSClient;
+exports.wsLink = links_wsLink.wsLink;
+exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
+exports.splitLink = links_splitLink.splitLink;
+exports.httpLink = links_httpLink.httpLink;
+exports.loggerLink = links_loggerLink.loggerLink;
 exports.createTRPCClient = createTRPCClient;
+exports.createTRPCClientProxy = createTRPCClientProxy;
+exports.dedupeLink = dedupeLink;
 exports.getFetch = getFetch;
+exports.retryLink = retryLink;