@penkov/swagger-code-gen 1.7.5 → 1.7.7

package/dist/property.js

@@ -89,6 +89,7 @@ export class Property {
     static toJsType(tpe, itemTpe = 'any', format = none) {
         switch (tpe) {
             case 'integer': return 'number';
+            case 'file': return 'File';
             case 'string':
                 if (format.contains('binary')) {
                     return 'Blob | Buffer';

package/dist/templates/index.ejs

@@ -49,7 +49,7 @@ function valueToString(value: any): string {
 /**
  * Helper to serialize data for 'multipart/form-data'
  */
-function objectToForm(o: object): FormData {
+function objectToForm(o: Record<string, any>): FormData {
     const res = new FormData();
     Object.keys(o)
         .filter(k => o[k] !== undefined && o[k] !== null)
@@ -58,6 +58,8 @@ function objectToForm(o: object): FormData {
                 o[k].forEach(e => {
                     res.append(k, valueToString(e));
                 })
+            } else if (o[k] instanceof File) {
+                res.append(k, o[k]);
             } else {
                 res.append(k, valueToString(o[k]));
             }
@@ -68,7 +70,7 @@ function objectToForm(o: object): FormData {
 /**
  * Helper to serialize data for 'application/x-www-form-urlencoded'
  */
-function objectToFormWwwEncoded(o: object): string {
+function objectToFormWwwEncoded(o: Record<string, any>): string {
     return Object.keys(o)
         .filter(k => o[k] !== undefined && o[k] !== null)
         .map(k => `${k}=${encodeURIComponent(valueToString(o[k]))}`)
@@ -82,7 +84,8 @@ async function requestImpl<T>(request: Request, requestOptions: RequestOptions):
     if (postProcessed.ok) {
         let json: any = null;
         if (postProcessed.headers.has('content-length')) {
-            const ct = parseInt(postProcessed.headers.get('content-length'));
+            const ctLent = postProcessed.headers.get('content-length');
+            const ct = ctLent != null ? parseInt(ctLent): 0;
             if (ct > 0) {
                 json = await postProcessed.json()
             }

package/dist/templates/method.ejs

@@ -62,6 +62,7 @@ export async function <%= method.endpointName %><%= body.map(b => b.suffix).getO
         query = '?' + queryParams.join('&');
     }
     <%_ }  -%>
+
     let bodySerialised: BodyInit | null = null;
     <%_ if (body.nonEmpty && body.get.mimeType === 'application/json') {%>
     bodySerialised = JSON.stringify(body);
@@ -72,22 +73,29 @@ export async function <%= method.endpointName %><%= body.map(b => b.suffix).getO
     <%_ } else if (body.nonEmpty && body.get.mimeType === 'application/octet-stream') { -%>
     bodySerialised = body;
     <%_ }  -%>
+
+    const headers: HeadersInit = {
+        ...requestOptions.headers || {},
+        'Accept': 'application/json',
+        <%_ if (body.nonEmpty && body.get.mimeType !== 'multipart/form-data') {%>
+        'Content-Type': '<%= body.get.mimeType %>',
+        <%_ }  -%>
+        <%_ if (method.parameters.filter(x => x.in === 'header').nonEmpty) { -%>
+        <%_ method.parameters.filter(x => x.in === 'header').foreach(p => { -%>
+        <%= p.name %>: <%= method.wrapParamsInObject ? 'params.' : '' %><%= p.uniqueName %>,
+        <%_ }) -%>
+        <%_ }  -%>
+    };
+    <%_ if (body.nonEmpty && body.get.mimeType === 'multipart/form-data') {%>
+    delete headers['Content-Type'];
+    <%_ }  -%>
+
+
     const request = new Request(`${requestOptions.apiPrefix}<%- method.pathWithSubstitutions %>${query}`, {
         method: '<%= method.method %>',
         body: bodySerialised,
         signal: requestOptions.signal,
-        headers: {
-            ...requestOptions.headers || {},
-            'Accept': 'application/json',
-            <%_ if (body.nonEmpty && body.get.mimeType !== 'multipart/form-data') {%>
-            'Content-Type': '<%= body.get.mimeType %>',
-            <%_ }  -%>
-            <%_ if (method.parameters.filter(x => x.in === 'header').nonEmpty) { -%>
-            <%_ method.parameters.filter(x => x.in === 'header').foreach(p => { -%>
-            <%= p.name %>: <%= method.wrapParamsInObject ? 'params.' : '' %><%= p.uniqueName %>,
-            <%_ }) -%>
-            <%_ }  -%>
-        }
+        headers: headers
     });
     return requestImpl<<%- method.response.responseType %>>(request, requestOptions);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"