feat(typescript-angular): unify tsVersion param

fix #20204

Author: Thibaud SOWA

docs/generators/typescript-angular.md

@@ -52,7 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |stringEnums|Generate string enums instead of objects for enum values.| |false|
 |supportsES6|Generate code that conforms to ES6.| |false|
 |taggedUnions|Use discriminators to create tagged unions instead of extending interfaces.| |false|
-|typescriptVersion|The version of typescript compatible with Angular (see ngVersion option).| |null|
+|tsVersion|The version of typescript compatible with Angular (see ngVersion option).| |null|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |useSquareBracketsInArrayNames|Setting this property to true will add brackets to array attribute names, e.g. my_values[].| |false|
 |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -78,9 +78,9 @@ public static enum PROVIDED_IN_LEVEL {none, root, any, platform}
     public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values.";
     public static final String QUERY_PARAM_OBJECT_FORMAT = "queryParamObjectFormat";
     public static final String USE_SQUARE_BRACKETS_IN_ARRAY_NAMES = "useSquareBracketsInArrayNames";
-    public static final String TYPESCRIPT_VERSION = "typescriptVersion";
+    public static final String TS_VERSION = "tsVersion";
     public static final String RXJS_VERSION = "rxjsVersion";
-    public static final String NGPACKAGR_VERSION = "ngPackagrVersion ";
+    public static final String NGPACKAGR_VERSION = "ngPackagrVersion";
     public static final String ZONEJS_VERSION = "zoneJsVersion";
 
     protected String ngVersion = "19.0.0";
@@ -150,7 +150,7 @@ public TypeScriptAngularClientCodegen() {
         this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.stringEnums)));
         this.cliOptions.add(new CliOption(QUERY_PARAM_OBJECT_FORMAT, "The format for query param objects: 'dot', 'json', 'key'.").defaultValue(this.queryParamObjectFormat.name()));
         this.cliOptions.add(CliOption.newBoolean(USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, "Setting this property to true will add brackets to array attribute names, e.g. my_values[].", false));
-        this.cliOptions.add(new CliOption(TYPESCRIPT_VERSION, "The version of typescript compatible with Angular (see ngVersion option)."));
+        this.cliOptions.add(new CliOption(TS_VERSION, "The version of typescript compatible with Angular (see ngVersion option)."));
         this.cliOptions.add(new CliOption(RXJS_VERSION, "The version of RxJS compatible with Angular (see ngVersion option)."));
         this.cliOptions.add(new CliOption(NGPACKAGR_VERSION, "The version of ng-packagr compatible with Angular (see ngVersion option)."));
         this.cliOptions.add(new CliOption(ZONEJS_VERSION, "The version of zone.js compatible with Angular (see ngVersion option)."));
@@ -321,15 +321,15 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
                 .map(Map.Entry::getValue)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid ngVersion. Only Angular v9+ is supported."));
 
-        additionalProperties.put("tsVersion", additionalProperties.containsKey(TYPESCRIPT_VERSION)
-                ? additionalProperties.containsKey(TYPESCRIPT_VERSION)
+        additionalProperties.put(TS_VERSION, additionalProperties.containsKey(TS_VERSION)
+                ? additionalProperties.containsKey(TS_VERSION)
                 : angularDependencies.getTsVersion());
 
-        additionalProperties.put("rxjsVersion", additionalProperties.containsKey(RXJS_VERSION)
+        additionalProperties.put(RXJS_VERSION, additionalProperties.containsKey(RXJS_VERSION)
                 ? additionalProperties.containsKey(RXJS_VERSION)
                 : angularDependencies.getRxjsVersion());
 
-        additionalProperties.put("ngPackagrVersion", additionalProperties.containsKey(NGPACKAGR_VERSION)
+        additionalProperties.put(NGPACKAGR_VERSION, additionalProperties.containsKey(NGPACKAGR_VERSION)
                 ? additionalProperties.containsKey(NGPACKAGR_VERSION)
                 : angularDependencies.getNgPackagrVersion());
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java

@@ -35,7 +35,7 @@ public class TypeScriptAngularClientOptionsProvider implements TypeScriptSharedC
     public static final String SERVICE_FILE_SUFFIX = ".service";
     public static final String MODEL_SUFFIX = "";
     public static final String MODEL_FILE_SUFFIX = "";
-    public static final String TYPESCRIPT_VERSION = "";
+    public static final String TS_VERSION = "";
     public static final String RXJS_VERSION = "";
     public static final String NGPACKAGR_VERSION = " ";
     public static final String ZONEJS_VERSION = "";
@@ -65,7 +65,7 @@ public Map<String, String> createOptions() {
                 .put(TypeScriptAngularClientCodegen.FILE_NAMING, FILE_NAMING_VALUE)
                 .put(TypeScriptAngularClientCodegen.QUERY_PARAM_OBJECT_FORMAT, QUERY_PARAM_OBJECT_FORMAT_VALUE)
                 .put(TypeScriptAngularClientCodegen.USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, Boolean.FALSE.toString())
-                .put(TypeScriptAngularClientCodegen.TYPESCRIPT_VERSION, TYPESCRIPT_VERSION)
+                .put(TypeScriptAngularClientCodegen.TS_VERSION, TS_VERSION)
                 .put(TypeScriptAngularClientCodegen.RXJS_VERSION, RXJS_VERSION)
                 .put(TypeScriptAngularClientCodegen.NGPACKAGR_VERSION, NGPACKAGR_VERSION)
                 .put(TypeScriptAngularClientCodegen.ZONEJS_VERSION, ZONEJS_VERSION)