fix field order attribute (#23)

* fix field order attribute

* update version

* fix .NET project

* fix out of range when reorder fields.

Author: quabug

Assets/Samples/TestAnySerialize.cs

@@ -76,10 +76,11 @@ public override string ToString()
     [Serializable]
     public class B<T> : IB<T>
     {
+        [field: AnySerializeFieldOrder(3)]
+        public float ReadOnlyProperty { get; }
         public readonly T ReadOnlyTValue;
         public T[] TArray;
         public T[][] TArrayArray;
-        public float ReadOnlyProperty { get; }
 
         public override string ToString()
         {

Assets/Tests/AnySerialize/TestFieldTypeSearcher.cs

@@ -20,7 +20,7 @@ public void SetUp()
 
         FieldTypeSearcher CreateSearcher(string fieldDeclaringTypeParameterName, string parameterName, GenericInstanceType genericType)
         {
-            return new FieldTypeSearcher(_logger, _module, fieldDeclaringTypeParameterName, genericType, new GenericParameter(parameterName, genericType.Resolve()));
+            return new FieldTypeSearcher(_logger, fieldDeclaringTypeParameterName, genericType, new GenericParameter(parameterName, genericType.Resolve()));
         }
 
         [Test]

Packages/com.quabug.any-serialize/CodeGen/FieldTypeSearcher.cs

@@ -11,16 +11,15 @@ public class FieldTypeSearcher : ITypeSearcher<AnyFieldTypeAttribute>
 
         public FieldTypeSearcher(
             ILPostProcessorLogger logger,
-            ModuleDefinition module,
             [Inject(typeof(AttributeLabel<>))] string fieldDeclaringTypeParameterName,
             [Inject(typeof(GenericLabel<>))] GenericInstanceType genericType,
             [Inject(typeof(GenericLabel<>))] GenericParameter parameter
         )
         {
             var fieldIndex = -1;
             var searcherFieldCount = 0;
-            var genericTypeDefinition = genericType.Resolve();
-            foreach (var genericParameter in genericTypeDefinition.GenericParameters)
+            var genericTypeDefinition = genericType.Resolve()!;
+            foreach (var genericParameter in genericTypeDefinition.GenericParameters!)
             {
                 if (genericParameter.Name == parameter.Name)
                     fieldIndex = searcherFieldCount;
@@ -31,7 +30,10 @@ public FieldTypeSearcher(
 
             var declaringGenericIndex = genericTypeDefinition.GenericParameters.FindIndexOf(parameter => parameter.Name == fieldDeclaringTypeParameterName);
             var declaringType = genericType.GenericArguments![declaringGenericIndex]!;
-            var fields =  declaringType.Resolve()!.Fields.Where(field => !field.IsStatic).Select(field => field.FieldType).ToArray();
+            var fields =  AnyClassUtility.Reorder(
+                declaringType.Resolve()!.Fields.Where(field => !field.IsStatic),
+                field => (int?)field.GetAttributesOf<AnySerializeFieldOrderAttribute>().SingleOrDefault()?.ConstructorArguments[0].Value
+            ).Select(field => field.FieldType).ToArray();
             if (searcherFieldCount != fields.Length || fieldIndex < 0) return;
 
             _fieldType = !fields[fieldIndex]!.IsConcreteType() && declaringType is GenericInstanceType genericInstanceType

Packages/com.quabug.any-serialize/Editor/ReadOnlyAnyClassDrawer.cs

@@ -45,7 +45,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             property.serializedObject.Update();
 
             var classType = property.GetFieldsByPath().Last().field.GetType().GenericTypeArguments[0];
-            var fields = classType.GetFields(AnyClassUtility.DefaultBindingFlags);
+            var fields = AnyClassUtility.GetOrderedFields(classType);
             var fieldIndex = 0;
             var end = property.GetEndProperty(includeInvisible: false);
             property.NextVisible(enterChildren: true);

Packages/com.quabug.any-serialize/Runtime/IAnyClass.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 
@@ -14,33 +13,32 @@ public static class AnyClassUtility
     {
         public static readonly BindingFlags DefaultBindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
+        [Pure]
+        public static IReadOnlyList<FieldInfo> GetOrderedFields<T>()
+        {
+            return GetOrderedFields(typeof(T));
+        }
+
         [Pure, ItemNotNull]
-        public static T[] Reorder<T>(this T[] array, IEnumerable<int> newIndices)
+        public static IReadOnlyList<T> Reorder<T>([ItemNotNull] IEnumerable<T> items, Func<T, int?> getOrder)
         {
-            var newArray = new T[array.Length];
-            var index = 0;
-            foreach (var newIndex in newIndices)
+            var orderedItems = new List<T>();
+            var sortedCache = new SortedList<int, T>();
+            foreach (var item in items)
             {
-                if (array[index] == null) throw new ArgumentException($"element of {nameof(array)} cannot be null", nameof(array));
-                newArray[newIndex] = array[index];
-                index++;
+                var order = getOrder(item);
+                if (order.HasValue) sortedCache.Add(order.Value, item);
+                else orderedItems.Add(item);
             }
-            if (index != array.Length)
-                throw new ArgumentException($"{nameof(array)}({array.Length}) and {nameof(newIndices)}({index}) must have same count of elements", nameof(newIndices));
-            return array;
+            foreach (var (order, item) in sortedCache) orderedItems.Insert(Math.Min(order, orderedItems.Count), item);
+            return orderedItems;
         }
 
         [Pure]
-        public static FieldInfo[] GetOrderedFields<T>()
+        public static IReadOnlyList<FieldInfo> GetOrderedFields(Type type)
         {
-            var fields = typeof(T).GetFields(DefaultBindingFlags);
-            var newIndices = fields
-                .Select((f, i) => (index: i, order: f.GetCustomAttribute<AnySerializeFieldOrderAttribute>()?.Order ?? i))
-                .OrderBy(t => t.order)
-                .Select(t => t.index)
-            ;
-            fields = fields.Reorder(newIndices);
-            return fields;
+            var fields = type.GetFields(DefaultBindingFlags);
+            return Reorder(fields, field => field.GetCustomAttribute<AnySerializeFieldOrderAttribute>()?.Order);
         }
     }
 }

Packages/com.quabug.any-serialize/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.quabug.any-serialize",
   "description": "Generate serializable code of any properties for Unity3D serializer",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "unity": "2021.3",
   "displayName": "AnySerialize",
   "type": "library",

Standard/AnyProcessor/AnyProcessor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>

Standard/AnySerialize/AnySerialize.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>