Release 6.2.1 (#194)

* fix: missing generateUnionEnums in .d.ts (#193) * fix: problem with missing default params for axios http client (issue #192, thanks @Nihisil); docs: update CHANGELOG * bump: up version to 6.2.1 Co-authored-by: Artem Shabanov <[email protected]>
acacode · Mar 4, 2021 · c9753aa · c9753aa
1 parent 08a5790
commit c9753aa
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # next release  
 
+# 6.2.1  
+
+Fixes:  
+- missing `generateUnionEnums?: boolean;` in `index.d.ts` file (thanks @artsaban)  
+- missing default params to axios http client (`--axios`) (issue #192, thanks @Nihisil)  
+
 # 6.2.0  
 
 Features:  

diff --git a/index.d.ts b/index.d.ts
@@ -29,6 +29,11 @@ interface GenerateApiParams {
    */
   templates?: string;
 
+  /**
+   * generate all "enum" types as union types (T1 | T2 | TN) (default: false)
+   */
+  generateUnionEnums?: boolean;
+
   /**
    * generate type definitions for API routes (default: false)
    */

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "Create typescript api module from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts --extract-request-params --enum-names-as-values",

diff --git a/templates/base/http-clients/axios-http-client.eta b/templates/base/http-clients/axios-http-client.eta
@@ -49,9 +49,11 @@ export class HttpClient<SecurityDataType = unknown> {
 
     private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
         return {
+            ...this.instance.defaults,
             ...params1,
             ...(params2 || {}),
             headers: {
+                ...this.instance.defaults,
                 ...(params1.headers || {}),
                 ...((params2 && params2.headers) || {}),
             },

diff --git a/tests/spec/axios/schema.ts b/tests/spec/axios/schema.ts
@@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
 
   private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
     return {
+      ...this.instance.defaults,
       ...params1,
       ...(params2 || {}),
       headers: {
+        ...this.instance.defaults,
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },

diff --git a/tests/spec/axiosSingleHttpClient/schema.ts b/tests/spec/axiosSingleHttpClient/schema.ts
@@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
 
   private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
     return {
+      ...this.instance.defaults,
       ...params1,
       ...(params2 || {}),
       headers: {
+        ...this.instance.defaults,
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },

diff --git a/tests/spec/jsAxios/schema.js b/tests/spec/jsAxios/schema.js
@@ -42,9 +42,11 @@ export class HttpClient {
   }
   mergeRequestParams(params1, params2) {
     return {
+      ...this.instance.defaults,
       ...params1,
       ...(params2 || {}),
       headers: {
+        ...this.instance.defaults,
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },