Merge pull request #67 from NSwag/master

Release v2.9
RicoSuter · Apr 22, 2016 · ea2abf7 · ea2abf7
2 parents c7a5385 + 9af97ee
commit ea2abf7
Show file tree

Hide file tree

Showing 31 changed files with 788 additions and 740 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.8.*")]
+[assembly: AssemblyVersion("2.9.*")]
diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -43,12 +43,12 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=2.7.5954.13236, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.7.5954.13236\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=2.9.5956.34079, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.9.5956.34079\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.8.*")]
+// [assembly: AssemblyVersion("2.9.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.CodeGeneration.Tests/packages.config b/src/NSwag.CodeGeneration.Tests/packages.config
@@ -4,6 +4,6 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="2.7.5954.13236" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="2.9.5956.34079" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs
@@ -37,7 +37,7 @@ public SwaggerToTypeScriptClientGenerator(SwaggerService service, SwaggerToTypeS
             foreach (var definition in _service.Definitions)
                 definition.Value.TypeName = definition.Key;
 
-            _resolver = new TypeScriptTypeResolver(_service.Definitions.Select(p => p.Value).ToArray());
+            _resolver = new TypeScriptTypeResolver(_service.Definitions.Select(p => p.Value).ToArray(), Settings.TypeScriptGeneratorSettings);
         }
 
         /// <summary>Gets or sets the generator settings.</summary>

diff --git a/...ag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGeneratorSettings.cs b/...ag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGeneratorSettings.cs
@@ -6,6 +6,8 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using NJsonSchema.CodeGeneration.TypeScript;
+
 namespace NSwag.CodeGeneration.CodeGenerators.TypeScript
 {
     /// <summary>Settings for the <see cref="SwaggerToTypeScriptClientGenerator"/>.</summary>
@@ -18,8 +20,12 @@ public SwaggerToTypeScriptClientGeneratorSettings()
             ClassName = "{controller}Client";
             Template = TypeScriptTemplate.JQueryCallbacks;
             PromiseType = PromiseType.Promise;
+            TypeScriptGeneratorSettings = new TypeScriptGeneratorSettings();
         }
 
+        /// <summary>Gets or sets the TypeScript generator settings.</summary>
+        public TypeScriptGeneratorSettings TypeScriptGeneratorSettings { get; set; }
+
         /// <summary>Gets or sets the class name of the service client.</summary>
         public string ClassName { get; set; }
 

diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
@@ -41,12 +41,12 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=2.7.5954.13236, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.7.5954.13236\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=2.9.5956.34079, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.9.5956.34079\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.8.*")]
+[assembly: AssemblyVersion("2.9.*")]
diff --git a/src/NSwag.CodeGeneration/packages.config b/src/NSwag.CodeGeneration/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Antlr4.StringTemplate" version="4.0.6.9004" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="2.7.5954.13236" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="2.9.5956.34079" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
@@ -46,8 +46,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.8.*")]
+[assembly: AssemblyVersion("2.9.*")]
diff --git a/src/NSwag.Core/packages.config b/src/NSwag.Core/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
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.8.*")]
+// [assembly: AssemblyVersion("2.9.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Demo.Web/Models/Car.cs b/src/NSwag.Demo.Web/Models/Car.cs
@@ -8,6 +8,7 @@ public class Car
     {
         public string Name { get; set; }
 
+        [ReadOnly(true)]
         public Person Driver { get; set; }
 
         [JsonConverter(typeof(StringEnumConverter))]

diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
@@ -47,8 +47,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http" />

diff --git a/src/NSwag.Demo.Web/Swagger.nswag b/src/NSwag.Demo.Web/Swagger.nswag
@@ -29,10 +29,11 @@
     "ModuleName": "",
     "Template": 0,
     "PromiseType": 0,
-    "GenerateClientClasses": true,
+    "GenerateClientClasses": false,
     "GenerateClientInterfaces": true,
     "GenerateDtoTypes": true,
     "OperationGenerationMode": 0,
+    "GenerateReadOnlyKeywords": false,
     "Input": null,
     "OutputFilePath": null
   },

diff --git a/src/NSwag.Demo.Web/Web.config b/src/NSwag.Demo.Web/Web.config
@@ -58,7 +58,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.7.5954.13235" newVersion="2.7.5954.13235" />
+        <bindingRedirect oldVersion="0.0.0.0-2.8.5956.13680" newVersion="2.8.5956.13680" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/NSwag.Demo.Web/packages.config b/src/NSwag.Demo.Web/packages.config
@@ -7,5 +7,5 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.Tests/NSwag.Tests.csproj b/src/NSwag.Tests/NSwag.Tests.csproj
@@ -39,8 +39,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.8.*")]
+// [assembly: AssemblyVersion("2.9.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/app.config b/src/NSwag.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.7.5954.13235" newVersion="2.7.5954.13235" />
+        <bindingRedirect oldVersion="0.0.0.0-2.8.5956.13680" newVersion="2.8.5956.13680" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/NSwag.Tests/packages.config b/src/NSwag.Tests/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="net452" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="net452" />
 </packages>
diff --git a/src/NSwag/Commands/SwaggerToTypeScriptCommand.cs b/src/NSwag/Commands/SwaggerToTypeScriptCommand.cs
@@ -83,6 +83,14 @@ public OperationGenerationMode OperationGenerationMode
             set { Settings.OperationGenerationMode = value; }
         }
 
+        [Description("Specifies whether to generate readonly keywords (only available in TS 2.0+, default: true).")]
+        [Argument(Name = "GenerateReadOnlyKeywords", DefaultValue = true)]
+        public bool GenerateReadOnlyKeywords
+        {
+            get { return Settings.TypeScriptGeneratorSettings.GenerateReadOnlyKeywords; }
+            set { Settings.TypeScriptGeneratorSettings.GenerateReadOnlyKeywords = value; }
+        }
+
         public override async Task RunAsync(CommandLineProcessor processor, IConsoleHost host)
         {
             var output = await RunAsync();

diff --git a/src/NSwag/NSwag.csproj b/src/NSwag/NSwag.csproj
@@ -46,12 +46,12 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.7.5954.13235, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.7.5954.13235\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.9.5956.34078, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.9.5956.34078\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=2.7.5954.13236, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.7.5954.13236\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=2.9.5956.34079, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.9.5956.34079\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.8.*")]
+[assembly: AssemblyVersion("2.9.*")]
diff --git a/src/NSwag/packages.config b/src/NSwag/packages.config
@@ -3,6 +3,6 @@
   <package id="Antlr4.StringTemplate" version="4.0.6.9004" targetFramework="net452" />
   <package id="NConsole" version="1.2.5854.14777" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.7.5954.13235" targetFramework="net46" />
-  <package id="NJsonSchema.CodeGeneration" version="2.7.5954.13236" targetFramework="net46" />
+  <package id="NJsonSchema" version="2.9.5956.34078" targetFramework="net46" />
+  <package id="NJsonSchema.CodeGeneration" version="2.9.5956.34079" targetFramework="net46" />
 </packages>