Merge pull request #746 from hey-api/fix/client-fetch-body

fix: handle formData parameters in generated types
hey-api · Jul 4, 2024 · 24ed655 · 24ed655
2 parents 0e14810 + 0448823
commit 24ed655
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/.changeset/brown-carrots-yawn.md b/.changeset/brown-carrots-yawn.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: handle formData parameters in generated types
diff --git a/packages/openapi-ts/src/utils/write/types.ts b/packages/openapi-ts/src/utils/write/types.ts
@@ -265,15 +265,20 @@ const processServiceTypes = ({
       }
 
       if (operation.parameters.length > 0) {
-        const bodyParameter = operation.parameters
-          .filter((parameter) => parameter.in === 'body')
-          .sort(sorterByName)[0];
+        let bodyParameter = operation.parameters.find(
+          (parameter) => parameter.in === 'body',
+        );
+        if (!bodyParameter) {
+          bodyParameter = operation.parameters.find(
+            (parameter) => parameter.in === 'formData',
+          );
+        }
         const bodyParameters: OperationParameter = {
+          mediaType: null,
           ...emptyModel,
           ...bodyParameter,
           in: 'body',
           isRequired: bodyParameter ? bodyParameter.isRequired : false,
-          // mediaType: null,
           name: 'body',
           prop: 'body',
         };
@@ -379,7 +384,7 @@ const processServiceTypes = ({
           response.responseTypes.includes('error'),
         );
 
-        if (isStandaloneClient(config)) {
+        if (isStandalone) {
           // create type export for operation error
           generateType({
             client,

diff --git a/...es/openapi-ts/test/__snapshots__/test/generated/v3_hey-api_client-axios/types.gen.ts.snap b/...es/openapi-ts/test/__snapshots__/test/generated/v3_hey-api_client-axios/types.gen.ts.snap
@@ -1174,6 +1174,10 @@ export type PostApiRequestBodyData = {
 };
 
 export type PostApiFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: ModelWithString;
     query?: {
         /**
          * This is a reusable parameter
@@ -1414,7 +1418,12 @@ export type ComplexTypesResponse = Array<ModelWithString>;
 
 export type ComplexTypesError = unknown;
 
-export type MultipartRequestData = unknown;
+export type MultipartRequestData = {
+    body?: {
+        content?: (Blob | File);
+        data?: ModelWithString | null;
+    };
+};
 
 export type MultipartResponseResponse = {
     file?: (Blob | File);

diff --git a/...es/openapi-ts/test/__snapshots__/test/generated/v3_hey-api_client-fetch/types.gen.ts.snap b/...es/openapi-ts/test/__snapshots__/test/generated/v3_hey-api_client-fetch/types.gen.ts.snap
@@ -1174,6 +1174,10 @@ export type PostApiRequestBodyData = {
 };
 
 export type PostApiFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: ModelWithString;
     query?: {
         /**
          * This is a reusable parameter
@@ -1414,7 +1418,12 @@ export type ComplexTypesResponse = Array<ModelWithString>;
 
 export type ComplexTypesError = unknown;
 
-export type MultipartRequestData = unknown;
+export type MultipartRequestData = {
+    body?: {
+        content?: (Blob | File);
+        data?: ModelWithString | null;
+    };
+};
 
 export type MultipartResponseResponse = {
     file?: (Blob | File);

diff --git a/packages/openapi-ts/test/sample.cjs b/packages/openapi-ts/test/sample.cjs
@@ -17,14 +17,14 @@ const main = async () => {
     },
     services: {
       // asClass: true,
-      export: false,
+      // export: false,
       // name: '^Parameters',
     },
     types: {
       // dates: 'types+transform',
       // enums: 'typescript',
-      include:
-        '^(ModelWithOneOfAndProperties|CompositionWithOneOfAndProperties)',
+      // include:
+      //   '^(ModelWithOneOfAndProperties|CompositionWithOneOfAndProperties)',
       // name: 'PascalCase',
     },
     // useOptions: false,