@trpc/client 10.32.0 → 10.33.1

package/dist/links/internals/httpUtils.d.ts

@@ -19,7 +19,7 @@ export interface HTTPLinkBaseOptions {
 }
 export interface ResolvedHTTPLinkOptions {
     url: string;
-    fetch: FetchEsque;
+    fetch?: FetchEsque;
     AbortController: AbortControllerEsque | null;
 }
 export declare function resolveHTTPLinkOptions(opts: HTTPLinkBaseOptions): ResolvedHTTPLinkOptions;
@@ -32,11 +32,11 @@ export interface HTTPResult {
 type GetInputOptions = {
     runtime: TRPCClientRuntime;
 } & ({
-    inputs: unknown[];
-} | {
     input: unknown;
+} | {
+    inputs: unknown[];
 });
-export type HTTPBaseRequestOptions = ResolvedHTTPLinkOptions & GetInputOptions & {
+export type HTTPBaseRequestOptions = GetInputOptions & ResolvedHTTPLinkOptions & {
     type: ProcedureType;
     path: string;
 };
@@ -54,7 +54,7 @@ export type Requester = (opts: HTTPBaseRequestOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
 }) => PromiseAndCancel<HTTPResult>;
 export declare const jsonHttpRequester: Requester;
-export type HTTPRequestOptions = HTTPBaseRequestOptions & ContentOptions & {
+export type HTTPRequestOptions = ContentOptions & HTTPBaseRequestOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
     TextDecoder?: TextDecoderEsque;
 };

package/dist/links/internals/httpUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC9C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,GACxB,uBAAuB,CAMzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;KACzB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,MAAM,MAAM,sBAAsB,GAAG,uBAAuB,GAC1D,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,CACpB,IAAI,EAAE,sBAAsB,KACzB,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAgBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GACrD,cAAc,GAAG;IACf,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEJ,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,EACxB,EAAE,CAAC,EAAE,4BAA4B,GAAG,IAAI,0BAyBzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAsB9B"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC9C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,GACxB,uBAAuB,CAMzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;KACzB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAUjD,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,CACpB,IAAI,EAAE,sBAAsB,KACzB,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAgBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEJ,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,EACxB,EAAE,CAAC,EAAE,4BAA4B,GAAG,IAAI,0BA0BzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAsB9B"}

package/dist/links/internals/parseJSONStream.d.ts

@@ -18,7 +18,7 @@ export declare function parseJSONStream<TReturn>(opts: {
     /**
      * As given by `(await fetch(url)).body`
      */
-    readableStream: WebReadableStreamEsque | NodeJS.ReadableStream;
+    readableStream: NodeJS.ReadableStream | WebReadableStreamEsque;
     /**
      * Called for each line of the stream
      */

package/dist/links/internals/parseJSONStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseJSONStream.d.ts","sourceRoot":"","sources":["../../../src/links/internals/parseJSONStream.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAIL,sBAAsB,EACtB,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE;IACnD;;OAEG;IACH,cAAc,EAAE,sBAAsB,GAAG,MAAM,CAAC,cAAc,CAAC;IAC/D;;OAEG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,gBAAgB,CAAC;CAC/B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB;AAwED,eAAO,MAAM,0BAA0B,SAC/B,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,QAAQ,WAAW,CAAC,CAAC;IAClD,WAAW,EAAE,gBAAgB,CAAC;CAC/B,oBACiB,MAAM,OAAO,UAAU,KAAK,IAAI;;;CA8BnD,CAAC"}
+{"version":3,"file":"parseJSONStream.d.ts","sourceRoot":"","sources":["../../../src/links/internals/parseJSONStream.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAIL,sBAAsB,EACtB,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE;IACnD;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC,cAAc,GAAG,sBAAsB,CAAC;IAC/D;;OAEG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,gBAAgB,CAAC;CAC/B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB;AAwED,eAAO,MAAM,0BAA0B,SAC/B,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,QAAQ,WAAW,CAAC,CAAC;IAClD,WAAW,EAAE,gBAAgB,CAAC;CAC/B,oBACiB,MAAM,OAAO,UAAU,KAAK,IAAI;;;CA8BnD,CAAC"}

package/dist/links/loggerLink.d.ts

@@ -6,25 +6,25 @@ type ConsoleEsque = {
     log: (...args: any[]) => void;
     error: (...args: any[]) => void;
 };
-type EnableFnOptions<TRouter extends AnyRouter> = (Operation & {
-    direction: 'up';
-}) | {
+type EnableFnOptions<TRouter extends AnyRouter> = {
     direction: 'down';
     result: OperationResultEnvelope<unknown> | TRPCClientError<TRouter>;
-};
+} | (Operation & {
+    direction: 'up';
+});
 type EnabledFn<TRouter extends AnyRouter> = (opts: EnableFnOptions<TRouter>) => boolean;
 type LoggerLinkFnOptions<TRouter extends AnyRouter> = Operation & ({
-    /**
-     * Request was just initialized
-     */
-    direction: 'up';
-} | {
     /**
      * Request result
      */
     direction: 'down';
     result: OperationResultEnvelope<unknown> | TRPCClientError<TRouter>;
     elapsedMs: number;
+} | {
+    /**
+     * Request was just initialized
+     */
+    direction: 'up';
 });
 type LoggerLinkFn<TRouter extends AnyRouter> = (opts: LoggerLinkFnOptions<TRouter>) => void;
 export interface LoggerLinkOptions<TRouter extends AnyRouter> {
@@ -34,6 +34,11 @@ export interface LoggerLinkOptions<TRouter extends AnyRouter> {
      * Used in the built-in defaultLogger
      */
     console?: ConsoleEsque;
+    /**
+     * Color mode
+     * @default typeof window === 'undefined' ? 'ansi' : 'css'
+     */
+    colorMode?: 'ansi' | 'css';
 }
 export declare function loggerLink<TRouter extends AnyRouter = AnyRouter>(opts?: LoggerLinkOptions<TRouter>): TRPCLink<TRouter>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,GACF;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,CAAC;AACN,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAOV,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AA+DD,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA2CnB"}
+{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,GACD,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,CAAC;AACP,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAEV,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC5B;AAsID,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA6CnB"}

package/dist/links/loggerLink.js

@@ -5,20 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var observable = require('@trpc/server/observable');
 
 /// <reference lib="dom.iterable" />
-const palette = {
-    query: [
-        '72e3ff',
-        '3fb0d8'
-    ],
-    mutation: [
-        'c5a3fc',
-        '904dfc'
-    ],
-    subscription: [
-        'ff49e1',
-        'd83fbe'
-    ]
-};
 function isFormData(value) {
     if (typeof FormData === 'undefined') {
         // FormData is not supported
@@ -26,43 +12,116 @@ function isFormData(value) {
     }
     return value instanceof FormData;
 }
-// maybe this should be moved to it's own package
-const defaultLogger = (c = console)=>(props)=>{
-        const { direction , type , path , context , id  } = props;
-        const [light, dark] = palette[type];
-        const rawInput = props.input;
-        const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
-        const css = `
-    background-color: #${direction === 'up' ? light : dark}; 
-    color: ${direction === 'up' ? 'black' : 'white'};
-    padding: 2px;
-  `;
-        const parts = [
-            '%c',
-            direction === 'up' ? '>>' : '<<',
-            type,
-            `#${id}`,
-            `%c${path}%c`,
-            '%O'
-        ];
-        const args = [
-            css,
-            `${css}; font-weight: bold;`,
-            `${css}; font-weight: normal;`
-        ];
-        if (props.direction === 'up') {
+const palettes = {
+    css: {
+        query: [
+            '72e3ff',
+            '3fb0d8'
+        ],
+        mutation: [
+            'c5a3fc',
+            '904dfc'
+        ],
+        subscription: [
+            'ff49e1',
+            'd83fbe'
+        ]
+    },
+    ansi: {
+        regular: {
+            // Cyan background, black and white text respectively
+            query: [
+                '\x1b[30;46m',
+                '\x1b[97;46m'
+            ],
+            // Magenta background, black and white text respectively
+            mutation: [
+                '\x1b[30;45m',
+                '\x1b[97;45m'
+            ],
+            // Green background, black and white text respectively
+            subscription: [
+                '\x1b[30;42m',
+                '\x1b[97;42m'
+            ]
+        },
+        bold: {
+            query: [
+                '\x1b[1;30;46m',
+                '\x1b[1;97;46m'
+            ],
+            mutation: [
+                '\x1b[1;30;45m',
+                '\x1b[1;97;45m'
+            ],
+            subscription: [
+                '\x1b[1;30;42m',
+                '\x1b[1;97;42m'
+            ]
+        }
+    }
+};
+function constructPartsAndArgs(opts) {
+    const { direction , type , path , id , input  } = opts;
+    const parts = [];
+    const args = [];
+    if (opts.colorMode === 'ansi') {
+        const [lightRegular, darkRegular] = palettes.ansi.regular[type];
+        const [lightBold, darkBold] = palettes.ansi.bold[type];
+        const reset = '\x1b[0m';
+        parts.push(direction === 'up' ? lightRegular : darkRegular, direction === 'up' ? '>>' : '<<', type, direction === 'up' ? lightBold : darkBold, `#${id}`, path, reset);
+        if (direction === 'up') {
             args.push({
-                input,
-                context: context
+                input: opts.input
             });
         } else {
             args.push({
-                input,
-                result: props.result,
-                elapsedMs: props.elapsedMs,
-                context
+                input: opts.input,
+                // strip context from result cause it's too noisy in terminal wihtout collapse mode
+                result: 'result' in opts.result ? opts.result.result : opts.result,
+                elapsedMs: opts.elapsedMs
             });
         }
+        return {
+            parts,
+            args
+        };
+    }
+    const [light, dark] = palettes.css[type];
+    const css = `
+    background-color: #${direction === 'up' ? light : dark}; 
+    color: ${direction === 'up' ? 'black' : 'white'};
+    padding: 2px;
+  `;
+    parts.push('%c', direction === 'up' ? '>>' : '<<', type, `#${id}`, `%c${path}%c`, '%O');
+    args.push(css, `${css}; font-weight: bold;`, `${css}; font-weight: normal;`);
+    if (direction === 'up') {
+        args.push({
+            input,
+            context: opts.context
+        });
+    } else {
+        args.push({
+            input,
+            result: opts.result,
+            elapsedMs: opts.elapsedMs,
+            context: opts.context
+        });
+    }
+    return {
+        parts,
+        args
+    };
+}
+// maybe this should be moved to it's own package
+const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
+        const rawInput = props.input;
+        const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
+        const { parts , args  } = constructPartsAndArgs({
+            ...props,
+            colorMode,
+            input
+        });
         const fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.result) ? 'error' : 'log';
         c[fn].apply(null, [
             parts.join(' ')
@@ -70,7 +129,11 @@ const defaultLogger = (c = console)=>(props)=>{
     };
 function loggerLink(opts = {}) {
     const { enabled =()=>true  } = opts;
-    const { logger =defaultLogger(opts.console)  } = opts;
+    const colorMode = opts.colorMode ?? (typeof window === 'undefined' ? 'ansi' : 'css');
+    const { logger =defaultLogger({
+        c: opts.console,
+        colorMode
+    })  } = opts;
     return ()=>{
         return ({ op , next  })=>{
             return observable.observable((observer)=>{

package/dist/links/loggerLink.mjs

@@ -1,20 +1,6 @@
 import { observable, tap } from '@trpc/server/observable';
 
 /// <reference lib="dom.iterable" />
-const palette = {
-    query: [
-        '72e3ff',
-        '3fb0d8'
-    ],
-    mutation: [
-        'c5a3fc',
-        '904dfc'
-    ],
-    subscription: [
-        'ff49e1',
-        'd83fbe'
-    ]
-};
 function isFormData(value) {
     if (typeof FormData === 'undefined') {
         // FormData is not supported
@@ -22,43 +8,116 @@ function isFormData(value) {
     }
     return value instanceof FormData;
 }
-// maybe this should be moved to it's own package
-const defaultLogger = (c = console)=>(props)=>{
-        const { direction , type , path , context , id  } = props;
-        const [light, dark] = palette[type];
-        const rawInput = props.input;
-        const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
-        const css = `
-    background-color: #${direction === 'up' ? light : dark}; 
-    color: ${direction === 'up' ? 'black' : 'white'};
-    padding: 2px;
-  `;
-        const parts = [
-            '%c',
-            direction === 'up' ? '>>' : '<<',
-            type,
-            `#${id}`,
-            `%c${path}%c`,
-            '%O'
-        ];
-        const args = [
-            css,
-            `${css}; font-weight: bold;`,
-            `${css}; font-weight: normal;`
-        ];
-        if (props.direction === 'up') {
+const palettes = {
+    css: {
+        query: [
+            '72e3ff',
+            '3fb0d8'
+        ],
+        mutation: [
+            'c5a3fc',
+            '904dfc'
+        ],
+        subscription: [
+            'ff49e1',
+            'd83fbe'
+        ]
+    },
+    ansi: {
+        regular: {
+            // Cyan background, black and white text respectively
+            query: [
+                '\x1b[30;46m',
+                '\x1b[97;46m'
+            ],
+            // Magenta background, black and white text respectively
+            mutation: [
+                '\x1b[30;45m',
+                '\x1b[97;45m'
+            ],
+            // Green background, black and white text respectively
+            subscription: [
+                '\x1b[30;42m',
+                '\x1b[97;42m'
+            ]
+        },
+        bold: {
+            query: [
+                '\x1b[1;30;46m',
+                '\x1b[1;97;46m'
+            ],
+            mutation: [
+                '\x1b[1;30;45m',
+                '\x1b[1;97;45m'
+            ],
+            subscription: [
+                '\x1b[1;30;42m',
+                '\x1b[1;97;42m'
+            ]
+        }
+    }
+};
+function constructPartsAndArgs(opts) {
+    const { direction , type , path , id , input  } = opts;
+    const parts = [];
+    const args = [];
+    if (opts.colorMode === 'ansi') {
+        const [lightRegular, darkRegular] = palettes.ansi.regular[type];
+        const [lightBold, darkBold] = palettes.ansi.bold[type];
+        const reset = '\x1b[0m';
+        parts.push(direction === 'up' ? lightRegular : darkRegular, direction === 'up' ? '>>' : '<<', type, direction === 'up' ? lightBold : darkBold, `#${id}`, path, reset);
+        if (direction === 'up') {
             args.push({
-                input,
-                context: context
+                input: opts.input
             });
         } else {
             args.push({
-                input,
-                result: props.result,
-                elapsedMs: props.elapsedMs,
-                context
+                input: opts.input,
+                // strip context from result cause it's too noisy in terminal wihtout collapse mode
+                result: 'result' in opts.result ? opts.result.result : opts.result,
+                elapsedMs: opts.elapsedMs
             });
         }
+        return {
+            parts,
+            args
+        };
+    }
+    const [light, dark] = palettes.css[type];
+    const css = `
+    background-color: #${direction === 'up' ? light : dark}; 
+    color: ${direction === 'up' ? 'black' : 'white'};
+    padding: 2px;
+  `;
+    parts.push('%c', direction === 'up' ? '>>' : '<<', type, `#${id}`, `%c${path}%c`, '%O');
+    args.push(css, `${css}; font-weight: bold;`, `${css}; font-weight: normal;`);
+    if (direction === 'up') {
+        args.push({
+            input,
+            context: opts.context
+        });
+    } else {
+        args.push({
+            input,
+            result: opts.result,
+            elapsedMs: opts.elapsedMs,
+            context: opts.context
+        });
+    }
+    return {
+        parts,
+        args
+    };
+}
+// maybe this should be moved to it's own package
+const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
+        const rawInput = props.input;
+        const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
+        const { parts , args  } = constructPartsAndArgs({
+            ...props,
+            colorMode,
+            input
+        });
         const fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.result) ? 'error' : 'log';
         c[fn].apply(null, [
             parts.join(' ')
@@ -66,7 +125,11 @@ const defaultLogger = (c = console)=>(props)=>{
     };
 function loggerLink(opts = {}) {
     const { enabled =()=>true  } = opts;
-    const { logger =defaultLogger(opts.console)  } = opts;
+    const colorMode = opts.colorMode ?? (typeof window === 'undefined' ? 'ansi' : 'css');
+    const { logger =defaultLogger({
+        c: opts.console,
+        colorMode
+    })  } = opts;
     return ()=>{
         return ({ op , next  })=>{
             return observable((observer)=>{

package/dist/links/types.d.ts

@@ -24,7 +24,7 @@ export interface OperationContext extends Record<string, unknown> {
  */
 export type Operation<TInput = unknown> = {
     id: number;
-    type: 'query' | 'mutation' | 'subscription';
+    type: 'mutation' | 'query' | 'subscription';
     input: TInput;
     path: string;
     context: OperationContext;
@@ -32,7 +32,7 @@ export type Operation<TInput = unknown> = {
 /**
  * @internal
  */
-export type HTTPHeaders = Record<string, string | string[] | undefined>;
+export type HTTPHeaders = Record<string, string[] | string | undefined>;
 /**
  * The default `fetch` implementation has an overloaded signature. By convention this library
  * only uses the overload taking a string and options object.
@@ -46,7 +46,7 @@ export interface TRPCClientRuntime {
  * @internal
  */
 export interface OperationResultEnvelope<TOutput> {
-    result: TRPCSuccessResponse<TOutput>['result'] | TRPCResultMessage<TOutput>['result'];
+    result: TRPCResultMessage<TOutput>['result'] | TRPCSuccessResponse<TOutput>['result'];
     context?: OperationContext;
 }
 /**

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,EACL,SAAS,EACT,uBAAuB,EACvB,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;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,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;AAExE;;;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;IAChC,WAAW,EAAE,eAAe,CAAC;IAE7B,mBAAmB,EAAE,uBAAuB,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB,CAAC,OAAO;IAC9C,MAAM,EACF,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GACtC,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,SAAS,EACzB,OAAO,IACL,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,OAAO,IACL,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,SAAS,EACzB,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,IACf,CAAC,IAAI,EAAE;IACT,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC9E,KAAK,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,SAAS,IAAI,CAChD,IAAI,EAAE,iBAAiB,KACpB,aAAa,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/links/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,uBAAuB,EACvB,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;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;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAExE;;;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;IAChC,WAAW,EAAE,eAAe,CAAC;IAE7B,mBAAmB,EAAE,uBAAuB,CAAC;CAC9C;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,OAAO,SAAS,SAAS,EACzB,OAAO,IACL,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,OAAO,IACL,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,SAAS,EACzB,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,OAAO,IACf,CAAC,IAAI,EAAE;IACT,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC9E,KAAK,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,SAAS,IAAI,CAChD,IAAI,EAAE,iBAAiB,KACpB,aAAa,CAAC,OAAO,CAAC,CAAC"}

package/dist/links/wsLink.js

@@ -41,7 +41,7 @@ function createWSClient(opts) {
         });
     }
     function tryReconnect() {
-        if (connectTimer || state === 'closed') {
+        if (connectTimer !== null || state === 'closed') {
             return;
         }
         const timeout = retryDelayFn(connectAttempt++);

package/dist/links/wsLink.mjs

@@ -37,7 +37,7 @@ function createWSClient(opts) {
         });
     }
     function tryReconnect() {
-        if (connectTimer || state === 'closed') {
+        if (connectTimer !== null || state === 'closed') {
             return;
         }
         const timeout = retryDelayFn(connectAttempt++);

package/dist/shared/transformResult.d.ts

@@ -2,7 +2,7 @@ import type { AnyRouter, inferRouterError } from '@trpc/server';
 import type { TRPCResponse, TRPCResponseMessage } from '@trpc/server/rpc';
 import type { TRPCClientRuntime } from '../links';
 /** @internal */
-declare function transformResultInner<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): {
+declare function transformResultInner<TRouter extends AnyRouter, TOutput>(response: TRPCResponse<TOutput, inferRouterError<TRouter>> | TRPCResponseMessage<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): {
     readonly ok: false;
     readonly error: {
         readonly error: inferRouterError<TRouter>;
@@ -29,6 +29,6 @@ declare function transformResultInner<TRouter extends AnyRouter, TOutput>(respon
  * Transforms and validates that the result is a valid TRPCResponse
  * @internal
  */
-export declare function transformResult<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): ReturnType<typeof transformResultInner>;
+export declare function transformResult<TRouter extends AnyRouter, TOutput>(response: TRPCResponse<TOutput, inferRouterError<TRouter>> | TRPCResponseMessage<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): ReturnType<typeof transformResultInner>;
 export {};
 //# sourceMappingURL=transformResult.d.ts.map

package/dist/shared/transformResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../src/shared/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAOlD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
+{"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../src/shared/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAOlD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.32.0",
+  "version": "10.33.1",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,11 +76,11 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.32.0"
+    "@trpc/server": "10.33.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.32.0",
+    "@trpc/server": "10.33.1",
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/node": "^18.16.16",
     "eslint": "^8.40.0",
@@ -98,5 +98,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "f8cf27c773b97dedb5eb95ca548cee7acb55c92a"
+  "gitHead": "403be02df05c29a9c3a77256805674baf6b6b125"
 }

package/src/TRPCClientError.ts

@@ -7,7 +7,7 @@ import {
 } from '@trpc/server';
 import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
 
-type ErrorInferrable = AnyRouter | AnyProcedure | TRPCErrorShape<number>;
+type ErrorInferrable = AnyProcedure | AnyRouter | TRPCErrorShape<number>;
 
 type inferErrorShape<TInferrable extends ErrorInferrable> =
   TInferrable extends AnyRouter

package/src/createTRPCClient.ts

@@ -49,8 +49,8 @@ export interface TRPCClient<TRouter extends AnyRouter> {
   >(
     path: TPath,
     input: TInput,
-    opts: TRPCRequestOptions &
-      Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>,
+    opts: Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>> &
+      TRPCRequestOptions,
   ): Unsubscribable;
 }
 /**

package/src/createTRPCClientProxy.ts

@@ -40,13 +40,13 @@ export type Resolver<TProcedure extends AnyProcedure> = (
 type SubscriptionResolver<TProcedure extends AnyProcedure> = (
   ...args: [
     input: ProcedureArgs<TProcedure['_def']>[0],
-    opts: ProcedureArgs<TProcedure['_def']>[1] &
-      Partial<
-        TRPCSubscriptionObserver<
-          inferTransformedSubscriptionOutput<TProcedure>,
-          TRPCClientError<TProcedure>
-        >
-      >,
+    opts: Partial<
+      TRPCSubscriptionObserver<
+        inferTransformedSubscriptionOutput<TProcedure>,
+        TRPCClientError<TProcedure>
+      >
+    > &
+      ProcedureArgs<TProcedure['_def']>[1],
   ]
 ) => Unsubscribable;