Merge pull request #730 from bezineb5/ts-angular-ModuleWithProviders-fx

Templatized ModuleWithProviders in typescript-angular
swagger-api · Jul 21, 2021 · 78ce303 · 78ce303
2 parents f3710d3 + 6c08748
commit 78ce303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java b/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java
@@ -154,6 +154,11 @@ 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);
+        }
 
         // for Angular 2 AOT support we will use good-old ngc,
         // Angular Package format wasn't invented at this time and building was much more easier

diff --git a/src/main/resources/handlebars/typescript-angular/api.module.mustache b/src/main/resources/handlebars/typescript-angular/api.module.mustache
@@ -18,7 +18,7 @@ import { {{classname}} } from './{{importPath}}';
     {{/hasMore}}{{/apis}}{{/apiInfo}} ]
 })
 export class ApiModule {
-    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders {
+    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders{{#genericModuleWithProviders}}<ApiModule>{{/genericModuleWithProviders}} {
         return {
             ngModule: ApiModule,
             providers: [ { provide: Configuration, useFactory: configurationFactory } ]