@trpc/client 10.0.0-alpha.8 → 10.0.0-proxy-alpha.53

package/dist/internals/dataLoader.d.ts

@@ -1,16 +1,17 @@
 import { CancelFn, PromiseAndCancel } from '../links/types';
-declare type BatchLoadFn<TKey, TValue> = (keys: TKey[]) => {
-    promise: Promise<TValue[]>;
-    cancel: CancelFn;
+declare type BatchLoader<TKey, TValue> = {
+    validate: (keys: TKey[]) => boolean;
+    fetch: (keys: TKey[]) => {
+        promise: Promise<TValue[]>;
+        cancel: CancelFn;
+    };
 };
 /**
  * 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
  */
-export declare function dataLoader<TKey, TValue>(fetchMany: BatchLoadFn<TKey, TValue>, opts?: {
-    maxBatchSize?: number;
-}): {
+export declare function dataLoader<TKey, TValue>(batchLoader: BatchLoader<TKey, TValue>): {
     load: (key: TKey) => PromiseAndCancel<TValue>;
 };
 export {};

package/dist/internals/dataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAY5D,aAAK,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK;IACjD,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3B,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EACpC,IAAI,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE;gBA8Bb,IAAI,KAAG,iBAAiB,MAAM,CAAC;EAiDnD"}
+{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAa5D,aAAK,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK;QACvB,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3B,MAAM,EAAE,QAAQ,CAAC;KAClB,CAAC;CACH,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBA2FnB,IAAI,KAAG,iBAAiB,MAAM,CAAC;EAsCnD"}

package/dist/internals/fetchHelpers.d.ts

@@ -1,3 +1,3 @@
 export declare function getWindow(): typeof globalThis;
-export declare function getAbortController(ac?: typeof AbortController): typeof AbortController | null;
+export declare function getAbortController(ac?: typeof AbortController): typeof AbortController | undefined;
 //# sourceMappingURL=fetchHelpers.d.ts.map

package/dist/internals/fetchHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,IAAI,CAG/B"}
+{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,SAAS,CAGpC"}

package/dist/internals/retryDelay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retryDelay.d.ts","sourceRoot":"","sources":["../../src/internals/retryDelay.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,UAAU,iBAAkB,MAAM,WACqB,CAAC"}
+{"version":3,"file":"retryDelay.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/retryDelay.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,UAAU,iBAAkB,MAAM,WACqB,CAAC"}

package/dist/links/dedupeLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA4CrB"}
+{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA6CrB"}

package/dist/links/httpBatchLink.d.ts

@@ -1,8 +1,8 @@
 import { AnyRouter } from '@trpc/server';
+import { HTTPLinkOptions } from './internals/httpUtils';
 import { TRPCLink } from './types';
-import { HTTPLinkOptions } from './httpUtils';
 export interface HttpBatchLinkOptions extends HTTPLinkOptions {
-    maxBatchSize?: number;
+    maxURLLength?: number;
 }
 export declare function httpBatchLink<TRouter extends AnyRouter>(opts: HttpBatchLinkOptions): TRPCLink<TRouter>;
 //# sourceMappingURL=httpBatchLink.d.ts.map

package/dist/links/httpBatchLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,eAAe,EAA8B,MAAM,aAAa,CAAC;AAE1E,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA+DnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAIxD,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4FnB"}

package/dist/links/httpBatchLink.js

@@ -2,194 +2,211 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var observable = require('../observable-85669100.js');
-var httpUtils = require('../httpUtils-1f9e4e3c.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; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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; }
-
+var observable = require('@trpc/server/observable');
+var transformResult = require('../transformResult-e15ccdf6.js');
+var httpUtils = require('../httpUtils-801112a6.js');
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
+ * A function that should never be called unless we messed something up.
+ */ const 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, opts) {
-  var batch = null;
-  var dispatchTimer = null;
-
-  var destroyTimerAndBatch = function destroyTimerAndBatch() {
-    clearTimeout(dispatchTimer);
-    dispatchTimer = null;
-    batch = null;
-  };
-
-  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);
-      }
-    }).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();
-      }
-    });
-  }
-
-  function load(key) {
-    var batchItem = {
-      cancelled: false,
-      key: key
+ */ function dataLoader(batchLoader) {
+    let pendingItems = null;
+    let dispatchTimer = null;
+    const destroyTimerAndPendingItems = ()=>{
+        clearTimeout(dispatchTimer);
+        dispatchTimer = null;
+        pendingItems = null;
     };
-
-    if (!batch) {
-      batch = {
-        items: [],
-        cancel: function cancel() {
-          destroyTimerAndBatch();
+    /**
+   * Iterate through the items and split them into groups based on the `batchLoader`'s validate function
+   */ function groupItems(items) {
+        const groupedItems = [
+            []
+        ];
+        let index = 0;
+        while(true){
+            const item = items[index];
+            if (!item) {
+                break;
+            }
+            const lastGroup = groupedItems[groupedItems.length - 1];
+            if (item.aborted) {
+                // Item was aborted before it was dispatched
+                item.reject(new Error('Aborted'));
+                index++;
+                continue;
+            }
+            const isValid = batchLoader.validate(lastGroup.concat(item).map((it)=>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;
     }
-
-    var thisBatch = batch;
-    var promise = new Promise(function (resolve, reject) {
-      var item = batchItem;
-      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) {
-      dispatchTimer = setTimeout(dispatch);
+    function dispatch() {
+        const groupedItems = groupItems(pendingItems);
+        destroyTimerAndPendingItems();
+        // Create batches for each group of items
+        for (const items of groupedItems){
+            if (!items.length) {
+                continue;
+            }
+            const batch = {
+                items,
+                cancel: throwFatalError
+            };
+            for (const item of items){
+                item.batch = batch;
+            }
+            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
+            batch.cancel = cancel;
+            promise.then((result)=>{
+                for(let i = 0; i < result.length; i++){
+                    const value = result[i];
+                    const item = batch.items[i];
+                    item.resolve(value);
+                    item.batch = null;
+                }
+            }).catch((cause)=>{
+                for (const item of batch.items){
+                    item.reject(cause);
+                    item.batch = null;
+                }
+            });
+        }
+    }
+    function load(key) {
+        const item = {
+            aborted: false,
+            key,
+            batch: null,
+            resolve: throwFatalError,
+            reject: throwFatalError
+        };
+        const promise = new Promise((resolve, reject)=>{
+            item.reject = reject;
+            item.resolve = resolve;
+            if (!pendingItems) {
+                pendingItems = [];
+            }
+            pendingItems.push(item);
+        });
+        if (!dispatchTimer) {
+            dispatchTimer = setTimeout(dispatch);
+        }
+        const cancel = ()=>{
+            item.aborted = true;
+            if (item.batch?.items.every((item)=>item.aborted)) {
+                // All items in the batch have been cancelled
+                item.batch.cancel();
+                item.batch = null;
+            }
+        };
+        return {
+            promise,
+            cancel
+        };
     }
-
-    var cancel = function cancel() {
-      batchItem.cancelled = true;
-
-      if (thisBatch.items.some(function (item) {
-        return !item.cancelled;
-      })) {
-        // there are still things that can be resolved
-        return;
-      }
-
-      thisBatch.cancel();
-    };
-
     return {
-      promise: promise,
-      cancel: cancel
+        load
     };
-  }
-
-  return {
-    load: load
-  };
 }
 
 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) {
-          return op.path;
-        }).join(',');
-        var inputs = keyInputPairs.map(function (op) {
-          return op.input;
-        });
-
-        var _httpRequest = httpUtils.httpRequest({
-          url: url,
-          inputs: inputs,
-          path: path,
-          runtime: runtime,
-          type: type
-        }),
-            promise = _httpRequest.promise,
-            cancel = _httpRequest.cancel;
-
-        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;
-          }),
-          cancel: cancel
+    // initialized config
+    return (runtime)=>{
+        const maxURLLength = opts.maxURLLength || Infinity;
+        const batchLoader = (type)=>{
+            const validate = (batchOps)=>{
+                if (maxURLLength === Infinity) {
+                    // escape hatch for quick calcs
+                    return true;
+                }
+                const path = batchOps.map((op)=>op.path).join(',');
+                const inputs = batchOps.map((op)=>op.input);
+                const url = httpUtils.getUrl({
+                    url: opts.url,
+                    runtime,
+                    type,
+                    path,
+                    inputs
+                });
+                return url.length <= maxURLLength;
+            };
+            const fetch = (batchOps)=>{
+                const path = batchOps.map((op)=>op.path).join(',');
+                const inputs = batchOps.map((op)=>op.input);
+                const { promise , cancel  } = httpUtils.httpRequest({
+                    url: opts.url,
+                    runtime,
+                    type,
+                    path,
+                    inputs
+                });
+                return {
+                    promise: promise.then((res)=>{
+                        const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
+                        const result = resJSON.map((item)=>({
+                                meta: res.meta,
+                                json: item
+                            }));
+                        return result;
+                    }),
+                    cancel
+                };
+            };
+            return {
+                validate,
+                fetch
+            };
         };
-      };
-    };
-
-    var query = dataLoader(fetcher('query'), opts);
-    var mutation = dataLoader(fetcher('mutation'), opts);
-    var subscription = dataLoader(fetcher('subscription'), opts);
-    var loaders = {
-      query: query,
-      subscription: subscription,
-      mutation: mutation
-    };
-    return function (_ref) {
-      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();
+        const query = dataLoader(batchLoader('query'));
+        const mutation = dataLoader(batchLoader('mutation'));
+        const subscription = dataLoader(batchLoader('subscription'));
+        const loaders = {
+            query,
+            subscription,
+            mutation
+        };
+        return ({ op  })=>{
+            return observable.observable((observer)=>{
+                const loader = loaders[op.type];
+                const { promise , cancel  } = loader.load(op);
+                promise.then((res)=>{
+                    const transformed = transformResult.transformResult(res.json, runtime);
+                    if (!transformed.ok) {
+                        observer.error(transformResult.TRPCClientError.from(transformed.error, {
+                            meta: res.meta
+                        }));
+                        return;
+                    }
+                    observer.next({
+                        context: res.meta,
+                        result: transformed.result
+                    });
+                    observer.complete();
+                }).catch((err)=>observer.error(transformResult.TRPCClientError.from(err)));
+                return ()=>{
+                    cancel();
+                };
+            });
         };
-      });
     };
-  };
 }
 
 exports.httpBatchLink = httpBatchLink;