[typescript-axios] Ignore unused imports when using 'withSeparateModelsAndApi' (#13204)

* Add typescript-axios/with-separate-models-and-api-inheritance sample as test for #13203

* [typescript-axios] Add // @ts-ignore to imports in models if withSeparateModelsAndApi is set

* [typescript-axios] Update samples

Author: Nikos410

bin/configs/typescript-axios-with-separate-models-and-api-inheritance.yaml

@@ -0,0 +1,8 @@
+generatorName: typescript-axios
+outputDir: samples/client/others/typescript-axios/with-separate-models-and-api-inheritance
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+additionalProperties:
+  apiPackage: api
+  modelPackage: model
+  withSeparateModelsAndApi: true

modules/openapi-generator/src/main/resources/typescript-axios/model.mustache

@@ -2,8 +2,14 @@
 /* eslint-disable */
 {{>licenseInfo}}
 {{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}}
+// May contain unused imports in some cases
+// @ts-ignore
 import { {{class}} } from './{{filename}}';{{/allOf}}{{/hasAllOf}}{{#hasOneOf}}{{#oneOf}}
+// May contain unused imports in some cases
+// @ts-ignore
 import { {{class}} } from './{{filename}}';{{/oneOf}}{{/hasOneOf}}{{^hasAllOf}}{{^hasOneOf}}{{#imports}}
+// May contain unused imports in some cases
+// @ts-ignore
 import { {{class}} } from './{{filename}}';{{/imports}}{{/hasOneOf}}{{/hasAllOf}}{{/withSeparateModelsAndApi}}
 {{#models}}{{#model}}
 {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#allOf}}{{#-first}}{{>modelAllOf}}{{/-first}}{{/allOf}}{{^isEnum}}{{^oneOf}}{{^allOf}}{{>modelGeneric}}{{/allOf}}{{/oneOf}}{{/isEnum}}

modules/openapi-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml

@@ -0,0 +1,35 @@
+---
+openapi: 3.0.1
+info:
+  title: Example
+  version: '1'
+paths: {}
+components:
+  schemas:
+    BranchDto:
+      type: object
+      properties:
+        name:
+          type: string
+    AbstractUserDto:
+      type: object
+      properties:
+        username:
+          type: string
+        branch:
+          "$ref": "#/components/schemas/BranchDto"
+        type:
+          type: string
+      discriminator:
+        propertyName: type
+        mapping:
+          internal-authenticated: "#/components/schemas/InternalAuthenticatedUserDto"
+          remote-authenticated: "#/components/schemas/RemoteAuthenticatedUserDto"
+    InternalAuthenticatedUserDto:
+      type: object
+      allOf:
+      - "$ref": "#/components/schemas/AbstractUserDto"
+    RemoteAuthenticatedUserDto:
+      type: object
+      allOf:
+      - "$ref": "#/components/schemas/AbstractUserDto"

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.gitignore

@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.npmignore

@@ -0,0 +1 @@
+# empty npmignore to ensure all required files (e.g., in the dist folder) are published by npm

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/FILES

@@ -0,0 +1,13 @@
+.gitignore
+.npmignore
+api.ts
+base.ts
+common.ts
+configuration.ts
+git_push.sh
+index.ts
+model/abstract-user-dto.ts
+model/branch-dto.ts
+model/index.ts
+model/internal-authenticated-user-dto.ts
+model/remote-authenticated-user-dto.ts

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION

@@ -0,0 +1 @@
+6.1.0-SNAPSHOT

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/api.ts

@@ -0,0 +1,17 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Example
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+

samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts

@@ -0,0 +1,71 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Example
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import { Configuration } from "./configuration";
+// Some imports not used depending on template conditions
+// @ts-ignore
+import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+
+export const BASE_PATH = "http://localhost".replace(/\/+$/, "");
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+/**
+ *
+ * @export
+ * @interface RequestArgs
+ */
+export interface RequestArgs {
+    url: string;
+    options: AxiosRequestConfig;
+}
+
+/**
+ *
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPI {
+    protected configuration: Configuration | undefined;
+
+    constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = configuration.basePath || this.basePath;
+        }
+    }
+};
+
+/**
+ *
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}