From 53907b9c366c87c7d7c3e3f9cccc5c3f49a552ac Mon Sep 17 00:00:00 2001
From: Daniel Cronqvist <dancro99@gmail.com>
Date: Thu, 5 Sep 2024 21:02:34 +0200
Subject: [PATCH] Add overload to MapPropertiesTo with supplied factory method

---
 src/DotTiled/Properties/IHasProperties.cs | 28 +++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/DotTiled/Properties/IHasProperties.cs b/src/DotTiled/Properties/IHasProperties.cs
index 705a7d2..40c9853 100644
--- a/src/DotTiled/Properties/IHasProperties.cs
+++ b/src/DotTiled/Properties/IHasProperties.cs
@@ -38,6 +38,14 @@ public interface IHasProperties
   /// <typeparam name="T"></typeparam>
   /// <returns></returns>
   T MapPropertiesTo<T>() where T : new();
+
+  /// <summary>
+  /// Maps all properties in this object to a new instance of the specified type using reflection.
+  /// </summary>
+  /// <typeparam name="T"></typeparam>
+  /// <param name="initializer"></param>
+  /// <returns></returns>
+  T MapPropertiesTo<T>(Func<T> initializer);
 }
 
 /// <summary>
@@ -78,15 +86,14 @@ public abstract class HasPropertiesBase : IHasProperties
   }
 
   /// <inheritdoc/>
-  public T MapPropertiesTo<T>() where T : new()
-  {
-    var properties = GetProperties();
-    return CreateMappedInstance<T>(properties);
-  }
+  public T MapPropertiesTo<T>() where T : new() => CreateMappedInstance<T>(GetProperties());
 
-  private static object CreatedMappedInstance(Type type, IList<IProperty> properties)
+  /// <inheritdoc/>
+  public T MapPropertiesTo<T>(Func<T> initializer) => CreateMappedInstance(GetProperties(), initializer);
+
+  private static object CreatedMappedInstance(object instance, IList<IProperty> properties)
   {
-    var instance = Activator.CreateInstance(type) ?? throw new InvalidOperationException($"Failed to create instance of '{type.Name}'.");
+    var type = instance.GetType();
 
     foreach (var prop in properties)
     {
@@ -118,7 +125,7 @@ public abstract class HasPropertiesBase : IHasProperties
           break;
         case ClassProperty classProp:
           var subClassProp = type.GetProperty(prop.Name);
-          subClassProp?.SetValue(instance, CreatedMappedInstance(subClassProp.PropertyType, classProp.GetProperties()));
+          subClassProp?.SetValue(instance, CreatedMappedInstance(Activator.CreateInstance(subClassProp.PropertyType), classProp.GetProperties()));
           break;
         case EnumProperty enumProp:
           var enumPropInClass = type.GetProperty(prop.Name);
@@ -133,5 +140,8 @@ public abstract class HasPropertiesBase : IHasProperties
     return instance;
   }
 
-  private static T CreateMappedInstance<T>(IList<IProperty> properties) where T : new() => (T)CreatedMappedInstance(typeof(T), properties);
+  private static T CreateMappedInstance<T>(IList<IProperty> properties) where T : new() =>
+    (T)CreatedMappedInstance(Activator.CreateInstance<T>() ?? throw new InvalidOperationException($"Failed to create instance of '{typeof(T).Name}'."), properties);
+
+  private static T CreateMappedInstance<T>(IList<IProperty> properties, Func<T> initializer) => (T)CreatedMappedInstance(initializer(), properties);
 }