Improved CborArray.FromCollection

- Better peformance
- Supports a mixed collection (IEnumerable<object>)

Author: Michaël Catanzariti

src/Dahomey.Cbor.Tests/CborValueTests.cs

@@ -208,6 +208,53 @@ public void FromArray()
             Assert.Equal(new CborArray(1, 2, 3), actual);
         }
 
+        class Foo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public void FromClassArray()
+        {
+            Foo[] array =
+            { 
+                new Foo 
+                { 
+                    Id = 1, 
+                    Name = "foo"
+                }, 
+                new Foo 
+                { 
+                    Id = 2, 
+                    Name = "bar"
+                }
+            };
+
+            CborArray actual = CborArray.FromCollection(array);
+            CborArray expected = new CborArray(
+                new CborObject
+                {
+                    ["Id"] = 1,
+                    ["Name"] = "foo"
+                },
+                new CborObject
+                {
+                    ["Id"] = 2,
+                    ["Name"] = "bar"
+                });
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void FromMixedArray()
+        {
+            object[] array = { true, "foo", 12, 12.12 };
+            CborArray actual = CborArray.FromCollection(array);
+            CborArray expected = new CborArray(true, "foo", 12, 12.12);
+            Assert.Equal(expected, actual);
+        }
+
         [Fact]
         public void ToArray()
         {
@@ -224,6 +271,47 @@ public void FromList()
             Assert.Equal(new CborArray(1, 2, 3), actual);
         }
 
+        [Fact]
+        public void FromClassList()
+        {
+            List<Foo> list = new List<Foo>
+            {
+                new Foo
+                {
+                    Id = 1,
+                    Name = "foo"
+                },
+                new Foo
+                {
+                    Id = 2,
+                    Name = "bar"
+                }
+            };
+
+            CborArray actual = CborArray.FromCollection(list);
+            CborArray expected = new CborArray(
+                new CborObject
+                {
+                    ["Id"] = 1,
+                    ["Name"] = "foo"
+                },
+                new CborObject
+                {
+                    ["Id"] = 2,
+                    ["Name"] = "bar"
+                });
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void FromMixedList()
+        {
+            List<object> list = new List<object> { true, "foo", 12, 12.12 };
+            CborArray actual = CborArray.FromCollection(list);
+            CborArray expected = new CborArray(true, "foo", 12, 12.12);
+            Assert.Equal(expected, actual);
+        }
+
         [Fact]
         public void ToList()
         {

src/Dahomey.Cbor/ObjectModel/CborArray.cs

@@ -177,19 +177,12 @@ public override int GetHashCode()
             return hash;
         }
 
-        public static CborArray FromCollection<T>(T collection, CborOptions? options = null)
-            where T : ICollection
+        public static CborArray FromCollection<T>(IEnumerable<T> collection, CborOptions? options = null)
         {
             options ??= CborOptions.Default;
 
-            using ByteBufferWriter buffer = new ByteBufferWriter();
-            ICborConverter<T> listConverter = options.Registry.ConverterRegistry.Lookup<T>();
-            CborWriter writer = new CborWriter(buffer);
-            listConverter.Write(ref writer, collection);
-
-            ICborConverter<CborArray> cborArrayConverter = options.Registry.ConverterRegistry.Lookup<CborArray>();
-            CborReader reader = new CborReader(buffer.WrittenSpan);
-            return cborArrayConverter.Read(ref reader);
+            IEnumerable<CborValue> values = collection.Select(item => item == null ? CborValue.Null : CborValueConvert.ToValue(item, options));
+            return new CborArray(values);
         }
 
         public T ToCollection<T>(CborOptions? options = null) 

src/Dahomey.Cbor/ObjectModel/CborValue.cs

@@ -1,4 +1,7 @@
-using System;
+using Dahomey.Cbor.Serialization;
+using Dahomey.Cbor.Serialization.Converters;
+using Dahomey.Cbor.Util;
+using System;
 using System.Collections.Generic;
 using System.Dynamic;
 
@@ -8,6 +11,9 @@ public abstract class CborValue : DynamicObject, IComparable<CborValue>, IEquata
     {
         public abstract CborValueType Type { get; }
 
+        private static readonly CborNull s_Null = new CborNull();
+        public static CborNull Null { get; } = s_Null;
+
         public virtual T Value<T>()
         {
             throw new NotSupportedException(
@@ -84,9 +90,6 @@ public static implicit operator CborValue(bool value)
             return (CborBoolean)value;
         }
 
-        private static readonly CborNull s_Null = new CborNull();
-        public static CborNull Null { get; } = s_Null;
-
         public static implicit operator CborValue(CborValue[] values)
         {
             return new CborArray(values);
@@ -121,4 +124,111 @@ public int CompareTypeTo(CborValue other)
         public abstract override bool Equals(object? obj);
         public abstract override int GetHashCode();
     }
+
+    public static class CborValueConvert
+    {
+        public static CborValue ToValue(string? value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(char value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(double value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(float value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(decimal value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(sbyte value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(byte value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(int value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(uint value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(short value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(ushort value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(long value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(ulong value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(bool value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(CborValue[] values, CborOptions? options = null)
+        {
+            return values;
+        }
+
+        public static CborValue ToValue(Dictionary<CborValue, CborValue> pairs, CborOptions? options = null)
+        {
+            return pairs;
+        }
+
+        public static CborValue ToValue(ReadOnlyMemory<byte> value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(ReadOnlySpan<byte> value, CborOptions? options = null)
+        {
+            return value;
+        }
+
+        public static CborValue ToValue(object value, CborOptions? options = null)
+        {
+            options ??= CborOptions.Default;
+
+            using ByteBufferWriter buffer = new ByteBufferWriter();
+            ICborConverter converter = options.Registry.ConverterRegistry.Lookup(value.GetType());
+            CborWriter writer = new CborWriter(buffer);
+            converter.Write(ref writer, value);
+
+            ICborConverter<CborValue> cborValueConverter = options.Registry.ConverterRegistry.Lookup<CborValue>();
+            CborReader reader = new CborReader(buffer.WrittenSpan);
+            return cborValueConverter.Read(ref reader);
+        }
+}
 }