@trpc/client 10.0.0-alpha.45 → 10.0.0-alpha.46

package/dist/links/httpBatchLink.mjs

@@ -1,330 +1,208 @@
 import { observable } from '@trpc/server/observable';
-import { t as transformResult, T as TRPCClientError } from '../transformResult-06bec648.mjs';
-import { g as getUrl, h as httpRequest } from '../httpUtils-089853f6.mjs';
-import '@babel/runtime/helpers/defineProperty';
-import '@babel/runtime/helpers/classCallCheck';
-import '@babel/runtime/helpers/createClass';
-import '@babel/runtime/helpers/assertThisInitialized';
-import '@babel/runtime/helpers/inherits';
-import '@babel/runtime/helpers/possibleConstructorReturn';
-import '@babel/runtime/helpers/getPrototypeOf';
-import '@babel/runtime/helpers/wrapNativeSuper';
+import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
+import { g as getUrl, h as httpRequest } from '../httpUtils-44781613.mjs';
 
-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; }
-
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
-/**
+/* 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');
+ */ 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(batchLoader) {
-  var pendingItems = null;
-  var dispatchTimer = null;
-
-  var destroyTimerAndPendingItems = function destroyTimerAndPendingItems() {
-    clearTimeout(dispatchTimer);
-    dispatchTimer = null;
-    pendingItems = null;
-  };
-  /**
+ */ function dataLoader(batchLoader) {
+    let pendingItems = null;
+    let dispatchTimer = null;
+    const destroyTimerAndPendingItems = ()=>{
+        clearTimeout(dispatchTimer);
+        dispatchTimer = null;
+        pendingItems = null;
+    };
+    /**
    * Iterate through the items and split them into groups based on the `batchLoader`'s validate function
-   */
-
-
-  function groupItems(items) {
-    var groupedItems = [[]];
-    var index = 0;
-
-    while (true) {
-      var item = items[index];
-
-      if (!item) {
-        // we're done
-        break;
-      }
-
-      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([]);
+   */ 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;
     }
-
-    return groupedItems;
-  }
-
-  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";
+    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;
+                }
+            });
         }
-
-        var batch = {
-          items: items,
-          cancel: throwFatalError
+    }
+    function load(key) {
+        const item = {
+            aborted: false,
+            key,
+            batch: null,
+            resolve: throwFatalError,
+            reject: throwFatalError
         };
-
-        var _iterator2 = _createForOfIteratorHelper(items),
-            _step2;
-
-        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;
+        const promise = new Promise((resolve, reject)=>{
+            item.reject = reject;
+            item.resolve = resolve;
+            if (!pendingItems) {
+                pendingItems = [];
             }
-          } catch (err) {
-            _iterator3.e(err);
-          } finally {
-            _iterator3.f();
-          }
+            pendingItems.push(item);
         });
-      };
-
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _ret = _loop();
-
-        if (_ret === "continue") continue;
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-  }
-
-  function load(key) {
-    var item = {
-      aborted: false,
-      key: key,
-      batch: null,
-      resolve: throwFatalError,
-      reject: throwFatalError
-    };
-    var promise = new Promise(function (resolve, reject) {
-      item.reject = reject;
-      item.resolve = resolve;
-
-      if (!pendingItems) {
-        pendingItems = [];
-      }
-
-      pendingItems.push(item);
-    });
-
-    if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
+        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() {
-      var _item$batch;
-
-      item.aborted = true;
-
-      if ((_item$batch = item.batch) !== null && _item$batch !== void 0 && _item$batch.items.every(function (item) {
-        return item.aborted;
-      })) {
-        // All items in the batch have been cancelled
-        item.batch.cancel();
-        item.batch = null;
-      }
-    };
-
     return {
-      promise: promise,
-      cancel: cancel
+        load
     };
-  }
-
-  return {
-    load: load
-  };
 }
 
 function httpBatchLink(opts) {
-  // initialized config
-  return function (runtime) {
-    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 = 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: opts.url,
-          runtime: runtime,
-          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 : batchOps.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 = 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  } = 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
+            };
         };
-      };
-
-      return {
-        validate: validate,
-        fetch: fetch
-      };
-    };
-
-    var query = dataLoader(batchLoader('query'));
-    var mutation = dataLoader(batchLoader('mutation'));
-    var subscription = dataLoader(batchLoader('subscription'));
-    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) {
-          var transformed = transformResult(res.json, runtime);
-
-          if (!transformed.ok) {
-            observer.error(TRPCClientError.from(transformed.error, {
-              meta: res.meta
-            }));
-            return;
-          }
-
-          observer.next({
-            context: res.meta,
-            result: transformed.result
-          });
-          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((observer)=>{
+                const loader = loaders[op.type];
+                const { promise , cancel  } = loader.load(op);
+                promise.then((res)=>{
+                    const transformed = transformResult(res.json, runtime);
+                    if (!transformed.ok) {
+                        observer.error(TRPCClientError.from(transformed.error, {
+                            meta: res.meta
+                        }));
+                        return;
+                    }
+                    observer.next({
+                        context: res.meta,
+                        result: transformed.result
+                    });
+                    observer.complete();
+                }).catch((err)=>observer.error(err));
+                return ()=>{
+                    cancel();
+                };
+            });
         };
-      });
     };
-  };
 }
 
 export { httpBatchLink };

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

@@ -1 +1 @@
-{"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,EAChD,IAAI,EAAE,eAAe,GACpB,QAAQ,CAAC,OAAO,CAAC,CAqCnB"}
+{"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,EAChD,IAAI,EAAE,eAAe,GACpB,QAAQ,CAAC,OAAO,CAAC,CAqCnB"}

package/dist/links/httpLink.js

@@ -3,61 +3,38 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-3ccc74ea.js');
-var httpUtils = require('../httpUtils-a0169eef.js');
-require('@babel/runtime/helpers/defineProperty');
-require('@babel/runtime/helpers/classCallCheck');
-require('@babel/runtime/helpers/createClass');
-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 transformResult = require('../transformResult-e15ccdf6.js');
+var httpUtils = require('../httpUtils-801112a6.js');
 
 function httpLink(opts) {
-  var url = opts.url;
-  return function (runtime) {
-    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({
-          url: url,
-          runtime: runtime,
-          type: type,
-          path: path,
-          input: input
-        }),
-            promise = _httpRequest.promise,
-            cancel = _httpRequest.cancel;
-
-        promise.then(function (res) {
-          var 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(function (cause) {
-          return transformResult.TRPCClientError.from(cause);
-        });
-        return function () {
-          cancel();
-        };
-      });
-    };
-  };
+    const { url  } = opts;
+    return (runtime)=>({ op  })=>observable.observable((observer)=>{
+                const { path , input , type  } = op;
+                const { promise , cancel  } = httpUtils.httpRequest({
+                    url,
+                    runtime,
+                    type,
+                    path,
+                    input
+                });
+                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((cause)=>transformResult.TRPCClientError.from(cause));
+                return ()=>{
+                    cancel();
+                };
+            });
 }
 
 exports.httpLink = httpLink;