Adds support to mix code between abstract classes and instance classe…

…s using the proxy
tonyredondo · Jun 23, 2020 · debd47e · debd47e
1 parent 023037e
commit debd47e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 5 deletions.
diff --git a/src/Wanhjor.ObjectInspector/DuckType.Create.cs b/src/Wanhjor.ObjectInspector/DuckType.Create.cs
@@ -32,7 +32,7 @@ public static object Create(Type duckType, object instance)
             var type = GetOrCreateProxyType(duckType, instance.GetType()); 
 
             // Create instance
-            var objInstance = (ISettableDuckType)FormatterServices.GetUninitializedObject(type);
+            var objInstance = (ISettableDuckType)Activator.CreateInstance(type);
             objInstance.SetInstance(instance);
             return objInstance;
         }
@@ -46,7 +46,7 @@ public static object Create(Type duckType, object instance)
         public static object Create(Type duckType, Type instanceType)
         {
             var type = GetOrCreateProxyType(duckType, instanceType);
-            return FormatterServices.GetUninitializedObject(type);
+            return Activator.CreateInstance(type);
         }
     }
 }
diff --git a/src/Wanhjor.ObjectInspector/DuckType.cs b/src/Wanhjor.ObjectInspector/DuckType.cs
@@ -121,7 +121,7 @@ private static Type CreateProxyType(Type duckType, Type instanceType)
                 parentType, interfaceTypes);
 
             // Define .ctor
-            typeBuilder.DefineDefaultConstructor(MethodAttributes.Private);
+            typeBuilder.DefineDefaultConstructor(MethodAttributes.Public);
 
             // Create instance field if is null
             instanceField ??= CreateInstanceField(typeBuilder);
@@ -216,7 +216,9 @@ private static void CreateProperties(Type baseType, Type instanceType, FieldInfo
             var selectedProperties = GetProperties(baseType);
             foreach (var iProperty in selectedProperties)
             {
-                var propertyBuilder = typeBuilder.DefineProperty(iProperty.Name, PropertyAttributes.None, iProperty.PropertyType, null);
+                PropertyBuilder? propertyBuilder = null;
+                if ((iProperty.CanRead && iProperty.GetMethod.IsAbstract) || (iProperty.CanWrite && iProperty.SetMethod.IsAbstract))
+                    propertyBuilder = typeBuilder.DefineProperty(iProperty.Name, PropertyAttributes.None, iProperty.PropertyType, null);
 
                 var duckAttrs = new List<DuckAttribute>(iProperty.GetCustomAttributes<DuckAttribute>(true));
                 if (duckAttrs.Count == 0)
@@ -242,6 +244,8 @@ private static void CreateProperties(Type baseType, Type instanceType, FieldInfo
                             if (prop is null)
                                 continue;
 
+                            propertyBuilder ??= typeBuilder.DefineProperty(iProperty.Name, PropertyAttributes.None, iProperty.PropertyType, null);
+
                             if (iProperty.CanRead)
                                 propertyBuilder.SetGetMethod(GetPropertyGetMethod(instanceType, typeBuilder, iProperty, prop, instanceField));
 
@@ -254,6 +258,8 @@ private static void CreateProperties(Type baseType, Type instanceType, FieldInfo
                             var field = instanceType.GetField(duckAttr.Name, duckAttr.Flags);
                             if (field is null)
                                 continue;
+
+                            propertyBuilder ??= typeBuilder.DefineProperty(iProperty.Name, PropertyAttributes.None, iProperty.PropertyType, null);
 
                             if (iProperty.CanRead)
                                 propertyBuilder.SetGetMethod(GetFieldGetMethod(instanceType, typeBuilder, iProperty, field, instanceField));
@@ -267,6 +273,9 @@ private static void CreateProperties(Type baseType, Type instanceType, FieldInfo
                     break;
                 }
 
+                if (propertyBuilder is null) 
+                    continue;
+
                 if (iProperty.CanRead && propertyBuilder.GetMethod is null)
                     propertyBuilder.SetGetMethod(GetNotFoundGetMethod(instanceType, typeBuilder, iProperty));
 

diff --git a/src/Wanhjor.ObjectInspector/Wanhjor.ObjectInspector.csproj b/src/Wanhjor.ObjectInspector/Wanhjor.ObjectInspector.csproj
@@ -6,7 +6,7 @@
     <Description>An efficient .NET object inspector/accesor to avoid reflection usage with duck typing support.</Description>
     <LangVersion>8</LangVersion>
     <Nullable>enable</Nullable>
-    <Version>0.4.0-beta.2</Version>
+    <Version>0.4.0-beta.3</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Title>ObjectInspector</Title>
     <Authors>Daniel Redondo</Authors>

diff --git a/test/Wanhjor.ObjectInspector.Tests/DuckTypeAbstractTests.cs b/test/Wanhjor.ObjectInspector.Tests/DuckTypeAbstractTests.cs
@@ -117,6 +117,22 @@ public void FactoryRentTest()
                 lease.Instance["Changes"] = "Changed";
             }
         }
+
+        [Fact]
+        [MethodImpl(MethodImplOptions.NoOptimization)]
+        public void ReverseDuckTest()
+        {
+            var obj = new ReverseObject();
+
+            var duck = obj.DuckAs<ReverseDuck>();
+            obj.SetProxyObject(duck);
+
+            var values = duck.GetValues();
+            Assert.Equal("From Base => From Instance", values);
+
+            var name = duck.GetName();
+            Assert.Equal("From Base", name);
+        }
     }
 
     public abstract class AbstractDictio : DuckType
@@ -135,6 +151,41 @@ public abstract class AbstractDuckTestNoInherits
         public abstract string Name { get; set; }
     }
 
+    public abstract class ReverseDuck
+    {
+        public string Name { get; set; } = "From Base";
+
+        public abstract string Value { get; set; }
+
+        public string GetValues()
+        {
+            return $"{Name} => {Value}";
+        }
+
+        public abstract string GetName();
+    }
+
+    public interface IReverseExtractor
+    {
+        string Name { get; set; }
+    }
+
+    public class ReverseObject
+    {
+        private IReverseExtractor _extractor;
+        public string Value { get; set; } = "From Instance";
+
+        public string GetName()
+        {
+            return _extractor.Name;
+        }
+
+        public void SetProxyObject(object proxy)
+        {
+            _extractor = proxy.DuckAs<IReverseExtractor>();
+        }
+    }
+
     public abstract class AbstractDuckTestObject : DuckType
     {
         public abstract string Name { get; set; }