@trpc/client 10.27.3 → 10.28.1

package/dist/{transformResult-fc4863b8.js → transformResult-ae8e970c.js}

@@ -1,87 +1,87 @@
-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,
-        });
-    }
+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,
+        });
+    }
 }
 
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
 }
 
-// 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 };
-}
-/**
- * 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;
+// 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 };
+}
+/**
+ * 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.27.3",
+  "version": "10.28.1",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -72,18 +72,19 @@
     "README.md",
     "package.json",
     "links",
-    "shared"
+    "shared",
+    "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.27.3"
+    "@trpc/server": "10.28.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.27.3",
+    "@trpc/server": "10.28.1",
     "@types/isomorphic-fetch": "^0.0.36",
-    "@types/node": "^18.7.20",
+    "@types/node": "^18.16.16",
     "eslint": "^8.40.0",
-    "expect-type": "^0.15.0",
+    "expect-type": "^0.16.0",
     "isomorphic-fetch": "^3.0.0",
     "node-fetch": "^3.3.0",
     "rollup": "^2.79.1",
@@ -94,5 +95,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a7bca8888003f0a2f3e8b966e44442bb576bfff2"
+  "funding": [
+    "https://trpc.io/sponsor"
+  ],
+  "gitHead": "ea70b1c33899b66f964a7d11f5a8710148f03f8e"
 }

package/src/internals/types.ts

@@ -43,33 +43,6 @@ export interface NodeFetchRequestInitEsque {
   body?: string;
 }
 
-/**
- * A subset of the standard Headers properties needed by tRPC internally.
- * @see Headers from lib.dom.d.ts
- * @remarks
- * If you need a property that you know exists but doesn't exist on this
- * interface, go ahead and add it.
- */
-export interface HeadersEsque {
-  append(name: string, value: string): void;
-  delete(name: string): void;
-  get(name: string): string | null;
-  has(name: string): boolean;
-  set(name: string, value: string): void;
-  forEach(
-    callbackfn: (value: string, key: string) => void,
-    thisArg?: any,
-  ): void;
-}
-
-export type ResponseType =
-  | 'basic'
-  | 'cors'
-  | 'default'
-  | 'error'
-  | 'opaque'
-  | 'opaqueredirect';
-
 /**
  * A subset of the standard RequestInit properties needed by tRPC internally.
  * @see RequestInit from lib.dom.d.ts
@@ -102,20 +75,8 @@ export interface RequestInitEsque {
 /**
  * A subset of the standard Response properties needed by tRPC internally.
  * @see Response from lib.dom.d.ts
- * @remarks
- * If you need a property that you know exists but doesn't exist on this
- * interface, go ahead and add it.
  */
 export interface ResponseEsque {
-  readonly headers: HeadersEsque;
-  readonly ok: boolean;
-  readonly redirected: boolean;
-  readonly status: number;
-  readonly statusText: string;
-  readonly type: ResponseType;
-  readonly url: string;
-  clone(): ResponseEsque;
-
   /**
    * @remarks
    * The built-in Response::json() method returns Promise<any>, but

package/src/links/wsLink.ts

@@ -120,6 +120,14 @@ export function createWSClient(opts: WebSocketClientOptions) {
     }
   }
 
+  function closeActiveSubscriptions() {
+    Object.values(pendingRequests).forEach((req) => {
+      if (req.type === 'subscription') {
+        req.callbacks.complete();
+      }
+    });
+  }
+
   function resumeSubscriptionOnReconnect(req: TRequest) {
     if (outgoing.some((r) => r.id === req.op.id)) {
       return;
@@ -281,6 +289,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
     close: () => {
       state = 'closed';
       onClose?.();
+      closeActiveSubscriptions();
       closeIfNoPending(activeConnection);
       clearTimeout(connectTimer as any);
       connectTimer = null;
@@ -304,14 +313,6 @@ class TRPCWebSocketClosedError extends Error {
   }
 }
 
-class TRPCSubscriptionEndedError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = 'TRPCSubscriptionEndedError';
-    Object.setPrototypeOf(this, TRPCSubscriptionEndedError.prototype);
-  }
-}
-
 export function wsLink<TRouter extends AnyRouter>(
   opts: WebSocketLinkOptions,
 ): TRPCLink<TRouter> {
@@ -323,28 +324,15 @@ export function wsLink<TRouter extends AnyRouter>(
 
         const input = runtime.transformer.serialize(op.input);
 
-        let isDone = false;
         const unsub = client.request(
           { type, path, input, id, context },
           {
             error(err) {
-              isDone = true;
               observer.error(err as TRPCClientError<any>);
               unsub();
             },
             complete() {
-              if (!isDone) {
-                isDone = true;
-                observer.error(
-                  TRPCClientError.from(
-                    new TRPCSubscriptionEndedError(
-                      'Operation ended prematurely',
-                    ),
-                  ),
-                );
-              } else {
-                observer.complete();
-              }
+              observer.complete();
             },
             next(message) {
               const transformed = transformResult(message, runtime);
@@ -360,7 +348,6 @@ export function wsLink<TRouter extends AnyRouter>(
               if (op.type !== 'subscription') {
                 // if it isn't a subscription we don't care about next response
 
-                isDone = true;
                 unsub();
                 observer.complete();
               }
@@ -368,7 +355,6 @@ export function wsLink<TRouter extends AnyRouter>(
           },
         );
         return () => {
-          isDone = true;
           unsub();
         };
       });

package/src/internals/types.test.ts

@@ -1,66 +0,0 @@
-import isomorphicFetch from 'isomorphic-fetch';
-import nodeFetch from 'node-fetch';
-import type { fetch as undiciFetch } from 'undici';
-import { createTRPCProxyClient } from '../createTRPCClientProxy';
-import { getFetch } from '../getFetch';
-import { httpBatchLink } from '../links/httpBatchLink';
-import { getAbortController } from './getAbortController';
-import {
-  AbortControllerEsque,
-  AbortControllerInstanceEsque,
-  FetchEsque,
-  ResponseEsque,
-} from './types';
-
-describe('AbortController', () => {
-  test('AbortControllerEsque', () => {
-    expectTypeOf(
-      getAbortController,
-    ).returns.toEqualTypeOf<AbortControllerEsque | null>();
-
-    expectTypeOf(() => {
-      const AbortController = getAbortController(undefined)!;
-      return new AbortController();
-    }).returns.toEqualTypeOf<AbortControllerInstanceEsque>();
-  });
-});
-
-describe('fetch', () => {
-  test('parameters', () => {
-    createTRPCProxyClient({
-      links: [
-        httpBatchLink({
-          url: 'YOUR_SERVER_URL',
-          fetch(url, options) {
-            return fetch(url, options);
-          },
-        }),
-      ],
-    });
-  });
-
-  test('FetchEsque', () => {
-    expectTypeOf(getFetch).returns.toEqualTypeOf<FetchEsque>();
-
-    expectTypeOf(() =>
-      getFetch()('', {
-        body: '',
-        headers: Math.random() > 0.5 ? [['a', 'b']] : { a: 'b' },
-        method: 'GET',
-        signal: new AbortSignal(),
-      }),
-    ).returns.toEqualTypeOf<Promise<ResponseEsque>>();
-
-    getFetch({} as unknown as typeof fetch);
-  });
-
-  test('NativeFetchEsque', () => {
-    getFetch(isomorphicFetch);
-    getFetch(nodeFetch as any);
-
-    // Passing in undiciFetch directly in Node v18.7.0 gives:
-    // ReferenceError: TextEncoder is not defined
-    // 🤷
-    getFetch({} as unknown as typeof undiciFetch);
-  });
-});

package/src/links/dedupeLink.test.ts

@@ -1,128 +0,0 @@
-import { waitFor } from '@testing-library/dom';
-import { OperationLink } from '..';
-import { AnyRouter } from '../../../server/src';
-import { observable } from '../../../server/src/observable';
-import { dedupeLink } from './dedupeLink';
-import { createChain } from './internals/createChain';
-
-test('dedupeLink', async () => {
-  const endingLinkTriggered = vi.fn();
-  const timerTriggered = vi.fn();
-  const links: OperationLink<AnyRouter, any, any>[] = [
-    // "dedupe link"
-    dedupeLink()(null as any),
-    ({ op }) => {
-      return observable((subscribe) => {
-        endingLinkTriggered();
-        const timer = setTimeout(() => {
-          timerTriggered();
-          subscribe.next({
-            result: {
-              type: 'data',
-              data: {
-                input: op.input,
-              },
-            },
-          });
-          subscribe.complete();
-        }, 1);
-        return () => clearTimeout(timer);
-      });
-    },
-  ];
-  {
-    const call1 = createChain<AnyRouter, unknown, unknown>({
-      links,
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-
-    const call2 = createChain<AnyRouter, unknown, unknown>({
-      links,
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-    const next = vi.fn();
-    call1.subscribe({ next });
-    call2.subscribe({ next });
-
-    expect(endingLinkTriggered).toHaveBeenCalledTimes(1);
-    await waitFor(() => {
-      expect(timerTriggered).toHaveBeenCalledTimes(1);
-    });
-
-    expect(next).toHaveBeenCalledTimes(2);
-  }
-});
-
-test('dedupe - cancel one does not cancel the other', async () => {
-  const endingLinkTriggered = vi.fn();
-  const timerTriggered = vi.fn();
-  const links: OperationLink<AnyRouter, any, any>[] = [
-    // "dedupe link"
-    dedupeLink()(null as any),
-    ({ op }) => {
-      return observable((subscribe) => {
-        endingLinkTriggered();
-        const timer = setTimeout(() => {
-          timerTriggered();
-          subscribe.next({
-            result: {
-              type: 'data',
-              data: {
-                input: op.input,
-              },
-            },
-          });
-          subscribe.complete();
-        }, 1);
-        return () => clearTimeout(timer);
-      });
-    },
-  ];
-
-  {
-    const call1 = createChain<AnyRouter, unknown, unknown>({
-      links,
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-
-    const call2 = createChain<AnyRouter, unknown, unknown>({
-      links,
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-    const next = vi.fn();
-    const call1$ = call1.subscribe({ next });
-    call2.subscribe({ next });
-    call1$.unsubscribe();
-
-    expect(endingLinkTriggered).toHaveBeenCalledTimes(1);
-    await waitFor(() => {
-      expect(timerTriggered).toHaveBeenCalledTimes(1);
-
-      expect(next).toHaveBeenCalledTimes(1);
-    });
-  }
-});

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

@@ -1,117 +0,0 @@
-import { observable } from '@trpc/server/observable';
-import { AnyRouter } from '@trpc/server/src';
-import { createChain } from './createChain';
-
-describe('chain', () => {
-  test('trivial', () => {
-    const result$ = createChain<AnyRouter, unknown, unknown>({
-      links: [
-        ({ next, op }) => {
-          return observable((observer) => {
-            const subscription = next(op).subscribe(observer);
-            return () => {
-              subscription.unsubscribe();
-            };
-          });
-        },
-        ({ op }) => {
-          return observable((observer) => {
-            observer.next({
-              context: {},
-              result: {
-                type: 'data',
-                data: {
-                  input: op.input,
-                },
-              },
-            });
-            observer.complete();
-          });
-        },
-      ],
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-
-    const next = vi.fn();
-
-    result$.subscribe({ next });
-    // console.log(next.mock.calls);
-    expect(next).toHaveBeenCalledTimes(1);
-  });
-  test('multiple responses', () => {
-    const result$ = createChain<AnyRouter, unknown, unknown>({
-      links: [
-        ({ next, op }) => {
-          return observable((observer) => {
-            observer.next({
-              context: {},
-              result: {
-                type: 'data',
-                data: 'from cache',
-              },
-            });
-            const subscription = next(op).subscribe(observer);
-            return () => {
-              subscription.unsubscribe();
-            };
-          });
-        },
-        ({ op }) => {
-          return observable((observer) => {
-            observer.next({
-              result: {
-                type: 'data',
-                data: {
-                  input: op.input,
-                },
-              },
-            });
-            observer.complete();
-          });
-        },
-      ],
-      op: {
-        type: 'query',
-        id: 1,
-        input: 'world',
-        path: 'hello',
-        context: {},
-      },
-    });
-
-    const next = vi.fn();
-
-    result$.subscribe({ next });
-
-    expect(next).toHaveBeenCalledTimes(2);
-    expect(next.mock.calls[0]).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "context": Object {},
-          "result": Object {
-            "data": "from cache",
-            "type": "data",
-          },
-        },
-      ]
-    `);
-    expect(next.mock.calls[1]).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "result": Object {
-            "data": Object {
-              "input": "world",
-            },
-            "type": "data",
-          },
-        },
-      ]
-    `);
-  });
-});