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 #644 from vanhoofmaarten/hotfix/respect-mediatype

Browse Source 
Fix: Respect mediatype
This commit is contained in:
Ferdi Koomen 2021-04-27 13:15:34 +02:00 committed by GitHub
commit 22f4d28071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 89 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/interfaces/OperationParameter.d.ts vendored
View File

@ -3,4 +3,5 @@ import type { Model } from './Model';
export interface OperationParameter extends Model {
in: 'path' | 'query' | 'header' | 'formData' | 'body' | 'cookie';
prop: string;
mediaType: string | null;
}

1
src/openApi/v2/parser/getOperationParameter.ts
View File

@ -42,6 +42,7 @@ export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParame
enum: [],
enums: [],
properties: [],
mediaType: null,
};
if (parameter.$ref) {

10
src/openApi/v3/parser/getMediaType.ts Normal file
View File

@ -0,0 +1,10 @@
import type { Dictionary } from '../../../utils/types';
import type { OpenApi } from '../interfaces/OpenApi';
import type { OpenApiMediaType } from '../interfaces/OpenApiMediaType';
export function getMediaType(openApi: OpenApi, content: Dictionary<OpenApiMediaType>): string | null {
return (
Object.keys(content).find(key => ['application/json-patch+json', 'application/json', 'text/json', 'text/plain', 'multipart/mixed', 'multipart/related', 'multipart/batch'].includes(key)) ||
null
);
}

1
src/openApi/v3/parser/getOperationParameter.ts
View File

@ -27,6 +27,7 @@ export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParame
enum: [],
enums: [],
properties: [],
mediaType: null,
};
if (parameter.$ref) {

4
src/openApi/v3/parser/getOperationRequestBody.ts
View File

@ -4,6 +4,7 @@ import type { OpenApi } from '../interfaces/OpenApi';
import type { OpenApiRequestBody } from '../interfaces/OpenApiRequestBody';
import { getComment } from './getComment';
import { getContent } from './getContent';
import { getMediaType } from './getMediaType';
import { getModel } from './getModel';
import { getType } from './getType';
@ -27,11 +28,14 @@ export function getOperationRequestBody(openApi: OpenApi, parameter: OpenApiRequ
enum: [],
enums: [],
properties: [],
mediaType: null,
};
if (parameter.content) {
const schema = getContent(openApi, parameter.content);
const mediaType = getMediaType(openApi, parameter.content);
if (schema) {
requestBody.mediaType = mediaType;
if (schema?.$ref) {
const model = getType(schema.$ref);
requestBody.export = 'reference';

1
src/templates/core/ApiRequestOptions.hbs
View File

@ -8,6 +8,7 @@ export type ApiRequestOptions = {
readonly query?: Record<string, any>;
readonly formData?: Record<string, any>;
readonly body?: any;
readonly bodyMediaType?: string;
readonly responseHeader?: string;
readonly errors?: Record<number, string>;
}

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

@ -20,12 +20,16 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
}
if (options.body) {
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
if (options.bodyMediaType) {
headers.append('Content-Type', options.bodyMediaType);
} else {
headers.append('Content-Type', 'application/json');
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
headers.append('Content-Type', 'application/json');
}
}
}
return headers;

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

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

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

@ -20,12 +20,16 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
}
if (options.body) {
if (isBinary(options.body)) {
headers.append('Content-Type', 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
if (options.bodyMediaType) {
headers.append('Content-Type', options.bodyMediaType);
} else {
headers.append('Content-Type', 'application/json');
if (isBinary(options.body)) {
headers.append('Content-Type', 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
headers.append('Content-Type', 'application/json');
}
}
}
return headers;

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

@ -3,7 +3,9 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
return getFormData(options.formData);
}
if (options.body) {
if (isString(options.body) || isBinary(options.body)) {
if (options.bodyMediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBinary(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);

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

@ -20,12 +20,16 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
}
if (options.body) {
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
if (options.bodyMediaType) {
headers.append('Content-Type', options.bodyMediaType);
} else {
headers.append('Content-Type', 'application/json');
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
headers.append('Content-Type', 'application/json');
}
}
}
return headers;

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

@ -3,7 +3,9 @@ function getRequestBody(options: ApiRequestOptions): any {
return getFormData(options.formData);
}
if (options.body) {
if (isString(options.body) || isBlob(options.body)) {
if (options.bodyMediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);

3
src/templates/exportService.hbs
View File

@ -69,6 +69,9 @@ export class {{{name}}} {
{{/if}}
{{#if parametersBody}}
body: {{{parametersBody.name}}},
{{#if parametersBody.mediaType}}
bodyMediaType: '{{{parametersBody.mediaType}}}',
{{/if}}
{{/if}}
{{#if responseHeader}}
responseHeader: '{{{responseHeader}}}',

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

@ -35,6 +35,7 @@ export type ApiRequestOptions = {
readonly query?: Record<string, any>;
readonly formData?: Record<string, any>;
readonly body?: any;
readonly bodyMediaType?: string;
readonly responseHeader?: string;
readonly errors?: Record<number, string>;
}"
@ -180,12 +181,16 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
}
if (options.body) {
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
if (options.bodyMediaType) {
headers.append('Content-Type', options.bodyMediaType);
} else {
headers.append('Content-Type', 'application/json');
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
headers.append('Content-Type', 'application/json');
}
}
}
return headers;
@ -196,7 +201,9 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
return getFormData(options.formData);
}
if (options.body) {
if (isString(options.body) || isBlob(options.body)) {
if (options.bodyMediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);
@ -2383,6 +2390,7 @@ export type ApiRequestOptions = {
readonly query?: Record<string, any>;
readonly formData?: Record<string, any>;
readonly body?: any;
readonly bodyMediaType?: string;
readonly responseHeader?: string;
readonly errors?: Record<number, string>;
}"
@ -2528,12 +2536,16 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
}
if (options.body) {
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
if (options.bodyMediaType) {
headers.append('Content-Type', options.bodyMediaType);
} else {
headers.append('Content-Type', 'application/json');
if (isBlob(options.body)) {
headers.append('Content-Type', options.body.type || 'application/octet-stream');
} else if (isString(options.body)) {
headers.append('Content-Type', 'text/plain');
} else {
headers.append('Content-Type', 'application/json');
}
}
}
return headers;
@ -2544,7 +2556,9 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
return getFormData(options.formData);
}
if (options.body) {
if (isString(options.body) || isBlob(options.body)) {
if (options.bodyMediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body)) {
return options.body;
} else {
return JSON.stringify(options.body);
@ -4481,6 +4495,7 @@ export class ComplexService {
method: 'PUT',
path: \`/api/v\${OpenAPI.VERSION}/complex/\${id}\`,
body: requestBody,
bodyMediaType: 'application/json-patch+json',
});
return result.body;
}
@ -4777,6 +4792,7 @@ export class ParametersService {
'parameterForm': parameterForm,
},
body: requestBody,
bodyMediaType: 'application/json',
});
return result.body;
}
@ -4821,6 +4837,7 @@ export class ParametersService {
'parameter_form': parameterForm,
},
body: requestBody,
bodyMediaType: 'application/json',
});
return result.body;
}
@ -4841,6 +4858,7 @@ export class ParametersService {
'parameter': parameter,
},
body: requestBody,
bodyMediaType: 'application/json',
});
return result.body;
}
@ -4861,6 +4879,7 @@ export class ParametersService {
'parameter': parameter,
},
body: requestBody,
bodyMediaType: 'application/json',
});
return result.body;
}
@ -4889,6 +4908,7 @@ export class RequestBodyService {
method: 'POST',
path: \`/api/v\${OpenAPI.VERSION}/requestBody/\`,
body: requestBody,
bodyMediaType: 'application/json',
});
return result.body;
}