Use ImmutableArray and ImmutableDictionary

generator/plugins/dotnet/custom/CustomArrayConverter.cs

@@ -0,0 +1,42 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Collections.Immutable;
+
+public class CustomArrayConverter<T> : JsonConverter<ImmutableArray<T>>
+{
+    public override ImmutableArray<T> ReadJson(JsonReader reader, Type objectType, ImmutableArray<T> existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.Null)
+        {
+            return default(ImmutableArray<T>);
+        }
+
+        JArray array = JArray.Load(reader);
+        ImmutableArray<T>.Builder builder = ImmutableArray.CreateBuilder<T>();
+
+        for (int i = 0; i < array.Count; i++)
+        {
+            builder.Add((T)array[i].ToObject(typeof(T))!);
+        }
+
+        return builder.ToImmutable();
+
+    }
+
+    public override void WriteJson(JsonWriter writer, ImmutableArray<T> value, JsonSerializer serializer)
+    {
+        if (value.IsDefault)
+        {
+            writer.WriteNull();
+        }
+        else
+        {
+            writer.WriteStartArray();
+            foreach (var item in value)
+            {
+                serializer.Serialize(writer, item);
+            }
+            writer.WriteEndArray();
+        }
+    }
+}

generator/plugins/dotnet/custom/CustomObjectConverter.cs

@@ -9,15 +9,15 @@ public override T ReadJson(JsonReader reader, Type objectType, T? existingValue,
     {
         if (reader.TokenType == JsonToken.Null)
         {
-            return default(T);
+            return default(T)!;
         }
 
         Dictionary<string, object?>? o = serializer.Deserialize<Dictionary<string, object?>>(reader);
         if (o == null)
         {
-            return default(T);
+            return default(T)!;
         }
-        return (T)Activator.CreateInstance(typeof(T), o) ?? default(T);
+        return (T)Activator.CreateInstance(typeof(T), o)! ?? default(T)!;
     }
 
     public override void WriteJson(JsonWriter writer, T? value, JsonSerializer serializer)

generator/plugins/dotnet/custom/DocumentSelectorConverter.cs

@@ -20,7 +20,7 @@ public override DocumentSelector ReadJson(JsonReader reader, Type objectType, Do
     {
         if (reader.TokenType == JsonToken.Null)
         {
-            return null;
+            return null!;
         }
         var token = JToken.Load(reader);
         if (token.Type == JTokenType.Array)

generator/plugins/dotnet/custom/OrType.cs

@@ -23,12 +23,12 @@ public OrType(U u)
         return obj.Value is T x ? x : default;
     }
 
-    public static explicit operator OrType<T, U>(U obj) => obj is null ? null : new OrType<T, U>(obj);
-    public static explicit operator OrType<T, U>(T obj) => obj is null ? null : new OrType<T, U>(obj);
+    public static explicit operator OrType<T, U>(U obj) => obj is null ? null! : new OrType<T, U>(obj);
+    public static explicit operator OrType<T, U>(T obj) => obj is null ? null! : new OrType<T, U>(obj);
 
     public override string ToString()
     {
-        return Value?.ToString();
+        return Value?.ToString()!;
     }
 }
 
@@ -66,15 +66,15 @@ public OrType(V v)
         return obj.Value is V x ? x : default;
     }
 
-    public static explicit operator OrType<T, U, V>(U obj) => obj is null ? null : new OrType<T, U, V>(obj);
+    public static explicit operator OrType<T, U, V>(U obj) => obj is null ? null! : new OrType<T, U, V>(obj);
 
-    public static explicit operator OrType<T, U, V>(T obj) => obj is null ? null : new OrType<T, U, V>(obj);
+    public static explicit operator OrType<T, U, V>(T obj) => obj is null ? null! : new OrType<T, U, V>(obj);
 
-    public static explicit operator OrType<T, U, V>(V obj) => obj is null ? null : new OrType<T, U, V>(obj);
+    public static explicit operator OrType<T, U, V>(V obj) => obj is null ? null! : new OrType<T, U, V>(obj);
 
     public override string ToString()
     {
-        return Value?.ToString();
+        return Value?.ToString()!;
     }
 }
 
@@ -123,16 +123,16 @@ public OrType(W w)
         return obj.Value is W x ? x : default;
     }
 
-    public static explicit operator OrType<T, U, V, W>(U obj) => obj is null ? null : new OrType<T, U, V, W>(obj);
+    public static explicit operator OrType<T, U, V, W>(U obj) => obj is null ? null! : new OrType<T, U, V, W>(obj);
 
-    public static explicit operator OrType<T, U, V, W>(T obj) => obj is null ? null : new OrType<T, U, V, W>(obj);
+    public static explicit operator OrType<T, U, V, W>(T obj) => obj is null ? null! : new OrType<T, U, V, W>(obj);
 
-    public static explicit operator OrType<T, U, V, W>(V obj) => obj is null ? null : new OrType<T, U, V, W>(obj);
+    public static explicit operator OrType<T, U, V, W>(V obj) => obj is null ? null! : new OrType<T, U, V, W>(obj);
 
-    public static explicit operator OrType<T, U, V, W>(W obj) => obj is null ? null : new OrType<T, U, V, W>(obj);
+    public static explicit operator OrType<T, U, V, W>(W obj) => obj is null ? null! : new OrType<T, U, V, W>(obj);
 
     public override string ToString()
     {
-        return Value?.ToString();
+        return Value?.ToString()!;
     }
 }

generator/plugins/dotnet/custom/OrTypeArrayConverter.cs

@@ -1,9 +1,9 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Immutable;
 
-
-public class OrTypeArrayConverter<T, U> : JsonConverter<OrType<T, U>[]>
+public class OrTypeArrayConverter<T, U> : JsonConverter<ImmutableArray<OrType<T, U>>>
 {
     private OrTypeConverter<T, U> _converter;
 
@@ -12,27 +12,27 @@ public OrTypeArrayConverter()
         _converter = new OrTypeConverter<T, U>();
     }
 
-    public override OrType<T, U>[] ReadJson(JsonReader reader, Type objectType, OrType<T, U>[]? existingValue, bool hasExistingValue, JsonSerializer serializer)
+    public override ImmutableArray<OrType<T, U>> ReadJson(JsonReader reader, Type objectType, ImmutableArray<OrType<T, U>> existingValue, bool hasExistingValue, JsonSerializer serializer)
     {
         if (reader.TokenType == JsonToken.Null)
         {
-            return null;
+            return default(ImmutableArray<OrType<T, U>>);
         }
 
         JArray array = JArray.Load(reader);
-        var result = new OrType<T, U>[array.Count];
+        ImmutableArray<OrType<T, U>>.Builder builder = ImmutableArray.CreateBuilder<OrType<T, U>>();
 
         for (int i = 0; i < array.Count; i++)
         {
-            result[i] = (OrType<T, U>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U>), null, serializer);
+            builder.Add((OrType<T, U>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U>), null, serializer)!);
         }
 
-        return result;
+        return builder.ToImmutable();
     }
 
-    public override void WriteJson(JsonWriter writer, OrType<T, U>[]? value, JsonSerializer serializer)
+    public override void WriteJson(JsonWriter writer, ImmutableArray<OrType<T, U>> value, JsonSerializer serializer)
     {
-        if (value is null)
+        if (value.IsDefault)
         {
             writer.WriteNull();
         }
@@ -49,7 +49,7 @@ public override void WriteJson(JsonWriter writer, OrType<T, U>[]? value, JsonSer
         }
     }
 }
-public class OrTypeArrayConverter<T, U, V> : JsonConverter<OrType<T, U, V>[]>
+public class OrTypeArrayConverter<T, U, V> : JsonConverter<ImmutableArray<OrType<T, U, V>>>
 {
     private OrTypeConverter<T, U, V> _converter;
 
@@ -58,27 +58,27 @@ public OrTypeArrayConverter()
         _converter = new OrTypeConverter<T, U, V>();
     }
 
-    public override OrType<T, U, V>[] ReadJson(JsonReader reader, Type objectType, OrType<T, U, V>[]? existingValue, bool hasExistingValue, JsonSerializer serializer)
+    public override ImmutableArray<OrType<T, U, V>> ReadJson(JsonReader reader, Type objectType, ImmutableArray<OrType<T, U, V>> existingValue, bool hasExistingValue, JsonSerializer serializer)
     {
         if (reader.TokenType == JsonToken.Null)
         {
-            return null;
+            return default(ImmutableArray<OrType<T, U, V>>);
         }
 
         JArray array = JArray.Load(reader);
-        var result = new OrType<T, U, V>[array.Count];
+        ImmutableArray<OrType<T, U, V>>.Builder builder = ImmutableArray.CreateBuilder<OrType<T, U, V>>();
 
         for (int i = 0; i < array.Count; i++)
         {
-            result[i] = (OrType<T, U, V>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U, V>), null, serializer);
+            builder.Add((OrType<T, U, V>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U, V>), null, serializer)!);
         }
 
-        return result;
+        return builder.ToImmutable();
     }
 
-    public override void WriteJson(JsonWriter writer, OrType<T, U, V>[]? value, JsonSerializer serializer)
+    public override void WriteJson(JsonWriter writer, ImmutableArray<OrType<T, U, V>> value, JsonSerializer serializer)
     {
-        if (value is null)
+        if (value.IsDefault)
         {
             writer.WriteNull();
         }
@@ -97,7 +97,7 @@ public override void WriteJson(JsonWriter writer, OrType<T, U, V>[]? value, Json
 }
 
 
-public class OrTypeArrayConverter<T, U, V, W> : JsonConverter<OrType<T, U, V, W>[]>
+public class OrTypeArrayConverter<T, U, V, W> : JsonConverter<ImmutableArray<OrType<T, U, V, W>>>
 {
     private OrTypeConverter<T, U, V, W> _converter;
 
@@ -106,27 +106,27 @@ public OrTypeArrayConverter()
         _converter = new OrTypeConverter<T, U, V, W>();
     }
 
-    public override OrType<T, U, V, W>[] ReadJson(JsonReader reader, Type objectType, OrType<T, U, V, W>[]? existingValue, bool hasExistingValue, JsonSerializer serializer)
+    public override ImmutableArray<OrType<T, U, V, W>> ReadJson(JsonReader reader, Type objectType, ImmutableArray<OrType<T, U, V, W>> existingValue, bool hasExistingValue, JsonSerializer serializer)
     {
         if (reader.TokenType == JsonToken.Null)
         {
-            return null;
+            return default(ImmutableArray<OrType<T, U, V, W>>);
         }
 
         JArray array = JArray.Load(reader);
-        var result = new OrType<T, U, V, W>[array.Count];
+        ImmutableArray<OrType<T, U, V, W>>.Builder builder = ImmutableArray.CreateBuilder<OrType<T, U, V, W>>();
 
         for (int i = 0; i < array.Count; i++)
         {
-            result[i] = (OrType<T, U, V, W>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U, V, W>), null, serializer);
+            builder.Add((OrType<T, U, V, W>)_converter.ReadJson(array[i].CreateReader(), typeof(OrType<T, U, V, W>), null, serializer)!);
         }
 
-        return result;
+        return builder.ToImmutable();
     }
 
-    public override void WriteJson(JsonWriter writer, OrType<T, U, V, W>[]? value, JsonSerializer serializer)
+    public override void WriteJson(JsonWriter writer, ImmutableArray<OrType<T, U, V, W>> value, JsonSerializer serializer)
     {
-        if (value is null)
+        if (value.IsDefault)
         {
             writer.WriteNull();
         }

generator/plugins/dotnet/custom/OrTypeConverter.cs

@@ -1,6 +1,28 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+
+internal class OrTypeConverterHelpers
+{
+    public static Type[] SortTypesByHeuristic(Type[] types, JToken jToken)
+    {
+        var typePropertyScores = new Dictionary<Type, int>();
+
+        string[] jTokenPropertyNames = jToken.Children<JProperty>().Select(p => p.Name.ToUpper()).ToArray();
+
+        foreach (Type type in types)
+        {
+            string[] typePropertyNames = type.GetProperties().Select(p => p.Name.ToUpper()).ToArray();
+
+            int score = jTokenPropertyNames.Count(propertyName => typePropertyNames.Contains(propertyName));
+            typePropertyScores[type] = score;
+        }
+
+        return types.OrderByDescending(type => typePropertyScores[type]).ToArray();
+    }
+}
 
 public class OrTypeConverter<T, U> : JsonConverter<OrType<T, U>>
 {
@@ -32,7 +54,8 @@ public class OrTypeConverter<T, U> : JsonConverter<OrType<T, U>>
             return ReadStringToken(reader, serializer, types);
         }
 
-        return OrTypeConverter<T, U>.ReadObjectToken(JToken.Load(reader), serializer, types);
+        var token = JToken.Load(reader);
+        return OrTypeConverter<T, U>.ReadObjectToken(token, serializer, OrTypeConverterHelpers.SortTypesByHeuristic(types, token));
     }
 
     private static OrType<T, U> ReadIntegerToken(JsonReader reader, JsonSerializer serializer, Type[] types)
@@ -93,7 +116,7 @@ private static OrType<T, U> ReadBooleanToken(JsonReader reader, JsonSerializer s
 
     private static OrType<T, U> ReadStringToken(JsonReader reader, JsonSerializer serializer, Type[] types)
     {
-        string str = serializer.Deserialize<string>(reader);
+        string str = serializer.Deserialize<string>(reader)!;
         if (typeof(T) == typeof(string))
         {
             return new OrType<T, U>((T)(object)str);
@@ -198,7 +221,8 @@ public class OrTypeConverter<T, U, V> : JsonConverter<OrType<T, U, V>>
             return ReadStringToken(reader, serializer, types);
         }
 
-        return OrTypeConverter<T, U, V>.ReadObjectToken(JToken.Load(reader), serializer, types);
+        var token = JToken.Load(reader);
+        return OrTypeConverter<T, U, V>.ReadObjectToken(token, serializer, OrTypeConverterHelpers.SortTypesByHeuristic(types, token));
     }
 
     private static OrType<T, U, V> ReadIntegerToken(JsonReader reader, JsonSerializer serializer, Type[] types)
@@ -275,7 +299,7 @@ private static OrType<T, U, V> ReadBooleanToken(JsonReader reader, JsonSerialize
 
     private static OrType<T, U, V> ReadStringToken(JsonReader reader, JsonSerializer serializer, Type[] types)
     {
-        string str = serializer.Deserialize<string>(reader);
+        string str = serializer.Deserialize<string>(reader)!;
         if (typeof(T) == typeof(string))
         {
             return new OrType<T, U, V>((T)(object)str);
@@ -351,7 +375,7 @@ public override void WriteJson(JsonWriter writer, OrType<T, U, V>? value, JsonSe
         }
         else
         {
-            serializer.Serialize(writer, value.Value);
+            serializer.Serialize(writer, value?.Value);
         }
     }
 }
@@ -386,7 +410,8 @@ public class OrTypeConverter<T, U, V, W> : JsonConverter<OrType<T, U, V, W>>
             return ReadStringToken(reader, serializer, types);
         }
 
-        return OrTypeConverter<T, U, V, W>.ReadObjectToken(JToken.Load(reader), serializer, types);
+        var token = JToken.Load(reader);
+        return OrTypeConverter<T, U, V, W>.ReadObjectToken(token, serializer, OrTypeConverterHelpers.SortTypesByHeuristic(types, token));
     }
 
     private static OrType<T, U, V, W> ReadIntegerToken(JsonReader reader, JsonSerializer serializer, Type[] types)
@@ -479,7 +504,7 @@ private static OrType<T, U, V, W> ReadBooleanToken(JsonReader reader, JsonSerial
 
     private static OrType<T, U, V, W> ReadStringToken(JsonReader reader, JsonSerializer serializer, Type[] types)
     {
-        string str = serializer.Deserialize<string>(reader);
+        string str = serializer.Deserialize<string>(reader)!;
         if (typeof(T) == typeof(string))
         {
             return new OrType<T, U, V, W>((T)(object)str);
@@ -564,7 +589,7 @@ public override void WriteJson(JsonWriter writer, OrType<T, U, V, W>? value, Jso
         }
         else
         {
-            serializer.Serialize(writer, value.Value);
+            serializer.Serialize(writer, value?.Value);
         }
     }
-}
+}