@trpc/client 10.0.0-proxy-beta.5 → 10.0.0-proxy-beta.7

package/dist/{httpUtils-73a50af6.js → httpUtils-5f1164a9.js}

@@ -7,7 +7,7 @@ function getWindow() {
     return globalThis;
 }
 function getAbortController(ac) {
-    return (ac ?? getWindow().AbortController) ?? null;
+    return ac ?? getWindow().AbortController ?? null;
 }
 
 function getFetch(f) {

package/dist/{httpUtils-5b17f7da.mjs → httpUtils-d1885508.mjs}

@@ -5,7 +5,7 @@ function getWindow() {
     return globalThis;
 }
 function getAbortController(ac) {
-    return (ac ?? getWindow().AbortController) ?? null;
+    return ac ?? getWindow().AbortController ?? null;
 }
 
 function getFetch(f) {

package/dist/index.js

@@ -7,7 +7,7 @@ var transformResult = require('./transformResult-e15ccdf6.js');
 var links_splitLink = require('./splitLink-695ae288.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var shared = require('@trpc/server/shared');
-var httpUtils = require('./httpUtils-73a50af6.js');
+var httpUtils = require('./httpUtils-5f1164a9.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');

package/dist/index.mjs

@@ -6,7 +6,7 @@ export { s as splitLink } from './splitLink-ad44a55d.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 import { createProxy } from '@trpc/server/shared';
-export { g as getFetch } from './httpUtils-5b17f7da.mjs';
+export { g as getFetch } from './httpUtils-d1885508.mjs';
 export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 export { createWSClient, wsLink } from './links/wsLink.mjs';

package/dist/links/httpBatchLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-e15ccdf6.js');
-var httpUtils = require('../httpUtils-73a50af6.js');
+var httpUtils = require('../httpUtils-5f1164a9.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpBatchLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
-import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-5b17f7da.mjs';
+import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-d1885508.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-e15ccdf6.js');
-var httpUtils = require('../httpUtils-73a50af6.js');
+var httpUtils = require('../httpUtils-5f1164a9.js');
 
 function httpLink(opts) {
     const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);

package/dist/links/httpLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
-import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-5b17f7da.mjs';
+import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-d1885508.mjs';
 
 function httpLink(opts) {
     const resolvedOpts = resolveHTTPLinkOptions(opts);

package/dist/links/loggerLink.js

@@ -33,12 +33,12 @@ const defaultLogger = (c = console)=>(props)=>{
             type,
             `#${id}`,
             `%c${path}%c`,
-            '%O', 
+            '%O'
         ];
         const args = [
             css,
             `${css}; font-weight: bold;`,
-            `${css}; font-weight: normal;`, 
+            `${css}; font-weight: normal;`
         ];
         if (props.direction === 'up') {
             args.push({

package/dist/links/loggerLink.mjs

@@ -29,12 +29,12 @@ const defaultLogger = (c = console)=>(props)=>{
             type,
             `#${id}`,
             `%c${path}%c`,
-            '%O', 
+            '%O'
         ];
         const args = [
             css,
             `${css}; font-weight: bold;`,
-            `${css}; font-weight: normal;`, 
+            `${css}; font-weight: normal;`
         ];
         if (props.direction === 'up') {
             args.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-proxy-beta.5",
+  "version": "10.0.0-proxy-beta.7",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -63,13 +63,14 @@
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-proxy-beta.5"
+    "@trpc/server": "10.0.0-proxy-beta.7"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-proxy-beta.5"
+    "@trpc/server": "10.0.0-proxy-beta.7",
+    "@types/node": "^18.7.20"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "54b1938bdca755d2d8ff6e79712ba57d3e29edab"
+  "gitHead": "5e39af089a59fe695a38662cac7775b01c65a16e"
 }

package/src/links/dedupeLink.test.ts

@@ -1,7 +1,7 @@
 import { waitFor } from '@testing-library/dom';
-import { AnyRouter } from '@trpc/server';
-import { observable } from '@trpc/server/observable';
 import { OperationLink } from '..';
+import { AnyRouter } from '../../../server/src';
+import { observable } from '../../../server/src/observable';
 import { dedupeLink } from './dedupeLink';
 import { createChain } from './internals/createChain';
 

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/links/httpBatchLink";

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

@@ -1,216 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
-var httpRequest = require('../../../dist/httpRequest-6b1f0c6f.cjs.dev.js');
-var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-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');
-
-/**
- * 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
-    };
-
-    if (!batch) {
-      batch = {
-        items: [],
-        cancel: function cancel() {
-          destroyTimerAndBatch();
-        }
-      };
-    }
-
-    var thisBatch = batch;
-    var dispatchImmediately = false;
-    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) {
-        dispatchImmediately = true;
-      }
-    });
-
-    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();
-    };
-
-    if (dispatchImmediately) {
-      dispatch();
-    } else if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
-
-    return {
-      promise: promise,
-      cancel: cancel
-    };
-  }
-
-  return {
-    load: load
-  };
-}
-
-function httpBatchLink(opts) {
-  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) {
-          return op.path;
-        }).join(',');
-        var inputs = keyInputPairs.map(function (op) {
-          return op.input;
-        });
-
-        var _httpRequest = httpRequest.httpRequest({
-          url: url,
-          inputs: inputs,
-          path: path,
-          runtime: runtime,
-          type: type
-        }),
-            promise = _httpRequest.promise,
-            cancel = _httpRequest.cancel;
-
-        return {
-          promise: promise.then(function (res) {
-            if (!Array.isArray(res)) {
-              return keyInputPairs.map(function () {
-                return res;
-              });
-            }
-
-            return res;
-          }),
-          cancel: cancel
-        };
-      };
-    };
-
-    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,
-          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.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));
-      });
-    };
-  };
-}
-
-exports.httpBatchLink = httpBatchLink;

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

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-client-links-httpBatchLink.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-client-links-httpBatchLink.cjs.dev.js");
-}

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

@@ -1,216 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
-var httpRequest = require('../../../dist/httpRequest-66400297.cjs.prod.js');
-var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-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');
-
-/**
- * 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
-    };
-
-    if (!batch) {
-      batch = {
-        items: [],
-        cancel: function cancel() {
-          destroyTimerAndBatch();
-        }
-      };
-    }
-
-    var thisBatch = batch;
-    var dispatchImmediately = false;
-    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) {
-        dispatchImmediately = true;
-      }
-    });
-
-    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();
-    };
-
-    if (dispatchImmediately) {
-      dispatch();
-    } else if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
-
-    return {
-      promise: promise,
-      cancel: cancel
-    };
-  }
-
-  return {
-    load: load
-  };
-}
-
-function httpBatchLink(opts) {
-  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) {
-          return op.path;
-        }).join(',');
-        var inputs = keyInputPairs.map(function (op) {
-          return op.input;
-        });
-
-        var _httpRequest = httpRequest.httpRequest({
-          url: url,
-          inputs: inputs,
-          path: path,
-          runtime: runtime,
-          type: type
-        }),
-            promise = _httpRequest.promise,
-            cancel = _httpRequest.cancel;
-
-        return {
-          promise: promise.then(function (res) {
-            if (!Array.isArray(res)) {
-              return keyInputPairs.map(function () {
-                return res;
-              });
-            }
-
-            return res;
-          }),
-          cancel: cancel
-        };
-      };
-    };
-
-    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,
-          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.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));
-      });
-    };
-  };
-}
-
-exports.httpBatchLink = httpBatchLink;