EventInvoke added

npodbielski · npodbielski · commit 232870b836ad · 2017-10-03T23:59:32.000+02:00
diff --git a/Platforms/NET35/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NET35/DelegatesFactory/DelegatesFactory.csproj
@@ -88,6 +88,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
       <Link>DelegateFactory_EventAdd.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
diff --git a/Platforms/NET35/DelegatesTest/DelegatesTest.csproj b/Platforms/NET35/DelegatesTest/DelegatesTest.csproj
@@ -60,6 +60,9 @@
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Add.cs">
       <Link>DelegateFactoryTests_Events_Add.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
+      <Link>DelegateFactoryTests_Events_Invoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
       <Link>DelegateFactoryTests_Events_Remove.cs</Link>
     </Compile>
diff --git a/Platforms/NET4/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NET4/DelegatesFactory/DelegatesFactory.csproj
@@ -76,6 +76,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
       <Link>DelegateFactory_EventAdd.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
diff --git a/Platforms/NET4/DelegatesTest/DelegatesTest.csproj b/Platforms/NET4/DelegatesTest/DelegatesTest.csproj
@@ -48,6 +48,9 @@
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Add.cs">
       <Link>DelegateFactoryTests_Events_Add.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
+      <Link>DelegateFactoryTests_Events_Invoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
       <Link>DelegateFactoryTests_Events_Remove.cs</Link>
     </Compile>
diff --git a/Platforms/NET45/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NET45/DelegatesFactory/DelegatesFactory.csproj
@@ -81,6 +81,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
       <Link>DelegateFactory_EventAdd.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
@@ -152,5 +155,5 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />  
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Platforms/NET45/DelegatesTest/DelegatesTest.csproj b/Platforms/NET45/DelegatesTest/DelegatesTest.csproj
@@ -48,6 +48,9 @@
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Add.cs">
       <Link>DelegateFactoryTests_Events_Add.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
+      <Link>DelegateFactoryTests_Events_Invoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
       <Link>DelegateFactoryTests_Events_Remove.cs</Link>
     </Compile>
diff --git a/Platforms/NET46/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NET46/DelegatesFactory/DelegatesFactory.csproj
@@ -84,6 +84,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_FieldGet.cs">
       <Link>DelegateFactory_FieldGet.cs</Link>
     </Compile>
@@ -152,5 +155,5 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />  
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Platforms/NET46/DelegatesTest/DelegatesTest.csproj b/Platforms/NET46/DelegatesTest/DelegatesTest.csproj
@@ -62,6 +62,9 @@
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
       <Link>DelegateFactoryTests_Events_Remove.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
+      <Link>DelegateFactoryTests_Events_Invoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Fields_GetValue.cs">
       <Link>DelegateFactoryTests_Fields_GetValue.cs</Link>
     </Compile>
@@ -152,6 +155,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\NET35\DelegatesTest\DelegatesTest.csproj">
+      <Project>{B26BA86D-3DC9-4D55-93DE-68152849518D}</Project>
+      <Name>DelegatesTest</Name>
+    </ProjectReference>
     <ProjectReference Include="..\DelegatesFactory\DelegatesFactory.csproj">
       <Project>{195c742a-24d5-46f2-9d49-f69964951d14}</Project>
       <Name>DelegatesFactory</Name>
diff --git a/Platforms/NETPortable/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NETPortable/DelegatesFactory/DelegatesFactory.csproj
@@ -74,6 +74,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
       <Link>DelegateFactory_EventAdd.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
@@ -154,5 +157,5 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />  
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
diff --git a/Platforms/NETPortable/DelegatesTest/DelegatesTest.csproj b/Platforms/NETPortable/DelegatesTest/DelegatesTest.csproj
@@ -62,6 +62,9 @@
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Add.cs">
       <Link>DelegateFactoryTests_Events_Add.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
+      <Link>DelegateFactoryTests_Events_Invoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
       <Link>DelegateFactoryTests_Events_Remove.cs</Link>
     </Compile>
diff --git a/Platforms/NETStandard/DelegatesFactory/DelegatesFactory.csproj b/Platforms/NETStandard/DelegatesFactory/DelegatesFactory.csproj
@@ -75,6 +75,9 @@
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
       <Link>DelegateFactory_EventAdd.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
+      <Link>DelegateFactory_EventInvoke.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
       <Link>DelegateFactory_EventRemove.cs</Link>
     </Compile>
@@ -158,5 +161,5 @@
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />  
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
diff --git a/src/DelegatesFactory/DelegateFactory_EventAdd.cs b/src/DelegatesFactory/DelegateFactory_EventAdd.cs
@@ -39,6 +39,7 @@ public static Action<TSource, EventHandler<TEventArgs>> EventAdd<TSource, TEvent
         public static Action<TSource, TDelegate> EventAddCustomDelegate<TSource, TDelegate>
             (string eventName) where TDelegate : class
         {
+            DelegateHelper.CheckDelegate<TDelegate>();
             return EventAccessor<TSource, TDelegate>(eventName, TypeExtensions.AddAccessor);
         }
 
@@ -113,15 +114,13 @@ private static Action<TSource, TDelegate> EventAccessor<TSource, TDelegate>
             if (accessor != null)
             {
                 var handlerType = accessor.GetParameters()[0].ParameterType;
-                DelegateHelper.IsCompatible<TDelegate>(handlerType);
                 if (typeof(TDelegate) == handlerType)
                 {
                     var eventArgsType = typeof(TDelegate).GetDelegateSecondParameter();
                     accessor.IsEventArgsTypeCorrect(eventArgsType);
                     return accessor.CreateDelegate<Action<TSource, TDelegate>>();
                 }
-                DelegateHelper.CheckDelegate<TDelegate>();
-                DelegateHelper.IsCompatible<TDelegate>(accessor.GetParameters()[0].ParameterType);
+                DelegateHelper.IsCompatible<TDelegate>(handlerType);
                 return EventAccessorImpl<Action<TSource, TDelegate>>(typeof(TSource), eventName, accessorName);
             }
             return null;
diff --git a/src/DelegatesFactory/DelegateFactory_EventInvoke.cs b/src/DelegatesFactory/DelegateFactory_EventInvoke.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Linq.Expressions;
+using Delegates.Extensions;
+using Delegates.Helper;
+
+namespace Delegates
+{
+#if !NET35
+    public static partial class DelegateFactory
+    {
+        public static Action<TSource, TEventArgs> EventInvoke<TSource, TEventArgs>(string eventName)
+        {
+            var sourceType = typeof(TSource);
+            return EventInvokeImpl<Action<TSource, TEventArgs>>(sourceType, eventName, typeof(TSource),
+                typeof(TEventArgs));
+        }
+
+        public static Action<object, TEventArgs> EventInvoke<TEventArgs>(this Type source, string eventName)
+        {
+            return EventInvokeImpl<Action<object, TEventArgs>>(source, eventName, typeof(object), typeof(TEventArgs));
+        }
+
+        public static Action<object, object> EventInvoke(this Type source, string eventName)
+        {
+            return EventInvokeImpl<Action<object, object>>(source, eventName, typeof(object), typeof(object));
+        }
+
+        public static TDelegate EventInvokeCustomDelegate<TSource, TDelegate>(string eventName)
+            where TDelegate : class
+        {
+            return EventInvokeImpl<TDelegate>(typeof(TSource), eventName);
+        }
+
+        public static TDelegate EventInvokeCustomDelegate<TDelegate>(this Type source, string eventName)
+            where TDelegate : class
+        {
+            return EventInvokeImpl<TDelegate>(source, eventName);
+        }
+
+        private static TDelegate EventInvokeImpl<TDelegate>(Type source, string eventName, Type lambdaSender = null,
+            Type lambdaArgs = null)
+            where TDelegate : class
+        {
+            var fieldInfo = source.GetFieldInfo(eventName, false);
+            if (fieldInfo != null)
+            {
+                var sender = fieldInfo.FieldType.GetDelegateFirstParameter();
+                var eventArgs = fieldInfo.FieldType.GetDelegateSecondParameter();
+                var lambaSenderParam = Expression.Parameter(lambdaSender ?? sender, "source");
+                if (lambdaArgs != null)
+                {
+                    DelegateHelper.IsEventArgsTypeCorrect(eventArgs, lambdaArgs, true);
+                }
+                else
+                {
+                    lambdaArgs = eventArgs;
+                }
+                var lambdaArgsParam = Expression.Parameter(lambdaArgs, "args");
+                var eventArgsParam = Expression.Convert(lambdaArgsParam, eventArgs);
+                var invokeMethod = fieldInfo.FieldType.GetMethod("Invoke");
+                var fieldExpression = Expression.Field(Expression.Convert(lambaSenderParam, source), fieldInfo);
+                var conditionExpression = Expression.IsTrue(
+                    Expression.NotEqual(fieldExpression, Expression.Constant(null)));
+                var callSenderExpr = lambdaSender != sender ?
+                    Expression.Convert(lambaSenderParam, sender) : (Expression)lambaSenderParam;
+                var callExpression = Expression.Call(fieldExpression, invokeMethod, callSenderExpr, eventArgsParam);
+                var ifExpress = Expression.IfThen(conditionExpression, callExpression);
+                var lambdaExpression = Expression.Lambda<TDelegate>(ifExpress, lambaSenderParam, lambdaArgsParam);
+                return lambdaExpression.Compile();
+            }
+            return null;
+        }
+    } 
+#endif
+
+    //internal class ChainDelegate
+    //{
+    //    private List<Func<object, object>> _chain;
+
+    //    public void Add(Func<object, object> deleg)
+    //    {
+    //        if (_chain == null)
+    //        {
+    //            _chain = new List<Func<object, object>>();
+    //        }
+    //        _chain.Add(deleg);
+    //    }
+    //}
+}
diff --git a/src/DelegatesFactory/DelegateFactory_EventRemove.cs b/src/DelegatesFactory/DelegateFactory_EventRemove.cs
@@ -1,5 +1,6 @@
 using System;
 using Delegates.Extensions;
+using Delegates.Helper;
 
 namespace Delegates
 {
@@ -36,6 +37,7 @@ public static Action<TSource, EventHandler<TEventArgs>> EventRemove<TSource, TEv
         public static Action<TSource, TDelegate> EventRemoveCustomDelegate<TSource, TDelegate>
             (string eventName) where TDelegate : class
         {
+            DelegateHelper.CheckDelegate<TDelegate>();
             return EventAccessor<TSource, TDelegate>(eventName, TypeExtensions.RemoveAccessor);
         }
 
diff --git a/src/DelegatesFactory/DelegateFactory_FieldGet.cs b/src/DelegatesFactory/DelegateFactory_FieldGet.cs
@@ -19,7 +19,8 @@ public static partial class DelegateFactory
         /// <typeparam name="TField">Type of field</typeparam>
         /// <param name="fieldName">Field name</param>
         /// <returns>Delegate for retrieving instance field value</returns>
-        public static Func<TSource, TField> FieldGet<TSource, TField>(string fieldName)
+        public static Func<TSource, TField> 
+            FieldGet<TSource, TField>(string fieldName)
         {
             return typeof(TSource).FieldGetImpl<Func<TSource, TField>>(fieldName);
         }
diff --git a/src/DelegatesFactory/Extensions/MethodInfoExtensions.cs b/src/DelegatesFactory/Extensions/MethodInfoExtensions.cs
@@ -1,4 +1,10 @@
-﻿using System;
+﻿// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MethodInfoExtensions.cs" company="Natan Podbielski">
+//   Copyright (c) 2016 - 2017 Natan Podbielski. All rights reserved.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+using System;
 using System.Reflection;
 using Delegates.Helper;
 
@@ -32,12 +38,7 @@ public static void IsEventArgsTypeCorrect(this MethodInfo method, Type eventArgs
         {
             var argsType = method.GetParameters()[0].ParameterType.GetMethod("Invoke")
                 .GetParameters()[1].ParameterType;
-            if (argsType != eventArgsType)
-            {
-                throw new ArgumentException(
-                    $"Provided event args type \'{eventArgsType.Name}\' is not compatible with expected type " +
-                    $"\'{argsType.Name}\'");
-            }
+            DelegateHelper.IsEventArgsTypeCorrect(argsType, eventArgsType, false);
         }
 
         public static void IsEventArgsTypeCorrect<TEventArgs>(this MethodInfo method)
diff --git a/src/DelegatesFactory/Helper/DelegateHelper.cs b/src/DelegatesFactory/Helper/DelegateHelper.cs
@@ -1,8 +1,17 @@
-﻿using System;
+﻿// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DelegateHelper.cs" company="Natan Podbielski">
+//   Copyright (c) 2016 - 2017 Natan Podbielski. All rights reserved.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+using System;
 using System.Linq;
 using System.Reflection;
+using Delegates.Extensions;
+
 #if !(NETCORE || NET45)
 using Delegates.Extensions;
+
 #endif
 
 namespace Delegates.Helper
@@ -81,7 +90,8 @@ public static Type GetDelegateSecondParameter(this Type delegateType)
             {
                 return parameters.Skip(1).Take(1).First().ParameterType;
             }
-            throw new ArgumentException("TDelegate type do not have 2 parameters. Check if Delegate is defined correctly!");
+            throw new ArgumentException(
+                "TDelegate type do not have 2 parameters. Check if Delegate is defined correctly!");
         }
 
         private static MethodInfo CheckInvokeMethod(Type delegateType)
@@ -126,5 +136,16 @@ public static bool IsCompatible<TDelegate>(Type @delegate)
             }
             return parametersCorrect;
         }
+
+        public static void IsEventArgsTypeCorrect(Type destinationArgs, Type sourceArgs, bool allowBase)
+        {
+            if (!allowBase && destinationArgs != sourceArgs
+                ||allowBase && !sourceArgs.CanBeAssignedFrom(destinationArgs))
+            {
+                throw new ArgumentException(
+                    $"Provided event args type \'{sourceArgs.Name}\' is not compatible with expected type " +
+                    $"\'{destinationArgs.Name}\'");
+            }
+        }
     }
-}
+}
diff --git a/src/DelegatesTest/DelegateFactoryTests_Events_Invoke.cs b/src/DelegatesTest/DelegateFactoryTests_Events_Invoke.cs
