@trpc/client 10.28.0 → 10.28.2

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.28.0",
+  "version": "10.28.2",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,15 +76,15 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.28.0"
+    "@trpc/server": "10.28.2"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.28.0",
+    "@trpc/server": "10.28.2",
     "@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",
@@ -98,5 +98,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "7aadb24ce0bc20ae27f32bd80891ef6da5885e5e"
+  "gitHead": "055c27724a3163ee9fde633f92f30756caf7690b"
 }

package/src/TRPCClientError.ts

@@ -2,8 +2,8 @@ import {
   AnyProcedure,
   AnyRouter,
   DefaultErrorShape,
-  Maybe,
   inferRouterError,
+  Maybe,
 } from '@trpc/server';
 import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
 

package/src/createTRPCClient.ts

@@ -6,7 +6,6 @@ import type {
 } from '@trpc/server';
 import { Unsubscribable } from '@trpc/server/observable';
 import { inferTransformedProcedureOutput } from '@trpc/server/shared';
-import { TRPCClientError } from './TRPCClientError';
 import {
   CreateTRPCClientOptions,
   TRPCRequestOptions,
@@ -14,6 +13,7 @@ import {
   TRPCUntypedClient,
 } from './internals/TRPCUntypedClient';
 import { TRPCClientRuntime } from './links';
+import { TRPCClientError } from './TRPCClientError';
 
 /**
  * @deprecated

package/src/createTRPCClientProxy.ts

@@ -17,7 +17,6 @@ import {
   inferTransformedProcedureOutput,
   inferTransformedSubscriptionOutput,
 } from '@trpc/server/shared';
-import { TRPCClientError } from './TRPCClientError';
 import { TRPCClient } from './createTRPCClient';
 import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
 import {
@@ -25,6 +24,7 @@ import {
   TRPCUntypedClient,
   UntypedClientProperties,
 } from './internals/TRPCUntypedClient';
+import { TRPCClientError } from './TRPCClientError';
 
 /** @public */
 export type inferRouterProxyClient<TRouter extends AnyRouter> =

package/src/internals/TRPCUntypedClient.ts

@@ -6,12 +6,11 @@ import {
   DefaultDataTransformer,
 } from '@trpc/server';
 import {
-  Unsubscribable,
   inferObservableValue,
   observableToPromise,
   share,
+  Unsubscribable,
 } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { createChain } from '../links/internals/createChain';
 import {
   OperationContext,
@@ -19,6 +18,7 @@ import {
   TRPCClientRuntime,
   TRPCLink,
 } from '../links/types';
+import { TRPCClientError } from '../TRPCClientError';
 
 type CreateTRPCClientBaseOptions<TRouter extends AnyRouter> =
   TRouter['_def']['_config']['transformer'] extends DefaultDataTransformer

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/httpBatchLink.ts

@@ -1,13 +1,13 @@
 import { AnyRouter, ProcedureType } from '@trpc/server';
 import { observable } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { dataLoader } from '../internals/dataLoader';
 import { NonEmptyArray } from '../internals/types';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import {
+  getUrl,
   HTTPLinkBaseOptions,
   HTTPResult,
-  getUrl,
   jsonHttpRequester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';

package/src/links/httpFormDataLink.ts

@@ -1,5 +1,5 @@
 import { httpLinkFactory } from './httpLink';
-import { GetBody, Requester, httpRequest } from './internals/httpUtils';
+import { GetBody, httpRequest, Requester } from './internals/httpUtils';
 
 const getBody: GetBody = (opts) => {
   if (!('input' in opts)) {

package/src/links/httpLink.ts

@@ -1,11 +1,11 @@
 import { AnyRouter } from '@trpc/server';
 import { observable } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import {
   HTTPLinkBaseOptions,
-  Requester,
   jsonHttpRequester,
+  Requester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import { HTTPHeaders, Operation, TRPCLink } from './types';

package/src/links/retryLink.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
-import { Unsubscribable, observable } from '@trpc/server/observable';
+import { observable, Unsubscribable } from '@trpc/server/observable';
 import { TRPCLink } from './types';
 
 export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {

package/src/links/types.ts

@@ -5,8 +5,8 @@ import {
 } from '@trpc/server';
 import { Observable, Observer } from '@trpc/server/observable';
 import { TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import { ResponseEsque } from '../internals/types';
+import { TRPCClientError } from '../TRPCClientError';
 
 /**
  * @internal

package/src/links/wsLink.ts

@@ -1,5 +1,5 @@
-import { AnyRouter, ProcedureType, inferRouterError } from '@trpc/server';
-import { Observer, UnsubscribeFn, observable } from '@trpc/server/observable';
+import { AnyRouter, inferRouterError, ProcedureType } from '@trpc/server';
+import { observable, Observer, UnsubscribeFn } from '@trpc/server/observable';
 import {
   TRPCClientIncomingMessage,
   TRPCClientIncomingRequest,
@@ -7,9 +7,9 @@ import {
   TRPCRequestMessage,
   TRPCResponseMessage,
 } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import { retryDelay } from '../internals/retryDelay';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import { Operation, TRPCLink } from './types';
 
 type WSCallbackResult<TRouter extends AnyRouter, TOutput> = TRPCResponseMessage<

package/src/shared/transformResult.ts

@@ -4,9 +4,9 @@ import type {
   TRPCResponseMessage,
   TRPCResultMessage,
 } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import type { TRPCClientRuntime } from '../links';
 import { isObject } from '../links/internals/isObject';
+import { TRPCClientError } from '../TRPCClientError';
 
 // FIXME:
 // - the generics here are probably unnecessary