Unduplicate some code

Author: kristiker

Codecs/Binary.cs

@@ -377,38 +377,10 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in
                 var id_bits = Reader.ReadBytes(16);
                 var id = new Guid(BitConverter.IsLittleEndian ? id_bits : id_bits.Reverse().ToArray());
 
-                Element? elem = null;
-                var matchedType = types.TryGetValue(type, out var classType);
-
-                if(matchedType && classType != null && reflectionParams.AttemptReflection)
-                {
-                    var isElementDerived = Element.IsElementDerived(classType);
-                    if (isElementDerived && classType.Name == type)
-                    {
-                        Type derivedType = classType;
-                
-                        ConstructorInfo? constructor = typeof(Element).GetConstructor(
-                            BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
-                            null,
-                            [typeof(Datamodel), typeof(string), typeof(Guid), typeof(string)],
-                            null
-                        );
-                
-                        if (constructor == null)
-                        {
-                            throw new InvalidOperationException("Failed to get constructor while attemption reflection based deserialisation");
-                        }
-                
-                        object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);
-                        constructor.Invoke(uninitializedObject, [dm, name, id, type]);
-                
-                        elem = (Element?)uninitializedObject;
-                    }
-                }
-                
-                if (elem == null)
+                if (!CodecUtilities.TryConstructCustomElement(types, dm, type, name, id, out _))
                 {
-                    elem = new Element(dm, name, id, type);
+                    // note: constructing an element, adds it to the datamodel.AllElements
+                    _ = new Element(dm, name, id, type);
                 }
             }
 
@@ -423,7 +395,7 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in
                 foreach (var i in Enumerable.Range(0, num_attrs))
                 {
                     var name = StringDict.ReadString(Reader);
-                    if (defer_mode == DeferredMode.Automatic && reflectionParams.AttemptReflection == false)
+                    if (defer_mode == DeferredMode.Automatic)
                     {
                         CodecUtilities.AddDeferredAttribute(elem, name, Reader.BaseStream.Position);
                         SkipAttribute(Reader);

Codecs/KeyValues2.cs

@@ -509,35 +509,8 @@ string Decode_NextToken(StreamReader reader)
                     var id = new Guid(elem_id);
                     if (elem_class != "$prefix_element$")
                     {
-                        var matchedType = types.TryGetValue(elem_class, out var classType);
-
-                        if (matchedType && classType != null && reflectionParams.AttemptReflection)
-                        {
-                            var isElementDerived = Element.IsElementDerived(classType);
-                            if (isElementDerived && classType.Name == elem_class)
-                            {
-                                Type derivedType = classType;
-
-                                ConstructorInfo? constructor = typeof(Element).GetConstructor(
-                                    BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
-                                    null,
-                                    [typeof(Datamodel), typeof(string), typeof(Guid), typeof(string)],
-                                    null
-                                );
-
-                                if (constructor == null)
-                                {
-                                    throw new InvalidOperationException("Failed to get constructor while attemption reflection based deserialisation");
-                                }
-
-                                object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);
-                                constructor.Invoke(uninitializedObject, [dataModel, elem_name, new Guid(elem_id), elem_class]);
-
-                                elem = (Element?)uninitializedObject;
-                            }
-                        }
-
-                        elem ??= new Element(dataModel, elem_name, new Guid(elem_id), elem_class);
+                        CodecUtilities.TryConstructCustomElement(types, dataModel, elem_class, elem_name, id, out elem);
+                        elem ??= new Element(dataModel, elem_name, id, elem_class);
                     }
 
                     continue;

Element.cs

@@ -388,27 +388,6 @@ public bool Equals(Element? other)
         {
             return other != null && ID == other.ID;
         }
-
-        public static bool IsElementDerived(Type type)
-        {
-            var elementType = typeof(Element);
-
-            while (type.BaseType != elementType)
-            {
-                var baseType = type.BaseType;
-
-                if (baseType != null)
-                {
-                    type = baseType;
-                }
-                else
-                {
-                    return type == elementType;
-                }
-            }
-
-            return type.BaseType == elementType;
-        }
     }
 
     namespace TypeConverters

Format/Attribute.cs

@@ -8,12 +8,12 @@ public sealed class DMProperty : System.Attribute
 {
     /// <param name="name">The name to use for serialization.</param>
     /// <param name="optional">Ignore serialization if property is on the default value.</param>
-    public DMProperty(string name = "", bool optional = false)
+    public DMProperty(string? name = null, bool optional = false)
     {
         Name = name;
         Optional = optional;
     }
 
-    public string Name { get; }
+    public string? Name { get; }
     public bool Optional { get; }
 }

ICodec.cs

@@ -4,6 +4,7 @@
 using System.Numerics;
 using System.Reflection;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 namespace Datamodel.Codecs
 {
@@ -198,18 +199,55 @@ public static Dictionary<string, Type> GetReflectionTypes(ReflectionParams refle
                 {
                     foreach (var classType in assembly.DefinedTypes)
                     {
-                        types.TryAdd(classType.Name, classType);
+                        if (classType.IsSubclassOf(typeof(Element)))
+                        {
+                            types.TryAdd(classType.Name, classType);
+                        }
                     }
                 }
 
                 foreach (var type in reflectionParams.AdditionalTypes)
                 {
-                    types.TryAdd(type.Name, type);
+                    if (type.IsSubclassOf(typeof(Element)))
+                    {
+                        types.TryAdd(type.Name, type);
+                    }
                 }
             }
 
             return types;
         }
+
+        public static bool TryConstructCustomElement(Dictionary<string, Type> types, Datamodel dataModel, string elem_class, string elem_name, Guid elem_id, out Element? elem)
+        {
+            var matchedType = types.TryGetValue(elem_class, out var classType);
+
+            if (!matchedType || classType is null)
+            {
+                elem = null;
+                return false;
+            }
+
+            Type derivedType = classType;
+
+            ConstructorInfo? constructor = typeof(Element).GetConstructor(
+                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
+                null,
+                [typeof(Datamodel), typeof(string), typeof(Guid), typeof(string)],
+                null
+            );
+
+            if (constructor == null)
+            {
+                throw new InvalidOperationException("Failed to get constructor while attemption reflection based deserialisation");
+            }
+
+            object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);
+            constructor.Invoke(uninitializedObject, [dataModel, elem_name, elem_id, elem_class]);
+
+            elem = (Element?)uninitializedObject;
+            return true;
+        }
     }
 
     [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]