Merge pull request swagger-api#10464 from derkoe/fix/typescript-angul…

…ar-10 Fix code generation for Angular 10
gogoyqj · Oct 15, 2020 · 755481e · 755481e
2 parents d819162 + f5783b0
commit 755481e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -136,6 +136,7 @@ public void processOpts() {
  additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
  additionalProperties.put("useHttpClient", ngVersion.atLeast("4.3.0"));
  additionalProperties.put("useRxJS6", ngVersion.atLeast("6.0.0"));
+ additionalProperties.put("genericModuleWithProviders", ngVersion.atLeast("7.0.0"));
  if (!ngVersion.atLeast("4.3.0")) {
  supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
  }

diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache b/modules/swagger-codegen/src/main/resources/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 } ]