bump: up version to 6.1.2; fix: problems with using --axios and --modular option together (#187)

Fixes (critical):  
- Problems with using both `--axios` and `--modular` options together (TS, `organizeImports` crashed the codegeneration)

Author: js2me

CHANGELOG.md

@@ -1,5 +1,10 @@
 # next release  
 
+# 6.1.2  
+
+Fixes:  
+- Problems with using both `--axios` and `--modular` options together (TS, `organizeImports` crashed the codegeneration)  
+
 # 6.1.1  
 
 Fixes:  

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "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",

package.json

@@ -1,6 +1,7 @@
 <%
 const { apiConfig, generateResponses } = it;
 %>
+
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, ResponseType } from "axios";
 
 export type QueryParamsType = Record<string | number, any>;

templates/base/http-clients/axios-http-client.eta

@@ -13,7 +13,9 @@ const descriptionLines = _.compact([
 ]);
 
 %>
+
 <% if (config.httpClientType === config.constants.HTTP_CLIENT.AXIOS) { %> import { AxiosRequestConfig, AxiosResponse } from "axios"; <% } %>
+
 <% if (descriptionLines.length) { %>
 /**
 <% descriptionLines.forEach((descriptionLine) => { %>

templates/default/api.eta

@@ -5,7 +5,9 @@ const apiClassName = classNameCase(route.moduleName);
 const routes = route.routes;
 const dataContracts = _.map(modelTypes, "name");
 %>
+
 <% if (config.httpClientType === config.constants.HTTP_CLIENT.AXIOS) { %> import { AxiosRequestConfig, AxiosResponse } from "axios"; <% } %>
+
 import { HttpClient, RequestParams, ContentType } from "./<%~ config.fileNames.httpClient %>";
 <% if (dataContracts.length) { %>
 import { <%~ dataContracts.join(", ") %> } from "./<%~ config.fileNames.dataContracts %>"

templates/modular/api.eta

@@ -1518,6 +1518,12 @@ export class HttpClient<SecurityDataType = unknown> {
   };
 }
 
+/**
+ * @title GitHub
+ * @version v3
+ * @baseUrl https://api.github.com
+ * Powerful collaboration, code review, and code management for open source and private projects.
+ */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
   someTest = {
     /**

tests/spec/axios/schema.ts

@@ -1518,6 +1518,12 @@ export class HttpClient<SecurityDataType = unknown> {
   };
 }
 
+/**
+ * @title GitHub
+ * @version v3
+ * @baseUrl https://api.github.com
+ * Powerful collaboration, code review, and code management for open source and private projects.
+ */
 export class Api<SecurityDataType extends unknown> {
   constructor(private http: HttpClient<SecurityDataType>) {}
 

tests/spec/axiosSingleHttpClient/schema.ts

@@ -1738,6 +1738,12 @@ export declare class HttpClient<SecurityDataType = unknown> {
     ...params
   }: FullRequestParams) => Promise<any>;
 }
+/**
+ * @title GitHub
+ * @version v3
+ * @baseUrl https://api.github.com
+ * Powerful collaboration, code review, and code management for open source and private projects.
+ */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
   emojis: {
     /**

tests/spec/jsAxios/schema.d.ts

@@ -51,6 +51,12 @@ export class HttpClient {
     };
   }
 }
+/**
+ * @title GitHub
+ * @version v3
+ * @baseUrl https://api.github.com
+ * Powerful collaboration, code review, and code management for open source and private projects.
+ */
 export class Api extends HttpClient {
   constructor() {
     super(...arguments);