@trpc/client 10.0.0-alpha.3 → 10.0.0-alpha.32

package/dist/links/httpBatchLink.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var observable = require('../observable-85669100.js');
-var httpUtils = require('../httpUtils-1f9e4e3c.js');
+var observable = require('@trpc/server/observable');
+var httpUtils = require('../httpUtils-a0169eef.js');
 require('@babel/runtime/helpers/defineProperty');
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -12,76 +12,174 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/**
+ * A function that should never be called unless we messed something up.
+ */
+var throwFatalError = function throwFatalError() {
+  throw new Error('Something went wrong. Please submit an issue at https://github.com/trpc/trpc/issues/new');
+};
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
  * 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) {
-  var batch = null;
+
+
+function dataLoader(batchLoader) {
+  var pendingItems = null;
   var dispatchTimer = null;
 
-  var destroyTimerAndBatch = function destroyTimerAndBatch() {
+  var destroyTimerAndPendingItems = function destroyTimerAndPendingItems() {
     clearTimeout(dispatchTimer);
     dispatchTimer = null;
-    batch = null;
+    pendingItems = null;
   };
+  /**
+   * Iterate through the items and split them into groups based on the `batchLoader`'s validate function
+   */
 
-  function dispatch() {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var batchCopy = batch;
-    destroyTimerAndBatch();
-
-    var _fetchMany = fetchMany(batchCopy.items.map(function (v) {
-      return v.key;
-    })),
-        promise = _fetchMany.promise,
-        cancel = _fetchMany.cancel;
-
-    batchCopy.cancel = cancel;
-    promise.then(function (result) {
-      for (var i = 0; i < result.length; i++) {
-        var _value = result[i];
-        batchCopy.items[i].resolve(_value);
+
+  function groupItems(items) {
+    var groupedItems = [[]];
+    var index = 0;
+
+    while (true) {
+      var item = items[index];
+
+      if (!item) {
+        // we're done
+        break;
       }
-    }).catch(function (cause) {
-      var _iterator = _createForOfIteratorHelper(batchCopy.items),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var item = _step.value;
-          item.reject(cause);
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+
+      var lastGroup = groupedItems[groupedItems.length - 1];
+
+      if (item.aborted) {
+        // Item was aborted before it was dispatched
+        item.reject(new Error('Aborted'));
+        index++;
+        continue;
       }
-    });
+
+      var isValid = batchLoader.validate(lastGroup.concat(item).map(function (it) {
+        return it.key;
+      }));
+
+      if (isValid) {
+        lastGroup.push(item);
+        index++;
+        continue;
+      }
+
+      if (lastGroup.length === 0) {
+        item.reject(new Error('Input is too big for a single dispatch'));
+        index++;
+        continue;
+      } // Create new group, next iteration will try to add the item to that
+
+
+      groupedItems.push([]);
+    }
+
+    return groupedItems;
   }
 
-  function load(key) {
-    var batchItem = {
-      cancelled: false,
-      key: key
-    };
+  function dispatch() {
+    var groupedItems = groupItems(pendingItems);
+    destroyTimerAndPendingItems(); // Create batches for each group of items
+
+    var _iterator = _createForOfIteratorHelper(groupedItems),
+        _step;
+
+    try {
+      var _loop = function _loop() {
+        var items = _step.value;
+
+        if (!items.length) {
+          return "continue";
+        }
+
+        var batch = {
+          items: items,
+          cancel: throwFatalError
+        };
+
+        var _iterator2 = _createForOfIteratorHelper(items),
+            _step2;
 
-    if (!batch) {
-      batch = {
-        items: [],
-        cancel: function cancel() {
-          destroyTimerAndBatch();
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+            item.batch = batch;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
         }
+
+        var _batchLoader$fetch = batchLoader.fetch(batch.items.map(function (_item) {
+          return _item.key;
+        })),
+            promise = _batchLoader$fetch.promise,
+            cancel = _batchLoader$fetch.cancel;
+
+        batch.cancel = cancel;
+        promise.then(function (result) {
+          for (var i = 0; i < result.length; i++) {
+            var _value = result[i];
+            var item = batch.items[i];
+            item.resolve(_value);
+            item.batch = null;
+          }
+        }).catch(function (cause) {
+          var _iterator3 = _createForOfIteratorHelper(batch.items),
+              _step3;
+
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var item = _step3.value;
+              item.reject(cause);
+              item.batch = null;
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        });
       };
+
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _ret = _loop();
+
+        if (_ret === "continue") continue;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
+  }
 
-    var thisBatch = batch;
+  function load(key) {
+    var item = {
+      aborted: false,
+      key: key,
+      batch: null,
+      resolve: throwFatalError,
+      reject: throwFatalError
+    };
     var promise = new Promise(function (resolve, reject) {
-      var item = batchItem;
       item.reject = reject;
       item.resolve = resolve;
-      thisBatch.items.push(item);
+
+      if (!pendingItems) {
+        pendingItems = [];
+      }
+
+      pendingItems.push(item);
     });
 
     if (!dispatchTimer) {
@@ -89,16 +187,17 @@ function dataLoader(fetchMany) {
     }
 
     var cancel = function cancel() {
-      batchItem.cancelled = true;
+      var _item$batch;
+
+      item.aborted = true;
 
-      if (thisBatch.items.some(function (item) {
-        return !item.cancelled;
+      if ((_item$batch = item.batch) !== null && _item$batch !== void 0 && _item$batch.items.every(function (item) {
+        return item.aborted;
       })) {
-        // there are still things that can be resolved
-        return;
+        // All items in the batch have been cancelled
+        item.batch.cancel();
+        item.batch = null;
       }
-
-      thisBatch.cancel();
     };
 
     return {
@@ -113,30 +212,54 @@ function dataLoader(fetchMany) {
 }
 
 function httpBatchLink(opts) {
-  var url = opts.url;
+  // initialized config
   return function (runtime) {
-    var fetcher = function fetcher(type) {
-      return function (keyInputPairs) {
-        var path = keyInputPairs.map(function (op) {
+    var maxURLLength = opts.maxURLLength || Infinity;
+
+    var batchLoader = function batchLoader(type) {
+      var validate = function validate(batchOps) {
+        if (maxURLLength === Infinity) {
+          // escape hatch for quick calcs
+          return true;
+        }
+
+        var path = batchOps.map(function (op) {
           return op.path;
         }).join(',');
-        var inputs = keyInputPairs.map(function (op) {
+        var inputs = batchOps.map(function (op) {
+          return op.input;
+        });
+        var url = httpUtils.getUrl({
+          url: opts.url,
+          runtime: runtime,
+          type: type,
+          path: path,
+          inputs: inputs
+        });
+        return url.length <= maxURLLength;
+      };
+
+      var fetch = function fetch(batchOps) {
+        var path = batchOps.map(function (op) {
+          return op.path;
+        }).join(',');
+        var inputs = batchOps.map(function (op) {
           return op.input;
         });
 
         var _httpRequest = httpUtils.httpRequest({
-          url: url,
-          inputs: inputs,
-          path: path,
+          url: opts.url,
           runtime: runtime,
-          type: type
+          type: type,
+          path: path,
+          inputs: inputs
         }),
             promise = _httpRequest.promise,
             cancel = _httpRequest.cancel;
 
         return {
           promise: promise.then(function (res) {
-            var resJSON = Array.isArray(res.json) ? res.json : keyInputPairs.map(function () {
+            var resJSON = Array.isArray(res.json) ? res.json : batchOps.map(function () {
               return res.json;
             });
             var result = resJSON.map(function (item) {
@@ -150,11 +273,16 @@ function httpBatchLink(opts) {
           cancel: cancel
         };
       };
+
+      return {
+        validate: validate,
+        fetch: fetch
+      };
     };
 
-    var query = dataLoader(fetcher('query'));
-    var mutation = dataLoader(fetcher('mutation'));
-    var subscription = dataLoader(fetcher('subscription'));
+    var query = dataLoader(batchLoader('query'));
+    var mutation = dataLoader(batchLoader('mutation'));
+    var subscription = dataLoader(batchLoader('subscription'));
     var loaders = {
       query: query,
       subscription: subscription,

package/dist/links/httpBatchLink.mjs

@@ -1,5 +1,5 @@
-import { o as observable } from '../observable-7e66cb56.mjs';
-import { h as httpRequest } from '../httpUtils-c09d7b79.mjs';
+import { observable } from '@trpc/server/observable';
+import { g as getUrl, h as httpRequest } from '../httpUtils-089853f6.mjs';
 import '@babel/runtime/helpers/defineProperty';
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -8,76 +8,174 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/**
+ * A function that should never be called unless we messed something up.
+ */
+var throwFatalError = function throwFatalError() {
+  throw new Error('Something went wrong. Please submit an issue at https://github.com/trpc/trpc/issues/new');
+};
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
  * 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) {
-  var batch = null;
+
+
+function dataLoader(batchLoader) {
+  var pendingItems = null;
   var dispatchTimer = null;
 
-  var destroyTimerAndBatch = function destroyTimerAndBatch() {
+  var destroyTimerAndPendingItems = function destroyTimerAndPendingItems() {
     clearTimeout(dispatchTimer);
     dispatchTimer = null;
-    batch = null;
+    pendingItems = null;
   };
+  /**
+   * Iterate through the items and split them into groups based on the `batchLoader`'s validate function
+   */
 
-  function dispatch() {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var batchCopy = batch;
-    destroyTimerAndBatch();
-
-    var _fetchMany = fetchMany(batchCopy.items.map(function (v) {
-      return v.key;
-    })),
-        promise = _fetchMany.promise,
-        cancel = _fetchMany.cancel;
-
-    batchCopy.cancel = cancel;
-    promise.then(function (result) {
-      for (var i = 0; i < result.length; i++) {
-        var _value = result[i];
-        batchCopy.items[i].resolve(_value);
+
+  function groupItems(items) {
+    var groupedItems = [[]];
+    var index = 0;
+
+    while (true) {
+      var item = items[index];
+
+      if (!item) {
+        // we're done
+        break;
       }
-    }).catch(function (cause) {
-      var _iterator = _createForOfIteratorHelper(batchCopy.items),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var item = _step.value;
-          item.reject(cause);
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+
+      var lastGroup = groupedItems[groupedItems.length - 1];
+
+      if (item.aborted) {
+        // Item was aborted before it was dispatched
+        item.reject(new Error('Aborted'));
+        index++;
+        continue;
       }
-    });
+
+      var isValid = batchLoader.validate(lastGroup.concat(item).map(function (it) {
+        return it.key;
+      }));
+
+      if (isValid) {
+        lastGroup.push(item);
+        index++;
+        continue;
+      }
+
+      if (lastGroup.length === 0) {
+        item.reject(new Error('Input is too big for a single dispatch'));
+        index++;
+        continue;
+      } // Create new group, next iteration will try to add the item to that
+
+
+      groupedItems.push([]);
+    }
+
+    return groupedItems;
   }
 
-  function load(key) {
-    var batchItem = {
-      cancelled: false,
-      key: key
-    };
+  function dispatch() {
+    var groupedItems = groupItems(pendingItems);
+    destroyTimerAndPendingItems(); // Create batches for each group of items
+
+    var _iterator = _createForOfIteratorHelper(groupedItems),
+        _step;
+
+    try {
+      var _loop = function _loop() {
+        var items = _step.value;
+
+        if (!items.length) {
+          return "continue";
+        }
+
+        var batch = {
+          items: items,
+          cancel: throwFatalError
+        };
+
+        var _iterator2 = _createForOfIteratorHelper(items),
+            _step2;
 
-    if (!batch) {
-      batch = {
-        items: [],
-        cancel: function cancel() {
-          destroyTimerAndBatch();
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+            item.batch = batch;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
         }
+
+        var _batchLoader$fetch = batchLoader.fetch(batch.items.map(function (_item) {
+          return _item.key;
+        })),
+            promise = _batchLoader$fetch.promise,
+            cancel = _batchLoader$fetch.cancel;
+
+        batch.cancel = cancel;
+        promise.then(function (result) {
+          for (var i = 0; i < result.length; i++) {
+            var _value = result[i];
+            var item = batch.items[i];
+            item.resolve(_value);
+            item.batch = null;
+          }
+        }).catch(function (cause) {
+          var _iterator3 = _createForOfIteratorHelper(batch.items),
+              _step3;
+
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var item = _step3.value;
+              item.reject(cause);
+              item.batch = null;
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        });
       };
+
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _ret = _loop();
+
+        if (_ret === "continue") continue;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
+  }
 
-    var thisBatch = batch;
+  function load(key) {
+    var item = {
+      aborted: false,
+      key: key,
+      batch: null,
+      resolve: throwFatalError,
+      reject: throwFatalError
+    };
     var promise = new Promise(function (resolve, reject) {
-      var item = batchItem;
       item.reject = reject;
       item.resolve = resolve;
-      thisBatch.items.push(item);
+
+      if (!pendingItems) {
+        pendingItems = [];
+      }
+
+      pendingItems.push(item);
     });
 
     if (!dispatchTimer) {
@@ -85,16 +183,17 @@ function dataLoader(fetchMany) {
     }
 
     var cancel = function cancel() {
-      batchItem.cancelled = true;
+      var _item$batch;
+
+      item.aborted = true;
 
-      if (thisBatch.items.some(function (item) {
-        return !item.cancelled;
+      if ((_item$batch = item.batch) !== null && _item$batch !== void 0 && _item$batch.items.every(function (item) {
+        return item.aborted;
       })) {
-        // there are still things that can be resolved
-        return;
+        // All items in the batch have been cancelled
+        item.batch.cancel();
+        item.batch = null;
       }
-
-      thisBatch.cancel();
     };
 
     return {
@@ -109,30 +208,54 @@ function dataLoader(fetchMany) {
 }
 
 function httpBatchLink(opts) {
-  var url = opts.url;
+  // initialized config
   return function (runtime) {
-    var fetcher = function fetcher(type) {
-      return function (keyInputPairs) {
-        var path = keyInputPairs.map(function (op) {
+    var maxURLLength = opts.maxURLLength || Infinity;
+
+    var batchLoader = function batchLoader(type) {
+      var validate = function validate(batchOps) {
+        if (maxURLLength === Infinity) {
+          // escape hatch for quick calcs
+          return true;
+        }
+
+        var path = batchOps.map(function (op) {
           return op.path;
         }).join(',');
-        var inputs = keyInputPairs.map(function (op) {
+        var inputs = batchOps.map(function (op) {
+          return op.input;
+        });
+        var url = getUrl({
+          url: opts.url,
+          runtime: runtime,
+          type: type,
+          path: path,
+          inputs: inputs
+        });
+        return url.length <= maxURLLength;
+      };
+
+      var fetch = function fetch(batchOps) {
+        var path = batchOps.map(function (op) {
+          return op.path;
+        }).join(',');
+        var inputs = batchOps.map(function (op) {
           return op.input;
         });
 
         var _httpRequest = httpRequest({
-          url: url,
-          inputs: inputs,
-          path: path,
+          url: opts.url,
           runtime: runtime,
-          type: type
+          type: type,
+          path: path,
+          inputs: inputs
         }),
             promise = _httpRequest.promise,
             cancel = _httpRequest.cancel;
 
         return {
           promise: promise.then(function (res) {
-            var resJSON = Array.isArray(res.json) ? res.json : keyInputPairs.map(function () {
+            var resJSON = Array.isArray(res.json) ? res.json : batchOps.map(function () {
               return res.json;
             });
             var result = resJSON.map(function (item) {
@@ -146,11 +269,16 @@ function httpBatchLink(opts) {
           cancel: cancel
         };
       };
+
+      return {
+        validate: validate,
+        fetch: fetch
+      };
     };
 
-    var query = dataLoader(fetcher('query'));
-    var mutation = dataLoader(fetcher('mutation'));
-    var subscription = dataLoader(fetcher('subscription'));
+    var query = dataLoader(batchLoader('query'));
+    var mutation = dataLoader(batchLoader('mutation'));
+    var subscription = dataLoader(batchLoader('subscription'));
     var loaders = {
       query: query,
       subscription: subscription,

package/dist/links/httpLink.d.ts

@@ -1,5 +1,5 @@
 import { AnyRouter } from '@trpc/server';
+import { HTTPLinkOptions } from './internals/httpUtils';
 import { TRPCLink } from './types';
-import { HTTPLinkOptions } from './httpUtils';
 export declare function httpLink<TRouter extends AnyRouter>(opts: HTTPLinkOptions): TRPCLink<TRouter>;
 //# sourceMappingURL=httpLink.d.ts.map