Serialization problems with inherited properties solved

Author: JoseGomis299

Assets/TableForge/Editor/Core/Data/Generation/ItemSerialization/IFieldSerializationStrategy.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using UnityEngine;
 
 namespace TableForge.Editor
 {
@@ -11,17 +12,24 @@ internal interface IFieldSerializationStrategy
 
     internal class BaseFieldSerializationStrategy : IFieldSerializationStrategy
     {
-        public List<TfFieldInfo> GetFields(Type type)
+        public List<TfFieldInfo> GetFields(Type baseType)
         {
+            HashSet<string> fields = new HashSet<string>();
             List<TfFieldInfo> members = new List<TfFieldInfo>();
-            foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+
+            foreach (var type in baseType.GetBaseTypes(breakType: typeof(ScriptableObject)))
             {
-                if (!SerializationUtil.IsSerializable(field)) continue;
-                if (SerializationUtil.HasCircularDependency(field.FieldType, type)) continue;
-                
-                string friendlyName = SerializationUtil.GetFriendlyName(field);
-                
-                members.Add(new TfFieldInfo(field.Name, friendlyName, type, field.FieldType));
+                foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+                {
+                    if (fields.Contains(field.Name)) continue;
+                    if (!SerializationUtil.IsSerializable(field)) continue;
+                    if (SerializationUtil.HasCircularDependency(field.FieldType, type)) continue;
+
+                    string friendlyName = SerializationUtil.GetFriendlyName(field);
+
+                    members.Add(new TfFieldInfo(field.Name, friendlyName, type, field.FieldType));
+                    fields.Add(field.Name); // Add field to the set to avoid duplicates
+                }
             }
 
             return members;
@@ -30,17 +38,24 @@ public List<TfFieldInfo> GetFields(Type type)
 
     internal class PrivateIncludedFieldSerializationStrategy : IFieldSerializationStrategy
     {
-        public List<TfFieldInfo> GetFields(Type type)
+        public List<TfFieldInfo> GetFields(Type baseType)
         {
+            HashSet<string> fields = new HashSet<string>();
             List<TfFieldInfo> members = new List<TfFieldInfo>();
-            foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+            
+            foreach (var type in baseType.GetBaseTypes(breakType: typeof(ScriptableObject)))
             {
-                if (!SerializationUtil.IsSerializable(field, true)) continue;
-                if (SerializationUtil.HasCircularDependency(field.FieldType, type)) continue;
-                
-                string friendlyName = SerializationUtil.GetFriendlyName(field);
-                
-                members.Add(new TfFieldInfo(field.Name, friendlyName, type, field.FieldType));
+                foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+                {
+                    if (fields.Contains(field.Name)) continue;
+                    if (!SerializationUtil.IsSerializable(field, true)) continue;
+                    if (SerializationUtil.HasCircularDependency(field.FieldType, type)) continue;
+
+                    string friendlyName = SerializationUtil.GetFriendlyName(field);
+
+                    members.Add(new TfFieldInfo(field.Name, friendlyName, type, field.FieldType));
+                    fields.Add(field.Name); // Add field to the set to avoid duplicates
+                }
             }
 
             return members;

Assets/TableForge/Editor/Core/Utilities/Extensions/TypeExtension.cs

@@ -102,6 +102,31 @@ public static bool IsListOrArrayType(this Type type)
 
         #region Reflection Methods
 
+        /// <summary>
+        /// Retrieves all base types of a given type, including the type itself.
+        /// </summary>
+        public static List<Type> GetBaseTypes(this Type type, bool includeSelf = true, Type breakType = null)
+        {
+            if (type == null)
+                throw new ArgumentNullException(nameof(type), "Type cannot be null.");
+
+            var baseTypes = new List<Type>();
+            if (includeSelf) baseTypes.Add(type);
+            
+            Type current = type.BaseType;
+            while (current != null)
+            {
+                if (breakType != null && current == breakType)
+                    break;
+
+                baseTypes.Insert(0, current);
+                current = current.BaseType;
+            }
+
+            return baseTypes;
+        }
+       
+        
         /// <summary>
         /// Retrieves the member information of a given property path in a type.
         /// </summary>

Assets/TableForge/Editor/PersistentData/TestData.meta

@@ -35,6 +35,12 @@ public void GetSerializableFields()
             Assert.IsTrue(fields.Any(x => x.Name == "vector3Array"));
             Assert.IsTrue(fields.Any(x => x.Name == "sampleEnum"));
             Assert.IsTrue(fields.Any(x => x.Name == "stringToIntDictionary"));
+            Assert.IsTrue(fields.Any(x => x.Name == "<InheritedIntProperty>k__BackingField"));
+            Assert.IsTrue(fields.Any(x => x.Name == "<InterfaceInt>k__BackingField"));
+            Assert.IsTrue(fields.Any(x => x.Name == "<AbstractInt>k__BackingField"));
+            Assert.IsTrue(fields.Any(x => x.Name == "<AbstractString>k__BackingField"));
+            Assert.IsTrue(fields.Any(x => x.Name == "<VirtualInt>k__BackingField"));
+            Assert.IsTrue(fields.Any(x => x.Name == "inheritedInt"));
 
             //Check if the fields non-serializable fields are not included
             Assert.IsTrue(fields.All(x => x.Name != "_privateIntField"));
@@ -45,6 +51,8 @@ public void GetSerializableFields()
             Assert.IsTrue(fields.All(x => x.Name != "intList2D"));
             Assert.IsTrue(fields.All(x => x.Name != "stringToNestedDataDictionary"));
             Assert.IsTrue(fields.All(x => x.Name != "nestedDataToIntDictionary"));
+            Assert.IsTrue(fields.Any(x => x.Name != "<AbstractFloat>k__BackingField"));
+
         }
 
     }

Assets/TableForge/Editor/Tests/UnitTests/SerializationTests.cs

@@ -6,7 +6,9 @@
 
 namespace TableForge.Tests
 {
-    internal class SampleTestData : ScriptableObject
+
+    [CreateAssetMenu(fileName = "SampleTestData", menuName = "TableForge/Tests/Sample Test Data")]
+    internal class SampleTestData : AbstractTestData, ITestInterface
     {
         #region Basic Fields
 
@@ -94,6 +96,11 @@ public enum SampleEnum
             };
 
         #endregion
+
+        [field: SerializeField] public int InterfaceInt { get; set; }
+        [field: SerializeField] public override int AbstractInt { get; protected set; } = 3;
+        [field: SerializeField] public override string AbstractString { get; set; }
+        [field: SerializeField] public override float AbstractFloat { get; } = 5;
     }
 
     [Serializable]
@@ -125,4 +132,20 @@ public NestedData(int number, string text)
 
         #endregion
     }
-}
+
+    internal abstract class AbstractTestData : ScriptableObject
+    {
+        public int inheritedInt;
+        [field: SerializeField] public int InheritedIntProperty { get; set; } = 42;
+
+        public abstract int AbstractInt { get; protected set; }
+        public abstract string AbstractString { get; set; }
+        public abstract float AbstractFloat { get; }
+        [field: SerializeField] public virtual int VirtualInt { get; set; } = 42;
+    }
+
+    internal interface ITestInterface
+    {
+        int InterfaceInt { get; set; }
+    }
+}