archive-gh-me/openapi-typescript-codegen
1
0
Fork 0
mirror of https://github.com/ferdikoomen/openapi-typescript-codegen.git synced 2025-12-08 20:16:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #740 from sjoerdmulder/feature/formdata-as-body

Browse Source 
Allow FormData as body argument
This commit is contained in:
Ferdi Koomen 2021-12-22 11:29:37 -05:00 committed by GitHub
commit d11d7c1448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/core/fetch/getHeaders.hbs
View File

@ -33,7 +33,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
} else if (!isFormData(options.body)) {
headers.append('Content-Type', 'application/json');
}
}

2
src/templates/core/fetch/getRequestBody.hbs
View File

@ -2,7 +2,7 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);

3
src/templates/core/fetch/request.hbs
View File

@ -19,6 +19,9 @@ import { OpenAPI } from './OpenAPI';
{{>functions/isBlob}}
{{>functions/isFormData}}
{{>functions/base64}}

3
src/templates/core/functions/isFormData.hbs Normal file
View File

@ -0,0 +1,3 @@
function isFormData(value: any): value is FormData {
return value instanceof FormData;
}

2
src/templates/core/node/getHeaders.hbs
View File

@ -33,7 +33,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
headers.append('Content-Type', 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
} else if (!isFormData(options.body)) {
headers.append('Content-Type', 'application/json');
}
}

2
src/templates/core/node/getRequestBody.hbs
View File

@ -2,7 +2,7 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return options.body as any;
} else {
return JSON.stringify(options.body);

2
src/templates/core/xhr/getHeaders.hbs
View File

@ -33,7 +33,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
} else if (!isFormData(options.body)) {
headers.append('Content-Type', 'application/json');
}
}

2
src/templates/core/xhr/getRequestBody.hbs
View File

@ -2,7 +2,7 @@ function getRequestBody(options: ApiRequestOptions): any {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);

2
src/utils/registerHandlebarTemplates.ts
View File

@ -24,6 +24,7 @@ import functionGetQueryString from '../templates/core/functions/getQueryString.h
import functionGetUrl from '../templates/core/functions/getUrl.hbs';
import functionIsBlob from '../templates/core/functions/isBlob.hbs';
import functionIsDefined from '../templates/core/functions/isDefined.hbs';
import functionIsFormData from '../templates/core/functions/isFormData.hbs';
import functionIsString from '../templates/core/functions/isString.hbs';
import functionIsStringWithValue from '../templates/core/functions/isStringWithValue.hbs';
import functionIsSuccess from '../templates/core/functions/isSuccess.hbs';
@ -157,6 +158,7 @@ export function registerHandlebarTemplates(root: {
Handlebars.registerPartial('functions/getUrl', Handlebars.template(functionGetUrl));
Handlebars.registerPartial('functions/isBlob', Handlebars.template(functionIsBlob));
Handlebars.registerPartial('functions/isDefined', Handlebars.template(functionIsDefined));
Handlebars.registerPartial('functions/isFormData', Handlebars.template(functionIsFormData));
Handlebars.registerPartial('functions/isString', Handlebars.template(functionIsString));
Handlebars.registerPartial('functions/isStringWithValue', Handlebars.template(functionIsStringWithValue));
Handlebars.registerPartial('functions/isSuccess', Handlebars.template(functionIsSuccess));

16
test/__snapshots__/index.spec.js.snap
View File

@ -233,6 +233,10 @@ function isBlob(value: any): value is Blob {
return value instanceof Blob;
}
function isFormData(value: any): value is FormData {
return value instanceof FormData;
}
function base64(str: string): string {
try {
return btoa(str);
@ -347,7 +351,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
} else if (!isFormData(options.body)) {
headers.append('Content-Type', 'application/json');
}
}
@ -359,7 +363,7 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);
@ -2933,6 +2937,10 @@ function isBlob(value: any): value is Blob {
return value instanceof Blob;
}
function isFormData(value: any): value is FormData {
return value instanceof FormData;
}
function base64(str: string): string {
try {
return btoa(str);
@ -3047,7 +3055,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
} else if (!isFormData(options.body)) {
headers.append('Content-Type', 'application/json');
}
}
@ -3059,7 +3067,7 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);