Support IEnumerable<KeyValuePair<TKey,TValue>> serialize key=value

Author: neuecc

sandbox/ConsoleApp/Program.cs

@@ -1,26 +1,25 @@
 using Cysharp.Web;
 using System.Net.Http.Json;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Web;
 
-var httpClient = new HttpClient { BaseAddress = new Uri("http://localhost:5000") };
-//var api = RestService.For<IMinimumAPI>(client);
-//await api.Get(10, "octocat");
+var parameters = new KeyValuePair<string, string>[]
+{
+    new ("id", "1"),
+    new ("name", "tanaka"),
+    new ("email", "[email protected]")
+};
+
+Console.WriteLine(WebSerializer.ToQueryString("https://example.com/user", parameters));
+
 
-//var k = " !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~";
-//var s1 = UrlEncoder.Default.Encode(k);
-//var s2 = HttpUtility.UrlEncode(k);
-//Console.WriteLine(s1);
-//Console.WriteLine(s2);
-//return;
 
 
-//await httpClient.GetAsync(WebSerializer.ToQueryString("Products", new { foo = new[] { 1, 10, 1000 } }, WebSerializerOptions.Default with { CollectionSeparator = "," }));
+//GCHandle handle = GCHandle.Alloc("", GCHandleType.Pinned);
 
-var s = WebSerializer.ToQueryString("http://www.example.com/q?foo=bar", new { hoge = "moge" });
-Console.WriteLine(s);
 
 return;
 

sandbox/WebApp/Program.cs

@@ -6,6 +6,9 @@
 builder.Logging.ClearProviders();
 builder.Logging.AddZLoggerConsole();
 
+
+
+
 builder.Services.AddControllers();
 
 var app = builder.Build();

src/WebSerializer/Providers/CollectionWebSerializerProvider.cs

@@ -36,7 +36,16 @@ public sealed class CollectionWebSerializerProvider : IWebSerializerProvider
                 if (enumerableDef != null)
                 {
                     var elementType = enumerableDef.GenericTypeArguments[0];
-                    return CreateInstance(typeof(EnumerableWebSerializer<,>), new[] { type, elementType });
+                    if (elementType.IsGenericType && elementType.GetGenericTypeDefinition() == typeof(KeyValuePair<,>))
+                    {
+                        var keyType = elementType.GenericTypeArguments[0];
+                        var valueType = elementType.GenericTypeArguments[1];
+                        return CreateInstance(typeof(EnumerableKeyValuePairWebSerializer<,,>), new[] { type, keyType, valueType });
+                    }
+                    else
+                    {
+                        return CreateInstance(typeof(EnumerableWebSerializer<,>), new[] { type, elementType });
+                    }
                 }
             }
 

src/WebSerializer/Serializers/CollectionSerializers.cs

@@ -82,6 +82,46 @@ public void Serialize(ref WebSerializerWriter writer, TDictionary value, WebSeri
             valueSerializer.Serialize(ref writer, item.Value, options);
         }
 
+        writer.Exit();
+    }
+}
+
+public sealed class EnumerableKeyValuePairWebSerializer<TCollection, TKey, TValue> : IWebSerializer<TCollection>
+    where TCollection : IEnumerable<KeyValuePair<TKey, TValue>>
+{
+    public void Serialize(ref WebSerializerWriter writer, TCollection value, WebSerializerOptions options)
+    {
+        if (value == null) return;
+
+        writer.EnterAndValidate(options);
+
+        var keySerializer = options.GetRequiredSerializer<TKey>();
+        var valueSerializer = options.GetRequiredSerializer<TValue>();
+
+        var first = true;
+        foreach (var item in value)
+        {
+            if (item.Value == null) continue;
+
+            if (first)
+            {
+                first = false;
+            }
+            else
+            {
+                writer.AppendConcatenate();
+            }
+
+            // Name
+            writer.AppendNamePrefix();
+            keySerializer.Serialize(ref writer, item.Key, options);
+
+            writer.AppendEqual();
+
+            // Value
+            valueSerializer.Serialize(ref writer, item.Value, options);
+        }
+
         writer.Exit();
     }
 }

tests/WebSerializer.Tests/CollectionTest.cs

@@ -49,6 +49,20 @@ public void Dict()
         WebSerializer.ToQueryString(foo, newConfig).Should().Be("Yeah=100&Kuooo=nano%20yo&DEAR=0");
     }
 
+    [Fact]
+    public void KVP()
+    {
+        var parameters = new KeyValuePair<string, string>[]
+        {
+            new ("id", "1"),
+            new ("name", "tanaka"),
+            new ("email", "[email protected]")
+        };
+
+        var url = WebSerializer.ToQueryString("https://example.com/user", parameters);
+
+        url.Should().Be("https://example.com/user?id=1&name=tanaka&email=test%40example.com");
+    }
 
     public class BoolZeroOneSerializer : IWebSerializer<bool>
     {