Update NJS

Saibamen · Jun 2, 2022 · 14e1873 · 14e1873
1 parent 0b19353
commit 14e1873
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 14 deletions.
diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NSwag.Annotations\NSwag.Annotations.csproj" />

diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 

diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj
@@ -18,6 +18,6 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.7.2" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj
@@ -18,6 +18,6 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.7.2" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="10.7.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs
@@ -323,6 +323,13 @@ public bool HandleReferences
             set { Settings.TypeScriptGeneratorSettings.HandleReferences = value; }
         }
 
+        [Argument(Name = "GenerateTypeCheckFunctions", IsRequired = false, Description = "Generate type check functions (only available when TypeStyle is Interface, default: false).")]
+        public bool GenerateTypeCheckFunctions
+        {
+            get { return Settings.TypeScriptGeneratorSettings.GenerateTypeCheckFunctions; }
+            set { Settings.TypeScriptGeneratorSettings.GenerateTypeCheckFunctions = value; }
+        }
+
         [Argument(Name = "GenerateConstructorInterface", IsRequired = false, Description = "Generate an class interface which is used in the constructor to initialize the class (only available when TypeStyle is Class, default: true).")]
         public bool GenerateConstructorInterface
         {

diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>NSwag</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.Yaml" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema.Yaml" Version="10.7.2" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
@@ -142,7 +142,7 @@
     <PackageReference Include="Microsoft.Owin.FileSystems" Version="3.0.1" />
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
     <PackageReference Include="Owin" Version="1.0.0" />
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">

diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj
@@ -65,10 +65,10 @@
     <PackageReference Include="Namotion.Reflection" Version="2.0.10" />
     <PackageReference Include="NConsole" Version="3.9.6519.30868" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="10.7.1" />
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.7.1" />
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="10.7.2" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.7.2" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.7.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
     <PackageReference Include="System.Security.Cryptography.Encoding" Version="4.3.0" />

diff --git a/src/NSwagStudio/Views/CodeGenerators/SwaggerToTypeScriptClientGeneratorView.xaml b/src/NSwagStudio/Views/CodeGenerators/SwaggerToTypeScriptClientGeneratorView.xaml
@@ -281,6 +281,13 @@
                                              Margin="0,0,0,12" />
                                 </StackPanel>
 
+                                <StackPanel Visibility="{Binding Command.TypeStyle, ConverterParameter='Interface', Converter={StaticResource EqualityConverter}}">
+                                    <CheckBox IsChecked="{Binding Command.GenerateTypeCheckFunctions, Mode=TwoWay}" 
+                                              Content="Generate type check functions"
+                                              ToolTip="GenerateTypeCheckFunctions"
+                                              Margin="0,0,0,12" />
+                                </StackPanel>
+
                                 <GroupBox Header="Serialization" Margin="0,0,0,12" Visibility="{Binding Command.TypeStyle, ConverterParameter='Class', Converter={StaticResource EqualityConverter}}">
                                     <StackPanel Margin="4,8,4,-8">
                                         <CheckBox IsChecked="{Binding Command.HandleReferences, Mode=TwoWay}"