loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[typescript][axios] Add any to index type when additionalPropertiesIsAnyType is true (#16494) (#17625)

Browse Source
This commit is contained in:
wouter-rednose 2024-02-02 16:04:42 +01:00 committed by GitHub
parent eb7d2d9fd2
commit 5397f64595
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java
View File

@ -226,6 +226,11 @@ public class TypeScriptAxiosClientCodegen extends AbstractTypeScriptClientCodege
for (ModelMap mo : models) { for (ModelMap mo : models) {
CodegenModel cm = mo.getModel(); CodegenModel cm = mo.getModel();
// Type is already any
if (cm.getAdditionalPropertiesIsAnyType() && "any".equals(cm.getAdditionalPropertiesType())) {
cm.setAdditionalPropertiesIsAnyType(false);
}
// Deduce the model file name in kebab case // Deduce the model file name in kebab case
cm.classFilename = cm.classname.replaceAll("([a-z0-9])([A-Z])", "$1-$2").toLowerCase(Locale.ROOT); cm.classFilename = cm.classname.replaceAll("([a-z0-9])([A-Z])", "$1-$2").toLowerCase(Locale.ROOT);

2
modules/openapi-generator/src/main/resources/typescript-axios/modelGeneric.mustache vendored
View File

@ -5,7 +5,7 @@
*/ */
export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
{{#additionalPropertiesType}} {{#additionalPropertiesType}}
[key: string]: {{{additionalPropertiesType}}}{{^additionalPropertiesIsAnyType}}{{#hasVars}} | any{{/hasVars}}{{/additionalPropertiesIsAnyType}}; [key: string]: {{{additionalPropertiesType}}}{{#additionalPropertiesIsAnyType}}{{#hasVars}} | any{{/hasVars}}{{/additionalPropertiesIsAnyType}};
{{/additionalPropertiesType}} {{/additionalPropertiesType}}
{{#vars}} {{#vars}}

4
samples/client/petstore/typescript-axios/builds/test-petstore/api.ts
View File

@ -447,7 +447,7 @@ export interface Dog extends Animal {
* @interface Drawing * @interface Drawing
*/ */
export interface Drawing { export interface Drawing {
[key: string]: Fruit; [key: string]: Fruit | any;
/** /**
* *
@ -1043,7 +1043,7 @@ export interface Name {
* @interface NullableClass * @interface NullableClass
*/ */
export interface NullableClass { export interface NullableClass {
[key: string]: object; [key: string]: object | any;
/** /**
* *

2
samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
View File

@ -811,7 +811,7 @@ export interface Name {
* @interface NullableClass * @interface NullableClass
*/ */
export interface NullableClass { export interface NullableClass {
[key: string]: object; [key: string]: object | any;
/** /**
* *