Merge pull request #867 from RSuter/master

Release v9.13.12
RicoSuter · Jan 8, 2019 · 8a8825d · 8a8825d
2 parents 5702a52 + 2e69d51
commit 8a8825d
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 16 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs
@@ -1636,6 +1636,34 @@ public async Task When_schema_has_AdditionProperties_schema_then_JsonExtensionDa
             Assert.Contains("JsonExtensionData", output);
         }
 
+        [Fact]
+        public void When_schema_has_negative_value_of_enum_it_is_generated_in_CSharp_and_TypeScript_correctly()
+        {
+            //// Arrange
+            var settings = new CSharpGeneratorSettings { EnumNameGenerator = new DefaultEnumNameGenerator() };
+            var generator = new CSharpGenerator(null, settings);
+
+            //// Act
+            var schema = new JsonSchema4()
+            {
+                Type = JsonObjectType.Integer,
+                Enumeration =
+                {
+                    0,
+                    1,
+                    2,
+                    -1,
+                },
+                Default = "-1"
+            };
+
+            var types = generator.GenerateTypes(schema, "MyEnum");
+
+            //// Assert
+            Assert.Contains("_1 = 1", types.Artifacts.First().Code);
+            Assert.Contains("__1 = -1", types.Artifacts.First().Code);
+        }
+
         private static void AssertCompile(string code)
         {
             var syntaxTree = CSharpSyntaxTree.ParseText(code);

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj
@@ -19,4 +19,4 @@
     <ProjectReference Include="..\NJsonSchema.CodeGeneration\NJsonSchema.CodeGeneration.csproj" />
     <ProjectReference Include="..\NJsonSchema\NJsonSchema.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.13.11</Version>
+    <Version>9.13.12</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.13.11</Version>
+    <Version>9.13.12</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration/DefaultEnumNameGenerator.cs b/src/NJsonSchema.CodeGeneration/DefaultEnumNameGenerator.cs
@@ -19,11 +19,17 @@ public class DefaultEnumNameGenerator : IEnumNameGenerator
         /// <returns>The enumeration name.</returns>
         public string Generate(int index, string name, object value, JsonSchema4 schema)
         {
+            if (name.StartsWith("_-"))
+            {
+                name = "__" + name.Substring(2);
+            }
+
             return ConversionUtilities.ConvertToUpperCamelCase(name
                 .Replace(":", "-").Replace(@"""", @""), true)
                 .Replace(".", "_")
                 .Replace("#", "_")
+                .Replace("-", "_")
                 .Replace("\\", "_");
         }
     }
-}
+}
diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.13.11</Version>
+    <Version>9.13.12</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.Tests/Serialization/ExtensionDataTests.cs b/src/NJsonSchema.Tests/Serialization/ExtensionDataTests.cs
@@ -7,6 +7,21 @@ namespace NJsonSchema.Tests.Serialization
 {
     public class ExtensionDataTests
     {
+        [Fact]
+        public async Task When_definition_entry_is_null_then_it_is_deserialized_correctly()
+        {
+            //// Arrange
+            var json = @"{ ""definitions"": { ""abc"": null } }";
+
+            //// Act
+            var schema = await JsonSchema4.FromJsonAsync(json);
+            var json2 = schema.ToJson();
+
+            //// Assert
+            Assert.False(schema.Definitions.ContainsKey("abc"));
+            Assert.DoesNotContain("abc", json2);
+        }
+
         [Fact]
         public void When_schema_has_extension_data_property_then_property_is_in_serialized_json()
         {

diff --git a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.13.11</Version>
+    <Version>9.13.12</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema/Infrastructure/XmlDocumentationExtensions.cs b/src/NJsonSchema/Infrastructure/XmlDocumentationExtensions.cs
@@ -516,6 +516,7 @@ private static string GetMemberElementName(dynamic member)
 
         private static async Task<string> GetXmlDocumentationPathAsync(dynamic assembly)
         {
+            string path;
             try
             {
                 if (assembly == null)
@@ -528,7 +529,6 @@ private static async Task<string> GetXmlDocumentationPathAsync(dynamic assembly)
                 if (Cache.ContainsKey(assemblyName.FullName))
                     return null;
 
-                string path;
                 if (!string.IsNullOrEmpty(assembly.Location))
                 {
                     var assemblyDirectory = DynamicApis.PathGetDirectoryName((string)assembly.Location);
@@ -547,8 +547,8 @@ private static async Task<string> GetXmlDocumentationPathAsync(dynamic assembly)
                         return path;
                 }
 
-                var currentDomain = Type.GetType("System.AppDomain").GetRuntimeProperty("CurrentDomain").GetValue(null);
-                if (currentDomain.HasProperty("BaseDirectory"))
+                var currentDomain = Type.GetType("System.AppDomain")?.GetRuntimeProperty("CurrentDomain").GetValue(null);
+                if (currentDomain?.HasProperty("BaseDirectory") == true)
                 {
                     var baseDirectory = currentDomain.TryGetPropertyValue("BaseDirectory", "");
                     path = DynamicApis.PathCombine(baseDirectory, assemblyName.Name + ".xml");
@@ -558,6 +558,19 @@ private static async Task<string> GetXmlDocumentationPathAsync(dynamic assembly)
                     return DynamicApis.PathCombine(baseDirectory, "bin\\" + assemblyName.Name + ".xml");
                 }
 
+                var currentDirectory = await DynamicApis.DirectoryGetCurrentDirectoryAsync();
+                path = DynamicApis.PathCombine(currentDirectory, assembly.GetName().Name + ".xml");
+                if (await DynamicApis.FileExistsAsync(path).ConfigureAwait(false))
+                {
+                    return path;
+                }
+
+                path = DynamicApis.PathCombine(currentDirectory, "bin\\" + assembly.GetName().Name + ".xml");
+                if (await DynamicApis.FileExistsAsync(path).ConfigureAwait(false))
+                {
+                    return path;
+                }
+
                 return null;
             }
             catch

diff --git a/src/NJsonSchema/JsonExtensionObject.cs b/src/NJsonSchema/JsonExtensionObject.cs
@@ -32,10 +32,18 @@ internal class ExtensionDataDeserializationConverter : JsonConverter
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            var obj = (IJsonExtensionObject)Activator.CreateInstance(objectType);
-            serializer.Populate(reader, obj);
-            DeserializeExtensionDataSchemas(obj, serializer);
-            return obj;
+            if (reader.TokenType != JsonToken.Null)
+            {
+                var obj = (IJsonExtensionObject)Activator.CreateInstance(objectType);
+                serializer.Populate(reader, obj);
+                DeserializeExtensionDataSchemas(obj, serializer);
+                return obj;
+            }
+            else
+            {
+                reader.Skip();
+                return null;
+            }
         }
 
         public override bool CanConvert(Type objectType)

diff --git a/src/NJsonSchema/JsonSchema4.Serialization.cs b/src/NJsonSchema/JsonSchema4.Serialization.cs
@@ -394,8 +394,18 @@ private void InitializeSchemaCollection(object sender, NotifyCollectionChangedEv
             else if (sender is ObservableDictionary<string, JsonSchema4>)
             {
                 var collection = (ObservableDictionary<string, JsonSchema4>)sender;
-                foreach (var item in collection.Values)
-                    item.Parent = this;
+
+                foreach (var pair in collection.ToArray())
+                {
+                    if (pair.Value == null)
+                    {
+                        collection.Remove(pair.Key);
+                    }
+                    else
+                    {
+                        pair.Value.Parent = this;
+                    }
+                }
             }
         }
     }

diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard2.0;net40;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.13.11</Version>
+    <Version>9.13.12</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>