@trpc/client 11.0.0-rc.364 → 11.0.0-rc.369

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 46982,
-  "bundleOrigSize": 66169,
-  "bundleReduction": 29,
+  "bundleSize": 46894,
+  "bundleOrigSize": 66367,
+  "bundleReduction": 29.34,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,20 +13,20 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.67,
+      "percent": 25.71,
       "reduction": 11.68
     },
     {
       "id": "/src/links/loggerLink.ts",
-      "size": 5545,
-      "origSize": 6496,
+      "size": 5457,
+      "origSize": 6694,
       "renderedExports": [
         "loggerLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.8,
-      "reduction": 14.64
+      "percent": 11.64,
+      "reduction": 18.48
     },
     {
       "id": "/src/internals/dataLoader.ts",
@@ -39,7 +39,7 @@
       "dependents": [
         "/src/links/internals/createHTTPBatchLink.ts"
       ],
-      "percent": 9.38,
+      "percent": 9.4,
       "reduction": 7.49
     },
     {
@@ -62,7 +62,7 @@
         "/src/links/internals/createHTTPBatchLink.ts",
         "/src/links/internals/parseJSONStream.ts"
       ],
-      "percent": 9.38,
+      "percent": 9.4,
       "reduction": 36.18
     },
     {
@@ -77,7 +77,7 @@
       "dependents": [
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 8.53,
+      "percent": 8.54,
       "reduction": 20.45
     },
     {
@@ -92,7 +92,7 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 6.27,
+      "percent": 6.28,
       "reduction": 20.67
     },
     {
@@ -107,7 +107,7 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.89,
+      "percent": 4.9,
       "reduction": 45.35
     },
     {
@@ -120,7 +120,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.62,
+      "percent": 4.63,
       "reduction": 21.23
     },
     {
@@ -139,7 +139,7 @@
         "/src/links/internals/createHTTPBatchLink.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.97,
+      "percent": 3.98,
       "reduction": 45.71
     },
     {
@@ -151,7 +151,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.85,
+      "percent": 2.86,
       "reduction": 38.42
     },
     {
@@ -180,7 +180,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.56,
+      "percent": 2.57,
       "reduction": 21.09
     },
     {

package/dist/links/loggerLink.d.ts

@@ -27,6 +27,7 @@ type LoggerLinkFnOptions<TRouter extends AnyRouter> = Operation & ({
     direction: 'up';
 });
 type LoggerLinkFn<TRouter extends AnyRouter> = (opts: LoggerLinkFnOptions<TRouter>) => void;
+type ColorMode = 'ansi' | 'css' | 'none';
 export interface LoggerLinkOptions<TRouter extends AnyRouter> {
     logger?: LoggerLinkFn<TRouter>;
     enabled?: EnabledFn<TRouter>;
@@ -38,7 +39,11 @@ export interface LoggerLinkOptions<TRouter extends AnyRouter> {
      * Color mode
      * @default typeof window === 'undefined' ? 'ansi' : 'css'
      */
-    colorMode?: 'ansi' | 'css';
+    colorMode?: ColorMode;
+    /**
+     * Include context in the log - defaults to false unless `colorMode` is 'css'
+     */
+    withContext?: boolean;
 }
 /**
  * @link https://trpc.io/docs/v11/client/links/loggerLink

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

@@ -1 +1 @@
-{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,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;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA6CnB"}
+{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,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,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,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,SAAS,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAoID;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CAgDnB"}

package/dist/links/loggerLink.js

@@ -64,50 +64,42 @@ const palettes = {
     }
 };
 function constructPartsAndArgs(opts) {
-    const { direction , type , path , id , input  } = opts;
+    const { direction , type , withContext , path , id , input  } = opts;
     const parts = [];
     const args = [];
-    if (opts.colorMode === 'ansi') {
+    if (opts.colorMode === 'none') {
+        parts.push(direction === 'up' ? '>>' : '<<', type, `#${id}`, path);
+    } else 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 = `
+    } else {
+        // css color mode
+        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;`);
+        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({
+        args.push(withContext ? {
             input,
             context: opts.context
+        } : {
+            input
         });
     } else {
         args.push({
             input,
             result: opts.result,
             elapsedMs: opts.elapsedMs,
-            context: opts.context
+            ...withContext && {
+                context: opts.context
+            }
         });
     }
     return {
@@ -116,13 +108,14 @@ function constructPartsAndArgs(opts) {
     };
 }
 // maybe this should be moved to it's own package
-const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
+const defaultLogger = ({ c =console , colorMode ='css' , withContext  })=>(props)=>{
         const rawInput = props.input;
         const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
         const { parts , args  } = constructPartsAndArgs({
             ...props,
             colorMode,
-            input
+            input,
+            withContext
         });
         const fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.result) ? 'error' : 'log';
         c[fn].apply(null, [
@@ -134,10 +127,12 @@ const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
  */ function loggerLink(opts = {}) {
     const { enabled =()=>true  } = opts;
     const colorMode = opts.colorMode ?? (typeof window === 'undefined' ? 'ansi' : 'css');
+    const withContext = opts.withContext ?? colorMode === 'css';
     const { logger =defaultLogger({
         c: opts.console,
-        colorMode
-    })  } = opts;
+        colorMode,
+        withContext
+    }) ,  } = opts;
     return ()=>{
         return ({ op , next  })=>{
             return observable.observable((observer)=>{

package/dist/links/loggerLink.mjs

@@ -62,50 +62,42 @@ const palettes = {
     }
 };
 function constructPartsAndArgs(opts) {
-    const { direction , type , path , id , input  } = opts;
+    const { direction , type , withContext , path , id , input  } = opts;
     const parts = [];
     const args = [];
-    if (opts.colorMode === 'ansi') {
+    if (opts.colorMode === 'none') {
+        parts.push(direction === 'up' ? '>>' : '<<', type, `#${id}`, path);
+    } else 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 = `
+    } else {
+        // css color mode
+        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;`);
+        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({
+        args.push(withContext ? {
             input,
             context: opts.context
+        } : {
+            input
         });
     } else {
         args.push({
             input,
             result: opts.result,
             elapsedMs: opts.elapsedMs,
-            context: opts.context
+            ...withContext && {
+                context: opts.context
+            }
         });
     }
     return {
@@ -114,13 +106,14 @@ function constructPartsAndArgs(opts) {
     };
 }
 // maybe this should be moved to it's own package
-const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
+const defaultLogger = ({ c =console , colorMode ='css' , withContext  })=>(props)=>{
         const rawInput = props.input;
         const input = isFormData(rawInput) ? Object.fromEntries(rawInput) : rawInput;
         const { parts , args  } = constructPartsAndArgs({
             ...props,
             colorMode,
-            input
+            input,
+            withContext
         });
         const fn = props.direction === 'down' && props.result && (props.result instanceof Error || 'error' in props.result.result) ? 'error' : 'log';
         c[fn].apply(null, [
@@ -132,10 +125,12 @@ const defaultLogger = ({ c =console , colorMode ='css'  })=>(props)=>{
  */ function loggerLink(opts = {}) {
     const { enabled =()=>true  } = opts;
     const colorMode = opts.colorMode ?? (typeof window === 'undefined' ? 'ansi' : 'css');
+    const withContext = opts.withContext ?? colorMode === 'css';
     const { logger =defaultLogger({
         c: opts.console,
-        colorMode
-    })  } = opts;
+        colorMode,
+        withContext
+    }) ,  } = opts;
     return ()=>{
         return ({ op , next  })=>{
             return observable((observer)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.364+d95fb467b",
+  "version": "11.0.0-rc.369+0fb9a1d0a",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.364+d95fb467b"
+    "@trpc/server": "11.0.0-rc.369+0fb9a1d0a"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.364+d95fb467b",
+    "@trpc/server": "11.0.0-rc.369+0fb9a1d0a",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -95,5 +95,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "d95fb467b966558ade5d1e2065faa33c9821ab6c"
+  "gitHead": "0fb9a1d0a5ed26aa155b6d01d5deebe22cbf19cf"
 }

package/src/links/loggerLink.ts

@@ -49,6 +49,8 @@ type LoggerLinkFn<TRouter extends AnyRouter> = (
   opts: LoggerLinkFnOptions<TRouter>,
 ) => void;
 
+type ColorMode = 'ansi' | 'css' | 'none';
+
 export interface LoggerLinkOptions<TRouter extends AnyRouter> {
   logger?: LoggerLinkFn<TRouter>;
   enabled?: EnabledFn<TRouter>;
@@ -60,7 +62,12 @@ export interface LoggerLinkOptions<TRouter extends AnyRouter> {
    * Color mode
    * @default typeof window === 'undefined' ? 'ansi' : 'css'
    */
-  colorMode?: 'ansi' | 'css';
+  colorMode?: ColorMode;
+
+  /**
+   * Include context in the log - defaults to false unless `colorMode` is 'css'
+   */
+  withContext?: boolean;
 }
 
 function isFormData(value: unknown): value is FormData {
@@ -96,15 +103,18 @@ const palettes = {
 
 function constructPartsAndArgs(
   opts: LoggerLinkFnOptions<any> & {
-    colorMode: 'ansi' | 'css';
+    colorMode: ColorMode;
+    withContext?: boolean;
   },
 ) {
-  const { direction, type, path, id, input } = opts;
+  const { direction, type, withContext, path, id, input } = opts;
 
   const parts: string[] = [];
   const args: any[] = [];
 
-  if (opts.colorMode === 'ansi') {
+  if (opts.colorMode === 'none') {
+    parts.push(direction === 'up' ? '>>' : '<<', type, `#${id}`, path);
+  } else if (opts.colorMode === 'ansi') {
     const [lightRegular, darkRegular] = palettes.ansi.regular[type];
     const [lightBold, darkBold] = palettes.ansi.bold[type];
     const reset = '\x1b[0m';
@@ -118,46 +128,38 @@ function constructPartsAndArgs(
       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 = `
+  } else {
+    // css color mode
+    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;`);
+    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 });
+    args.push(withContext ? { input, context: opts.context } : { input });
   } else {
     args.push({
       input,
       result: opts.result,
       elapsedMs: opts.elapsedMs,
-      context: opts.context,
+      ...(withContext && { context: opts.context }),
     });
   }
 
@@ -169,9 +171,11 @@ const defaultLogger =
   <TRouter extends AnyRouter>({
     c = console,
     colorMode = 'css',
+    withContext,
   }: {
     c?: ConsoleEsque;
-    colorMode?: 'ansi' | 'css';
+    colorMode?: ColorMode;
+    withContext?: boolean;
   }): LoggerLinkFn<TRouter> =>
   (props) => {
     const rawInput = props.input;
@@ -183,6 +187,7 @@ const defaultLogger =
       ...props,
       colorMode,
       input,
+      withContext,
     });
 
     const fn: 'error' | 'log' =
@@ -205,7 +210,10 @@ export function loggerLink<TRouter extends AnyRouter = AnyRouter>(
 
   const colorMode =
     opts.colorMode ?? (typeof window === 'undefined' ? 'ansi' : 'css');
-  const { logger = defaultLogger({ c: opts.console, colorMode }) } = opts;
+  const withContext = opts.withContext ?? colorMode === 'css';
+  const {
+    logger = defaultLogger({ c: opts.console, colorMode, withContext }),
+  } = opts;
 
   return () => {
     return ({ op, next }) => {