@trpc/client 10.11.1 → 10.13.0

package/dist/getFetch.d.ts

@@ -1,3 +1,3 @@
 import { FetchEsque, NativeFetchEsque } from './internals/types';
-export declare function getFetch(f?: FetchEsque | NativeFetchEsque): FetchEsque;
+export declare function getFetch(customFetchImpl?: FetchEsque | NativeFetchEsque): FetchEsque;
 //# sourceMappingURL=getFetch.d.ts.map

package/dist/getFetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEjE,wBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,GAAG,gBAAgB,GAAG,UAAU,CAgBtE"}
+{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEjE,wBAAgB,QAAQ,CACtB,eAAe,CAAC,EAAE,UAAU,GAAG,gBAAgB,GAC9C,UAAU,CAiBZ"}

package/dist/{httpUtils-9322dc79.mjs → httpUtils-24d9ee59.mjs}

@@ -1,23 +1,27 @@
-function getWindow() {
-    if (typeof window !== 'undefined') {
-        return window;
+function getFetch(customFetchImpl) {
+    if (customFetchImpl) {
+        return customFetchImpl;
     }
-    return globalThis;
-}
-function getAbortController(ac) {
-    return ac ?? getWindow().AbortController ?? null;
+    if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+        return window.fetch.bind(window);
+    }
+    if (typeof globalThis !== 'undefined' && typeof globalThis.fetch === 'function') {
+        return globalThis.fetch.bind(globalThis);
+    }
+    throw new Error('No fetch implementation found');
 }
 
-function getFetch(f) {
-    if (f) {
-        return f;
+function getAbortController(customAbortControllerImpl) {
+    if (customAbortControllerImpl) {
+        return customAbortControllerImpl;
     }
-    const win = getWindow();
-    const globalFetch = win.fetch;
-    if (globalFetch) {
-        return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
+    if (typeof window !== 'undefined' && window.AbortController) {
+        return window.AbortController;
     }
-    throw new Error('No fetch implementation found');
+    if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
+        return globalThis.AbortController;
+    }
+    return null;
 }
 
 function resolveHTTPLinkOptions(opts) {
@@ -77,7 +81,7 @@ function httpRequest(opts) {
         const body = getBody(opts);
         const meta = {};
         Promise.resolve(opts.headers()).then((headers)=>{
-            /* istanbul ignore if  */ if (type === 'subscription') {
+            /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
                 throw new Error('Subscriptions should use wsLink');
             }
             return opts.fetch(url, {

package/dist/{httpUtils-30a43613.js → httpUtils-ce40966a.js}

@@ -1,25 +1,29 @@
 'use strict';
 
-function getWindow() {
-    if (typeof window !== 'undefined') {
-        return window;
+function getFetch(customFetchImpl) {
+    if (customFetchImpl) {
+        return customFetchImpl;
     }
-    return globalThis;
-}
-function getAbortController(ac) {
-    return ac ?? getWindow().AbortController ?? null;
+    if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+        return window.fetch.bind(window);
+    }
+    if (typeof globalThis !== 'undefined' && typeof globalThis.fetch === 'function') {
+        return globalThis.fetch.bind(globalThis);
+    }
+    throw new Error('No fetch implementation found');
 }
 
-function getFetch(f) {
-    if (f) {
-        return f;
+function getAbortController(customAbortControllerImpl) {
+    if (customAbortControllerImpl) {
+        return customAbortControllerImpl;
     }
-    const win = getWindow();
-    const globalFetch = win.fetch;
-    if (globalFetch) {
-        return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
+    if (typeof window !== 'undefined' && window.AbortController) {
+        return window.AbortController;
     }
-    throw new Error('No fetch implementation found');
+    if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
+        return globalThis.AbortController;
+    }
+    return null;
 }
 
 function resolveHTTPLinkOptions(opts) {
@@ -79,7 +83,7 @@ function httpRequest(opts) {
         const body = getBody(opts);
         const meta = {};
         Promise.resolve(opts.headers()).then((headers)=>{
-            /* istanbul ignore if  */ if (type === 'subscription') {
+            /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
                 throw new Error('Subscriptions should use wsLink');
             }
             return opts.fetch(url, {

package/dist/httpUtils-d348a3ca.js

@@ -0,0 +1,120 @@
+function getFetch(customFetchImpl) {
+    if (customFetchImpl) {
+        return customFetchImpl;
+    }
+    if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+        return window.fetch.bind(window);
+    }
+    if (typeof globalThis !== 'undefined' &&
+        typeof globalThis.fetch === 'function') {
+        return globalThis.fetch.bind(globalThis);
+    }
+    throw new Error('No fetch implementation found');
+}
+
+function getAbortController(customAbortControllerImpl) {
+    if (customAbortControllerImpl) {
+        return customAbortControllerImpl;
+    }
+    if (typeof window !== 'undefined' && window.AbortController) {
+        return window.AbortController;
+    }
+    if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
+        return globalThis.AbortController;
+    }
+    return null;
+}
+
+function resolveHTTPLinkOptions(opts) {
+    const headers = opts.headers || (() => ({}));
+    return {
+        url: opts.url,
+        fetch: getFetch(opts.fetch),
+        AbortController: getAbortController(opts.AbortController),
+        headers: typeof headers === 'function' ? headers : () => headers,
+    };
+}
+// https://github.com/trpc/trpc/pull/669
+function arrayToDict(array) {
+    const dict = {};
+    for (let index = 0; index < array.length; index++) {
+        const element = array[index];
+        dict[index] = element;
+    }
+    return dict;
+}
+const METHOD = {
+    query: 'GET',
+    mutation: 'POST',
+};
+function getInput(opts) {
+    return 'input' in opts
+        ? opts.runtime.transformer.serialize(opts.input)
+        : arrayToDict(opts.inputs.map((_input) => opts.runtime.transformer.serialize(_input)));
+}
+function getUrl(opts) {
+    let url = opts.url + '/' + opts.path;
+    const queryParts = [];
+    if ('inputs' in opts) {
+        queryParts.push('batch=1');
+    }
+    if (opts.type === 'query') {
+        const input = getInput(opts);
+        if (input !== undefined) {
+            queryParts.push(`input=${encodeURIComponent(JSON.stringify(input))}`);
+        }
+    }
+    if (queryParts.length) {
+        url += '?' + queryParts.join('&');
+    }
+    return url;
+}
+function getBody(opts) {
+    if (opts.type === 'query') {
+        return undefined;
+    }
+    const input = getInput(opts);
+    return input !== undefined ? JSON.stringify(input) : undefined;
+}
+function httpRequest(opts) {
+    const { type } = opts;
+    const ac = opts.AbortController ? new opts.AbortController() : null;
+    const promise = new Promise((resolve, reject) => {
+        const url = getUrl(opts);
+        const body = getBody(opts);
+        const meta = {};
+        Promise.resolve(opts.headers())
+            .then((headers) => {
+            /* istanbul ignore if -- @preserve */
+            if (type === 'subscription') {
+                throw new Error('Subscriptions should use wsLink');
+            }
+            return opts.fetch(url, {
+                method: METHOD[type],
+                signal: ac?.signal,
+                body: body,
+                headers: {
+                    'content-type': 'application/json',
+                    ...headers,
+                },
+            });
+        })
+            .then((_res) => {
+            meta.response = _res;
+            return _res.json();
+        })
+            .then((json) => {
+            resolve({
+                json: json,
+                meta,
+            });
+        })
+            .catch(reject);
+    });
+    const cancel = () => {
+        ac?.abort();
+    };
+    return { promise, cancel };
+}
+
+export { getUrl as a, getFetch as g, httpRequest as h, resolveHTTPLinkOptions as r };

package/dist/index.js

@@ -6,7 +6,7 @@ var observable = require('@trpc/server/observable');
 var transformResult = require('./transformResult-e7a1e69e.js');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var shared = require('@trpc/server/shared');
-var httpUtils = require('./httpUtils-30a43613.js');
+var httpUtils = require('./httpUtils-ce40966a.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');

package/dist/index.mjs

@@ -4,7 +4,7 @@ export { T as TRPCClientError } from './transformResult-6fb67924.mjs';
 import { c as createChain } from './splitLink-4c75f7be.mjs';
 export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
-export { g as getFetch } from './httpUtils-9322dc79.mjs';
+export { g as getFetch } from './httpUtils-24d9ee59.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';

package/dist/internals/getAbortController.d.ts

@@ -0,0 +1,4 @@
+import { Maybe } from '@trpc/server';
+import { AbortControllerEsque } from './types';
+export declare function getAbortController(customAbortControllerImpl: Maybe<AbortControllerEsque>): AbortControllerEsque | null;
+//# sourceMappingURL=getAbortController.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getAbortController.d.ts","sourceRoot":"","sources":["../../src/internals/getAbortController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,wBAAgB,kBAAkB,CAChC,yBAAyB,EAAE,KAAK,CAAC,oBAAoB,CAAC,GACrD,oBAAoB,GAAG,IAAI,CAc7B"}

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-e7a1e69e.js');
-var httpUtils = require('../httpUtils-30a43613.js');
+var httpUtils = require('../httpUtils-ce40966a.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-6fb67924.mjs';
-import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-9322dc79.mjs';
+import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-24d9ee59.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-e7a1e69e.js');
-var httpUtils = require('../httpUtils-30a43613.js');
+var httpUtils = require('../httpUtils-ce40966a.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-6fb67924.mjs';
-import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-9322dc79.mjs';
+import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-24d9ee59.mjs';
 
 function httpLink(opts) {
     const resolvedOpts = resolveHTTPLinkOptions(opts);

package/dist/links/wsLink.d.ts

@@ -7,7 +7,7 @@ import { Operation, TRPCLink } from './types';
 declare type WSCallbackResult<TRouter extends AnyRouter, TOutput> = TRPCResponseMessage<TOutput, inferRouterError<TRouter>>;
 declare type WSCallbackObserver<TRouter extends AnyRouter, TOutput> = Observer<WSCallbackResult<TRouter, TOutput>, TRPCClientError<TRouter>>;
 export interface WebSocketClientOptions {
-    url: string;
+    url: string | (() => string);
     WebSocket?: typeof WebSocket;
     retryDelayMs?: typeof retryDelay;
     onOpen?: () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAKL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE9C,aAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,aAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBA+MpC,SAAS,wDAA0B,aAAa;;EAoDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4DnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAKL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE9C,aAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,aAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAgNpC,SAAS,wDAA0B,aAAa;;EAoDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4DnB"}

package/dist/links/wsLink.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-e7a1e69e.js');
 
-/* istanbul ignore next */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
+/* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 
 function createWSClient(opts) {
     const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose  } = opts;
-    /* istanbul ignore next */ if (!WebSocketImpl) {
+    /* istanbul ignore next -- @preserve */ if (!WebSocketImpl) {
         throw new Error("No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill");
     }
     /**
@@ -74,11 +74,12 @@ function createWSClient(opts) {
         request(req.op, req.callbacks);
     }
     function createWS() {
-        const conn = new WebSocketImpl(url);
+        const urlString = typeof url === 'function' ? url() : url;
+        const conn = new WebSocketImpl(urlString);
         clearTimeout(connectTimer);
         connectTimer = null;
         conn.addEventListener('open', ()=>{
-            /* istanbul ignore next */ if (conn !== activeConnection) {
+            /* istanbul ignore next -- @preserve */ if (conn !== activeConnection) {
                 return;
             }
             connectAttempt = 0;

package/dist/links/wsLink.mjs

@@ -1,11 +1,11 @@
 import { observable } from '@trpc/server/observable';
 import { T as TRPCClientError, t as transformResult } from '../transformResult-6fb67924.mjs';
 
-/* istanbul ignore next */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
+/* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 
 function createWSClient(opts) {
     const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose  } = opts;
-    /* istanbul ignore next */ if (!WebSocketImpl) {
+    /* istanbul ignore next -- @preserve */ if (!WebSocketImpl) {
         throw new Error("No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill");
     }
     /**
@@ -70,11 +70,12 @@ function createWSClient(opts) {
         request(req.op, req.callbacks);
     }
     function createWS() {
-        const conn = new WebSocketImpl(url);
+        const urlString = typeof url === 'function' ? url() : url;
+        const conn = new WebSocketImpl(urlString);
         clearTimeout(connectTimer);
         connectTimer = null;
         conn.addEventListener('open', ()=>{
-            /* istanbul ignore next */ if (conn !== activeConnection) {
+            /* istanbul ignore next -- @preserve */ if (conn !== activeConnection) {
                 return;
             }
             connectAttempt = 0;

package/dist/splitLink-aebd28df.js

@@ -0,0 +1,41 @@
+import { observable } from '@trpc/server/observable';
+
+/** @internal */
+function createChain(opts) {
+    return observable((observer) => {
+        function execute(index = 0, op = opts.op) {
+            const next = opts.links[index];
+            if (!next) {
+                throw new Error('No more links to execute - did you forget to add an ending link?');
+            }
+            const subscription = next({
+                op,
+                next(nextOp) {
+                    const nextObserver = execute(index + 1, nextOp);
+                    return nextObserver;
+                },
+            });
+            return subscription;
+        }
+        const obs$ = execute();
+        return obs$.subscribe(observer);
+    });
+}
+
+function asArray(value) {
+    return Array.isArray(value) ? value : [value];
+}
+function splitLink(opts) {
+    return (runtime) => {
+        const yes = asArray(opts.true).map((link) => link(runtime));
+        const no = asArray(opts.false).map((link) => link(runtime));
+        return (props) => {
+            return observable((observer) => {
+                const links = opts.condition(props.op) ? yes : no;
+                return createChain({ op: props.op, links }).subscribe(observer);
+            });
+        };
+    };
+}
+
+export { createChain as c, splitLink as s };

package/dist/transformResult-4e205a12.js

@@ -0,0 +1,86 @@
+class TRPCClientError extends Error {
+    constructor(message, opts) {
+        const cause = opts?.cause;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, { cause });
+        this.meta = opts?.meta;
+        this.cause = cause;
+        this.shape = opts?.result?.error;
+        this.data = opts?.result?.error.data;
+        this.name = 'TRPCClientError';
+        Object.setPrototypeOf(this, TRPCClientError.prototype);
+    }
+    static from(cause, opts = {}) {
+        if (!(cause instanceof Error)) {
+            return new TRPCClientError(cause.error.message ?? '', {
+                ...opts,
+                cause: undefined,
+                result: cause,
+            });
+        }
+        if (cause.name === 'TRPCClientError') {
+            return cause;
+        }
+        return new TRPCClientError(cause.message, {
+            ...opts,
+            cause,
+            result: null,
+        });
+    }
+}
+
+// FIXME:
+// - the generics here are probably unnecessary
+// - the RPC-spec could probably be simplified to combine HTTP + WS
+/** @internal */
+function transformResultInner(response, runtime) {
+    if ('error' in response) {
+        const error = runtime.transformer.deserialize(response.error);
+        return {
+            ok: false,
+            error: {
+                ...response,
+                error,
+            },
+        };
+    }
+    const result = {
+        ...response.result,
+        ...((!response.result.type || response.result.type === 'data') && {
+            type: 'data',
+            data: runtime.transformer.deserialize(response.result.data),
+        }),
+    };
+    return { ok: true, result };
+}
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+/**
+ * Transforms and validates that the result is a valid TRPCResponse
+ * @internal
+ */
+function transformResult(response, runtime) {
+    let result;
+    try {
+        // Use the data transformers on the JSON-response
+        result = transformResultInner(response, runtime);
+    }
+    catch (err) {
+        throw new TRPCClientError('Unable to transform response from server');
+    }
+    // check that output of the transformers is a valid TRPCResponse
+    if (!result.ok &&
+        (!isObject(result.error.error) ||
+            typeof result.error.error.code !== 'number')) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    if (result.ok && !isObject(result.result)) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    return result;
+}
+
+export { TRPCClientError as T, transformResult as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.11.1",
+  "version": "10.13.0",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -69,22 +69,24 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.11.1"
+    "@trpc/server": "10.13.0"
   },
   "devDependencies": {
-    "@testing-library/dom": "^8.18.1",
-    "@trpc/server": "10.11.1",
+    "@testing-library/dom": "^9.0.0",
+    "@trpc/server": "10.13.0",
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/node": "^18.7.20",
     "eslint": "^8.30.0",
     "expect-type": "^0.15.0",
     "isomorphic-fetch": "^3.0.0",
+    "node-fetch": "^3.3.0",
     "rollup": "^2.79.1",
     "tsx": "^3.9.0",
-    "undici": "^5.14.0"
+    "undici": "^5.14.0",
+    "vitest": "^0.28.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cece9537d172ee576034cd04d49c417d3954d03c"
+  "gitHead": "1214c2d1d239c6864a32c7df24651899551be8f8"
 }

package/src/getFetch.ts

@@ -1,19 +1,21 @@
-import { getWindow } from './internals/fetchHelpers';
 import { FetchEsque, NativeFetchEsque } from './internals/types';
 
-export function getFetch(f?: FetchEsque | NativeFetchEsque): FetchEsque {
-  if (f) {
-    return f as FetchEsque;
+export function getFetch(
+  customFetchImpl?: FetchEsque | NativeFetchEsque,
+): FetchEsque {
+  if (customFetchImpl) {
+    return customFetchImpl as FetchEsque;
   }
 
-  const win = getWindow();
-  const globalFetch = win.fetch;
-  if (globalFetch) {
-    return (
-      typeof globalFetch.bind === 'function'
-        ? globalFetch.bind(win)
-        : globalFetch
-    ) as FetchEsque;
+  if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+    return window.fetch.bind(window) as FetchEsque;
+  }
+
+  if (
+    typeof globalThis !== 'undefined' &&
+    typeof globalThis.fetch === 'function'
+  ) {
+    return globalThis.fetch.bind(globalThis) as FetchEsque;
   }
 
   throw new Error('No fetch implementation found');

package/src/internals/getAbortController.ts

@@ -0,0 +1,20 @@
+import { Maybe } from '@trpc/server';
+import { AbortControllerEsque } from './types';
+
+export function getAbortController(
+  customAbortControllerImpl: Maybe<AbortControllerEsque>,
+): AbortControllerEsque | null {
+  if (customAbortControllerImpl) {
+    return customAbortControllerImpl;
+  }
+
+  if (typeof window !== 'undefined' && window.AbortController) {
+    return window.AbortController;
+  }
+
+  if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
+    return globalThis.AbortController;
+  }
+
+  return null;
+}

package/src/internals/retryDelay.ts

@@ -1,3 +1,3 @@
-/* istanbul ignore next */
+/* istanbul ignore next -- @preserve */
 export const retryDelay = (attemptIndex: number) =>
   attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);

package/src/internals/types.test.ts

@@ -5,7 +5,7 @@ import type { fetch as undiciFetch } from 'undici';
 import { createTRPCProxyClient } from '../createTRPCClientProxy';
 import { getFetch } from '../getFetch';
 import { httpBatchLink } from '../links/httpBatchLink';
-import { getAbortController } from './fetchHelpers';
+import { getAbortController } from './getAbortController';
 import {
   AbortControllerEsque,
   AbortControllerInstanceEsque,
@@ -57,7 +57,7 @@ describe('fetch', () => {
 
   test('NativeFetchEsque', () => {
     getFetch(isomorphicFetch);
-    getFetch(nodeFetch);
+    getFetch(nodeFetch as any);
 
     // Passing in undiciFetch directly in Node v18.7.0 gives:
     // ReferenceError: TextEncoder is not defined

package/src/links/dedupeLink.test.ts

@@ -6,8 +6,8 @@ import { dedupeLink } from './dedupeLink';
 import { createChain } from './internals/createChain';
 
 test('dedupeLink', async () => {
-  const endingLinkTriggered = jest.fn();
-  const timerTriggered = jest.fn();
+  const endingLinkTriggered = vi.fn();
+  const timerTriggered = vi.fn();
   const links: OperationLink<AnyRouter, any, any>[] = [
     // "dedupe link"
     dedupeLink()(null as any),
@@ -52,7 +52,7 @@ test('dedupeLink', async () => {
         context: {},
       },
     });
-    const next = jest.fn();
+    const next = vi.fn();
     call1.subscribe({ next });
     call2.subscribe({ next });
 
@@ -66,8 +66,8 @@ test('dedupeLink', async () => {
 });
 
 test('dedupe - cancel one does not cancel the other', async () => {
-  const endingLinkTriggered = jest.fn();
-  const timerTriggered = jest.fn();
+  const endingLinkTriggered = vi.fn();
+  const timerTriggered = vi.fn();
   const links: OperationLink<AnyRouter, any, any>[] = [
     // "dedupe link"
     dedupeLink()(null as any),
@@ -113,7 +113,7 @@ test('dedupe - cancel one does not cancel the other', async () => {
         context: {},
       },
     });
-    const next = jest.fn();
+    const next = vi.fn();
     const call1$ = call1.subscribe({ next });
     call2.subscribe({ next });
     call1$.unsubscribe();

package/src/links/dedupeLink.ts

@@ -1,4 +1,4 @@
-/* istanbul ignore file */
+/* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
 import { Observable, observable, share } from '@trpc/server/observable';

package/src/links/internals/createChain.test.ts

@@ -38,7 +38,7 @@ describe('chain', () => {
       },
     });
 
-    const next = jest.fn();
+    const next = vi.fn();
 
     result$.subscribe({ next });
     // console.log(next.mock.calls);
@@ -85,7 +85,7 @@ describe('chain', () => {
       },
     });
 
-    const next = jest.fn();
+    const next = vi.fn();
 
     result$.subscribe({ next });
 

package/src/links/internals/httpUtils.ts

@@ -1,7 +1,7 @@
 import { ProcedureType } from '@trpc/server';
 import { TRPCResponse } from '@trpc/server/rpc';
 import { getFetch } from '../../getFetch';
-import { getAbortController } from '../../internals/fetchHelpers';
+import { getAbortController } from '../../internals/getAbortController';
 import {
   AbortControllerEsque,
   FetchEsque,
@@ -130,7 +130,7 @@ export function httpRequest(
     const meta = {} as HTTPResult['meta'];
     Promise.resolve(opts.headers())
       .then((headers) => {
-        /* istanbul ignore if  */
+        /* istanbul ignore if -- @preserve */
         if (type === 'subscription') {
           throw new Error('Subscriptions should use wsLink');
         }

package/src/links/retryLink.ts

@@ -1,4 +1,4 @@
-/* istanbul ignore file */
+/* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
 import { Unsubscribable, observable } from '@trpc/server/observable';
@@ -21,7 +21,7 @@ export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {
           next$?.unsubscribe();
           next$ = next(op).subscribe({
             error(error) {
-              /* istanbul ignore if  */
+              /* istanbul ignore if -- @preserve */
               if (attempts >= opts.attempts) {
                 observer.error(error);
                 return;

package/src/links/splitLink.test.ts

@@ -5,12 +5,12 @@ import { AnyRouter } from '../../../server/src';
 import { createChain } from '../links/internals/createChain';
 
 test('splitLink', () => {
-  const wsLinkSpy = jest.fn();
+  const wsLinkSpy = vi.fn();
   const wsLink: TRPCLink<any> = () => () =>
     observable(() => {
       wsLinkSpy();
     });
-  const httpLinkSpy = jest.fn();
+  const httpLinkSpy = vi.fn();
   const httpLink: TRPCLink<any> = () => () =>
     observable(() => {
       httpLinkSpy();
@@ -38,7 +38,7 @@ test('splitLink', () => {
   }).subscribe({});
   expect(httpLinkSpy).toHaveBeenCalledTimes(1);
   expect(wsLinkSpy).toHaveBeenCalledTimes(0);
-  jest.resetAllMocks();
+  vi.resetAllMocks();
 
   createChain({
     links,

package/src/links/wsLink.ts

@@ -23,7 +23,7 @@ type WSCallbackObserver<TRouter extends AnyRouter, TOutput> = Observer<
 >;
 
 export interface WebSocketClientOptions {
-  url: string;
+  url: string | (() => string);
   WebSocket?: typeof WebSocket;
   retryDelayMs?: typeof retryDelay;
   onOpen?: () => void;
@@ -38,7 +38,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
     onOpen,
     onClose,
   } = opts;
-  /* istanbul ignore next */
+  /* istanbul ignore next -- @preserve */
   if (!WebSocketImpl) {
     throw new Error(
       "No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill",
@@ -128,12 +128,13 @@ export function createWSClient(opts: WebSocketClientOptions) {
   }
 
   function createWS() {
-    const conn = new WebSocketImpl(url);
+    const urlString = typeof url === 'function' ? url() : url;
+    const conn = new WebSocketImpl(urlString);
     clearTimeout(connectTimer as any);
     connectTimer = null;
 
     conn.addEventListener('open', () => {
-      /* istanbul ignore next */
+      /* istanbul ignore next -- @preserve */
       if (conn !== activeConnection) {
         return;
       }

package/dist/internals/fetchHelpers.d.ts

@@ -1,5 +0,0 @@
-import { Maybe } from '@trpc/server';
-import { AbortControllerEsque } from './types';
-export declare function getWindow(): typeof globalThis;
-export declare function getAbortController(ac: Maybe<AbortControllerEsque>): AbortControllerEsque | null;
-//# sourceMappingURL=fetchHelpers.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,KAAK,CAAC,oBAAoB,CAAC,GAC9B,oBAAoB,GAAG,IAAI,CAE7B"}

package/src/internals/fetchHelpers.ts

@@ -1,14 +0,0 @@
-import { Maybe } from '@trpc/server';
-import { AbortControllerEsque } from './types';
-
-export function getWindow() {
-  if (typeof window !== 'undefined') {
-    return window;
-  }
-  return globalThis;
-}
-export function getAbortController(
-  ac: Maybe<AbortControllerEsque>,
-): AbortControllerEsque | null {
-  return ac ?? getWindow().AbortController ?? null;
-}