From b0e0fd9c370f3dd6b71069afe0bf04b805289883 Mon Sep 17 00:00:00 2001
From: Artem Shabanov <artem.a.shabanov@gmail.com>
Date: Thu, 4 Mar 2021 15:53:24 +0700
Subject: [PATCH 1/3] fix: missing generateUnionEnums in .d.ts (#193)

---
 index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/index.d.ts b/index.d.ts
index 0d4f88e8..a308a9e7 100644
--- 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)
    */

From e40d36fef78a6aba287228ece7c991447ad4c892 Mon Sep 17 00:00:00 2001
From: svolkov <svolkov@everpoint.ru>
Date: Thu, 4 Mar 2021 12:06:46 +0300
Subject: [PATCH 2/3] fix: problem with missing default params for axios http
 client (issue #192, thanks @Nihisil); docs: update CHANGELOG

---
 CHANGELOG.md                                      | 6 ++++++
 templates/base/http-clients/axios-http-client.eta | 2 ++
 tests/spec/axios/schema.ts                        | 2 ++
 tests/spec/axiosSingleHttpClient/schema.ts        | 2 ++
 tests/spec/jsAxios/schema.js                      | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e10f996f..d05cb7fd 100644
--- 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/templates/base/http-clients/axios-http-client.eta b/templates/base/http-clients/axios-http-client.eta
index a843fe62..d5e89fc2 100644
--- 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
index 0b78671b..0f7aa413 100644
--- 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
index 15eeaad4..f5e7d8c1 100644
--- 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
index 423f56e3..31a9c120 100644
--- 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) || {}),
       },

From 69258f6652e101020f4cbd00470087920dbe7df5 Mon Sep 17 00:00:00 2001
From: svolkov <svolkov@everpoint.ru>
Date: Thu, 4 Mar 2021 12:09:07 +0300
Subject: [PATCH 3/3] bump: up version to 6.2.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76c4af3b..932f7ee4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ff4c4f4d..7e96f929 100644
--- 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",