Merge pull request #1 from tomohisa/fix-form-data

FormData as [FromForm] RequestBody

Author: tomohisa

package-lock.json

@@ -14,4 +14,5 @@ export interface Model extends Schema {
     enum: Enum[];
     enums: Model[];
     properties: Model[];
+    content?: string;
 }

src/client/interfaces/Model.d.ts

@@ -9,4 +9,5 @@ export interface OperationParameters {
     parametersCookie: OperationParameter[];
     parametersHeader: OperationParameter[];
     parametersBody: OperationParameter | null;
+    parametersFormData?: OperationParameter | null;
 }

src/client/interfaces/OperationParameters.d.ts

@@ -44,4 +44,5 @@ export interface OpenApiSchema extends OpenApiReference, WithEnumExtension {
     externalDocs?: OpenApiExternalDocs;
     example?: any;
     deprecated?: boolean;
+    content?: string;
 }

src/openApi/v3/interfaces/OpenApiSchema.d.ts

@@ -5,26 +5,30 @@ import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 
 export function getContent(openApi: OpenApi, content: Dictionary<OpenApiMediaType>): OpenApiSchema | null {
     /* prettier-ignore */
+    let contentToReturn
     return (
         content['application/json-patch+json'] &&
-        content['application/json-patch+json'].schema
+        { ...content['application/json-patch+json'].schema, content: 'application/json-patch+json' }
     ) || (
         content['application/json'] &&
-        content['application/json'].schema
+        { ...content['application/json'].schema, content: 'application/json' }
     ) || (
         content['text/json'] &&
-        content['text/json'].schema
+        { ...content['text/json'].schema, content: 'text/json' }
     ) || (
         content['text/plain'] &&
-        content['text/plain'].schema
+        { ...content['text/plain'].schema, content: 'text/plain' }
     ) || (
         content['multipart/mixed'] &&
-        content['multipart/mixed'].schema
+        { ...content['multipart/mixed'].schema, content: 'multipart/mixed' }
     ) || (
         content['multipart/related'] &&
-        content['multipart/related'].schema
+        { ...content['multipart/related'].schema, content: 'multipart/related' }
     ) || (
         content['multipart/batch'] &&
-        content['multipart/batch'].schema
+        { ...content['multipart/batch'].schema, content: 'multipart/batch' }
+    ) || (
+        content['multipart/form-data'] &&
+        { ...content['multipart/form-data'].schema, content: 'multipart/form-data' }
     ) || null;
 }

src/openApi/v3/parser/getContent.ts

@@ -42,6 +42,7 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefiniti
         enum: [],
         enums: [],
         properties: [],
+        content: definition.content
     };
 
     if (definition.$ref) {

src/openApi/v3/parser/getModel.ts

@@ -62,10 +62,17 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
     if (op.requestBody) {
         const requestBodyDef = getRef<OpenApiRequestBody>(openApi, op.requestBody);
         const requestBody = getOperationRequestBody(openApi, requestBodyDef);
-        operation.imports.push(...requestBody.imports);
-        operation.parameters.push(requestBody);
-        operation.parameters = operation.parameters.sort(sortByRequired);
-        operation.parametersBody = requestBody;
+        if (requestBody.name == "formData") {
+            operation.imports.push(...requestBody.imports);
+            operation.parameters.push(requestBody);
+            operation.parameters = operation.parameters.sort(sortByRequired);
+            operation.parametersFormData = requestBody;
+        } else {
+            operation.imports.push(...requestBody.imports);
+            operation.parameters.push(requestBody);
+            operation.parameters = operation.parameters.sort(sortByRequired);
+            operation.parametersBody = requestBody;
+        }
     }
 
     // Parse the operation responses.

src/openApi/v3/parser/getOperation.ts

@@ -30,7 +30,7 @@ export function getOperationRequestBody(openApi: OpenApi, parameter: OpenApiRequ
     };
 
     if (parameter.content) {
-        const schema = getContent(openApi, parameter.content);
+        var schema = getContent(openApi, parameter.content);
         if (schema) {
             if (schema?.$ref) {
                 const model = getType(schema.$ref);
@@ -42,6 +42,9 @@ export function getOperationRequestBody(openApi: OpenApi, parameter: OpenApiRequ
                 return requestBody;
             } else {
                 const model = getModel(openApi, schema);
+                if (model.content == "multipart/form-data") {
+                    requestBody.name = 'formData'
+                }
                 requestBody.export = model.export;
                 requestBody.type = model.type;
                 requestBody.base = model.base;

src/openApi/v3/parser/getOperationRequestBody.ts

@@ -70,6 +70,9 @@ export class {{{name}}} {
             {{#if parametersBody}}
             body: {{{parametersBody.name}}},
             {{/if}}
+            {{#if parametersFormData}}
+            formData: {{{parametersFormData.name}}},
+            {{/if}}
             {{#if responseHeader}}
             responseHeader: '{{{responseHeader}}}',
             {{/if}}

src/templates/exportService.hbs

@@ -31,10 +31,19 @@ async function generateV3() {
         request: './test/custom/request.ts',
     });
 }
+async function generateForm() {
+    /* eslint-disable @typescript-eslint/no-var-requires */
+    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
+    await OpenAPI.generate({
+        input: "https://localhost:44350/swagger/v1/swagger.json",
+        output: './test/generated/form/',
+        useOptions: true
+    });
+ }
+
 
 async function generate() {
-    await generateV2();
-    await generateV3();
+    await generateForm();
 }
 
 generate();