0.3.0 mixed form data - files and fields with objects

Author: gergan

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@essquare/typescript-openapi-codegen",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/essquare/typescript-openapi-codegen",

src/templates/core/functions/getFormData.hbs

@@ -17,7 +17,7 @@ const getFormData = (options: ApiRequestOptions) => {
             } else if (isBlob(value)) {
               formData.append(key, value, value.type);
             } else {
-                formData.append(key, JSON.stringify(value));
+                formData.append(key, new Blob([JSON.stringify(value)], {"type":"application/json"}));
             }
         };
 

src/templates/core/functions/prepareFormData.hbs

@@ -19,7 +19,7 @@ const prepareFormData = (formData: any) => {
     const prefix = `--${boundary}\r\nContent-Disposition: form-data; name="`;
 
     for (let [name, value] of formData) {
-        if (typeof value === 'string') {
+        if (isStringWithValue(value)) {
             chunks.push(prefix + escape(name) + `"\r\n\r\n${value.replace(/\r\n?/g, '\n').replace(/\n/g,'\r\n')}\r\n`);
         } else {
             chunks.push(prefix + escape(name) + `"; filename="${escape(value.name, true)}"\r\n` + `Content-Type: ${value.type || 'application/octet-stream'}\r\n\r\n`, value, '\r\n');

test/__snapshots__/index.spec.ts.snap

@@ -374,7 +374,7 @@ const getFormData = (options: ApiRequestOptions) => {
             } else if (isBlob(value)) {
               formData.append(key, value, value.type);
             } else {
-                formData.append(key, JSON.stringify(value));
+                formData.append(key, new Blob([JSON.stringify(value)], {\\"type\\":\\"application/json\\"}));
             }
         };
 
@@ -3468,7 +3468,7 @@ const getFormData = (options: ApiRequestOptions) => {
             } else if (isBlob(value)) {
               formData.append(key, value, value.type);
             } else {
-                formData.append(key, JSON.stringify(value));
+                formData.append(key, new Blob([JSON.stringify(value)], {\\"type\\":\\"application/json\\"}));
             }
         };
 

test/e2e/client.axios.spec.ts

@@ -13,7 +13,7 @@ describe('client.axios', () => {
 
     afterAll(async () => {
         await server.stop();
-    });
+    }, 30000);
 
     it('requests token', async () => {
         const { ApiClient } = require('./generated/client/axios/index.js');