@trpc/client 10.22.0 → 10.23.1

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

@@ -1,6 +1,6 @@
 import { ProcedureType } from '@trpc/server';
 import { TRPCResponse } from '@trpc/server/rpc';
-import { AbortControllerEsque, FetchEsque, ResponseEsque } from '../../internals/types';
+import { AbortControllerEsque, FetchEsque, RequestInitEsque, ResponseEsque } from '../../internals/types';
 import { HTTPHeaders, PromiseAndCancel, TRPCClientRuntime } from '../types';
 /**
  * @internal
@@ -35,18 +35,24 @@ declare type GetInputOptions = {
 } | {
     input: unknown;
 });
-declare type GetUrlOptions = ResolvedHTTPLinkOptions & GetInputOptions & {
+export declare type HTTPBaseRequestOptions = ResolvedHTTPLinkOptions & GetInputOptions & {
     type: ProcedureType;
     path: string;
 };
-export declare function getUrl(opts: GetUrlOptions): string;
-declare type GetBodyOptions = {
-    type: ProcedureType;
-} & GetInputOptions;
-export declare function getBody(opts: GetBodyOptions): string | undefined;
-export declare type HTTPRequestOptions = ResolvedHTTPLinkOptions & GetInputOptions & {
-    type: ProcedureType;
-    path: string;
+export declare type GetUrl = (opts: HTTPBaseRequestOptions) => string;
+export declare type GetBody = (opts: HTTPBaseRequestOptions) => RequestInitEsque['body'];
+export declare type ContentOptions = {
+    contentTypeHeader?: string;
+    getUrl: GetUrl;
+    getBody: GetBody;
+};
+export declare const getUrl: GetUrl;
+export declare const getBody: GetBody;
+export declare type Requester = (opts: HTTPBaseRequestOptions & {
+    headers: () => HTTPHeaders | Promise<HTTPHeaders>;
+}) => PromiseAndCancel<HTTPResult>;
+export declare const jsonHttpRequester: Requester;
+export declare type HTTPRequestOptions = HTTPBaseRequestOptions & ContentOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
 };
 export declare function httpRequest(opts: HTTPRequestOptions): PromiseAndCancel<HTTPResult>;

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,UAAU,EACV,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,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,aAAK,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,aAAK,aAAa,GAAG,uBAAuB,GAC1C,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,aAAa,UAgBzC;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,oBAAY,kBAAkB,GAAG,uBAAuB,GACtD,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAEJ,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAyC9B"}
+{"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,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,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,aAAK,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,oBAAY,sBAAsB,GAAG,uBAAuB,GAC1D,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,oBAAY,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AAC9D,oBAAY,OAAO,GAAG,CACpB,IAAI,EAAE,sBAAsB,KACzB,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE9B,oBAAY,cAAc,GAAG;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,oBAAY,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,oBAAY,kBAAkB,GAAG,sBAAsB,GACrD,cAAc,GAAG;IACf,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAEJ,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA4C9B"}

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

@@ -0,0 +1,2 @@
+export declare function isObject(value: unknown): value is Record<string, unknown>;
+//# sourceMappingURL=isObject.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isObject.d.ts","sourceRoot":"","sources":["../../../src/links/internals/isObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzE"}

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

@@ -1 +1 @@
-{"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../../src/links/internals/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAMvC,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;AAOD;;;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/links/internals/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAOvC,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAAA,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,aAAK,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,aAAK,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,aAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,aAAK,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,aAAK,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;AAiDD,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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,aAAK,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,aAAK,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,aAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,aAAK,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,aAAK,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;AAgED,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA2CnB"}

package/dist/links/loggerLink.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
+var isObject = require('../isObject-617ad59e.js');
 
 const palette = {
     query: [
@@ -18,10 +19,19 @@ const palette = {
         'd83fbe'
     ]
 };
+function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
 // maybe this should be moved to it's own package
 const defaultLogger = (c = console)=>(props)=>{
-        const { direction , input , type , path , context , id  } = props;
+        const { direction , type , path , context , id  } = props;
         const [light, dark] = palette[type];
+        const rawInput = props.input;
+        const input = isObject.isObject(rawInput) && isFormData(rawInput) ? Object.fromEntries(rawInput) : props.input;
         const css = `
     background-color: #${direction === 'up' ? light : dark}; 
     color: ${direction === 'up' ? 'black' : 'white'};

package/dist/links/loggerLink.mjs

@@ -1,4 +1,5 @@
 import { observable, tap } from '@trpc/server/observable';
+import { i as isObject } from '../isObject-3ec9fe00.mjs';
 
 const palette = {
     query: [
@@ -14,10 +15,19 @@ const palette = {
         'd83fbe'
     ]
 };
+function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
 // maybe this should be moved to it's own package
 const defaultLogger = (c = console)=>(props)=>{
-        const { direction , input , type , path , context , id  } = props;
+        const { direction , type , path , context , id  } = props;
         const [light, dark] = palette[type];
+        const rawInput = props.input;
+        const input = isObject(rawInput) && isFormData(rawInput) ? Object.fromEntries(rawInput) : props.input;
         const css = `
     background-color: #${direction === 'up' ? light : dark}; 
     color: ${direction === 'up' ? 'black' : 'white'};

package/dist/links/wsLink.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-e7a1e69e.js');
+var transformResult = require('../transformResult-12020457.js');
+require('../isObject-617ad59e.js');
 
 /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 

package/dist/links/wsLink.mjs

@@ -1,5 +1,6 @@
 import { observable } from '@trpc/server/observable';
-import { T as TRPCClientError, t as transformResult } from '../transformResult-6fb67924.mjs';
+import { T as TRPCClientError, t as transformResult } from '../transformResult-403dc1d4.mjs';
+import '../isObject-3ec9fe00.mjs';
 
 /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 

package/dist/{transformResult-e7a1e69e.js → transformResult-12020457.js}

@@ -1,5 +1,7 @@
 'use strict';
 
+var isObject = require('./isObject-617ad59e.js');
+
 class TRPCClientError extends Error {
     static from(cause, opts = {}) {
         if (!(cause instanceof Error)) {
@@ -60,10 +62,6 @@ class TRPCClientError extends Error {
         result
     };
 }
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
 /**
  * Transforms and validates that the result is a valid TRPCResponse
  * @internal
@@ -76,10 +74,10 @@ function isObject(value) {
         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')) {
+    if (!result.ok && (!isObject.isObject(result.error.error) || typeof result.error.error.code !== 'number')) {
         throw new TRPCClientError('Badly formatted response from server');
     }
-    if (result.ok && !isObject(result.result)) {
+    if (result.ok && !isObject.isObject(result.result)) {
         throw new TRPCClientError('Badly formatted response from server');
     }
     return result;

package/dist/{transformResult-6fb67924.mjs → transformResult-403dc1d4.mjs}

@@ -1,3 +1,5 @@
+import { i as isObject } from './isObject-3ec9fe00.mjs';
+
 class TRPCClientError extends Error {
     static from(cause, opts = {}) {
         if (!(cause instanceof Error)) {
@@ -58,10 +60,6 @@ class TRPCClientError extends Error {
         result
     };
 }
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
 /**
  * Transforms and validates that the result is a valid TRPCResponse
  * @internal

package/dist/{transformResult-4e205a12.js → transformResult-51c1bc81.js}

@@ -1,3 +1,5 @@
+import { i as isObject } from './isObject-246cec0f.js';
+
 class TRPCClientError extends Error {
     constructor(message, opts) {
         const cause = opts?.cause;
@@ -54,10 +56,6 @@ function transformResultInner(response, runtime) {
     };
     return { ok: true, result };
 }
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
 /**
  * Transforms and validates that the result is a valid TRPCResponse
  * @internal

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@trpc/client",
-  "version": "10.22.0",
-  "description": "tRPC Client lib",
+  "version": "10.23.1",
+  "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
   "main": "dist/index.js",
@@ -69,11 +69,11 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.22.0"
+    "@trpc/server": "10.23.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.22.0",
+    "@trpc/server": "10.23.1",
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/node": "^18.7.20",
     "eslint": "^8.30.0",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "65ca7a2be17de07f35f29e69fdcfddd3eeacfbaf"
+  "gitHead": "4edcb4ebd2dd04d530b962086c75b8d4dc93464e"
 }

package/src/internals/types.ts

@@ -81,7 +81,7 @@ export interface RequestInitEsque {
   /**
    * Sets the request's body.
    */
-  body?: string | ReadableStream | null;
+  body?: string | ReadableStream | FormData | null;
 
   /**
    * Sets the request's associated headers.

package/src/links/httpBatchLink.ts

@@ -7,7 +7,7 @@ import {
   HTTPLinkBaseOptions,
   HTTPResult,
   getUrl,
-  httpRequest,
+  jsonHttpRequester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import { transformResult } from './internals/transformResult';
@@ -58,7 +58,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(
         const path = batchOps.map((op) => op.path).join(',');
         const inputs = batchOps.map((op) => op.input);
 
-        const { promise, cancel } = httpRequest({
+        const { promise, cancel } = jsonHttpRequester({
           ...resolvedOpts,
           runtime,
           type,

package/src/links/httpFormDataLink.ts

@@ -0,0 +1,30 @@
+import { httpLinkFactory } from './httpLink';
+import { GetBody, Requester, httpRequest } from './internals/httpUtils';
+
+const getBody: GetBody = (opts) => {
+  if (!('input' in opts)) {
+    return undefined;
+  }
+  if (!(opts.input instanceof FormData)) {
+    throw new Error('Input is not FormData');
+  }
+  return opts.input;
+};
+
+const formDataRequester: Requester = (opts) => {
+  if (opts.type !== 'mutation') {
+    // TODO(?) handle formdata queries
+    throw new Error('We only handle mutations with formdata');
+  }
+  return httpRequest({
+    ...opts,
+    getUrl() {
+      return `${opts.url}/${opts.path}`;
+    },
+    getBody,
+  });
+};
+
+export const experimental_formDataLink = httpLinkFactory({
+  requester: formDataRequester,
+});

package/src/links/httpLink.ts

@@ -3,7 +3,8 @@ import { observable } from '@trpc/server/observable';
 import { TRPCClientError } from '../TRPCClientError';
 import {
   HTTPLinkBaseOptions,
-  httpRequest,
+  Requester,
+  jsonHttpRequester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import { transformResult } from './internals/transformResult';
@@ -19,56 +20,59 @@ export interface HTTPLinkOptions extends HTTPLinkBaseOptions {
     | ((opts: { op: Operation }) => HTTPHeaders | Promise<HTTPHeaders>);
 }
 
-export function httpLink<TRouter extends AnyRouter>(
-  opts: HTTPLinkOptions,
-): TRPCLink<TRouter> {
-  const resolvedOpts = resolveHTTPLinkOptions(opts);
-  return (runtime) =>
-    ({ op }) =>
-      observable((observer) => {
-        const { path, input, type } = op;
+export function httpLinkFactory(factoryOpts: { requester: Requester }) {
+  return <TRouter extends AnyRouter>(
+    opts: HTTPLinkOptions,
+  ): TRPCLink<TRouter> => {
+    const resolvedOpts = resolveHTTPLinkOptions(opts);
 
-        const { promise, cancel } = httpRequest({
-          ...resolvedOpts,
-          runtime,
-          type,
-          path,
-          input,
-          headers() {
-            if (!opts.headers) {
-              return {};
-            }
-            if (typeof opts.headers === 'function') {
-              return opts.headers({
-                op,
-              });
-            }
-            return opts.headers;
-          },
-        });
-
-        promise
-          .then((res) => {
-            const transformed = transformResult(res.json, runtime);
+    return (runtime) =>
+      ({ op }) =>
+        observable((observer) => {
+          const { path, input, type } = op;
+          const { promise, cancel } = factoryOpts.requester({
+            ...resolvedOpts,
+            runtime,
+            type,
+            path,
+            input,
+            headers() {
+              if (!opts.headers) {
+                return {};
+              }
+              if (typeof opts.headers === 'function') {
+                return opts.headers({
+                  op,
+                });
+              }
+              return opts.headers;
+            },
+          });
+          promise
+            .then((res) => {
+              const transformed = transformResult(res.json, runtime);
 
-            if (!transformed.ok) {
-              observer.error(
-                TRPCClientError.from(transformed.error, {
-                  meta: res.meta,
-                }),
-              );
-              return;
-            }
-            observer.next({
-              context: res.meta,
-              result: transformed.result,
-            });
-            observer.complete();
-          })
-          .catch((cause) => observer.error(TRPCClientError.from(cause)));
+              if (!transformed.ok) {
+                observer.error(
+                  TRPCClientError.from(transformed.error, {
+                    meta: res.meta,
+                  }),
+                );
+                return;
+              }
+              observer.next({
+                context: res.meta,
+                result: transformed.result,
+              });
+              observer.complete();
+            })
+            .catch((cause) => observer.error(TRPCClientError.from(cause)));
 
-        return () => {
-          cancel();
-        };
-      });
+          return () => {
+            cancel();
+          };
+        });
+  };
 }
+
+export const httpLink = httpLinkFactory({ requester: jsonHttpRequester });

package/src/links/index.ts

@@ -1,9 +1,11 @@
+export * from './types';
+
 export * from './httpBatchLink';
 export * from './httpLink';
 export * from './loggerLink';
 export * from './splitLink';
 export * from './wsLink';
-export * from './types';
+export * from './httpFormDataLink';
 
 // These are not public (yet) as we get this functionality from tanstack query
 // export * from './retryLink';

package/src/links/internals/httpUtils.ts

@@ -5,6 +5,7 @@ import { getAbortController } from '../../internals/getAbortController';
 import {
   AbortControllerEsque,
   FetchEsque,
+  RequestInitEsque,
   ResponseEsque,
 } from '../../internals/types';
 import { HTTPHeaders, PromiseAndCancel, TRPCClientRuntime } from '../types';
@@ -74,13 +75,24 @@ function getInput(opts: GetInputOptions) {
       );
 }
 
-type GetUrlOptions = ResolvedHTTPLinkOptions &
+export type HTTPBaseRequestOptions = ResolvedHTTPLinkOptions &
   GetInputOptions & {
     type: ProcedureType;
     path: string;
   };
 
-export function getUrl(opts: GetUrlOptions) {
+export type GetUrl = (opts: HTTPBaseRequestOptions) => string;
+export type GetBody = (
+  opts: HTTPBaseRequestOptions,
+) => RequestInitEsque['body'];
+
+export type ContentOptions = {
+  contentTypeHeader?: string;
+  getUrl: GetUrl;
+  getBody: GetBody;
+};
+
+export const getUrl: GetUrl = (opts) => {
   let url = opts.url + '/' + opts.path;
   const queryParts: string[] = [];
   if ('inputs' in opts) {
@@ -96,22 +108,33 @@ export function getUrl(opts: GetUrlOptions) {
     url += '?' + queryParts.join('&');
   }
   return url;
-}
+};
 
-type GetBodyOptions = { type: ProcedureType } & GetInputOptions;
-
-export function getBody(opts: GetBodyOptions) {
+export const getBody: GetBody = (opts) => {
   if (opts.type === 'query') {
     return undefined;
   }
   const input = getInput(opts);
   return input !== undefined ? JSON.stringify(input) : undefined;
-}
+};
 
-export type HTTPRequestOptions = ResolvedHTTPLinkOptions &
-  GetInputOptions & {
-    type: ProcedureType;
-    path: string;
+export type Requester = (
+  opts: HTTPBaseRequestOptions & {
+    headers: () => HTTPHeaders | Promise<HTTPHeaders>;
+  },
+) => PromiseAndCancel<HTTPResult>;
+
+export const jsonHttpRequester: Requester = (opts) => {
+  return httpRequest({
+    ...opts,
+    contentTypeHeader: 'application/json',
+    getUrl,
+    getBody,
+  });
+};
+
+export type HTTPRequestOptions = HTTPBaseRequestOptions &
+  ContentOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
   };
 
@@ -122,8 +145,8 @@ export function httpRequest(
   const ac = opts.AbortController ? new opts.AbortController() : null;
 
   const promise = new Promise<HTTPResult>((resolve, reject) => {
-    const url = getUrl(opts);
-    const body = getBody(opts);
+    const url = opts.getUrl(opts);
+    const body = opts.getBody(opts);
 
     const meta = {} as HTTPResult['meta'];
     Promise.resolve(opts.headers())
@@ -132,12 +155,15 @@ export function httpRequest(
         if (type === 'subscription') {
           throw new Error('Subscriptions should use wsLink');
         }
+
         return opts.fetch(url, {
           method: METHOD[type],
           signal: ac?.signal,
           body: body,
           headers: {
-            'content-type': 'application/json',
+            ...(opts.contentTypeHeader
+              ? { 'content-type': opts.contentTypeHeader }
+              : {}),
             ...headers,
           },
         });

package/src/links/internals/isObject.ts

@@ -0,0 +1,4 @@
+export function isObject(value: unknown): value is Record<string, unknown> {
+  // check that value is object
+  return !!value && !Array.isArray(value) && typeof value === 'object';
+}

package/src/links/internals/transformResult.ts

@@ -6,6 +6,7 @@ import {
 } from '@trpc/server/rpc';
 import { TRPCClientRuntime } from '..';
 import { TRPCClientError } from '../../TRPCClientError';
+import { isObject } from './isObject';
 
 // FIXME:
 // - the generics here are probably unnecessary
@@ -40,11 +41,6 @@ function transformResultInner<TRouter extends AnyRouter, TOutput>(
   return { ok: true, result } as const;
 }
 
-function isObject(value: unknown): value is Record<string, unknown> {
-  // check that value is object
-  return !!value && !Array.isArray(value) && typeof value === 'object';
-}
-
 /**
  * Transforms and validates that the result is a valid TRPCResponse
  * @internal

package/src/links/loggerLink.ts

@@ -1,6 +1,7 @@
 import { AnyRouter } from '@trpc/server';
 import { observable, tap } from '@trpc/server/observable';
 import { TRPCClientError } from '..';
+import { isObject } from './internals/isObject';
 import { Operation, OperationResultEnvelope, TRPCLink } from './types';
 
 type ConsoleEsque = {
@@ -56,15 +57,30 @@ export interface LoggerLinkOptions<TRouter extends AnyRouter> {
   console?: ConsoleEsque;
 }
 
+function isFormData(value: unknown): value is FormData {
+  if (typeof FormData === 'undefined') {
+    // FormData is not supported
+    return false;
+  }
+  return value instanceof FormData;
+}
+
 // maybe this should be moved to it's own package
 const defaultLogger =
   <TRouter extends AnyRouter>(
     c: ConsoleEsque = console,
   ): LoggerLinkFn<TRouter> =>
   (props) => {
-    const { direction, input, type, path, context, id } = props;
+    const { direction, type, path, context, id } = props;
     const [light, dark] = palette[type];
 
+    const rawInput = props.input;
+
+    const input =
+      isObject(rawInput) && isFormData(rawInput)
+        ? Object.fromEntries(rawInput)
+        : props.input;
+
     const css = `
     background-color: #${direction === 'up' ? light : dark}; 
     color: ${direction === 'up' ? 'black' : 'white'};