[TypeScriptAngular2Client] Fixed model extend on another model syntax…

… error. swagger-api#1334
iain17 · May 15, 2017 · 47794d8 · 47794d8
1 parent 80ffbac
commit 47794d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/...r-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java b/...r-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
@@ -32,7 +32,7 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
     protected String npmName = null;
     protected String npmVersion = "1.0.0";
     protected String npmRepository = null;
-    protected String injectionToken = "InjectionToken";
+    protected String injectionToken = "InjectionToken<string>";
 
     public TypeScriptAngular2ClientCodegen() {
         super();
@@ -41,7 +41,8 @@ public TypeScriptAngular2ClientCodegen() {
         embeddedTemplateDir = templateDir = "typescript-angular2";
         modelTemplateFiles.put("model.mustache", ".ts");
         apiTemplateFiles.put("api.mustache", ".ts");
-        typeMapping.put("Date","Date");
+        typeMapping.put("Date", "Date");
+        typeMapping.put("Array", "Array");
         apiPackage = "api";
         modelPackage = "model";
 

diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/modelGeneric.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/modelGeneric.mustache
@@ -1,4 +1,4 @@
-export class {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}}{
+export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 {{#additionalPropertiesType}}
     [key: string]: {{{additionalPropertiesType}}}{{#hasVars}} | any{{/hasVars}};
 

diff --git a/samples/client/petstore/typescript-angular2/default/variables.ts b/samples/client/petstore/typescript-angular2/default/variables.ts
@@ -1,6 +1,6 @@
-import { InjectionToken } from '@angular/core';
+import { InjectionToken<string> } from '@angular/core';
 
-export const BASE_PATH = new InjectionToken('basePath');
+export const BASE_PATH = new InjectionToken<string>('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',

diff --git a/samples/client/petstore/typescript-angular2/npm/variables.ts b/samples/client/petstore/typescript-angular2/npm/variables.ts
@@ -1,6 +1,6 @@
-import { InjectionToken } from '@angular/core';
+import { InjectionToken<string> } from '@angular/core';
 
-export const BASE_PATH = new InjectionToken('basePath');
+export const BASE_PATH = new InjectionToken<string>('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',