fix(typescript-angular): fix new angular dependency cli option usage (#20247)

Co-authored-by: Thibaud SOWA <[email protected]>

Author: thibaudsowa

bin/configs/typescript-angular-v19-with-angular-dependency-params.yaml

@@ -0,0 +1,12 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 19.0.1
+  npmName: sample-angular-19-0-0-with-angular-dependency-params
+  supportsES6: true
+  tsVersion: 5.6.3
+  zonejsVersion: 0.15.0
+  ngPackagrVersion: 19.0.1
+  rxjsVersion: 6.5.3

…script-angular-v19-provided-in-root.yaml bin/configs/typescript-angular-v19.yamlbin/configs/typescript-angular-v19-provided-in-root.yaml renamed to bin/configs/typescript-angular-v19.yaml bin/configs/typescript-angular-v19-provided-in-root.yaml renamed to bin/configs/typescript-angular-v19.yaml

@@ -1,7 +1,8 @@
 generatorName: typescript-angular
-outputDir: samples/client/petstore/typescript-angular-v19-provided-in-root/builds/default
+outputDir: samples/client/petstore/typescript-angular-v19/builds/default
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/typescript-angular
 additionalProperties:
   ngVersion: 19.0.0
+  npmName: sample-angular-19-0-0
   supportsES6: true

docs/generators/typescript-angular.md

@@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
-|zoneJsVersion|The version of zone.js compatible with Angular (see ngVersion option).| |null|
+|zonejsVersion|The version of zone.js compatible with Angular (see ngVersion option).| |null|
 
 ## IMPORT MAPPING
 

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

@@ -81,7 +81,7 @@ public static enum PROVIDED_IN_LEVEL {none, root, any, platform}
     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 ZONEJS_VERSION = "zoneJsVersion";
+    public static final String ZONEJS_VERSION = "zonejsVersion";
 
     protected String ngVersion = "19.0.0";
     @Getter @Setter
@@ -321,21 +321,21 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
                 .map(Map.Entry::getValue)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid ngVersion. Only Angular v9+ is supported."));
 
-        additionalProperties.put(TS_VERSION, additionalProperties.containsKey(TS_VERSION)
-                ? additionalProperties.containsKey(TS_VERSION)
-                : angularDependencies.getTsVersion());
+        if (!additionalProperties.containsKey(TS_VERSION)) {
+            additionalProperties.put(TS_VERSION, angularDependencies.getTsVersion());
+        }
 
-        additionalProperties.put(RXJS_VERSION, additionalProperties.containsKey(RXJS_VERSION)
-                ? additionalProperties.containsKey(RXJS_VERSION)
-                : angularDependencies.getRxjsVersion());
+        if (!additionalProperties.containsKey(RXJS_VERSION)) {
+            additionalProperties.put(RXJS_VERSION, angularDependencies.getRxjsVersion());
+        }
 
-        additionalProperties.put(NGPACKAGR_VERSION, additionalProperties.containsKey(NGPACKAGR_VERSION)
-                ? additionalProperties.containsKey(NGPACKAGR_VERSION)
-                : angularDependencies.getNgPackagrVersion());
+        if (!additionalProperties.containsKey(NGPACKAGR_VERSION)) {
+            additionalProperties.put(NGPACKAGR_VERSION, angularDependencies.getNgPackagrVersion());
+        }
 
-        additionalProperties.put("zonejsVersion", additionalProperties.containsKey(ZONEJS_VERSION)
-                ? additionalProperties.containsKey(ZONEJS_VERSION)
-                : angularDependencies.getZonejsVersion());
+        if (!additionalProperties.containsKey(ZONEJS_VERSION)) {
+            additionalProperties.put(ZONEJS_VERSION, angularDependencies.getZonejsVersion());
+        }
 
         if (angularDependencies.getTsickleVersion() != null) {
             additionalProperties.put("tsickleVersion", angularDependencies.getTsickleVersion());

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

@@ -25,7 +25,7 @@
 public class TypeScriptAngularClientOptionsProvider implements TypeScriptSharedClientOptionsProvider {
     public static final String STRING_ENUMS_VALUE = "false";
     private static final String NPM_REPOSITORY = "https://registry.npmjs.org";
-    public static final String NG_VERSION = "12";
+    public static final String NG_VERSION = "19";
     public static final String FILE_NAMING_VALUE = "camelCase";
     public static final String API_MODULE_PREFIX = "";
     public static final String CONFIGURATION_PREFIX = "";
@@ -37,7 +37,7 @@ public class TypeScriptAngularClientOptionsProvider implements TypeScriptSharedC
     public static final String MODEL_FILE_SUFFIX = "";
     public static final String TS_VERSION = "";
     public static final String RXJS_VERSION = "";
-    public static final String NGPACKAGR_VERSION = " ";
+    public static final String NGPACKAGR_VERSION = "";
     public static final String ZONEJS_VERSION = "";
 
     @Override

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java

@@ -21,6 +21,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 
 @Test(groups = {TypeScriptGroups.TYPESCRIPT, TypeScriptGroups.TYPESCRIPT_ANGULAR})
 public class TypeScriptAngularClientCodegenTest {
@@ -344,4 +346,48 @@ public void testModelNameMappings() throws Exception {
                 "files?: Array<SystemFile>;" // ensure it's an array of SystemFile (not Any)
         );
     }
+
+    @Test
+    public void testAngularDependenciesFromCliOptions() {
+        // GIVEN
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+
+        TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();
+        codegen.additionalProperties().put("npmName", "@openapi/typescript-angular-petstore");
+        codegen.additionalProperties().put("tsVersion", "12");
+        codegen.additionalProperties().put("rxjsVersion", "23");
+        codegen.additionalProperties().put("ngPackagrVersion", "34");
+        codegen.additionalProperties().put("zonejsVersion", "45");
+
+        // WHEN
+        codegen.processOpts();
+        codegen.preprocessOpenAPI(openAPI);
+
+        // THEN
+        assertThat(codegen.additionalProperties()).containsEntry("tsVersion", "12");
+        assertThat(codegen.additionalProperties()).containsEntry("rxjsVersion", "23");
+        assertThat(codegen.additionalProperties()).containsEntry("ngPackagrVersion", "34");
+        assertThat(codegen.additionalProperties()).containsEntry("zonejsVersion", "45");
+    }
+
+    @Test
+    public void testAngularDependenciesFromConfigFile() {
+        // GIVEN
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+
+        TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();
+        codegen.additionalProperties().put("npmName", "@openapi/typescript-angular-petstore");
+        // We fix ngVersion to do not update this test on every new angular release.
+        codegen.additionalProperties().put("ngVersion", "19.0.0");
+
+        // WHEN
+        codegen.processOpts();
+        codegen.preprocessOpenAPI(openAPI);
+
+        // THEN
+        assertThat(codegen.additionalProperties()).containsEntry("tsVersion", ">=5.5.0 <5.7.0");
+        assertThat(codegen.additionalProperties()).containsEntry("rxjsVersion", "7.4.0");
+        assertThat(codegen.additionalProperties()).containsEntry("ngPackagrVersion", "19.0.0");
+        assertThat(codegen.additionalProperties()).containsEntry("zonejsVersion", "0.15.0");
+    }
 }

…ovided-in-root/builds/default/.gitignore …endency-params/builds/default/.gitignoresamples/client/petstore/typescript-angular-v19-provided-in-root/builds/default/.gitignore renamed to samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/.gitignore samples/client/petstore/typescript-angular-v19-provided-in-root/builds/default/.gitignore renamed to samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/.gitignore

@@ -16,5 +16,8 @@ model/order.ts
 model/pet.ts
 model/tag.ts
 model/user.ts
+ng-package.json
+package.json
 param.ts
+tsconfig.json
 variables.ts