@trpc/client 9.16.0 → 10.0.0-alpha.1

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

@@ -1,13 +1,7 @@
-import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
 import _createForOfIteratorHelper from '@babel/runtime/helpers/esm/createForOfIteratorHelper';
-import { T as TRPCAbortError, t as transformRPCResponse, h as httpRequest } from '../../../dist/httpRequest-672ff1f0.esm.js';
+import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
+import { h as httpRequest } from '../../../dist/httpUtils-e45c9056.esm.js';
 import '@babel/runtime/helpers/objectSpread2';
-import '@babel/runtime/helpers/classCallCheck';
-import '@babel/runtime/helpers/createClass';
-import '@babel/runtime/helpers/assertThisInitialized';
-import '@babel/runtime/helpers/inherits';
-import '@babel/runtime/helpers/createSuper';
-import '@babel/runtime/helpers/wrapNativeSuper';
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -110,10 +104,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) {
@@ -135,13 +127,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
         };
@@ -157,39 +152,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.from(new TRPCAbortError(), {
-          isDone: true
-        }));
-        cancel();
-      });
-      promise.then(function (envelope) {
-        prevOnce(transformRPCResponse({
-          envelope: envelope,
-          runtime: runtime
-        }));
-      }).catch(function (cause) {
-        prevOnce(TRPCClientError.from(cause));
+      var op = _ref.op;
+      return 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/httpLink/dist/trpc-client-links-httpLink.cjs.dev.js

@@ -2,63 +2,40 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
-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');
 
 function httpLink(opts) {
-  var url = opts.url; // initialized config
-
+  var url = opts.url;
   return function (runtime) {
-    // initialized in app
     return function (_ref) {
-      var op = _ref.op,
-          prev = _ref.prev,
-          onDestroy = _ref.onDestroy;
-      var path = op.path,
-          input = op.input,
-          type = op.type;
-
-      var _httpRequest = httpRequest.httpRequest({
-        runtime: runtime,
-        type: type,
-        input: input,
-        url: url,
-        path: path
-      }),
-          promise = _httpRequest.promise,
-          cancel = _httpRequest.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 path = op.path,
+            input = op.input,
+            type = op.type;
+
+        var _httpRequest = httpUtils.httpRequest({
+          runtime: runtime,
+          path: path,
+          input: input,
+          type: type,
+          url: url
+        }),
+            promise = _httpRequest.promise,
+            cancel = _httpRequest.cancel;
+
+        promise.then(function (res) {
+          observer.next({
+            context: res.meta,
+            data: res.json
+          });
+          observer.complete();
+        }).catch(observer.error);
+        return function () {
+          cancel();
+        };
       });
     };
   };

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

@@ -2,63 +2,40 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
-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');
 
 function httpLink(opts) {
-  var url = opts.url; // initialized config
-
+  var url = opts.url;
   return function (runtime) {
-    // initialized in app
     return function (_ref) {
-      var op = _ref.op,
-          prev = _ref.prev,
-          onDestroy = _ref.onDestroy;
-      var path = op.path,
-          input = op.input,
-          type = op.type;
-
-      var _httpRequest = httpRequest.httpRequest({
-        runtime: runtime,
-        type: type,
-        input: input,
-        url: url,
-        path: path
-      }),
-          promise = _httpRequest.promise,
-          cancel = _httpRequest.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 path = op.path,
+            input = op.input,
+            type = op.type;
+
+        var _httpRequest = httpUtils.httpRequest({
+          runtime: runtime,
+          path: path,
+          input: input,
+          type: type,
+          url: url
+        }),
+            promise = _httpRequest.promise,
+            cancel = _httpRequest.cancel;
+
+        promise.then(function (res) {
+          observer.next({
+            context: res.meta,
+            data: res.json
+          });
+          observer.complete();
+        }).catch(observer.error);
+        return function () {
+          cancel();
+        };
       });
     };
   };

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

@@ -1,60 +1,37 @@
-import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
-import { h as httpRequest, T as TRPCAbortError, t as transformRPCResponse } from '../../../dist/httpRequest-672ff1f0.esm.js';
+import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
+import { h as httpRequest } from '../../../dist/httpUtils-e45c9056.esm.js';
 import '@babel/runtime/helpers/objectSpread2';
-import '@babel/runtime/helpers/classCallCheck';
-import '@babel/runtime/helpers/createClass';
-import '@babel/runtime/helpers/assertThisInitialized';
-import '@babel/runtime/helpers/inherits';
-import '@babel/runtime/helpers/createSuper';
-import '@babel/runtime/helpers/wrapNativeSuper';
 
 function httpLink(opts) {
-  var url = opts.url; // initialized config
-
+  var url = opts.url;
   return function (runtime) {
-    // initialized in app
     return function (_ref) {
-      var op = _ref.op,
-          prev = _ref.prev,
-          onDestroy = _ref.onDestroy;
-      var path = op.path,
-          input = op.input,
-          type = op.type;
-
-      var _httpRequest = httpRequest({
-        runtime: runtime,
-        type: type,
-        input: input,
-        url: url,
-        path: path
-      }),
-          promise = _httpRequest.promise,
-          cancel = _httpRequest.cancel;
-
-      var isDone = false;
-
-      var prevOnce = function prevOnce(result) {
-        if (isDone) {
-          return;
-        }
-
-        isDone = true;
-        prev(result);
-      };
-
-      onDestroy(function () {
-        prevOnce(TRPCClientError.from(new TRPCAbortError(), {
-          isDone: true
-        }));
-        cancel();
-      });
-      promise.then(function (envelope) {
-        prevOnce(transformRPCResponse({
-          envelope: envelope,
-          runtime: runtime
-        }));
-      }).catch(function (cause) {
-        prevOnce(TRPCClientError.from(cause));
+      var op = _ref.op;
+      return observable(function (observer) {
+        var path = op.path,
+            input = op.input,
+            type = op.type;
+
+        var _httpRequest = httpRequest({
+          runtime: runtime,
+          path: path,
+          input: input,
+          type: type,
+          url: url
+        }),
+            promise = _httpRequest.promise,
+            cancel = _httpRequest.cancel;
+
+        promise.then(function (res) {
+          observer.next({
+            context: res.meta,
+            data: res.json
+          });
+          observer.complete();
+        }).catch(observer.error);
+        return function () {
+          cancel();
+        };
       });
     };
   };

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

@@ -4,6 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
+require('@babel/runtime/helpers/createForOfIteratorHelper');
+var tap = require('../../../dist/tap-2d565250.cjs.dev.js');
 
 var palette = {
   query: ['72e3ff', '3fb0d8'],
@@ -44,7 +47,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -60,27 +63,36 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next,
-          prev = _ref.prev;
-      // ->
-      enabled(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      }));
-      var requestStartTime = Date.now();
-      next(op, function (result) {
-        var elapsedMs = Date.now() - requestStartTime;
+          next = _ref.next;
+      return observable.observable(function (observer) {
+        // ->
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          result: result
+          direction: 'up'
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          elapsedMs: elapsedMs,
-          result: result
-        })); // <-
+          direction: 'up'
+        }));
+        var requestStartTime = Date.now();
 
-        prev(result);
+        function logResult(result) {
+          var elapsedMs = Date.now() - requestStartTime;
+          enabled(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            result: result
+          })) && logger(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            elapsedMs: elapsedMs,
+            result: result
+          }));
+        }
+
+        return next(op).pipe(tap.tap({
+          next: function next(result) {
+            logResult(result);
+          },
+          error: function error(result) {
+            logResult(result);
+          }
+        })).subscribe(observer);
       });
     };
   };

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

@@ -4,6 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
+require('@babel/runtime/helpers/createForOfIteratorHelper');
+var tap = require('../../../dist/tap-d907998d.cjs.prod.js');
 
 var palette = {
   query: ['72e3ff', '3fb0d8'],
@@ -44,7 +47,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -60,27 +63,36 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next,
-          prev = _ref.prev;
-      // ->
-      enabled(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      }));
-      var requestStartTime = Date.now();
-      next(op, function (result) {
-        var elapsedMs = Date.now() - requestStartTime;
+          next = _ref.next;
+      return observable.observable(function (observer) {
+        // ->
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          result: result
+          direction: 'up'
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          elapsedMs: elapsedMs,
-          result: result
-        })); // <-
+          direction: 'up'
+        }));
+        var requestStartTime = Date.now();
 
-        prev(result);
+        function logResult(result) {
+          var elapsedMs = Date.now() - requestStartTime;
+          enabled(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            result: result
+          })) && logger(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            elapsedMs: elapsedMs,
+            result: result
+          }));
+        }
+
+        return next(op).pipe(tap.tap({
+          next: function next(result) {
+            logResult(result);
+          },
+          error: function error(result) {
+            logResult(result);
+          }
+        })).subscribe(observer);
       });
     };
   };

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

@@ -1,5 +1,8 @@
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 import _slicedToArray from '@babel/runtime/helpers/esm/slicedToArray';
+import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
+import '@babel/runtime/helpers/createForOfIteratorHelper';
+import { t as tap } from '../../../dist/tap-606957cb.esm.js';
 
 var palette = {
   query: ['72e3ff', '3fb0d8'],
@@ -40,7 +43,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -56,27 +59,36 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next,
-          prev = _ref.prev;
-      // ->
-      enabled(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-        direction: 'up'
-      }));
-      var requestStartTime = Date.now();
-      next(op, function (result) {
-        var elapsedMs = Date.now() - requestStartTime;
+          next = _ref.next;
+      return observable(function (observer) {
+        // ->
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          result: result
+          direction: 'up'
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'down',
-          elapsedMs: elapsedMs,
-          result: result
-        })); // <-
+          direction: 'up'
+        }));
+        var requestStartTime = Date.now();
 
-        prev(result);
+        function logResult(result) {
+          var elapsedMs = Date.now() - requestStartTime;
+          enabled(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            result: result
+          })) && logger(_objectSpread(_objectSpread({}, op), {}, {
+            direction: 'down',
+            elapsedMs: elapsedMs,
+            result: result
+          }));
+        }
+
+        return next(op).pipe(tap({
+          next: function next(result) {
+            logResult(result);
+          },
+          error: function error(result) {
+            logResult(result);
+          }
+        })).subscribe(observer);
       });
     };
   };

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

@@ -2,16 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
+var createChain = require('../../../dist/createChain-93a38e1c.cjs.dev.js');
+
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
 function splitLink(opts) {
   return function (rt) {
-    var links = 'left' in opts ? {
-      true: opts.left,
-      false: opts.right
-    } : opts;
-    var yes = links.true(rt);
-    var no = links.false(rt);
+    var yes = asArray(opts.true).map(function (link) {
+      return link(rt);
+    });
+    var no = asArray(opts.false).map(function (link) {
+      return link(rt);
+    });
     return function (props) {
-      opts.condition(props.op) ? yes(props) : no(props);
+      return observable.observable(function (observer) {
+        var links = opts.condition(props.op) ? yes : no;
+        return createChain.createChain({
+          op: props.op,
+          links: links
+        }).subscribe(observer);
+      });
     };
   };
 }