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

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

@@ -1,6 +1,12 @@
 import _createForOfIteratorHelper from '@babel/runtime/helpers/esm/createForOfIteratorHelper';
-import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
-import { h as httpRequest } from '../../../dist/httpUtils-e45c9056.esm.js';
+import { T as TRPCAbortError, t as transformRPCResponse, h as httpRequest } from '../../../dist/transformRPCResponse-3700ef8b.esm.js';
+import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
+import '@babel/runtime/helpers/createClass';
+import '@babel/runtime/helpers/classCallCheck';
+import '@babel/runtime/helpers/assertThisInitialized';
+import '@babel/runtime/helpers/inherits';
+import '@babel/runtime/helpers/createSuper';
+import '@babel/runtime/helpers/wrapNativeSuper';
 import '@babel/runtime/helpers/objectSpread2';
 
 /**
@@ -8,7 +14,7 @@ import '@babel/runtime/helpers/objectSpread2';
  * 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
  */
-function dataLoader(fetchMany) {
+function dataLoader(fetchMany, opts) {
   var batch = null;
   var dispatchTimer = null;
 
@@ -73,6 +79,11 @@ function dataLoader(fetchMany) {
       item.reject = reject;
       item.resolve = resolve;
       thisBatch.items.push(item);
+
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.maxBatchSize) !== 'undefined' && thisBatch.items.length >= opts.maxBatchSize) {
+        dispatch();
+        return;
+      }
     });
 
     if (!dispatchTimer) {
@@ -104,8 +115,11 @@ function dataLoader(fetchMany) {
 }
 
 function httpBatchLink(opts) {
-  var url = opts.url;
+  var url = opts.url,
+      maxBatchSize = opts.maxBatchSize; // initialized config
+
   return function (runtime) {
+    // initialized in app
     var fetcher = function fetcher(type) {
       return function (keyInputPairs) {
         var path = keyInputPairs.map(function (op) {
@@ -127,51 +141,67 @@ function httpBatchLink(opts) {
 
         return {
           promise: promise.then(function (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;
+            if (!Array.isArray(res)) {
+              return keyInputPairs.map(function () {
+                return res;
+              });
+            }
+
+            return res;
           }),
           cancel: cancel
         };
       };
     };
 
-    var query = dataLoader(fetcher('query'));
-    var mutation = dataLoader(fetcher('mutation'));
-    var subscription = dataLoader(fetcher('subscription'));
+    var query = dataLoader(fetcher('query'), {
+      maxBatchSize: maxBatchSize
+    });
+    var mutation = dataLoader(fetcher('mutation'), {
+      maxBatchSize: maxBatchSize
+    });
+    var subscription = dataLoader(fetcher('subscription'), {
+      maxBatchSize: maxBatchSize
+    });
     var loaders = {
       query: query,
       subscription: subscription,
       mutation: mutation
     };
     return function (_ref) {
-      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();
-        };
+      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));
       });
     };
   };

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

@@ -2,40 +2,63 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
-var httpUtils = require('../../../dist/httpUtils-a1426e14.cjs.dev.js');
+var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
+var transformRPCResponse = require('../../../dist/transformRPCResponse-0ad3cc9f.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;
+  var url = opts.url; // initialized config
+
   return function (runtime) {
+    // initialized in app
     return function (_ref) {
-      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();
-        };
+      var op = _ref.op,
+          prev = _ref.prev,
+          onDestroy = _ref.onDestroy;
+      var path = op.path,
+          input = op.input,
+          type = op.type;
+
+      var _httpRequest = transformRPCResponse.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 transformRPCResponse.TRPCAbortError(), {
+          isDone: true
+        }));
+        cancel();
+      });
+      promise.then(function (envelope) {
+        prevOnce(transformRPCResponse.transformRPCResponse({
+          envelope: envelope,
+          runtime: runtime
+        }));
+      }).catch(function (cause) {
+        prevOnce(TRPCClientError.TRPCClientError.from(cause));
       });
     };
   };

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

@@ -2,40 +2,63 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
-var httpUtils = require('../../../dist/httpUtils-299a66f6.cjs.prod.js');
+var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
+var transformRPCResponse = require('../../../dist/transformRPCResponse-e6daeb02.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;
+  var url = opts.url; // initialized config
+
   return function (runtime) {
+    // initialized in app
     return function (_ref) {
-      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();
-        };
+      var op = _ref.op,
+          prev = _ref.prev,
+          onDestroy = _ref.onDestroy;
+      var path = op.path,
+          input = op.input,
+          type = op.type;
+
+      var _httpRequest = transformRPCResponse.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 transformRPCResponse.TRPCAbortError(), {
+          isDone: true
+        }));
+        cancel();
+      });
+      promise.then(function (envelope) {
+        prevOnce(transformRPCResponse.transformRPCResponse({
+          envelope: envelope,
+          runtime: runtime
+        }));
+      }).catch(function (cause) {
+        prevOnce(TRPCClientError.TRPCClientError.from(cause));
       });
     };
   };

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

@@ -1,37 +1,60 @@
-import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
-import { h as httpRequest } from '../../../dist/httpUtils-e45c9056.esm.js';
+import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
+import { h as httpRequest, T as TRPCAbortError, t as transformRPCResponse } from '../../../dist/transformRPCResponse-3700ef8b.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;
+  var url = opts.url; // initialized config
+
   return function (runtime) {
+    // initialized in app
     return function (_ref) {
-      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();
-        };
+      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));
       });
     };
   };

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

@@ -4,9 +4,6 @@ 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'],
@@ -47,7 +44,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -63,36 +60,27 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next;
-      return observable.observable(function (observer) {
-        // ->
+          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;
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
+          direction: 'down',
+          result: result
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
-        }));
-        var requestStartTime = Date.now();
+          direction: 'down',
+          elapsedMs: elapsedMs,
+          result: 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);
+        prev(result);
       });
     };
   };

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

@@ -4,9 +4,6 @@ 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'],
@@ -47,7 +44,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -63,36 +60,27 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next;
-      return observable.observable(function (observer) {
-        // ->
+          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;
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
+          direction: 'down',
+          result: result
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
-        }));
-        var requestStartTime = Date.now();
+          direction: 'down',
+          elapsedMs: elapsedMs,
+          result: 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);
+        prev(result);
       });
     };
   };

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

@@ -1,8 +1,5 @@
 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'],
@@ -43,7 +40,7 @@ var defaultLogger = function defaultLogger() {
       });
     }
 
-    var fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.data) ? 'error' : 'log';
+    var fn = props.direction === 'down' && props.result && props.result instanceof Error ? 'error' : 'log';
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
 };
@@ -59,36 +56,27 @@ function loggerLink() {
   return function () {
     return function (_ref) {
       var op = _ref.op,
-          next = _ref.next;
-      return observable(function (observer) {
-        // ->
+          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;
         enabled(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
+          direction: 'down',
+          result: result
         })) && logger(_objectSpread(_objectSpread({}, op), {}, {
-          direction: 'up'
-        }));
-        var requestStartTime = Date.now();
+          direction: 'down',
+          elapsedMs: elapsedMs,
+          result: 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);
+        prev(result);
       });
     };
   };