@trpc/client 11.0.0-rc.449 → 11.0.0-rc.455

package/dist/links/internals/httpUtils.js

@@ -1,15 +1,12 @@
 'use strict';
 
 var getFetch = require('../../getFetch.js');
-var getAbortController = require('../../internals/getAbortController.js');
-var TRPCClientError = require('../../TRPCClientError.js');
 var transformer = require('../../internals/transformer.js');
 
 function resolveHTTPLinkOptions(opts) {
     return {
         url: opts.url.toString(),
         fetch: opts.fetch,
-        AbortController: getAbortController.getAbortController(opts.AbortController),
         transformer: transformer.getTransformer(opts.transformer),
         methodOverride: opts.methodOverride
     };
@@ -68,7 +65,8 @@ const jsonHttpRequester = (opts)=>{
         getBody
     });
 };
-async function fetchHTTPResponse(opts, ac) {
+async function fetchHTTPResponse(opts) {
+    opts.signal?.throwIfAborted();
     const url = opts.getUrl(opts);
     const body = opts.getBody(opts);
     const { type  } = opts;
@@ -90,43 +88,50 @@ async function fetchHTTPResponse(opts, ac) {
     };
     return getFetch.getFetch(opts.fetch)(url, {
         method: opts.methodOverride ?? METHOD[type],
-        signal: ac?.signal,
+        signal: opts.signal,
         body,
         headers
     });
 }
-function httpRequest(opts) {
-    const ac = opts.AbortController ? new opts.AbortController() : null;
+async function httpRequest(opts) {
     const meta = {};
-    let done = false;
-    const promise = new Promise((resolve, reject)=>{
-        fetchHTTPResponse(opts, ac).then((_res)=>{
-            meta.response = _res;
-            done = true;
-            return _res.json();
-        }).then((json)=>{
-            meta.responseJSON = json;
-            resolve({
-                json: json,
-                meta
-            });
-        }).catch((err)=>{
-            done = true;
-            reject(TRPCClientError.TRPCClientError.from(err, {
-                meta
-            }));
-        });
-    });
-    const cancel = ()=>{
-        if (!done) {
-            ac?.abort();
-        }
-    };
+    const res = await fetchHTTPResponse(opts);
+    meta.response = res;
+    const json = await res.json();
+    meta.responseJSON = json;
     return {
-        promise,
-        cancel
+        json: json,
+        meta
     };
 }
+/**
+ * Merges multiple abort signals into a single one
+ * - When all signals have been aborted, the merged signal will be aborted
+ */ function mergeAbortSignals(opts) {
+    const ac = new AbortController();
+    if (opts.some((o)=>!o.signal)) {
+        return ac;
+    }
+    const count = opts.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const o of opts){
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const signal = o.signal;
+        if (signal.aborted) {
+            onAbort();
+        } else {
+            signal.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac;
+}
 
 exports.fetchHTTPResponse = fetchHTTPResponse;
 exports.getBody = getBody;
@@ -134,4 +139,5 @@ exports.getInput = getInput;
 exports.getUrl = getUrl;
 exports.httpRequest = httpRequest;
 exports.jsonHttpRequester = jsonHttpRequester;
+exports.mergeAbortSignals = mergeAbortSignals;
 exports.resolveHTTPLinkOptions = resolveHTTPLinkOptions;

package/dist/links/internals/httpUtils.mjs

@@ -1,13 +1,10 @@
 import { getFetch } from '../../getFetch.mjs';
-import { getAbortController } from '../../internals/getAbortController.mjs';
-import { TRPCClientError } from '../../TRPCClientError.mjs';
 import { getTransformer } from '../../internals/transformer.mjs';
 
 function resolveHTTPLinkOptions(opts) {
     return {
         url: opts.url.toString(),
         fetch: opts.fetch,
-        AbortController: getAbortController(opts.AbortController),
         transformer: getTransformer(opts.transformer),
         methodOverride: opts.methodOverride
     };
@@ -66,7 +63,8 @@ const jsonHttpRequester = (opts)=>{
         getBody
     });
 };
-async function fetchHTTPResponse(opts, ac) {
+async function fetchHTTPResponse(opts) {
+    opts.signal?.throwIfAborted();
     const url = opts.getUrl(opts);
     const body = opts.getBody(opts);
     const { type  } = opts;
@@ -88,42 +86,49 @@ async function fetchHTTPResponse(opts, ac) {
     };
     return getFetch(opts.fetch)(url, {
         method: opts.methodOverride ?? METHOD[type],
-        signal: ac?.signal,
+        signal: opts.signal,
         body,
         headers
     });
 }
-function httpRequest(opts) {
-    const ac = opts.AbortController ? new opts.AbortController() : null;
+async function httpRequest(opts) {
     const meta = {};
-    let done = false;
-    const promise = new Promise((resolve, reject)=>{
-        fetchHTTPResponse(opts, ac).then((_res)=>{
-            meta.response = _res;
-            done = true;
-            return _res.json();
-        }).then((json)=>{
-            meta.responseJSON = json;
-            resolve({
-                json: json,
-                meta
-            });
-        }).catch((err)=>{
-            done = true;
-            reject(TRPCClientError.from(err, {
-                meta
-            }));
-        });
-    });
-    const cancel = ()=>{
-        if (!done) {
-            ac?.abort();
-        }
-    };
+    const res = await fetchHTTPResponse(opts);
+    meta.response = res;
+    const json = await res.json();
+    meta.responseJSON = json;
     return {
-        promise,
-        cancel
+        json: json,
+        meta
     };
 }
+/**
+ * Merges multiple abort signals into a single one
+ * - When all signals have been aborted, the merged signal will be aborted
+ */ function mergeAbortSignals(opts) {
+    const ac = new AbortController();
+    if (opts.some((o)=>!o.signal)) {
+        return ac;
+    }
+    const count = opts.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const o of opts){
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const signal = o.signal;
+        if (signal.aborted) {
+            onAbort();
+        } else {
+            signal.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac;
+}
 
-export { fetchHTTPResponse, getBody, getInput, getUrl, httpRequest, jsonHttpRequester, resolveHTTPLinkOptions };
+export { fetchHTTPResponse, getBody, getInput, getUrl, httpRequest, jsonHttpRequester, mergeAbortSignals, resolveHTTPLinkOptions };

package/dist/links/types.d.ts

@@ -1,19 +1,8 @@
 import type { Observable, Observer } from '@trpc/server/observable';
-import type { InferrableClientTypes, TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/unstable-core-do-not-import';
+import type { InferrableClientTypes, Maybe, TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/unstable-core-do-not-import';
 import type { ResponseEsque } from '../internals/types';
 import type { TRPCClientError } from '../TRPCClientError';
 export { isNonJsonSerializable, isFormData, isOctetType, } from './internals/contentTypes';
-/**
- * @internal
- */
-export type CancelFn = () => void;
-/**
- * @internal
- */
-export type PromiseAndCancel<TValue> = {
-    promise: Promise<TValue>;
-    cancel: CancelFn;
-};
 /**
  * @internal
  */
@@ -28,6 +17,7 @@ export type Operation<TInput = unknown> = {
     input: TInput;
     path: string;
     context: OperationContext;
+    signal: Maybe<AbortSignal>;
 };
 interface HeadersInitEsque {
     [Symbol.iterator](): IterableIterator<[string, string]>;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/links/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC;AAElC;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,MAAM,IAAI;IACrC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAAG;AAEpE;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,MAAM,GAAG,OAAO,IAAI;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,UAAU,gBAAgB;IACxB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACzD;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,gBAAgB,GAChB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,iBAAiB;CAEjC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB,CAAC,OAAO;IAC9C,MAAM,EACF,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GACpC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,WAAW,SAAS,qBAAqB,EACzC,OAAO,IACL,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,uBAAuB,CACjC,WAAW,SAAS,qBAAqB,EACzC,OAAO,IACL,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAE7E;;GAEG;AACH,MAAM,MAAM,aAAa,CACvB,WAAW,SAAS,qBAAqB,EACzC,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,IACf,CAAC,IAAI,EAAE;IACT,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,CACJ,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,KAClB,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CACtD,KAAK,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,WAAW,SAAS,qBAAqB,IAAI,CAChE,IAAI,EAAE,iBAAiB,KACpB,aAAa,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/links/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,KAAK,EACV,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAAG;AAEpE;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,MAAM,GAAG,OAAO,IAAI;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,gBAAgB,CAAC;IAC1B,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;CAC5B,CAAC;AAEF,UAAU,gBAAgB;IACxB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACzD;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,gBAAgB,GAChB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,iBAAiB;CAEjC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB,CAAC,OAAO;IAC9C,MAAM,EACF,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GACpC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,WAAW,SAAS,qBAAqB,EACzC,OAAO,IACL,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,uBAAuB,CACjC,WAAW,SAAS,qBAAqB,EACzC,OAAO,IACL,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAE7E;;GAEG;AACH,MAAM,MAAM,aAAa,CACvB,WAAW,SAAS,qBAAqB,EACzC,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,IACf,CAAC,IAAI,EAAE;IACT,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,CACJ,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,KAClB,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CACtD,KAAK,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,WAAW,SAAS,qBAAqB,IAAI,CAChE,IAAI,EAAE,iBAAiB,KACpB,aAAa,CAAC,WAAW,CAAC,CAAC"}

package/dist/links/wsLink.js

@@ -322,7 +322,8 @@ class TRPCWebSocketClosedError extends Error {
                     path,
                     input,
                     id,
-                    context
+                    context,
+                    signal: null
                 }, {
                     error (err) {
                         observer.error(err);

package/dist/links/wsLink.mjs

@@ -320,7 +320,8 @@ class TRPCWebSocketClosedError extends Error {
                     path,
                     input,
                     id,
-                    context
+                    context,
+                    signal: null
                 }, {
                     error (err) {
                         observer.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.449+42acce6ac",
+  "version": "11.0.0-rc.455+244538dd3",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.449+42acce6ac"
+    "@trpc/server": "11.0.0-rc.455+244538dd3"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.449+42acce6ac",
+    "@trpc/server": "11.0.0-rc.455+244538dd3",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "42acce6ac165dd489ebc11721e1c4dd15f4d8b7a"
+  "gitHead": "244538dd3d42c0df05c7a491def21562e3cce253"
 }

package/src/TRPCClientError.ts

@@ -5,7 +5,6 @@ import type {
   TRPCErrorResponse,
 } from '@trpc/server/unstable-core-do-not-import';
 import {
-  getCauseFromUnknown,
   isObject,
   type DefaultErrorShape,
 } from '@trpc/server/unstable-core-do-not-import';
@@ -40,6 +39,16 @@ function isTRPCErrorResponse(obj: unknown): obj is TRPCErrorResponse<any> {
   );
 }
 
+function getMessageFromUnknownError(err: unknown, fallback: string): string {
+  if (typeof err === 'string') {
+    return err;
+  }
+  if (isObject(err) && typeof err['message'] === 'string') {
+    return err['message'];
+  }
+  return fallback;
+}
+
 export class TRPCClientError<TRouterOrProcedure extends InferrableClientTypes>
   extends Error
   implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>
@@ -102,16 +111,12 @@ export class TRPCClientError<TRouterOrProcedure extends InferrableClientTypes>
         result: cause,
       });
     }
-    if (!(cause instanceof Error)) {
-      return new TRPCClientError('Unknown error', {
+    return new TRPCClientError(
+      getMessageFromUnknownError(cause, 'Unknown error'),
+      {
         ...opts,
         cause: cause as any,
-      });
-    }
-
-    return new TRPCClientError(cause.message, {
-      ...opts,
-      cause: getCauseFromUnknown(cause),
-    });
+      },
+    );
   }
 }

package/src/internals/TRPCUntypedClient.ts

@@ -6,6 +6,7 @@ import { observableToPromise, share } from '@trpc/server/observable';
 import type {
   AnyRouter,
   InferrableClientTypes,
+  Maybe,
   TypeError,
 } from '@trpc/server/unstable-core-do-not-import';
 import { createChain } from '../links/internals/createChain';
@@ -65,53 +66,41 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
     this.links = opts.links.map((link) => link(this.runtime));
   }
 
-  private $request<TInput = unknown, TOutput = unknown>({
-    type,
-    input,
-    path,
-    context = {},
-  }: {
+  private $request<TInput = unknown, TOutput = unknown>(opts: {
     type: TRPCType;
     input: TInput;
     path: string;
     context?: OperationContext;
+    signal: Maybe<AbortSignal>;
   }) {
     const chain$ = createChain<AnyRouter, TInput, TOutput>({
       links: this.links as OperationLink<any, any, any>[],
       op: {
+        ...opts,
+        context: opts.context ?? {},
         id: ++this.requestId,
-        type,
-        path,
-        input,
-        context,
       },
     });
     return chain$.pipe(share());
   }
-  private requestAsPromise<TInput = unknown, TOutput = unknown>(opts: {
+
+  private async requestAsPromise<TInput = unknown, TOutput = unknown>(opts: {
     type: TRPCType;
     input: TInput;
     path: string;
     context?: OperationContext;
-    signal?: AbortSignal;
+    signal: Maybe<AbortSignal>;
   }): Promise<TOutput> {
-    const req$ = this.$request<TInput, TOutput>(opts);
-    type TValue = inferObservableValue<typeof req$>;
-    const { promise, abort } = observableToPromise<TValue>(req$);
-
-    const abortablePromise = new Promise<TOutput>((resolve, reject) => {
-      opts.signal?.addEventListener('abort', abort);
-
-      promise
-        .then((envelope) => {
-          resolve((envelope.result as any).data);
-        })
-        .catch((err) => {
-          reject(TRPCClientError.from(err));
-        });
-    });
+    try {
+      const req$ = this.$request<TInput, TOutput>(opts);
+      type TValue = inferObservableValue<typeof req$>;
 
-    return abortablePromise;
+      const envelope = await observableToPromise<TValue>(req$);
+      const data = (envelope.result as any).data;
+      return data;
+    } catch (err) {
+      throw TRPCClientError.from(err as Error);
+    }
   }
   public query(path: string, input?: unknown, opts?: TRPCRequestOptions) {
     return this.requestAsPromise<unknown, unknown>({
@@ -144,6 +133,7 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
       path,
       input,
       context: opts?.context,
+      signal: null,
     });
     return observable$.subscribe({
       next(envelope) {

package/src/internals/dataLoader.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import type { CancelFn, PromiseAndCancel } from '../links/types';
 
 type BatchItem<TKey, TValue> = {
   aborted: boolean;
@@ -10,14 +9,10 @@ type BatchItem<TKey, TValue> = {
 };
 type Batch<TKey, TValue> = {
   items: BatchItem<TKey, TValue>[];
-  cancel: CancelFn;
 };
 export type BatchLoader<TKey, TValue> = {
   validate: (keys: TKey[]) => boolean;
-  fetch: (keys: TKey[]) => {
-    promise: Promise<TValue[] | Promise<TValue>[]>;
-    cancel: CancelFn;
-  };
+  fetch: (keys: TKey[]) => Promise<TValue[] | Promise<TValue>[]>;
 };
 
 /**
@@ -99,15 +94,11 @@ export function dataLoader<TKey, TValue>(
       }
       const batch: Batch<TKey, TValue> = {
         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;
+      const promise = batchLoader.fetch(batch.items.map((_item) => _item.key));
 
       promise
         .then(async (result) => {
@@ -141,7 +132,7 @@ export function dataLoader<TKey, TValue>(
         });
     }
   }
-  function load(key: TKey): PromiseAndCancel<TValue> {
+  function load(key: TKey): Promise<TValue> {
     const item: BatchItem<TKey, TValue> = {
       aborted: false,
       key,
@@ -163,17 +154,8 @@ export function dataLoader<TKey, TValue>(
     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 };
+    return promise;
   }
 
   return {

package/src/internals/types.ts

@@ -1,21 +1,3 @@
-export type AbortControllerEsque = new () => AbortControllerInstanceEsque;
-
-/**
- * Allows you to abort one or more requests.
- */
-export interface AbortControllerInstanceEsque {
-  /**
-   * The AbortSignal object associated with this object.
-   */
-  readonly signal: AbortSignal;
-
-  /**
-   * Sets this object's AbortSignal's aborted flag and signals to
-   * any observers that the associated activity is to be aborted.
-   */
-  abort(): void;
-}
-
 /**
  * A subset of the standard fetch function type needed by tRPC internally.
  * @see fetch from lib.dom.d.ts

package/src/links/httpBatchLink.ts

@@ -10,6 +10,7 @@ import type { HTTPResult } from './internals/httpUtils';
 import {
   getUrl,
   jsonHttpRequester,
+  mergeAbortSignals,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import type { Operation, TRPCLink } from './types';
@@ -41,15 +42,17 @@ export function httpBatchLink<TRouter extends AnyRouter>(
             type,
             path,
             inputs,
+            signal: null,
           });
 
           return url.length <= maxURLLength;
         },
-        fetch(batchOps) {
+        async fetch(batchOps) {
           const path = batchOps.map((op) => op.path).join(',');
           const inputs = batchOps.map((op) => op.input);
+          const ac = mergeAbortSignals(batchOps);
 
-          const requester = jsonHttpRequester({
+          const res = await jsonHttpRequester({
             ...resolvedOpts,
             path,
             inputs,
@@ -65,22 +68,16 @@ export function httpBatchLink<TRouter extends AnyRouter>(
               }
               return opts.headers;
             },
+            signal: ac.signal,
           });
-          return {
-            cancel: requester.cancel,
-            promise: requester.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;
-            }),
-          };
+          const resJSON = Array.isArray(res.json)
+            ? res.json
+            : batchOps.map(() => res.json);
+          const result = resJSON.map((item) => ({
+            meta: res.meta,
+            json: item,
+          }));
+          return result;
         },
       };
     };
@@ -98,7 +95,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(
           );
         }
         const loader = loaders[op.type];
-        const { promise, cancel } = loader.load(op);
+        const promise = loader.load(op);
 
         let _res = undefined as HTTPResult | undefined;
         promise
@@ -132,7 +129,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(
           });
 
         return () => {
-          cancel();
+          // noop
         };
       });
     };