Merge pull request #52 from NSwag/master

Release v2.1
RicoSuter · Mar 25, 2016 · 916868b · 916868b
2 parents b736696 + 0443cf5
commit 916868b
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 17 deletions.
diff --git a/src/NSwag.Annotations/Properties/AssemblyInfo.cs b/src/NSwag.Annotations/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.Annotations")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]
diff --git a/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.0.*")]
+// [assembly: AssemblyVersion("2.1.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs
@@ -59,6 +59,7 @@ internal override string RenderFile(string clientCode)
         {
             var template = LoadTemplate("File");
             template.Add("toolchain", SwaggerService.ToolchainVersion);
+            template.Add("isAngular2", Settings.Template == TypeScriptTemplate.Angular2);
             template.Add("clients", Settings.GenerateClientClasses ? clientCode : string.Empty);
             template.Add("interfaces", Settings.GenerateDtoTypes ? _resolver.GenerateTypes() : string.Empty);
             template.Add("hasModuleName", !string.IsNullOrEmpty(Settings.ModuleName));

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/Angular2.txt b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/Angular2.txt
@@ -1,9 +1,4 @@
-import 'rxjs/Rx'; 
-import {Observable} from 'rxjs/Observable';
-import {Injectable, Inject} from 'angular2/core';
-import {Http, Headers, Response} from 'angular2/http';
-
-<if(hasOperations)>
+<if(hasOperations)>
 <if(generateClientInterfaces)>
 export interface I<class> {
 <operations:{operation | 
@@ -22,9 +17,9 @@ export class <class> <if(generateClientInterfaces)>implements I<class> <endif>{
     private http: Http = null; 
     baseUrl: string = undefined; 
 
-    constructor(@Inject(Http) http: Http, baseUrl?: string) {
+    constructor(@Inject(Http) http: Http, @Optional() @Inject(API_BASE_URL) baseUrl?: string) {
         this.http = http; 
-        this.baseUrl = baseUrl !== undefined ? baseUrl : "<baseUrl>"; 
+        this.baseUrl = baseUrl ? baseUrl : "<baseUrl>"; 
     }
 <operations:{operation | 
 

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/File.txt b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/File.txt
@@ -1,7 +1,18 @@
-// Generated using the NSwag toolchain v<toolchain> (http://NSwag.org)
+<if(isAngular2)>
+import 'rxjs/Rx'; 
+import {Observable} from 'rxjs/Observable';
+import {Injectable, Inject} from 'angular2/core';
+import {Http, Headers, Response} from 'angular2/http';
+
+<endif>
+// Generated using the NSwag toolchain v<toolchain> (http://NSwag.org)
 
 <if(hasModuleName)>
 module <moduleName> {
+<endif>
+<if(isAngular2)>
+const API_BASE_URL = new OpaqueToken('API_BASE_URL');
+
 <endif>
 <clients>
 <interfaces>

diff --git a/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.CodeGeneration")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]
diff --git a/src/NSwag.Core/Properties/AssemblyInfo.cs b/src/NSwag.Core/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]
diff --git a/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs b/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.0.*")]
+// [assembly: AssemblyVersion("2.1.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/Properties/AssemblyInfo.cs b/src/NSwag.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.0.*")]
+// [assembly: AssemblyVersion("2.1.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag/Properties/AssemblyInfo.cs b/src/NSwag/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.Console")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]
diff --git a/src/NSwagStudio/Properties/AssemblyInfo.cs b/src/NSwagStudio/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwagStudio")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]