Add IsCollection, byte[] operator, return "null" in tostring

Author: xPaw

ValveKeyValue/ValveKeyValue.Test/ConversionCoverageTestCase.cs

@@ -232,6 +232,25 @@ public void KVObjectBlobFactory()
 
         #endregion
 
+        #region Explicit byte[] operator
+
+        [Test]
+        public void ExplicitByteArrayFromKVObject()
+        {
+            var obj = KVObject.Blob(new byte[] { 1, 2, 3 });
+            byte[] result = (byte[])obj;
+            Assert.That(result, Is.EqualTo(new byte[] { 1, 2, 3 }));
+        }
+
+        [Test]
+        public void ExplicitByteArrayFromNonBlobThrows()
+        {
+            var obj = new KVObject(42);
+            Assert.That(() => (byte[])obj, Throws.InstanceOf<InvalidOperationException>());
+        }
+
+        #endregion
+
         #region KVObject IConvertible (Convert.ChangeType works directly)
 
         [Test]

ValveKeyValue/ValveKeyValue.Test/KVObjectApiTestCase.cs

@@ -205,6 +205,16 @@ public void ToStringReturnsCollectionForCollection()
             Assert.That(obj.ToString(CultureInfo.InvariantCulture), Is.EqualTo("[Collection]"));
         }
 
+        [Test]
+        public void ToStringReturnsNullStringForNullValue()
+        {
+            var obj = KVObject.Null();
+            Assert.That(obj.ToString(CultureInfo.InvariantCulture), Is.EqualTo("null"));
+#pragma warning disable CA1305
+            Assert.That(obj.ToString(), Is.EqualTo("null"));
+#pragma warning restore CA1305
+        }
+
         #endregion
 
         #region Explicit operators to primitives
@@ -281,6 +291,34 @@ public void NullKVObjectIsNull()
             Assert.That(value.IsNull, Is.True);
         }
 
+        [Test]
+        public void IsCollectionReturnsTrueForDictCollection()
+        {
+            var obj = KVObject.Collection();
+            Assert.That(obj.IsCollection, Is.True);
+        }
+
+        [Test]
+        public void IsCollectionReturnsTrueForListCollection()
+        {
+            var obj = KVObject.ListCollection();
+            Assert.That(obj.IsCollection, Is.True);
+        }
+
+        [Test]
+        public void IsCollectionReturnsFalseForScalar()
+        {
+            var obj = new KVObject(42);
+            Assert.That(obj.IsCollection, Is.False);
+        }
+
+        [Test]
+        public void IsCollectionReturnsFalseForArray()
+        {
+            var obj = KVObject.Array();
+            Assert.That(obj.IsCollection, Is.False);
+        }
+
         [Test]
         public void NullKVObjectValueTypeIsNull()
         {

ValveKeyValue/ValveKeyValue.Test/KVSerializerNullInputsTestCase.cs

@@ -13,6 +13,25 @@ public void DeserializeWithNullStream(KVSerializationFormat format)
                 .With.Property(nameof(ArgumentNullException.ParamName)).EqualTo("stream"));
         }
 
+        [TestCaseSource(nameof(Formats))]
+        public void SerializeWithNullStream(KVSerializationFormat format)
+        {
+            Assert.That(
+                () => KVSerializer.Create(format).Serialize(stream: null!, data: new KVObject()),
+                Throws.Exception.TypeOf<ArgumentNullException>()
+                .With.Property(nameof(ArgumentNullException.ParamName)).EqualTo("stream"));
+        }
+
+        [TestCaseSource(nameof(Formats))]
+        public void SerializeDocumentWithNullStream(KVSerializationFormat format)
+        {
+            var doc = new KVDocument(new KVHeader(), "test", new KVObject());
+            Assert.That(
+                () => KVSerializer.Create(format).Serialize(stream: null!, data: doc),
+                Throws.Exception.TypeOf<ArgumentNullException>()
+                .With.Property(nameof(ArgumentNullException.ParamName)).EqualTo("stream"));
+        }
+
         public static IEnumerable Formats => Enum.GetValues<KVSerializationFormat>();
     }
 }

ValveKeyValue/ValveKeyValue.Test/Test Data/apisurface.txt

@@ -48,6 +48,7 @@ public class ValveKeyValue.KVDocument
     public ValveKeyValue.KVFlag get_Flag();
     public ValveKeyValue.KVHeader get_Header();
     public bool get_IsArray();
+    public bool get_IsCollection();
     public bool get_IsNull();
     public ValveKeyValue.KVObject get_Item(int index);
     public ValveKeyValue.KVObject get_Item(string key);
@@ -182,6 +183,7 @@ public class ValveKeyValue.KVObject
     public int get_Count();
     public ValveKeyValue.KVFlag get_Flag();
     public bool get_IsArray();
+    public bool get_IsCollection();
     public bool get_IsNull();
     public ValveKeyValue.KVObject get_Item(int index);
     public ValveKeyValue.KVObject get_Item(string key);
@@ -211,6 +213,7 @@ public class ValveKeyValue.KVObject
     public static sbyte op_Explicit(ValveKeyValue.KVObject obj);
     public static decimal op_Explicit(ValveKeyValue.KVObject obj);
     public static IntPtr op_Explicit(ValveKeyValue.KVObject obj);
+    public static byte[] op_Explicit(ValveKeyValue.KVObject obj);
     public static ValveKeyValue.KVObject op_Implicit(bool value);
     public static ValveKeyValue.KVObject op_Implicit(byte value);
     public static ValveKeyValue.KVObject op_Implicit(byte[] value);

ValveKeyValue/ValveKeyValue/KVObject.cs

@@ -43,6 +43,11 @@ public partial class KVObject : IReadOnlyDictionary<string, KVObject>
         /// </summary>
         public bool IsArray => ValueType == KVValueType.Array;
 
+        /// <summary>
+        /// Gets a value indicating whether this value is a collection.
+        /// </summary>
+        public bool IsCollection => ValueType == KVValueType.Collection;
+
         /// <summary>
         /// Gets the number of children in this object's collection or array value.
         /// Returns 0 if the value is neither a collection nor an array.

ValveKeyValue/ValveKeyValue/KVObject_IConvertible.cs

@@ -192,7 +192,7 @@ KVValueType.Collection or KVValueType.Array or KVValueType.BinaryBlob
         {
             KVValueType.String => (string)_ref!,
             KVValueType.Boolean => _scalar != 0 ? "1" : "0",
-            KVValueType.Null => throw new NotSupportedException("Cannot convert null to String."),
+            KVValueType.Null => "null",
             KVValueType.FloatingPoint => BitConverter.Int32BitsToSingle((int)_scalar).ToString(provider),
             KVValueType.FloatingPoint64 => BitConverter.Int64BitsToDouble(_scalar).ToString(provider),
             KVValueType.Int32 or KVValueType.Pointer => ((int)_scalar).ToString(provider),

ValveKeyValue/ValveKeyValue/KVObject_operators.cs

@@ -95,6 +95,9 @@ public partial class KVObject
         /// <summary>Explicit cast from <see cref="KVObject"/> to <see cref="IntPtr"/>.</summary>
         public static explicit operator IntPtr(KVObject obj) => new(obj.ToInt32(null));
 
+        /// <summary>Explicit cast from <see cref="KVObject"/> to <see langword="byte[]"/>.</summary>
+        public static explicit operator byte[](KVObject obj) => obj.AsBlob();
+
         #endregion
     }
 }