Skip to content

Enable FormData as input #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable FormData as input #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,14 @@ function getQuery(
return queryString(queryObj)
}

function getHeaders(body?: string, init?: HeadersInit) {
function getHeaders(body?: CustomRequestInit['body'], init?: HeadersInit) {
const headers = new Headers(init)

if (body !== undefined && !headers.has('Content-Type')) {
if (
body !== undefined &&
!(body instanceof FormData) &&
!headers.has('Content-Type')
) {
headers.append('Content-Type', 'application/json')
}

Expand All @@ -86,8 +90,11 @@ function getHeaders(body?: string, init?: HeadersInit) {
return headers
}

function getBody(method: Method, payload: any) {
const body = sendBody(method) ? JSON.stringify(payload) : undefined
function getBody(method: Method, payload: unknown): CustomRequestInit['body'] {
if (!sendBody(method)) {
return
}
const body = payload instanceof FormData ? payload : JSON.stringify(payload)
// if delete don't send body if empty
return method === 'delete' && body === '{}' ? undefined : body
}
Expand All @@ -108,7 +115,10 @@ function mergeRequestInit(
return { ...first, ...second, headers }
}

function getFetchParams(request: Request) {
function getFetchParams(request: Request): {
url: string
init: CustomRequestInit
} {
// clone payload
// if body is a top level array [ 'a', 'b', param: value ] with param values
// using spread [ ...payload ] returns [ 'a', 'b' ] and skips custom keys
Expand Down
14 changes: 10 additions & 4 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,18 @@ export type OpArgType<OP> = OP extends {
}
// openapi 3
requestBody?: {
content: {
'application/json': infer RB
}
content:
| {
'application/json': infer RB
}
| {
'multipart/form-data': infer FD
}
}
}
? P & Q & (B extends Record<string, unknown> ? B[keyof B] : unknown) & RB
? FD extends Record<string, string>
? FormData
: P & Q & (B extends Record<string, unknown> ? B[keyof B] : unknown) & RB
: Record<string, never>

type OpResponseTypes<OP> = OP extends {
Expand Down