fix TS version check (#1616)

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

@@ -218,17 +218,14 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
         }
 
         // Set the typescript version compatible to the Angular version
-        if (ngVersion.atLeast("7.0.0")){
+        if (ngVersion.atLeast("7.0.0")) {
             // Angular v7 requires typescript ">=3.1.1 <3.2.0"
             additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
-        }
+        } else if (ngVersion.atLeast("6.0.0")) {
-        else if (ngVersion.atLeast("6.0.0")) {
             additionalProperties.put("tsVersion", ">=2.1.5 <2.7.0");
-        }
+        } else if (ngVersion.atLeast("5.0.0")) {
-        else if (ngVersion.atLeast("5.0.0")) {
             additionalProperties.put("tsVersion", ">=2.1.5 <2.7.0");
-        }
+        } else {
-        else {
             // Angular v2-v4 requires typescript ">=2.1.5 <2.8"
             additionalProperties.put("tsVersion", ">=2.1.5 <2.8.0");
         }
@@ -262,22 +259,19 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
         additionalProperties.put("useOldNgPackagr", !ngVersion.atLeast("5.0.0"));
 
         // Specific ng-packagr configuration
-        if (ngVersion.atLeast("6.0.0")) {
+        if (ngVersion.atLeast("7.0.0")) {
             // compatible versions with typescript version
             additionalProperties.put("ngPackagrVersion", "4.4.5");
             additionalProperties.put("tsickleVersion", "0.34.0");
-        }
+        } else if (ngVersion.atLeast("6.0.0")) {
-        else if (ngVersion.atLeast("6.0.0")) {
             // compatible versions with typescript version
             additionalProperties.put("ngPackagrVersion", "2.4.5");
             additionalProperties.put("tsickleVersion", "0.27.5");
-        }
+        } else if (ngVersion.atLeast("5.0.0")) {
-        else if (ngVersion.atLeast("5.0.0")) {
             // compatible versions with typescript version
             additionalProperties.put("ngPackagrVersion", "2.4.5");
             additionalProperties.put("tsickleVersion", "0.27.5");
-        }
+        } else {
-        else {
             // Angular versions prior to v5
             additionalProperties.put("ngPackagrVersion", "1.6.0");
         }
@@ -286,8 +280,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
         if (ngVersion.atLeast("5.0.0")) {
             // compatible versions to Angular 5+
             additionalProperties.put("zonejsVersion", "0.8.26");
-        }
+        } else {
-        else {
             // Angular versions prior to v5
             additionalProperties.put("zonejsVersion", "0.7.6");
         }
@@ -600,6 +593,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     /**
      * Validates that the given string value only contains '-', '.' and alpha numeric characters.
      * Throws an IllegalArgumentException, if the string contains any other characters.
+     *
      * @param argument The name of the argument being validated. This is only used for displaying an error message.
      * @param value    The value that is being validated.
      */
@@ -614,6 +608,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     /**
      * Validates that the given string value only contains alpha numeric characters.
      * Throws an IllegalArgumentException, if the string contains any other characters.
+     *
      * @param argument The name of the argument being validated. This is only used for displaying an error message.
      * @param value    The value that is being validated.
      */
@@ -627,6 +622,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 
     /**
      * Set the file naming type.
+     *
      * @param fileNaming the file naming to use
      */
     private void setFileNaming(String fileNaming) {
@@ -640,6 +636,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 
     /**
      * Converts the original name according to the current <code>fileNaming</code> strategy.
+     *
      * @param originalName the original name to transform
      * @return the transformed name
      */

samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json

@@ -27,8 +27,8 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
-    "ng-packagr": "^4.4.5",
+    "ng-packagr": "^2.4.5",
-    "tsickle": "^0.34.0",
+    "tsickle": "^0.27.5",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
     "zone.js": "^0.8.26",

samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json

@@ -27,8 +27,8 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
-    "ng-packagr": "^4.4.5",
+    "ng-packagr": "^2.4.5",
-    "tsickle": "^0.34.0",
+    "tsickle": "^0.27.5",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.1.0",
     "zone.js": "^0.8.26",