Merge pull request swagger-api#933 from swagger-api/codegen-issue-10040

added support for angular 8 to 11 versions
Andy-Grigg · Jul 23, 2021 · 8799694 · 8799694
2 parents f7c638d + 28f68e4
commit 8799694
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 63 deletions.
diff --git a/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java b/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java
@@ -123,20 +123,6 @@ public void processOpts() {
             additionalProperties.put(NG_PACKAGR, true);
         }
 
-        // Set the typescript version compatible to the Angular version
-        if (ngVersion.atLeast("8.0.0")) {
-            additionalProperties.put("tsVersion", ">=3.4.0 <3.6.0");
-        } else if (ngVersion.atLeast("7.0.0")) {
-            additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
-        } else if (ngVersion.atLeast("6.0.0")) {
-            additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
-        } else if (ngVersion.atLeast("5.0.0")) {
-            additionalProperties.put("tsVersion", ">=2.1.5 <2.7.0");
-        } else {
-            // Angular v2-v4 requires typescript ">=2.1.5 <2.8"
-            additionalProperties.put("tsVersion", ">=2.1.5 <2.8.0");
-        }
-
         // Set the rxJS version compatible to the Angular version
         if (ngVersion.atLeast("8.0.0")) {
             additionalProperties.put("rxjsVersion", "6.5.0");
@@ -154,7 +140,7 @@ public void processOpts() {
         if (!ngVersion.atLeast("4.3.0")) {
             supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
         }
-        
+
         // Version after Angular 10 require ModuleWithProviders to be generic. Compatible from version 7.
         if (ngVersion.atLeast("7.0.0")) {
             additionalProperties.put("genericModuleWithProviders", true);
@@ -174,50 +160,6 @@ public void processOpts() {
         // Libraries generated with v2.x of ng-packagr will ship with AoT metadata in v4, which is intended for Angular v5 (and Angular v6).
         additionalProperties.put("useOldNgPackagr", !ngVersion.atLeast("5.0.0"));
 
-        // Specific ng-packagr configuration
-        if (ngVersion.atLeast("8.0.0")) {
-            additionalProperties.put("ngPackagrVersion", "5.4.0");
-            additionalProperties.put("tsickleVersion", "0.35.0");
-        } else if (ngVersion.atLeast("7.0.0")) {
-            // compatible versions with typescript version
-            additionalProperties.put("ngPackagrVersion", "5.1.0");
-            additionalProperties.put("tsickleVersion", "0.34.0");
-        } else if (ngVersion.atLeast("6.0.0")) {
-            // compatible versions with typescript version
-            additionalProperties.put("ngPackagrVersion", "3.0.6");
-            additionalProperties.put("tsickleVersion", "0.32.1");
-        } 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 {
-            // Angular versions prior to v5
-            additionalProperties.put("ngPackagrVersion", "1.6.0");
-        }
-
-        // set zone.js version
-        if (ngVersion.atLeast("8.0.0")) {
-            additionalProperties.put("zonejsVersion", "0.9.1");
-        } else if (ngVersion.atLeast("5.0.0")) {
-            // compatible versions to Angular 5+
-            additionalProperties.put("zonejsVersion", "0.8.26");
-        } else {
-            // Angular versions prior to v5
-            additionalProperties.put("zonejsVersion", "0.7.6");
-        }
-
-        // set http client usage
-        if (ngVersion.atLeast("8.0.0")) {
-            additionalProperties.put("useHttpClient", true);
-            additionalProperties.put("useHttpClientPackage", false);
-        } else if (ngVersion.atLeast("4.3.0")) {
-            additionalProperties.put("useHttpClient", true);
-            additionalProperties.put("useHttpClientPackage", true);
-        } else {
-            additionalProperties.put("useHttpClient", false);
-            additionalProperties.put("useHttpClientPackage", false);
-        }
-
         if (additionalProperties.containsKey(PROVIDED_IN_ROOT) && !ngVersion.atLeast("6.0.0")) {
             additionalProperties.put(PROVIDED_IN_ROOT,false);
         }
@@ -226,7 +168,7 @@ public void processOpts() {
         additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
 
         if (additionalProperties.containsKey(NPM_NAME)) {
-            addNpmPackageGeneration();
+            addNpmPackageGeneration(ngVersion);
         }
 
         if (additionalProperties.containsKey(WITH_INTERFACES)) {
@@ -252,7 +194,7 @@ private SemVer determineNgVersion() {
         return ngVersion;
     }
 
-    private void addNpmPackageGeneration() {
+    private void addNpmPackageGeneration(SemVer ngVersion) {
         if (additionalProperties.containsKey(NPM_NAME)) {
             this.setNpmName(additionalProperties.get(NPM_NAME).toString());
         }
@@ -271,6 +213,60 @@ private void addNpmPackageGeneration() {
             this.setNpmRepository(additionalProperties.get(NPM_REPOSITORY).toString());
         }
 
+        additionalProperties.put("useRxJS6", true);
+        additionalProperties.put("useHttpClient", true);
+        additionalProperties.put("useHttpClientPackage", false);
+        if (ngVersion.atLeast("11.0.0")) {
+            additionalProperties.put("tsVersion", ">=4.0.0 <4.1.0");
+            additionalProperties.put("rxjsVersion", "6.6.0");
+            additionalProperties.put("ngPackagrVersion", "11.0.2");
+            additionalProperties.put("tsickleVersion", "0.39.1");
+            additionalProperties.put("zonejsVersion", "0.11.3");
+        } else if (ngVersion.atLeast("10.0.0")) {
+            additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
+            additionalProperties.put("rxjsVersion", "6.6.0");
+            additionalProperties.put("ngPackagrVersion", "10.0.3");
+            additionalProperties.put("tsickleVersion", "0.39.1");
+            additionalProperties.put("zonejsVersion", "0.10.2");
+        } else if (ngVersion.atLeast("9.0.0")) {
+            additionalProperties.put("tsVersion", ">=3.6.0 <3.8.0");
+            additionalProperties.put("rxjsVersion", "6.5.3");
+            additionalProperties.put("ngPackagrVersion", "9.0.1");
+            additionalProperties.put("tsickleVersion", "0.38.0");
+            additionalProperties.put("zonejsVersion", "0.10.2");
+        } else if (ngVersion.atLeast("8.0.0")) {
+            additionalProperties.put("tsVersion", ">=3.4.0 <3.6.0");
+            additionalProperties.put("rxjsVersion", "6.5.0");
+            additionalProperties.put("ngPackagrVersion", "5.4.0");
+            additionalProperties.put("tsickleVersion", "0.35.0");
+            additionalProperties.put("zonejsVersion", "0.9.1");
+        } else if (ngVersion.atLeast("7.0.0")) {
+            additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
+            additionalProperties.put("rxjsVersion", "6.3.0");
+            additionalProperties.put("ngPackagrVersion", "5.1.0");
+            additionalProperties.put("tsickleVersion", "0.34.0");
+            additionalProperties.put("zonejsVersion", "0.8.26");
+
+            additionalProperties.put("useHttpClientPackage", true);
+        } else if (ngVersion.atLeast("6.0.0")) {
+            additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
+            additionalProperties.put("rxjsVersion", "6.1.0");
+            additionalProperties.put("ngPackagrVersion", "3.0.6");
+            additionalProperties.put("tsickleVersion", "0.32.1");
+            additionalProperties.put("zonejsVersion", "0.8.26");
+
+            additionalProperties.put("useHttpClientPackage", true);
+        } else {
+            additionalProperties.put("tsVersion", ">=2.1.5 and <2.8");
+            additionalProperties.put("rxjsVersion", "6.1.0");
+            additionalProperties.put("ngPackagrVersion", "3.0.6");
+            additionalProperties.put("tsickleVersion", "0.32.1");
+            additionalProperties.put("zonejsVersion", "0.8.26");
+
+            additionalProperties.put("useRxJS6", false);
+            additionalProperties.put("useHttpClientPackage", true);
+        }
+
         //Files for building our lib
         supportingFiles.add(new SupportingFile("README.mustache", getIndexDirectory(), "README.md"));
         supportingFiles.add(new SupportingFile("package.mustache", getIndexDirectory(), "package.json"));

diff --git a/src/main/resources/handlebars/typescript-angular/package.mustache b/src/main/resources/handlebars/typescript-angular/package.mustache
@@ -38,8 +38,7 @@
     "@angular/platform-browser": "^{{ngVersion}}",{{#useNgPackagr}}
     "ng-packagr": "^{{ngPackagrVersion}}",{{/useNgPackagr}}
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^{{rxjsVersion}}",{{#useNgPackagr}}{{^useOldNgPackagr}}
-    "tsickle": "^{{tsickleVersion}}",{{/useOldNgPackagr}}{{/useNgPackagr}}
+    "rxjs": "^{{rxjsVersion}}",
     "typescript": "{{{tsVersion}}}",
     "zone.js": "^{{zonejsVersion}}"
   }{{#npmRepository}},{{/npmRepository}}