@trpc/client 10.33.0 → 10.33.1

package/dist/getFetch.d.ts.map

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

package/dist/{httpBatchLink-3e9aaa76.js → httpBatchLink-76c6f2d4.js}

@@ -2,7 +2,7 @@
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('./transformResult-70f95ffb.js');
-var httpUtils = require('./httpUtils-4e5cf721.js');
+var httpUtils = require('./httpUtils-fa0d6f71.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/{httpBatchLink-5d821c7a.mjs → httpBatchLink-c184c799.mjs}

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from './transformResult-9a244fe7.mjs';
-import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-9d0d09cb.mjs';
+import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-a9242d4e.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/{httpBatchLink-5c66d3c6.js → httpBatchLink-c64f6cdb.js}

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from './transformResult-ae8e970c.js';
-import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-c937fe75.js';
+import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-a0ac1597.js';
 
 /**
  * A function that should never be called unless we messed something up.

package/dist/{httpUtils-c937fe75.js → httpUtils-a0ac1597.js}

@@ -1,17 +1,13 @@
 const isFunction = (fn) => typeof fn === 'function';
-function _bind(fn, thisArg) {
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    return isFunction(fn.bind) ? fn.bind(thisArg) : fn;
-}
 function getFetch(customFetchImpl) {
     if (customFetchImpl) {
         return customFetchImpl;
     }
     if (typeof window !== 'undefined' && isFunction(window.fetch)) {
-        return _bind(window.fetch, window);
+        return window.fetch;
     }
     if (typeof globalThis !== 'undefined' && isFunction(globalThis.fetch)) {
-        return _bind(globalThis.fetch, globalThis);
+        return globalThis.fetch;
     }
     throw new Error('No fetch implementation found');
 }
@@ -32,7 +28,7 @@ function getAbortController(customAbortControllerImpl) {
 function resolveHTTPLinkOptions(opts) {
     return {
         url: opts.url,
-        fetch: getFetch(opts.fetch),
+        fetch: opts.fetch,
         AbortController: getAbortController(opts.AbortController),
     };
 }
@@ -104,7 +100,7 @@ async function fetchHTTPResponse(opts, ac) {
             : {}),
         ...resolvedHeaders,
     };
-    return opts.fetch(url, {
+    return getFetch(opts.fetch)(url, {
         method: METHOD[type],
         signal: ac?.signal,
         body: body,

package/dist/{httpUtils-9d0d09cb.mjs → httpUtils-a9242d4e.mjs}

@@ -1,17 +1,13 @@
 const isFunction = (fn)=>typeof fn === 'function';
-function _bind(fn, thisArg) {
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    return isFunction(fn.bind) ? fn.bind(thisArg) : fn;
-}
 function getFetch(customFetchImpl) {
     if (customFetchImpl) {
         return customFetchImpl;
     }
     if (typeof window !== 'undefined' && isFunction(window.fetch)) {
-        return _bind(window.fetch, window);
+        return window.fetch;
     }
     if (typeof globalThis !== 'undefined' && isFunction(globalThis.fetch)) {
-        return _bind(globalThis.fetch, globalThis);
+        return globalThis.fetch;
     }
     throw new Error('No fetch implementation found');
 }
@@ -32,7 +28,7 @@ function getAbortController(customAbortControllerImpl) {
 function resolveHTTPLinkOptions(opts) {
     return {
         url: opts.url,
-        fetch: getFetch(opts.fetch),
+        fetch: opts.fetch,
         AbortController: getAbortController(opts.AbortController)
     };
 }
@@ -101,7 +97,7 @@ async function fetchHTTPResponse(opts, ac) {
         } : {},
         ...resolvedHeaders
     };
-    return opts.fetch(url, {
+    return getFetch(opts.fetch)(url, {
         method: METHOD[type],
         signal: ac?.signal,
         body: body,

package/dist/{httpUtils-4e5cf721.js → httpUtils-fa0d6f71.js}

@@ -1,19 +1,15 @@
 'use strict';
 
 const isFunction = (fn)=>typeof fn === 'function';
-function _bind(fn, thisArg) {
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    return isFunction(fn.bind) ? fn.bind(thisArg) : fn;
-}
 function getFetch(customFetchImpl) {
     if (customFetchImpl) {
         return customFetchImpl;
     }
     if (typeof window !== 'undefined' && isFunction(window.fetch)) {
-        return _bind(window.fetch, window);
+        return window.fetch;
     }
     if (typeof globalThis !== 'undefined' && isFunction(globalThis.fetch)) {
-        return _bind(globalThis.fetch, globalThis);
+        return globalThis.fetch;
     }
     throw new Error('No fetch implementation found');
 }
@@ -34,7 +30,7 @@ function getAbortController(customAbortControllerImpl) {
 function resolveHTTPLinkOptions(opts) {
     return {
         url: opts.url,
-        fetch: getFetch(opts.fetch),
+        fetch: opts.fetch,
         AbortController: getAbortController(opts.AbortController)
     };
 }
@@ -103,7 +99,7 @@ async function fetchHTTPResponse(opts, ac) {
         } : {},
         ...resolvedHeaders
     };
-    return opts.fetch(url, {
+    return getFetch(opts.fetch)(url, {
         method: METHOD[type],
         signal: ac?.signal,
         body: body,

package/dist/index.js

@@ -6,8 +6,8 @@ var observable = require('@trpc/server/observable');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var transformResult = require('./transformResult-70f95ffb.js');
 var shared = require('@trpc/server/shared');
-var httpUtils = require('./httpUtils-4e5cf721.js');
-var links_httpBatchLink = require('./httpBatchLink-3e9aaa76.js');
+var httpUtils = require('./httpUtils-fa0d6f71.js');
+var links_httpBatchLink = require('./httpBatchLink-76c6f2d4.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');

package/dist/index.mjs

@@ -4,10 +4,10 @@ export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
 export { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
-import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-9d0d09cb.mjs';
-export { b as getFetch } from './httpUtils-9d0d09cb.mjs';
-import { c as createHTTPBatchLink } from './httpBatchLink-5d821c7a.mjs';
-export { h as httpBatchLink } from './httpBatchLink-5d821c7a.mjs';
+import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-a9242d4e.mjs';
+export { b as getFetch } from './httpUtils-a9242d4e.mjs';
+import { c as createHTTPBatchLink } from './httpBatchLink-c184c799.mjs';
+export { h as httpBatchLink } from './httpBatchLink-c184c799.mjs';
 import { httpLinkFactory } from './links/httpLink.mjs';
 export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';

package/dist/links/httpBatchLink.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var links_httpBatchLink = require('../httpBatchLink-3e9aaa76.js');
-require('../httpUtils-4e5cf721.js');
+var links_httpBatchLink = require('../httpBatchLink-76c6f2d4.js');
+require('../httpUtils-fa0d6f71.js');
 require('@trpc/server/observable');
 require('../transformResult-70f95ffb.js');
 

package/dist/links/httpBatchLink.mjs

@@ -1,4 +1,4 @@
-export { h as httpBatchLink } from '../httpBatchLink-5d821c7a.mjs';
-import '../httpUtils-9d0d09cb.mjs';
+export { h as httpBatchLink } from '../httpBatchLink-c184c799.mjs';
+import '../httpUtils-a9242d4e.mjs';
 import '@trpc/server/observable';
 import '../transformResult-9a244fe7.mjs';

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-70f95ffb.js');
-var httpUtils = require('../httpUtils-4e5cf721.js');
+var httpUtils = require('../httpUtils-fa0d6f71.js');
 
 function httpLinkFactory(factoryOpts) {
     return (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-9a244fe7.mjs';
-import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-9d0d09cb.mjs';
+import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-a9242d4e.mjs';
 
 function httpLinkFactory(factoryOpts) {
     return (opts)=>{

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;

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,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"}
+{"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/loggerLink.d.ts

@@ -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;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;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.33.0",
+  "version": "10.33.1",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,11 +76,11 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.33.0"
+    "@trpc/server": "10.33.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.33.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": "b92f34aacd300402f4c41e3f4a5b1f236f490672"
+  "gitHead": "403be02df05c29a9c3a77256805674baf6b6b125"
 }

package/src/getFetch.ts

@@ -4,11 +4,6 @@ type AnyFn = (...args: any[]) => unknown;
 
 const isFunction = (fn: unknown): fn is AnyFn => typeof fn === 'function';
 
-function _bind(fn: AnyFn, thisArg: unknown): AnyFn {
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  return isFunction(fn.bind) ? fn.bind(thisArg) : fn;
-}
-
 export function getFetch(
   customFetchImpl?: FetchEsque | NativeFetchEsque,
 ): FetchEsque {
@@ -17,11 +12,11 @@ export function getFetch(
   }
 
   if (typeof window !== 'undefined' && isFunction(window.fetch)) {
-    return _bind(window.fetch, window) as FetchEsque;
+    return window.fetch as FetchEsque;
   }
 
   if (typeof globalThis !== 'undefined' && isFunction(globalThis.fetch)) {
-    return _bind(globalThis.fetch, globalThis) as FetchEsque;
+    return globalThis.fetch as FetchEsque;
   }
 
   throw new Error('No fetch implementation found');

package/src/links/internals/httpUtils.ts

@@ -29,7 +29,7 @@ export interface HTTPLinkBaseOptions {
 
 export interface ResolvedHTTPLinkOptions {
   url: string;
-  fetch: FetchEsque;
+  fetch?: FetchEsque;
   AbortController: AbortControllerEsque | null;
 }
 
@@ -38,7 +38,7 @@ export function resolveHTTPLinkOptions(
 ): ResolvedHTTPLinkOptions {
   return {
     url: opts.url,
-    fetch: getFetch(opts.fetch),
+    fetch: opts.fetch,
     AbortController: getAbortController(opts.AbortController),
   };
 }
@@ -164,7 +164,7 @@ export async function fetchHTTPResponse(
     ...resolvedHeaders,
   };
 
-  return opts.fetch(url, {
+  return getFetch(opts.fetch)(url, {
     method: METHOD[type],
     signal: ac?.signal,
     body: body,

package/src/links/loggerLink.ts

@@ -49,11 +49,6 @@ type LoggerLinkFn<TRouter extends AnyRouter> = (
   opts: LoggerLinkFnOptions<TRouter>,
 ) => void;
 
-const palette = {
-  query: ['72e3ff', '3fb0d8'],
-  mutation: ['c5a3fc', '904dfc'],
-  subscription: ['ff49e1', 'd83fbe'],
-};
 export interface LoggerLinkOptions<TRouter extends AnyRouter> {
   logger?: LoggerLinkFn<TRouter>;
   enabled?: EnabledFn<TRouter>;
@@ -61,6 +56,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';
 }
 
 function isFormData(value: unknown): value is FormData {
@@ -71,50 +71,120 @@ function isFormData(value: unknown): value is FormData {
   return value instanceof FormData;
 }
 
+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'],
+    },
+  },
+} as const;
+
+function constructPartsAndArgs(
+  opts: LoggerLinkFnOptions<any> & {
+    colorMode: 'ansi' | 'css';
+  },
+) {
+  const { direction, type, path, id, input } = opts;
+
+  const parts: string[] = [];
+  const args: any[] = [];
+
+  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: opts.input });
+    } else {
+      args.push({
+        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 =
-  <TRouter extends AnyRouter>(
-    c: ConsoleEsque = console,
-  ): LoggerLinkFn<TRouter> =>
+  <TRouter extends AnyRouter>({
+    c = console,
+    colorMode = 'css',
+  }: {
+    c?: ConsoleEsque;
+    colorMode?: 'ansi' | 'css';
+  }): LoggerLinkFn<TRouter> =>
   (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, args } = constructPartsAndArgs({
+      ...props,
+      colorMode,
+      input,
+    });
 
-    const parts = [
-      '%c',
-      direction === 'up' ? '>>' : '<<',
-      type,
-      `#${id}`,
-      `%c${path}%c`,
-      '%O',
-    ];
-    const args: any[] = [
-      css,
-      `${css}; font-weight: bold;`,
-      `${css}; font-weight: normal;`,
-    ];
-    if (props.direction === 'up') {
-      args.push({ input, context: context });
-    } else {
-      args.push({
-        input,
-        result: props.result,
-        elapsedMs: props.elapsedMs,
-        context,
-      });
-    }
     const fn: 'error' | 'log' =
       props.direction === 'down' &&
       props.result &&
@@ -124,12 +194,15 @@ const defaultLogger =
 
     c[fn].apply(null, [parts.join(' ')].concat(args));
   };
+
 export function loggerLink<TRouter extends AnyRouter = AnyRouter>(
   opts: LoggerLinkOptions<TRouter> = {},
 ): TRPCLink<TRouter> {
   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 }) => {