@trpc/client 11.18.1-canary.2 → 11.18.1-canary.30

package/dist/TRPCClientError-CmHlBkPF.cjs

@@ -0,0 +1,56 @@
+const require_objectSpread2 = require("./objectSpread2-D-dJi1gK.cjs");
+let _trpc_server_unstable_core_do_not_import = require("@trpc/server/unstable-core-do-not-import");
+//#region src/TRPCClientError.ts
+function isTRPCClientError(cause) {
+	return cause instanceof TRPCClientError;
+}
+function isTRPCErrorResponse(obj) {
+	return (0, _trpc_server_unstable_core_do_not_import.isObject)(obj) && (0, _trpc_server_unstable_core_do_not_import.isObject)(obj["error"]) && typeof obj["error"]["code"] === "number" && typeof obj["error"]["message"] === "string";
+}
+function getMessageFromUnknownError(err, fallback) {
+	if (typeof err === "string") return err;
+	if ((0, _trpc_server_unstable_core_do_not_import.isObject)(err) && typeof err["message"] === "string") return err["message"];
+	return fallback;
+}
+var TRPCClientError = class TRPCClientError extends Error {
+	constructor(message, opts) {
+		var _opts$result, _opts$result2;
+		const cause = opts === null || opts === void 0 ? void 0 : opts.cause;
+		super(message, { cause });
+		require_objectSpread2._defineProperty(this, "cause", void 0);
+		require_objectSpread2._defineProperty(this, "shape", void 0);
+		require_objectSpread2._defineProperty(this, "data", void 0);
+		require_objectSpread2._defineProperty(this, "meta", void 0);
+		this.meta = opts === null || opts === void 0 ? void 0 : opts.meta;
+		this.cause = cause;
+		this.shape = opts === null || opts === void 0 || (_opts$result = opts.result) === null || _opts$result === void 0 ? void 0 : _opts$result.error;
+		this.data = opts === null || opts === void 0 || (_opts$result2 = opts.result) === null || _opts$result2 === void 0 ? void 0 : _opts$result2.error.data;
+		this.name = "TRPCClientError";
+		Object.setPrototypeOf(this, TRPCClientError.prototype);
+	}
+	static from(_cause, opts = {}) {
+		const cause = _cause;
+		if (isTRPCClientError(cause)) {
+			if (opts.meta) cause.meta = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, cause.meta), opts.meta);
+			return cause;
+		}
+		if (isTRPCErrorResponse(cause)) return new TRPCClientError(cause.error.message, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, opts), {}, {
+			result: cause,
+			cause: opts.cause
+		}));
+		return new TRPCClientError(getMessageFromUnknownError(cause, "Unknown error"), require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, opts), {}, { cause }));
+	}
+};
+//#endregion
+Object.defineProperty(exports, "TRPCClientError", {
+	enumerable: true,
+	get: function() {
+		return TRPCClientError;
+	}
+});
+Object.defineProperty(exports, "isTRPCClientError", {
+	enumerable: true,
+	get: function() {
+		return isTRPCClientError;
+	}
+});

package/dist/{TRPCClientError-apv8gw59.mjs → TRPCClientError-CxFRO7Js.mjs}

@@ -1,9 +1,6 @@
-import { __toESM, require_defineProperty, require_objectSpread2 } from "./objectSpread2-BvkFp-_Y.mjs";
+import { n as _defineProperty, t as _objectSpread2 } from "./objectSpread2-weooBxVk.mjs";
 import { isObject } from "@trpc/server/unstable-core-do-not-import";
-
 //#region src/TRPCClientError.ts
-var import_defineProperty = __toESM(require_defineProperty(), 1);
-var import_objectSpread2 = __toESM(require_objectSpread2(), 1);
 function isTRPCClientError(cause) {
 	return cause instanceof TRPCClientError;
 }
@@ -20,10 +17,10 @@ var TRPCClientError = class TRPCClientError extends Error {
 		var _opts$result, _opts$result2;
 		const cause = opts === null || opts === void 0 ? void 0 : opts.cause;
 		super(message, { cause });
-		(0, import_defineProperty.default)(this, "cause", void 0);
-		(0, import_defineProperty.default)(this, "shape", void 0);
-		(0, import_defineProperty.default)(this, "data", void 0);
-		(0, import_defineProperty.default)(this, "meta", void 0);
+		_defineProperty(this, "cause", void 0);
+		_defineProperty(this, "shape", void 0);
+		_defineProperty(this, "data", void 0);
+		_defineProperty(this, "meta", void 0);
 		this.meta = opts === null || opts === void 0 ? void 0 : opts.meta;
 		this.cause = cause;
 		this.shape = opts === null || opts === void 0 || (_opts$result = opts.result) === null || _opts$result === void 0 ? void 0 : _opts$result.error;
@@ -34,17 +31,17 @@ var TRPCClientError = class TRPCClientError extends Error {
 	static from(_cause, opts = {}) {
 		const cause = _cause;
 		if (isTRPCClientError(cause)) {
-			if (opts.meta) cause.meta = (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, cause.meta), opts.meta);
+			if (opts.meta) cause.meta = _objectSpread2(_objectSpread2({}, cause.meta), opts.meta);
 			return cause;
 		}
-		if (isTRPCErrorResponse(cause)) return new TRPCClientError(cause.error.message, (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, opts), {}, {
+		if (isTRPCErrorResponse(cause)) return new TRPCClientError(cause.error.message, _objectSpread2(_objectSpread2({}, opts), {}, {
 			result: cause,
 			cause: opts.cause
 		}));
-		return new TRPCClientError(getMessageFromUnknownError(cause, "Unknown error"), (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, opts), {}, { cause }));
+		return new TRPCClientError(getMessageFromUnknownError(cause, "Unknown error"), _objectSpread2(_objectSpread2({}, opts), {}, { cause }));
 	}
 };
-
 //#endregion
-export { TRPCClientError, isTRPCClientError };
-//# sourceMappingURL=TRPCClientError-apv8gw59.mjs.map
+export { isTRPCClientError as n, TRPCClientError as t };
+
+//# sourceMappingURL=TRPCClientError-CxFRO7Js.mjs.map

package/dist/TRPCClientError-CxFRO7Js.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"TRPCClientError-CxFRO7Js.mjs","names":[],"sources":["../src/TRPCClientError.ts"],"sourcesContent":["import type {\n  inferClientTypes,\n  InferrableClientTypes,\n  Maybe,\n  TRPCErrorResponse,\n} from '@trpc/server/unstable-core-do-not-import';\nimport {\n  isObject,\n  type DefaultErrorShape,\n} from '@trpc/server/unstable-core-do-not-import';\n\ntype inferErrorShape<TInferrable extends InferrableClientTypes> =\n  inferClientTypes<TInferrable>['errorShape'];\nexport interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {\n  readonly message: string;\n  readonly shape: Maybe<TShape>;\n  readonly data: Maybe<TShape['data']>;\n}\nexport type TRPCClientErrorLike<TInferrable extends InferrableClientTypes> =\n  TRPCClientErrorBase<inferErrorShape<TInferrable>>;\n\nexport function isTRPCClientError<TInferrable extends InferrableClientTypes>(\n  cause: unknown,\n): cause is TRPCClientError<TInferrable> {\n  return cause instanceof TRPCClientError;\n}\n\nfunction isTRPCErrorResponse(obj: unknown): obj is TRPCErrorResponse<any> {\n  return (\n    isObject(obj) &&\n    isObject(obj['error']) &&\n    typeof obj['error']['code'] === 'number' &&\n    typeof obj['error']['message'] === 'string'\n  );\n}\n\nfunction getMessageFromUnknownError(err: unknown, fallback: string): string {\n  if (typeof err === 'string') {\n    return err;\n  }\n  if (isObject(err) && typeof err['message'] === 'string') {\n    return err['message'];\n  }\n  return fallback;\n}\n\nexport class TRPCClientError<TRouterOrProcedure extends InferrableClientTypes>\n  extends Error\n  implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>\n{\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore override doesn't work in all environments due to \"This member cannot have an 'override' modifier because it is not declared in the base class 'Error'\"\n  public override readonly cause;\n  public readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;\n  public readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;\n\n  /**\n   * Additional meta data about the error\n   * In the case of HTTP-errors, we'll have `response` and potentially `responseJSON` here\n   */\n  public meta;\n\n  constructor(\n    message: string,\n    opts?: {\n      result?: Maybe<TRPCErrorResponse<inferErrorShape<TRouterOrProcedure>>>;\n      cause?: Error;\n      meta?: Record<string, unknown>;\n    },\n  ) {\n    const cause = opts?.cause;\n\n    // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n    // @ts-ignore https://github.com/tc39/proposal-error-cause\n    super(message, { cause });\n\n    this.meta = opts?.meta;\n\n    this.cause = cause;\n    this.shape = opts?.result?.error;\n    this.data = opts?.result?.error.data;\n    this.name = 'TRPCClientError';\n\n    Object.setPrototypeOf(this, TRPCClientError.prototype);\n  }\n\n  public static from<TRouterOrProcedure extends InferrableClientTypes>(\n    _cause: Error | TRPCErrorResponse<any> | object,\n    opts: { meta?: Record<string, unknown>; cause?: Error } = {},\n  ): TRPCClientError<TRouterOrProcedure> {\n    const cause = _cause as unknown;\n\n    if (isTRPCClientError(cause)) {\n      if (opts.meta) {\n        // Decorate with meta error data\n        cause.meta = {\n          ...cause.meta,\n          ...opts.meta,\n        };\n      }\n      return cause;\n    }\n    if (isTRPCErrorResponse(cause)) {\n      return new TRPCClientError(cause.error.message, {\n        ...opts,\n        result: cause,\n        cause: opts.cause,\n      });\n    }\n    return new TRPCClientError(\n      getMessageFromUnknownError(cause, 'Unknown error'),\n      {\n        ...opts,\n        cause: cause as any,\n      },\n    );\n  }\n}\n"],"mappings":";;;AAqBA,SAAgB,kBACd,OACuC;CACvC,OAAO,iBAAiB;AAC1B;AAEA,SAAS,oBAAoB,KAA6C;CACxE,OACE,SAAS,GAAG,KACZ,SAAS,IAAI,QAAQ,KACrB,OAAO,IAAI,QAAQ,CAAC,YAAY,YAChC,OAAO,IAAI,QAAQ,CAAC,eAAe;AAEvC;AAEA,SAAS,2BAA2B,KAAc,UAA0B;CAC1E,IAAI,OAAO,QAAQ,UACjB,OAAO;CAET,IAAI,SAAS,GAAG,KAAK,OAAO,IAAI,eAAe,UAC7C,OAAO,IAAI;CAEb,OAAO;AACT;AAEA,IAAa,kBAAb,MAAa,wBACH,MAEV;CAaE,YACE,SACA,MAKA;;EACA,MAAM,QAAA,SAAA,QAAA,SAAA,KAAA,IAAA,KAAA,IAAQ,KAAM;EAIpB,MAAM,SAAS,EAAE,MAAM,CAAC;EAtBD,gBAAA,MAAA,SAAA,KAAA,CAAA;EACT,gBAAA,MAAA,SAAA,KAAA,CAAA;EACA,gBAAA,MAAA,QAAA,KAAA,CAAA;EAMT,gBAAA,MAAA,QAAA,KAAA,CAAA;EAgBL,KAAK,OAAA,SAAA,QAAA,SAAA,KAAA,IAAA,KAAA,IAAO,KAAM;EAElB,KAAK,QAAQ;EACb,KAAK,QAAA,SAAA,QAAA,SAAA,KAAA,MAAA,eAAQ,KAAM,YAAA,QAAA,iBAAA,KAAA,IAAA,KAAA,IAAA,aAAQ;EAC3B,KAAK,OAAA,SAAA,QAAA,SAAA,KAAA,MAAA,gBAAO,KAAM,YAAA,QAAA,kBAAA,KAAA,IAAA,KAAA,IAAA,cAAQ,MAAM;EAChC,KAAK,OAAO;EAEZ,OAAO,eAAe,MAAM,gBAAgB,SAAS;CACvD;CAEA,OAAc,KACZ,QACA,OAA0D,CAAC,GACtB;EACrC,MAAM,QAAQ;EAEd,IAAI,kBAAkB,KAAK,GAAG;GAC5B,IAAI,KAAK,MAEP,MAAM,OAAA,eAAA,eAAA,CAAA,GACD,MAAM,IAAA,GACN,KAAK,IACV;GAEF,OAAO;EACT;EACA,IAAI,oBAAoB,KAAK,GAC3B,OAAO,IAAI,gBAAgB,MAAM,MAAM,SAAA,eAAA,eAAA,CAAA,GAClC,IAAA,GAAA,CAAA,GAAA;GACH,QAAQ;GACR,OAAO,KAAK;EACd,CAAA,CAAC;EAEH,OAAO,IAAI,gBACT,2BAA2B,OAAO,eAAe,GAAA,eAAA,eAAA,CAAA,GAE5C,IAAA,GAAA,CAAA,GAAA,EACI,MAAA,CACT,CACF;CACF;AACF"}

package/dist/{httpBatchLink-LhidKAPw.mjs → httpBatchLink-BMtWxLJV.mjs}

@@ -1,9 +1,8 @@
-import { __toESM, require_objectSpread2 } from "./objectSpread2-BvkFp-_Y.mjs";
-import { TRPCClientError } from "./TRPCClientError-apv8gw59.mjs";
-import { getUrl, jsonHttpRequester, resolveHTTPLinkOptions } from "./httpUtils-pyf5RF99.mjs";
+import { t as _objectSpread2 } from "./objectSpread2-weooBxVk.mjs";
+import { t as TRPCClientError } from "./TRPCClientError-CxFRO7Js.mjs";
+import { a as jsonHttpRequester, c as allAbortSignals, l as raceAbortSignals, o as resolveHTTPLinkOptions, r as getUrl } from "./httpUtils-CB_100ND.mjs";
 import { observable } from "@trpc/server/observable";
 import { transformResult } from "@trpc/server/unstable-core-do-not-import";
-
 //#region src/internals/dataLoader.ts
 /**
 * A function that should never be called unless we messed something up.
@@ -36,19 +35,18 @@ function dataLoader(batchLoader) {
 			const lastGroup = groupedItems[groupedItems.length - 1];
 			if (item.aborted) {
 				var _item$reject;
-				(_item$reject = item.reject) === null || _item$reject === void 0 || _item$reject.call(item, new Error("Aborted"));
+				(_item$reject = item.reject) === null || _item$reject === void 0 || _item$reject.call(item, /* @__PURE__ */ new Error("Aborted"));
 				index++;
 				continue;
 			}
-			const isValid = batchLoader.validate(lastGroup.concat(item).map((it) => it.key));
-			if (isValid) {
+			if (batchLoader.validate(lastGroup.concat(item).map((it) => it.key))) {
 				lastGroup.push(item);
 				index++;
 				continue;
 			}
 			if (lastGroup.length === 0) {
 				var _item$reject2;
-				(_item$reject2 = item.reject) === null || _item$reject2 === void 0 || _item$reject2.call(item, new Error("Input is too big for a single dispatch"));
+				(_item$reject2 = item.reject) === null || _item$reject2 === void 0 || _item$reject2.call(item, /* @__PURE__ */ new Error("Input is too big for a single dispatch"));
 				index++;
 				continue;
 			}
@@ -63,8 +61,7 @@ function dataLoader(batchLoader) {
 			if (!items.length) continue;
 			const batch = { items };
 			for (const item of items) item.batch = batch;
-			const promise = batchLoader.fetch(batch.items.map((_item) => _item.key));
-			promise.then(async (result) => {
+			batchLoader.fetch(batch.items.map((_item) => _item.key)).then(async (result) => {
 				await Promise.all(result.map(async (valueOrPromise, index) => {
 					const item = batch.items[index];
 					try {
@@ -81,7 +78,7 @@ function dataLoader(batchLoader) {
 				}));
 				for (const item of batch.items) {
 					var _item$reject4;
-					(_item$reject4 = item.reject) === null || _item$reject4 === void 0 || _item$reject4.call(item, new Error("Missing result"));
+					(_item$reject4 = item.reject) === null || _item$reject4 === void 0 || _item$reject4.call(item, /* @__PURE__ */ new Error("Missing result"));
 					item.batch = null;
 				}
 			}).catch((cause) => {
@@ -114,52 +111,8 @@ function dataLoader(batchLoader) {
 	}
 	return { load };
 }
-
-//#endregion
-//#region src/internals/signals.ts
-/**
-* Like `Promise.all()` but for abort signals
-* - When all signals have been aborted, the merged signal will be aborted
-* - If one signal is `null`, no signal will be aborted
-*/
-function allAbortSignals(...signals) {
-	const ac = new AbortController();
-	const count = signals.length;
-	let abortedCount = 0;
-	const onAbort = () => {
-		if (++abortedCount === count) ac.abort();
-	};
-	for (const signal of signals) if (signal === null || signal === void 0 ? void 0 : signal.aborted) onAbort();
-	else signal === null || signal === void 0 || signal.addEventListener("abort", onAbort, { once: true });
-	return ac.signal;
-}
-/**
-* Like `Promise.race` but for abort signals
-*
-* Basically, a ponyfill for
-* [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
-*/
-function raceAbortSignals(...signals) {
-	const ac = new AbortController();
-	for (const signal of signals) if (signal === null || signal === void 0 ? void 0 : signal.aborted) ac.abort();
-	else signal === null || signal === void 0 || signal.addEventListener("abort", () => ac.abort(), { once: true });
-	return ac.signal;
-}
-function abortSignalToPromise(signal) {
-	return new Promise((_, reject) => {
-		if (signal.aborted) {
-			reject(signal.reason);
-			return;
-		}
-		signal.addEventListener("abort", () => {
-			reject(signal.reason);
-		}, { once: true });
-	});
-}
-
 //#endregion
 //#region src/links/httpBatchLink.ts
-var import_objectSpread2 = __toESM(require_objectSpread2(), 1);
 /**
 * @see https://trpc.io/docs/client/links/httpBatchLink
 */
@@ -176,19 +129,18 @@ function httpBatchLink(opts) {
 					if (batchOps.length > maxItems) return false;
 					const path = batchOps.map((op) => op.path).join(",");
 					const inputs = batchOps.map((op) => op.input);
-					const url = getUrl((0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, resolvedOpts), {}, {
+					return getUrl(_objectSpread2(_objectSpread2({}, resolvedOpts), {}, {
 						type,
 						path,
 						inputs,
 						signal: null
-					}));
-					return url.length <= maxURLLength;
+					})).length <= maxURLLength;
 				},
 				async fetch(batchOps) {
 					const path = batchOps.map((op) => op.path).join(",");
 					const inputs = batchOps.map((op) => op.input);
 					const signal = allAbortSignals(...batchOps.map((op) => op.signal));
-					const res = await jsonHttpRequester((0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, resolvedOpts), {}, {
+					const res = await jsonHttpRequester(_objectSpread2(_objectSpread2({}, resolvedOpts), {}, {
 						path,
 						inputs,
 						type,
@@ -199,29 +151,27 @@ function httpBatchLink(opts) {
 						},
 						signal
 					}));
-					const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(() => res.json);
-					const result = resJSON.map((item) => ({
+					return (Array.isArray(res.json) ? res.json : batchOps.map(() => res.json)).map((item) => ({
 						meta: res.meta,
 						json: item
 					}));
-					return result;
 				}
 			};
 		};
-		const query = dataLoader(batchLoader("query"));
-		const mutation = dataLoader(batchLoader("mutation"));
 		const loaders = {
-			query,
-			mutation
+			query: dataLoader(batchLoader("query")),
+			mutation: dataLoader(batchLoader("mutation"))
 		};
 		return ({ op }) => {
 			return observable((observer) => {
 				/* istanbul ignore if -- @preserve */
 				if (op.type === "subscription") throw new Error("Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`");
-				const loader = loaders[op.type];
-				const promise = loader.load(op);
+				const ac = new AbortController();
+				const promise = loaders[op.type].load(_objectSpread2(_objectSpread2({}, op), {}, { signal: raceAbortSignals(op.signal, ac.signal) }));
+				let isDone = false;
 				let _res = void 0;
 				promise.then((res) => {
+					isDone = true;
 					_res = res;
 					const transformed = transformResult(res.json, resolvedOpts.transformer.output);
 					if (!transformed.ok) {
@@ -234,14 +184,17 @@ function httpBatchLink(opts) {
 					});
 					observer.complete();
 				}).catch((err) => {
+					isDone = true;
 					observer.error(TRPCClientError.from(err, { meta: _res === null || _res === void 0 ? void 0 : _res.meta }));
 				});
-				return () => {};
+				return () => {
+					if (!isDone) ac.abort();
+				};
 			});
 		};
 	};
 }
-
 //#endregion
-export { abortSignalToPromise, allAbortSignals, dataLoader, httpBatchLink, raceAbortSignals };
-//# sourceMappingURL=httpBatchLink-LhidKAPw.mjs.map
+export { dataLoader as n, httpBatchLink as t };
+
+//# sourceMappingURL=httpBatchLink-BMtWxLJV.mjs.map

package/dist/httpBatchLink-BMtWxLJV.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpBatchLink-BMtWxLJV.mjs","names":[],"sources":["../src/internals/dataLoader.ts","../src/links/httpBatchLink.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\ntype BatchItem<TKey, TValue> = {\n  aborted: boolean;\n  key: TKey;\n  resolve: ((value: TValue) => void) | null;\n  reject: ((error: Error) => void) | null;\n  batch: Batch<TKey, TValue> | null;\n};\ntype Batch<TKey, TValue> = {\n  items: BatchItem<TKey, TValue>[];\n};\nexport type BatchLoader<TKey, TValue> = {\n  validate: (keys: TKey[]) => boolean;\n  fetch: (keys: TKey[]) => Promise<TValue[] | Promise<TValue>[]>;\n};\n\n/**\n * A function that should never be called unless we messed something up.\n */\nconst throwFatalError = () => {\n  throw new Error(\n    'Something went wrong. Please submit an issue at https://github.com/trpc/trpc/issues/new',\n  );\n};\n\n/**\n * Dataloader that's very inspired by https://github.com/graphql/dataloader\n * Less configuration, no caching, and allows you to cancel requests\n * When cancelling a single fetch the whole batch will be cancelled only when _all_ items are cancelled\n */\nexport function dataLoader<TKey, TValue>(\n  batchLoader: BatchLoader<TKey, TValue>,\n) {\n  let pendingItems: BatchItem<TKey, TValue>[] | null = null;\n  let dispatchTimer: ReturnType<typeof setTimeout> | null = null;\n\n  const destroyTimerAndPendingItems = () => {\n    clearTimeout(dispatchTimer as any);\n    dispatchTimer = null;\n    pendingItems = null;\n  };\n\n  /**\n   * Iterate through the items and split them into groups based on the `batchLoader`'s validate function\n   */\n  function groupItems(items: BatchItem<TKey, TValue>[]) {\n    const groupedItems: BatchItem<TKey, TValue>[][] = [[]];\n    let index = 0;\n    while (true) {\n      const item = items[index];\n      if (!item) {\n        // we're done\n        break;\n      }\n      const lastGroup = groupedItems[groupedItems.length - 1]!;\n\n      if (item.aborted) {\n        // Item was aborted before it was dispatched\n        item.reject?.(new Error('Aborted'));\n        index++;\n        continue;\n      }\n\n      const isValid = batchLoader.validate(\n        lastGroup.concat(item).map((it) => it.key),\n      );\n\n      if (isValid) {\n        lastGroup.push(item);\n        index++;\n        continue;\n      }\n\n      if (lastGroup.length === 0) {\n        item.reject?.(new Error('Input is too big for a single dispatch'));\n        index++;\n        continue;\n      }\n      // Create new group, next iteration will try to add the item to that\n      groupedItems.push([]);\n    }\n    return groupedItems;\n  }\n\n  function dispatch() {\n    const groupedItems = groupItems(pendingItems!);\n    destroyTimerAndPendingItems();\n\n    // Create batches for each group of items\n    for (const items of groupedItems) {\n      if (!items.length) {\n        continue;\n      }\n      const batch: Batch<TKey, TValue> = {\n        items,\n      };\n      for (const item of items) {\n        item.batch = batch;\n      }\n      const promise = batchLoader.fetch(batch.items.map((_item) => _item.key));\n\n      promise\n        .then(async (result) => {\n          await Promise.all(\n            result.map(async (valueOrPromise, index) => {\n              const item = batch.items[index]!;\n              try {\n                const value = await Promise.resolve(valueOrPromise);\n\n                item.resolve?.(value);\n              } catch (cause) {\n                item.reject?.(cause as Error);\n              }\n\n              item.batch = null;\n              item.reject = null;\n              item.resolve = null;\n            }),\n          );\n\n          for (const item of batch.items) {\n            item.reject?.(new Error('Missing result'));\n            item.batch = null;\n          }\n        })\n        .catch((cause) => {\n          for (const item of batch.items) {\n            item.reject?.(cause);\n            item.batch = null;\n          }\n        });\n    }\n  }\n  function load(key: TKey): Promise<TValue> {\n    const item: BatchItem<TKey, TValue> = {\n      aborted: false,\n      key,\n      batch: null,\n      resolve: throwFatalError,\n      reject: throwFatalError,\n    };\n\n    const promise = new Promise<TValue>((resolve, reject) => {\n      item.reject = reject;\n      item.resolve = resolve;\n\n      pendingItems ??= [];\n      pendingItems.push(item);\n    });\n\n    dispatchTimer ??= setTimeout(dispatch);\n\n    return promise;\n  }\n\n  return {\n    load,\n  };\n}\n","import type { AnyRouter, ProcedureType } from '@trpc/server';\nimport { observable } from '@trpc/server/observable';\nimport { transformResult } from '@trpc/server/unstable-core-do-not-import';\nimport type { BatchLoader } from '../internals/dataLoader';\nimport { dataLoader } from '../internals/dataLoader';\nimport { allAbortSignals, raceAbortSignals } from '../internals/signals';\nimport type { NonEmptyArray } from '../internals/types';\nimport { TRPCClientError } from '../TRPCClientError';\nimport type { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';\nimport type { HTTPResult } from './internals/httpUtils';\nimport {\n  getUrl,\n  jsonHttpRequester,\n  resolveHTTPLinkOptions,\n} from './internals/httpUtils';\nimport type { Operation, TRPCLink } from './types';\n\n/**\n * @see https://trpc.io/docs/client/links/httpBatchLink\n */\nexport function httpBatchLink<TRouter extends AnyRouter>(\n  opts: HTTPBatchLinkOptions<TRouter['_def']['_config']['$types']>,\n): TRPCLink<TRouter> {\n  const resolvedOpts = resolveHTTPLinkOptions(opts);\n  const maxURLLength = opts.maxURLLength ?? Infinity;\n  const maxItems = opts.maxItems ?? Infinity;\n\n  return () => {\n    const batchLoader = (\n      type: ProcedureType,\n    ): BatchLoader<Operation, HTTPResult> => {\n      return {\n        validate(batchOps) {\n          if (maxURLLength === Infinity && maxItems === Infinity) {\n            // escape hatch for quick calcs\n            return true;\n          }\n          if (batchOps.length > maxItems) {\n            return false;\n          }\n          const path = batchOps.map((op) => op.path).join(',');\n          const inputs = batchOps.map((op) => op.input);\n\n          const url = getUrl({\n            ...resolvedOpts,\n            type,\n            path,\n            inputs,\n            signal: null,\n          });\n\n          return url.length <= maxURLLength;\n        },\n        async fetch(batchOps) {\n          const path = batchOps.map((op) => op.path).join(',');\n          const inputs = batchOps.map((op) => op.input);\n          const signal = allAbortSignals(...batchOps.map((op) => op.signal));\n\n          const res = await jsonHttpRequester({\n            ...resolvedOpts,\n            path,\n            inputs,\n            type,\n            headers() {\n              if (!opts.headers) {\n                return {};\n              }\n              if (typeof opts.headers === 'function') {\n                return opts.headers({\n                  opList: batchOps as NonEmptyArray<Operation>,\n                });\n              }\n              return opts.headers;\n            },\n            signal,\n          });\n          const resJSON = Array.isArray(res.json)\n            ? res.json\n            : batchOps.map(() => res.json);\n          const result = resJSON.map((item) => ({\n            meta: res.meta,\n            json: item,\n          }));\n          return result;\n        },\n      };\n    };\n\n    const query = dataLoader(batchLoader('query'));\n    const mutation = dataLoader(batchLoader('mutation'));\n\n    const loaders = { query, mutation };\n    return ({ op }) => {\n      return observable((observer) => {\n        /* istanbul ignore if -- @preserve */\n        if (op.type === 'subscription') {\n          throw new Error(\n            'Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`',\n          );\n        }\n        const ac = new AbortController();\n        const loader = loaders[op.type];\n        const promise = loader.load({\n          ...op,\n          signal: raceAbortSignals(op.signal, ac.signal),\n        });\n\n        let isDone = false;\n        let _res = undefined as HTTPResult | undefined;\n        promise\n          .then((res) => {\n            isDone = true;\n            _res = res;\n            const transformed = transformResult(\n              res.json,\n              resolvedOpts.transformer.output,\n            );\n\n            if (!transformed.ok) {\n              observer.error(\n                TRPCClientError.from(transformed.error, {\n                  meta: res.meta,\n                }),\n              );\n              return;\n            }\n            observer.next({\n              context: res.meta,\n              result: transformed.result,\n            });\n            observer.complete();\n          })\n          .catch((err) => {\n            isDone = true;\n            observer.error(\n              TRPCClientError.from(err, {\n                meta: _res?.meta,\n              }),\n            );\n          });\n\n        return () => {\n          if (!isDone) {\n            ac.abort();\n          }\n        };\n      });\n    };\n  };\n}\n"],"mappings":"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"}

package/dist/{httpBatchLink.d-7jyWtY5H.d.cts → httpBatchLink-Br-pzPXf.d.cts}

@@ -1,8 +1,7 @@
-import { HTTPHeaders, NonEmptyArray, Operation, TRPCLink } from "./types.d-Dmmedc5G.cjs";
-import { HTTPLinkBaseOptions } from "./httpUtils.d-BqmeKEGo.cjs";
+import { _ as NonEmptyArray, n as Operation, t as HTTPHeaders, u as TRPCLink } from "./types-BxbMkv6C.cjs";
+import { t as HTTPLinkBaseOptions } from "./httpUtils-CUqAubVD.cjs";
 import { AnyClientTypes } from "@trpc/server/unstable-core-do-not-import";
 import { AnyRouter as AnyRouter$1 } from "@trpc/server";
-
 //#region src/links/HTTPBatchLinkOptions.d.ts
 type HTTPBatchLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TRoot> & {
   maxURLLength?: number;
@@ -19,15 +18,12 @@ type HTTPBatchLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TR
    */
   maxItems?: number;
 };
-//# sourceMappingURL=HTTPBatchLinkOptions.d.ts.map
 //#endregion
 //#region src/links/httpBatchLink.d.ts
 /**
  * @see https://trpc.io/docs/client/links/httpBatchLink
  */
 declare function httpBatchLink<TRouter extends AnyRouter$1>(opts: HTTPBatchLinkOptions<TRouter['_def']['_config']['$types']>): TRPCLink<TRouter>;
-//# sourceMappingURL=httpBatchLink.d.ts.map
-
 //#endregion
-export { HTTPBatchLinkOptions, httpBatchLink };
-//# sourceMappingURL=httpBatchLink.d-7jyWtY5H.d.cts.map
+export { HTTPBatchLinkOptions as n, httpBatchLink as t };
+//# sourceMappingURL=httpBatchLink-Br-pzPXf.d.cts.map

package/dist/httpBatchLink-Br-pzPXf.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpBatchLink-Br-pzPXf.d.cts","names":[],"sources":["../src/links/HTTPBatchLinkOptions.ts","../src/links/httpBatchLink.ts"],"mappings":";;;;;KAKY,qBAAqB,cAAc,kBAC7C,oBAAoB;EAClB;;;;;EAKA,UACI,gBACE;IACA,QAAQ,cAAc;QAClB,cAAc,QAAQ;;;;;EAMhC;;;;;;;iBCFY,cAAc,gBAAgB,aAC5C,MAAM,qBAAqB,wCAC1B,SAAS"}

package/dist/{httpBatchLink-BGZRsGNf.cjs → httpBatchLink-DO3WQoxu.cjs}

@@ -1,10 +1,8 @@
-const require_chunk = require('./chunk-DWy1uDak.cjs');
-const require_objectSpread2$1 = require('./objectSpread2-Bsvh_OqM.cjs');
-const require_TRPCClientError = require('./TRPCClientError-CQrTQLrk.cjs');
-const require_httpUtils = require('./httpUtils-wv2o-njD.cjs');
-const __trpc_server_observable = require_chunk.__toESM(require("@trpc/server/observable"));
-const __trpc_server_unstable_core_do_not_import = require_chunk.__toESM(require("@trpc/server/unstable-core-do-not-import"));
-
+const require_objectSpread2 = require("./objectSpread2-D-dJi1gK.cjs");
+const require_TRPCClientError = require("./TRPCClientError-CmHlBkPF.cjs");
+const require_httpUtils = require("./httpUtils-cggqcHz0.cjs");
+let _trpc_server_observable = require("@trpc/server/observable");
+let _trpc_server_unstable_core_do_not_import = require("@trpc/server/unstable-core-do-not-import");
 //#region src/internals/dataLoader.ts
 /**
 * A function that should never be called unless we messed something up.
@@ -37,19 +35,18 @@ function dataLoader(batchLoader) {
 			const lastGroup = groupedItems[groupedItems.length - 1];
 			if (item.aborted) {
 				var _item$reject;
-				(_item$reject = item.reject) === null || _item$reject === void 0 || _item$reject.call(item, new Error("Aborted"));
+				(_item$reject = item.reject) === null || _item$reject === void 0 || _item$reject.call(item, /* @__PURE__ */ new Error("Aborted"));
 				index++;
 				continue;
 			}
-			const isValid = batchLoader.validate(lastGroup.concat(item).map((it) => it.key));
-			if (isValid) {
+			if (batchLoader.validate(lastGroup.concat(item).map((it) => it.key))) {
 				lastGroup.push(item);
 				index++;
 				continue;
 			}
 			if (lastGroup.length === 0) {
 				var _item$reject2;
-				(_item$reject2 = item.reject) === null || _item$reject2 === void 0 || _item$reject2.call(item, new Error("Input is too big for a single dispatch"));
+				(_item$reject2 = item.reject) === null || _item$reject2 === void 0 || _item$reject2.call(item, /* @__PURE__ */ new Error("Input is too big for a single dispatch"));
 				index++;
 				continue;
 			}
@@ -64,8 +61,7 @@ function dataLoader(batchLoader) {
 			if (!items.length) continue;
 			const batch = { items };
 			for (const item of items) item.batch = batch;
-			const promise = batchLoader.fetch(batch.items.map((_item) => _item.key));
-			promise.then(async (result) => {
+			batchLoader.fetch(batch.items.map((_item) => _item.key)).then(async (result) => {
 				await Promise.all(result.map(async (valueOrPromise, index) => {
 					const item = batch.items[index];
 					try {
@@ -82,7 +78,7 @@ function dataLoader(batchLoader) {
 				}));
 				for (const item of batch.items) {
 					var _item$reject4;
-					(_item$reject4 = item.reject) === null || _item$reject4 === void 0 || _item$reject4.call(item, new Error("Missing result"));
+					(_item$reject4 = item.reject) === null || _item$reject4 === void 0 || _item$reject4.call(item, /* @__PURE__ */ new Error("Missing result"));
 					item.batch = null;
 				}
 			}).catch((cause) => {
@@ -115,52 +111,8 @@ function dataLoader(batchLoader) {
 	}
 	return { load };
 }
-
-//#endregion
-//#region src/internals/signals.ts
-/**
-* Like `Promise.all()` but for abort signals
-* - When all signals have been aborted, the merged signal will be aborted
-* - If one signal is `null`, no signal will be aborted
-*/
-function allAbortSignals(...signals) {
-	const ac = new AbortController();
-	const count = signals.length;
-	let abortedCount = 0;
-	const onAbort = () => {
-		if (++abortedCount === count) ac.abort();
-	};
-	for (const signal of signals) if (signal === null || signal === void 0 ? void 0 : signal.aborted) onAbort();
-	else signal === null || signal === void 0 || signal.addEventListener("abort", onAbort, { once: true });
-	return ac.signal;
-}
-/**
-* Like `Promise.race` but for abort signals
-*
-* Basically, a ponyfill for
-* [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
-*/
-function raceAbortSignals(...signals) {
-	const ac = new AbortController();
-	for (const signal of signals) if (signal === null || signal === void 0 ? void 0 : signal.aborted) ac.abort();
-	else signal === null || signal === void 0 || signal.addEventListener("abort", () => ac.abort(), { once: true });
-	return ac.signal;
-}
-function abortSignalToPromise(signal) {
-	return new Promise((_, reject) => {
-		if (signal.aborted) {
-			reject(signal.reason);
-			return;
-		}
-		signal.addEventListener("abort", () => {
-			reject(signal.reason);
-		}, { once: true });
-	});
-}
-
 //#endregion
 //#region src/links/httpBatchLink.ts
-var import_objectSpread2 = require_chunk.__toESM(require_objectSpread2$1.require_objectSpread2(), 1);
 /**
 * @see https://trpc.io/docs/client/links/httpBatchLink
 */
@@ -177,19 +129,18 @@ function httpBatchLink(opts) {
 					if (batchOps.length > maxItems) return false;
 					const path = batchOps.map((op) => op.path).join(",");
 					const inputs = batchOps.map((op) => op.input);
-					const url = require_httpUtils.getUrl((0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, resolvedOpts), {}, {
+					return require_httpUtils.getUrl(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, resolvedOpts), {}, {
 						type,
 						path,
 						inputs,
 						signal: null
-					}));
-					return url.length <= maxURLLength;
+					})).length <= maxURLLength;
 				},
 				async fetch(batchOps) {
 					const path = batchOps.map((op) => op.path).join(",");
 					const inputs = batchOps.map((op) => op.input);
-					const signal = allAbortSignals(...batchOps.map((op) => op.signal));
-					const res = await require_httpUtils.jsonHttpRequester((0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, resolvedOpts), {}, {
+					const signal = require_httpUtils.allAbortSignals(...batchOps.map((op) => op.signal));
+					const res = await require_httpUtils.jsonHttpRequester(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, resolvedOpts), {}, {
 						path,
 						inputs,
 						type,
@@ -200,31 +151,29 @@ function httpBatchLink(opts) {
 						},
 						signal
 					}));
-					const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(() => res.json);
-					const result = resJSON.map((item) => ({
+					return (Array.isArray(res.json) ? res.json : batchOps.map(() => res.json)).map((item) => ({
 						meta: res.meta,
 						json: item
 					}));
-					return result;
 				}
 			};
 		};
-		const query = dataLoader(batchLoader("query"));
-		const mutation = dataLoader(batchLoader("mutation"));
 		const loaders = {
-			query,
-			mutation
+			query: dataLoader(batchLoader("query")),
+			mutation: dataLoader(batchLoader("mutation"))
 		};
 		return ({ op }) => {
-			return (0, __trpc_server_observable.observable)((observer) => {
+			return (0, _trpc_server_observable.observable)((observer) => {
 				/* istanbul ignore if -- @preserve */
 				if (op.type === "subscription") throw new Error("Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`");
-				const loader = loaders[op.type];
-				const promise = loader.load(op);
+				const ac = new AbortController();
+				const promise = loaders[op.type].load(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, op), {}, { signal: require_httpUtils.raceAbortSignals(op.signal, ac.signal) }));
+				let isDone = false;
 				let _res = void 0;
 				promise.then((res) => {
+					isDone = true;
 					_res = res;
-					const transformed = (0, __trpc_server_unstable_core_do_not_import.transformResult)(res.json, resolvedOpts.transformer.output);
+					const transformed = (0, _trpc_server_unstable_core_do_not_import.transformResult)(res.json, resolvedOpts.transformer.output);
 					if (!transformed.ok) {
 						observer.error(require_TRPCClientError.TRPCClientError.from(transformed.error, { meta: res.meta }));
 						return;
@@ -235,42 +184,26 @@ function httpBatchLink(opts) {
 					});
 					observer.complete();
 				}).catch((err) => {
+					isDone = true;
 					observer.error(require_TRPCClientError.TRPCClientError.from(err, { meta: _res === null || _res === void 0 ? void 0 : _res.meta }));
 				});
-				return () => {};
+				return () => {
+					if (!isDone) ac.abort();
+				};
 			});
 		};
 	};
 }
-
 //#endregion
-Object.defineProperty(exports, 'abortSignalToPromise', {
-  enumerable: true,
-  get: function () {
-    return abortSignalToPromise;
-  }
-});
-Object.defineProperty(exports, 'allAbortSignals', {
-  enumerable: true,
-  get: function () {
-    return allAbortSignals;
-  }
-});
-Object.defineProperty(exports, 'dataLoader', {
-  enumerable: true,
-  get: function () {
-    return dataLoader;
-  }
+Object.defineProperty(exports, "dataLoader", {
+	enumerable: true,
+	get: function() {
+		return dataLoader;
+	}
 });
-Object.defineProperty(exports, 'httpBatchLink', {
-  enumerable: true,
-  get: function () {
-    return httpBatchLink;
-  }
+Object.defineProperty(exports, "httpBatchLink", {
+	enumerable: true,
+	get: function() {
+		return httpBatchLink;
+	}
 });
-Object.defineProperty(exports, 'raceAbortSignals', {
-  enumerable: true,
-  get: function () {
-    return raceAbortSignals;
-  }
-});

package/dist/{httpBatchLink.d-p8Y9QM8p.d.mts → httpBatchLink-nvc48L_N.d.mts}

@@ -1,8 +1,7 @@
-import { HTTPHeaders, NonEmptyArray, Operation, TRPCLink } from "./types.d-CAr6snH0.mjs";
-import { HTTPLinkBaseOptions } from "./httpUtils.d-C5t5to0D.mjs";
+import { _ as NonEmptyArray, n as Operation, t as HTTPHeaders, u as TRPCLink } from "./types-CAPs7vhA.mjs";
+import { t as HTTPLinkBaseOptions } from "./httpUtils-C37jRVnj.mjs";
 import { AnyClientTypes } from "@trpc/server/unstable-core-do-not-import";
 import { AnyRouter as AnyRouter$1 } from "@trpc/server";
-
 //#region src/links/HTTPBatchLinkOptions.d.ts
 type HTTPBatchLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TRoot> & {
   maxURLLength?: number;
@@ -19,15 +18,12 @@ type HTTPBatchLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TR
    */
   maxItems?: number;
 };
-//# sourceMappingURL=HTTPBatchLinkOptions.d.ts.map
 //#endregion
 //#region src/links/httpBatchLink.d.ts
 /**
  * @see https://trpc.io/docs/client/links/httpBatchLink
  */
 declare function httpBatchLink<TRouter extends AnyRouter$1>(opts: HTTPBatchLinkOptions<TRouter['_def']['_config']['$types']>): TRPCLink<TRouter>;
-//# sourceMappingURL=httpBatchLink.d.ts.map
-
 //#endregion
-export { HTTPBatchLinkOptions, httpBatchLink };
-//# sourceMappingURL=httpBatchLink.d-p8Y9QM8p.d.mts.map
+export { HTTPBatchLinkOptions as n, httpBatchLink as t };
+//# sourceMappingURL=httpBatchLink-nvc48L_N.d.mts.map

package/dist/httpBatchLink-nvc48L_N.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpBatchLink-nvc48L_N.d.mts","names":[],"sources":["../src/links/HTTPBatchLinkOptions.ts","../src/links/httpBatchLink.ts"],"mappings":";;;;;KAKY,qBAAqB,cAAc,kBAC7C,oBAAoB;EAClB;;;;;EAKA,UACI,gBACE;IACA,QAAQ,cAAc;QAClB,cAAc,QAAQ;;;;;EAMhC;;;;;;;iBCFY,cAAc,gBAAgB,aAC5C,MAAM,qBAAqB,wCAC1B,SAAS"}