feat: support form-data and urlencoded content types

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
   "formatter": {
     "enabled": true,
     "formatWithErrors": false,

src/gen/createBarrel.ts

@@ -1,4 +1,5 @@
 import { camel } from 'case';
+
 import type { ApiOperation, ClientOptions } from '../types';
 import { renderFile } from '../utils';
 

src/gen/genOperations.spec.ts

@@ -1,9 +1,9 @@
 import { expect } from 'chai';
+import type { OpenAPIV3 as OA3 } from 'openapi-types';
 
 import { prepareOperations, fixDuplicateOperations, getOperationName } from './genOperations';
 import type { ApiOperation } from '../types';
 import { getClientOptions } from '../utils';
-import type { OpenAPIV3 as OA3 } from 'openapi-types';
 
 describe('prepareOperations', () => {
   const opts = getClientOptions();
@@ -105,7 +105,7 @@ describe('prepareOperations', () => {
       expect(op2.parameters).to.deep.equal([]);
     });
 
-    describe('requestBody', () => {
+    describe('requestBody (JSON)', () => {
       it('should handle requestBody with ref type', () => {
         const ops: ApiOperation[] = [
           {
@@ -129,6 +129,7 @@ describe('prepareOperations', () => {
 
         const [op1] = prepareOperations(ops, opts);
         const expectedBodyParam = {
+          contentType: 'json',
           name: 'body',
           optional: false,
           originalName: 'body',
@@ -205,6 +206,7 @@ describe('prepareOperations', () => {
 
           const [op1] = prepareOperations(ops, opts);
           const expectedBodyParam = {
+            contentType: 'json',
             name: 'body',
             optional: true,
             originalName: 'body',
@@ -251,6 +253,7 @@ describe('prepareOperations', () => {
 
         const [op1] = prepareOperations(ops, opts);
         const expectedBodyParam = {
+          contentType: 'json',
           name: 'petBody',
           optional: false,
           originalName: 'pet-body',
@@ -334,6 +337,127 @@ describe('prepareOperations', () => {
         ]);
       });
     });
+
+    describe('requestBody (x-www-form-urlencoded)', () => {
+      it('should handle requestBody with ref type', () => {
+        const ops: ApiOperation[] = [
+          {
+            operationId: 'createPet',
+            method: 'post',
+            path: '/pet',
+            requestBody: {
+              required: true,
+              content: {
+                'application/x-www-form-urlencoded': {
+                  schema: {
+                    $ref: '#/components/schemas/Pet',
+                  },
+                },
+              },
+            },
+            responses: {},
+            group: null,
+          },
+        ];
+
+        const [op1] = prepareOperations(ops, opts);
+        const expectedBodyParam = {
+          contentType: 'urlencoded',
+          name: 'body',
+          optional: false,
+          originalName: 'body',
+          type: 'Pet',
+          original: ops[0].requestBody,
+        };
+
+        expect(op1.body).to.deep.equal(expectedBodyParam);
+        expect(op1.parameters).to.deep.equal([expectedBodyParam]);
+      });
+    });
+
+    describe('requestBody (application/octet-stream)', () => {
+      it('should handle File request body', () => {
+        const ops: ApiOperation[] = [
+          {
+            operationId: 'createPet',
+            method: 'post',
+            path: '/pet',
+            requestBody: {
+              required: true,
+              content: {
+                'application/octet-stream': {
+                  schema: {
+                    type: 'string',
+                    format: 'binary',
+                  },
+                },
+              },
+            },
+            responses: {},
+            group: null,
+          },
+        ];
+
+        const [op1] = prepareOperations(ops, opts);
+        const expectedBodyParam = {
+          contentType: 'binary',
+          name: 'body',
+          optional: false,
+          originalName: 'body',
+          type: 'File',
+          original: ops[0].requestBody,
+        };
+
+        expect(op1.body).to.deep.equal(expectedBodyParam);
+        expect(op1.parameters).to.deep.equal([expectedBodyParam]);
+      });
+    });
+
+    describe('requestBody (multipart/form-data)', () => {
+      it('should handle form data', () => {
+        const ops: ApiOperation[] = [
+          {
+            operationId: 'createPet',
+            method: 'post',
+            path: '/pet',
+            requestBody: {
+              required: true,
+              content: {
+                'multipart/form-data': {
+                  schema: {
+                    type: 'object',
+                    properties: {
+                      name: {
+                        type: 'string',
+                      },
+                      file: {
+                        type: 'string',
+                        format: 'binary',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+            responses: {},
+            group: null,
+          },
+        ];
+
+        const [op1] = prepareOperations(ops, opts);
+        const expectedBodyParam = {
+          contentType: 'form-data',
+          name: 'body',
+          optional: false,
+          originalName: 'body',
+          type: 'FormData',
+          original: ops[0].requestBody,
+        };
+
+        expect(op1.body).to.deep.equal(expectedBodyParam);
+        expect(op1.parameters).to.deep.equal([expectedBodyParam]);
+      });
+    });
   });
 });
 

src/gen/genOperations.ts

@@ -155,15 +155,6 @@ function getParams(
     }));
 }
 
-export function renderOperationGroup(
-  group: any[],
-  func: any,
-  spec: OA3.Document,
-  options: ClientOptions
-): string[] {
-  return group.map((op) => func.call(this, spec, op, options)).reduce((a, b) => a.concat(b));
-}
-
 /**
  * Escapes param names to more safe form
  */
@@ -176,29 +167,63 @@ export function getParamName(name: string): string {
   );
 }
 
-function getRequestBody(
-  reqBody: OA3.ReferenceObject | OA3.RequestBodyObject
-): IOperationParam | null {
+function getRequestBody(reqBody: OA3.ReferenceObject | OA3.RequestBodyObject): IBodyParam | null {
   if (reqBody && 'content' in reqBody) {
-    const bodyContent =
-      reqBody.content['application/json'] ??
-      reqBody.content['text/json'] ??
-      reqBody.content['text/plain'] ??
-      null;
+    const [bodyContent, contentType] = getBestContentType(reqBody);
+    const isFormData = contentType === 'form-data';
 
     if (bodyContent) {
       return {
         originalName: reqBody['x-name'] ?? 'body',
         name: getParamName(reqBody['x-name'] ?? 'body'),
-        type: getParameterType(bodyContent, {}),
+        type: isFormData ? 'FormData' : getParameterType(bodyContent, {}),
         optional: !reqBody.required,
         original: reqBody,
+        contentType,
       };
     }
   }
   return null;
 }
 
+const orderedContentTypes = [
+  'application/json',
+  'text/json',
+  'text/plain',
+  'application/x-www-form-urlencoded',
+  'multipart/form-data',
+];
+function getBestContentType(reqBody: OA3.RequestBodyObject): [OA3.MediaTypeObject, MyContentType] {
+  const contentTypes = Object.keys(reqBody.content);
+  if (contentTypes.length === 0) {
+    return [null, null];
+  }
+
+  const firstContentType = orderedContentTypes.find((ct) => contentTypes.includes(ct));
+  if (firstContentType) {
+    const typeObject = reqBody.content[firstContentType];
+    const type = getContentType(firstContentType);
+    return [typeObject, type];
+  }
+
+  const typeObject = reqBody.content[contentTypes[0]];
+  const type = getContentType(contentTypes[0]);
+  return [typeObject, type];
+}
+
+function getContentType(type: string) {
+  if (type === 'application/x-www-form-urlencoded') {
+    return 'urlencoded';
+  }
+  if (type === 'multipart/form-data') {
+    return 'form-data';
+  }
+  if (type === 'application/octet-stream') {
+    return 'binary';
+  }
+  return 'json';
+}
+
 interface ClientData {
   clientName: string;
   camelCaseName: string;
@@ -214,7 +239,7 @@ interface IOperation {
   parameters: IOperationParam[];
   query: IOperationParam[];
   pathParams: IOperationParam[];
-  body: IOperationParam;
+  body: IBodyParam;
   headers: IOperationParam[];
 }
 
@@ -225,3 +250,8 @@ interface IOperationParam {
   optional: boolean;
   original: OA3.ParameterObject | OA3.RequestBodyObject;
 }
+
+interface IBodyParam extends IOperationParam {
+  contentType?: MyContentType;
+}
+type MyContentType = 'json' | 'urlencoded' | 'form-data' | 'binary';