Skip to content

fix(parse): fix form data v3 #1

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.

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: fix-required
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/client/interfaces/OperationParameters.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export interface OperationParameters {
parametersCookie: OperationParameter[];
parametersHeader: OperationParameter[];
parametersBody: OperationParameter | null;
parametersFormData: OperationParameter | null; // only for V3
}
1 change: 1 addition & 0 deletions src/openApi/v2/parser/getOperation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
parametersHeader: [...pathParams.parametersHeader],
parametersCookie: [...pathParams.parametersCookie],
parametersBody: pathParams.parametersBody,
parametersFormData: null, // should not be touched in V2
imports: [],
errors: [],
results: [],
Expand Down
1 change: 1 addition & 0 deletions src/openApi/v2/parser/getOperationParameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function getOperationParameters(openApi: OpenApi, parameters: OpenApiPara
parametersCookie: [],
parametersHeader: [],
parametersBody: null,
parametersFormData: null,
};

// Iterate over the parameters
Expand Down
2 changes: 1 addition & 1 deletion src/openApi/v3/interfaces/OpenApiParameter.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { OpenApiSchema } from './OpenApiSchema';
*/
export interface OpenApiParameter extends OpenApiReference {
name: string;
in: 'path' | 'query' | 'header' | 'formData' | 'cookie';
in: 'path' | 'query' | 'header' | 'cookie';
description?: string;
required?: boolean;
nullable?: boolean;
Expand Down
3 changes: 3 additions & 0 deletions src/openApi/v3/parser/getContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@ export function getContent(openApi: OpenApi, content: Dictionary<OpenApiMediaTyp
) || (
content['multipart/batch'] &&
content['multipart/batch'].schema
) || (
content['multipart/form-data'] &&
content['multipart/form-data'].schema
) || null;
}
8 changes: 7 additions & 1 deletion src/openApi/v3/parser/getOperation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
parametersHeader: [...pathParams.parametersHeader],
parametersCookie: [...pathParams.parametersCookie],
parametersBody: pathParams.parametersBody,
parametersFormData: pathParams.parametersFormData,
imports: [],
errors: [],
results: [],
Expand All @@ -65,7 +66,12 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
operation.imports.push(...requestBody.imports);
operation.parameters.push(requestBody);
operation.parameters = operation.parameters.sort(sortByRequired);
operation.parametersBody = requestBody;

if (op.requestBody.content['multipart/form-data']) {
operation.parametersFormData = requestBody;
} else {
operation.parametersBody = requestBody;
}
}

// Parse the operation responses.
Expand Down
7 changes: 1 addition & 6 deletions src/openApi/v3/parser/getOperationParameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function getOperationParameters(openApi: OpenApi, parameters: OpenApiPara
parametersCookie: [],
parametersHeader: [],
parametersBody: null, // Not used in V3 -> @see requestBody
parametersFormData: null,
};

// Iterate over the parameters
Expand All @@ -38,12 +39,6 @@ export function getOperationParameters(openApi: OpenApi, parameters: OpenApiPara
operationParameters.imports.push(...parameter.imports);
break;

case 'formData':
operationParameters.parametersForm.push(parameter);
operationParameters.parameters.push(parameter);
operationParameters.imports.push(...parameter.imports);
break;

case 'cookie':
operationParameters.parametersCookie.push(parameter);
operationParameters.parameters.push(parameter);
Expand Down
3 changes: 3 additions & 0 deletions src/templates/exportService.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ export class {{{name}}} {
{{/each}}
},
{{/if}}
{{#if parametersFormData}}
formData: {{{parametersFormData.name}}},
{{/if}}
{{#if parametersBody}}
body: {{{parametersBody.name}}},
{{#if parametersBody.mediaType}}
Expand Down