fix(client): respect multiple request body types (#360)

ardatan · Jul 19, 2023 · 098806a · 098806a
1 parent b1114a5
commit 098806a
Show file tree

Hide file tree

Showing 4 changed files with 862 additions and 42 deletions.
diff --git a/.changeset/slimy-parents-refuse.md b/.changeset/slimy-parents-refuse.md
@@ -0,0 +1,5 @@
+---
+'fets': patch
+---
+
+Respect multiple request body types
diff --git a/packages/fets/src/client/types.ts b/packages/fets/src/client/types.ts
@@ -251,6 +251,46 @@ export type OASRequestParams<
           OASMethodMap<TOAS, TPath>[TMethod]['requestBody']['content']['application/json']['schema']
         >;
       }
+  : OASMethodMap<TOAS, TPath>[TMethod] extends {
+      requestBody: { content: { 'multipart/form-data': { schema: JSONSchema } } };
+    }
+  ? OASMethodMap<TOAS, TPath>[TMethod]['requestBody'] extends { required: true }
+    ? {
+        formData: FromSchema<
+          OASMethodMap<
+            TOAS,
+            TPath
+          >[TMethod]['requestBody']['content']['multipart/form-data']['schema']
+        >;
+      }
+    : {
+        formData?: FromSchema<
+          OASMethodMap<
+            TOAS,
+            TPath
+          >[TMethod]['requestBody']['content']['multipart/form-data']['schema']
+        >;
+      }
+  : OASMethodMap<TOAS, TPath>[TMethod] extends {
+      requestBody: { content: { 'application/x-www-form-urlencoded': { schema: JSONSchema } } };
+    }
+  ? OASMethodMap<TOAS, TPath>[TMethod]['requestBody'] extends { required: true }
+    ? {
+        formUrlEncoded: FromSchema<
+          OASMethodMap<
+            TOAS,
+            TPath
+          >[TMethod]['requestBody']['content']['application/x-www-form-urlencoded']['schema']
+        >;
+      }
+    : {
+        formUrlEncoded?: FromSchema<
+          OASMethodMap<
+            TOAS,
+            TPath
+          >[TMethod]['requestBody']['content']['application/x-www-form-urlencoded']['schema']
+        >;
+      }
   : {}) &
   (OASMethodMap<TOAS, TPath>[TMethod] extends { parameters: { name: string; in: string }[] }
     ? OASParamMap<OASMethodMap<TOAS, TPath>[TMethod]['parameters']>
@@ -305,48 +345,6 @@ export type OASRequestParams<
       }
       ? OASSecurityParams<TSecurityScheme>
       : {}
-    : {}) &
-  (OASMethodMap<TOAS, TPath>[TMethod] extends {
-    requestBody: { content: { 'multipart/form-data': { schema: JSONSchema } } };
-  }
-    ? OASMethodMap<TOAS, TPath>[TMethod]['requestBody'] extends { required: true }
-      ? {
-          formData: FromSchema<
-            OASMethodMap<
-              TOAS,
-              TPath
-            >[TMethod]['requestBody']['content']['multipart/form-data']['schema']
-          >;
-        }
-      : {
-          formData?: FromSchema<
-            OASMethodMap<
-              TOAS,
-              TPath
-            >[TMethod]['requestBody']['content']['multipart/form-data']['schema']
-          >;
-        }
-    : {}) &
-  (OASMethodMap<TOAS, TPath>[TMethod] extends {
-    requestBody: { content: { 'application/x-www-form-urlencoded': { schema: JSONSchema } } };
-  }
-    ? OASMethodMap<TOAS, TPath>[TMethod]['requestBody'] extends { required: true }
-      ? {
-          formUrlEncoded: FromSchema<
-            OASMethodMap<
-              TOAS,
-              TPath
-            >[TMethod]['requestBody']['content']['application/x-www-form-urlencoded']['schema']
-          >;
-        }
-      : {
-          formUrlEncoded?: FromSchema<
-            OASMethodMap<
-              TOAS,
-              TPath
-            >[TMethod]['requestBody']['content']['application/x-www-form-urlencoded']['schema']
-          >;
-        }
     : {});
 
 export type OASInput<