In version for .NET Framework improved a performance of the embedding of objects and types

Author: Taritsyn

src/MsieJavaScriptEngine/Helpers/ReflectionHelpers.cs

@@ -1,10 +1,13 @@
-#if NETSTANDARD
-using System;
+using System;
+#if NETSTANDARD
 using System.Collections.Generic;
 using System.Linq;
+#endif
 using System.Reflection;
+#if NETSTANDARD
 
 using MsieJavaScriptEngine.Utilities;
+#endif
 
 namespace MsieJavaScriptEngine.Helpers
 {
@@ -28,6 +31,21 @@ public static BindingFlags GetDefaultBindingFlags(bool instance)
 			return bindingFlags;
 		}
 
+		public static bool IsFullyFledgedMethod(MethodInfo method)
+		{
+			if (!method.Attributes.HasFlag(MethodAttributes.SpecialName))
+			{
+				return true;
+			}
+
+			string name = method.Name;
+			bool isFullyFledged = !(name.StartsWith("get_", StringComparison.Ordinal)
+				|| name.StartsWith("set_", StringComparison.Ordinal));
+
+			return isFullyFledged;
+		}
+#if NETSTANDARD
+
 		public static void FixFieldValueType(ref object value, FieldInfo field)
 		{
 			Type valueType = value.GetType();
@@ -208,6 +226,6 @@ public ushort CompatibilityScore
 				set;
 			}
 		}
+#endif
 	}
-}
-#endif
+}

src/MsieJavaScriptEngine/HostItemBase.cs

@@ -1,9 +1,10 @@
 #if !NETSTANDARD
 using System;
 using System.Globalization;
-using System.Linq;
 using System.Reflection;
 
+using MsieJavaScriptEngine.Helpers;
+
 namespace MsieJavaScriptEngine
 {
 	/// <summary>
@@ -22,7 +23,7 @@ internal abstract class HostItemBase : IReflect
 		protected readonly object _target;
 
 		/// <summary>
-		/// JavaScript engine mode
+		/// JS engine mode
 		/// </summary>
 		protected readonly JsEngineMode _engineMode;
 
@@ -31,6 +32,11 @@ internal abstract class HostItemBase : IReflect
 		/// </summary>
 		private readonly FieldInfo[] _fields;
 
+		/// <summary>
+		/// List of field names
+		/// </summary>
+		private string[] _fieldNames;
+
 		/// <summary>
 		/// List of properties
 		/// </summary>
@@ -63,19 +69,18 @@ protected HostItemBase(Type type, object target, JsEngineMode engineMode, bool i
 			_target = target;
 			_engineMode = engineMode;
 
-			BindingFlags bindingFlags = BindingFlags.Public;
-			if (instance)
-			{
-				bindingFlags |= BindingFlags.Instance;
-			}
-			else
-			{
-				bindingFlags |= BindingFlags.Static;
-			}
-
-			_fields = _type.GetFields(bindingFlags);
-			_properties = _type.GetProperties(bindingFlags);
-			_methods = _type.GetMethods(bindingFlags);
+			BindingFlags defaultBindingFlags = ReflectionHelpers.GetDefaultBindingFlags(instance);
+			FieldInfo[] fields = _type.GetFields(defaultBindingFlags);
+			string[] fieldNames = fields.Length > 0 ? Array.ConvertAll(fields, f => f.Name) : new string[0];
+			PropertyInfo[] properties = _type.GetProperties(defaultBindingFlags);
+			MethodInfo[] methods = _type.GetMethods(defaultBindingFlags);
+			MethodInfo[] fullyFledgedMethods = methods.Length > 0 ?
+				Array.FindAll(methods, ReflectionHelpers.IsFullyFledgedMethod) : methods;
+
+			_fields = fields;
+			_fieldNames = fieldNames;
+			_properties = properties;
+			_methods = fullyFledgedMethods;
 		}
 
 
@@ -89,8 +94,7 @@ protected object InvokeStandardMember(string name, BindingFlags invokeAttr, Bind
 			if ((processedInvokeAttr.HasFlag(BindingFlags.GetProperty)
 				|| processedInvokeAttr.HasFlag(BindingFlags.SetProperty)
 				|| processedInvokeAttr.HasFlag(BindingFlags.PutDispProperty))
-				&& !_properties.Any(p => p.Name == name)
-				&& _fields.Any(p => p.Name == name))
+				&& Array.IndexOf(_fieldNames, name) != -1)
 			{
 				if (processedInvokeAttr.HasFlag(BindingFlags.GetProperty))
 				{
@@ -125,9 +129,7 @@ Type IReflect.UnderlyingSystemType
 
 		FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr)
 		{
-			FieldInfo field = _fields.SingleOrDefault(f => f.Name == name);
-
-			return field;
+			throw new NotImplementedException();
 		}
 
 		FieldInfo[] IReflect.GetFields(BindingFlags bindingAttr)
@@ -147,9 +149,7 @@ MemberInfo[] IReflect.GetMembers(BindingFlags bindingAttr)
 
 		MethodInfo IReflect.GetMethod(string name, BindingFlags bindingAttr)
 		{
-			MethodInfo method = _methods.SingleOrDefault(m => m.Name == name);
-
-			return method;
+			throw new NotImplementedException();
 		}
 
 		MethodInfo IReflect.GetMethod(string name, BindingFlags bindingAttr, Binder binder, Type[] types, ParameterModifier[] modifiers)
@@ -169,9 +169,7 @@ PropertyInfo[] IReflect.GetProperties(BindingFlags bindingAttr)
 
 		PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr)
 		{
-			PropertyInfo property = _properties.SingleOrDefault(p => p.Name == name);
-
-			return property;
+			throw new NotImplementedException();
 		}
 
 		PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr, Binder binder,

src/MsieJavaScriptEngine/HostObject.cs

@@ -14,52 +14,58 @@ namespace MsieJavaScriptEngine
 	/// </summary>
 	internal sealed class HostObject : HostItemBase
 	{
+		/// <summary>
+		/// Number of delegate parameters
+		/// </summary>
+		private int _delegateParameterCount = int.MinValue;
+
+
 		/// <summary>
 		/// Constructs an instance of the wrapper for object, that implements <see cref="IReflect"/> interface
 		/// </summary>
 		/// <param name="target">Target object</param>
 		/// <param name="engineMode">JS engine mode</param>
 		public HostObject(object target, JsEngineMode engineMode)
 			: base(target.GetType(), target, engineMode, true)
-		{ }
-
-
-		private object InvokeDelegate(Delegate del, object[] args)
 		{
-			if (del == null)
-			{
-				throw new ArgumentNullException(nameof(del));
-			}
-
-			object[] processedArgs = args;
-
-			if (_engineMode == JsEngineMode.Classic && processedArgs.Length > 0
-				&& del.Method.ReturnType != typeof(void))
+			if (_engineMode == JsEngineMode.Classic)
 			{
-				processedArgs = processedArgs.Skip(1).ToArray();
+				var del = _target as Delegate;
+				if (del != null)
+				{
+					_delegateParameterCount = del.Method.GetParameters().Length;
+				}
 			}
-
-			object result = del.DynamicInvoke(processedArgs);
-
-			return result;
 		}
 
+
 		#region HostItemBase overrides
 
 		protected override object InnerInvokeMember(string name, BindingFlags invokeAttr, Binder binder, object target,
 			object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters)
 		{
 			object result;
 			object processedTarget = TypeMappingHelpers.MapToHostType(target);
-			object[] processedArgs = TypeMappingHelpers.MapToHostType(args);
 
 			if (name == SpecialMemberName.Default && processedTarget is Delegate)
 			{
 				var del = (Delegate)processedTarget;
-				result = InvokeDelegate(del, processedArgs);
+				object[] processedArgs = args;
+
+				if (_engineMode == JsEngineMode.Classic
+					&& processedArgs.Length > 0
+					&& (processedArgs.Length - _delegateParameterCount) == 1)
+				{
+					processedArgs = processedArgs.Skip(1).ToArray();
+				}
+				processedArgs = TypeMappingHelpers.MapToHostType(processedArgs);
+
+				result = del.DynamicInvoke(processedArgs);
 			}
 			else
 			{
+				object[] processedArgs = TypeMappingHelpers.MapToHostType(args);
+
 				result = InvokeStandardMember(name, invokeAttr, binder, processedTarget,
 					processedArgs, modifiers, culture, namedParameters);
 			}

src/MsieJavaScriptEngine/HostType.cs

@@ -29,20 +29,24 @@ public HostType(Type type, JsEngineMode engineMode)
 		protected override object InnerInvokeMember(string name, BindingFlags invokeAttr, Binder binder, object target,
 			object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters)
 		{
-			object[] processedArgs = TypeMappingHelpers.MapToHostType(args);
 			object result;
 
 			if (name == SpecialMemberName.Default && invokeAttr.HasFlag(BindingFlags.CreateInstance))
 			{
+				object[] processedArgs = args;
+
 				if (_engineMode != JsEngineMode.Classic && processedArgs.Length > 0)
 				{
 					processedArgs = processedArgs.Skip(1).ToArray();
 				}
+				processedArgs = TypeMappingHelpers.MapToHostType(processedArgs);
 
 				result = Activator.CreateInstance(_type, processedArgs);
 			}
 			else
 			{
+				object[] processedArgs = TypeMappingHelpers.MapToHostType(args);
+
 				result = InvokeStandardMember(name, invokeAttr, binder, target,
 					processedArgs, modifiers, culture, namedParameters);
 			}

src/MsieJavaScriptEngine/JsRt/Edge/EdgeTypeMapper.cs

@@ -556,9 +556,7 @@ private void ProjectMethods(EdgeEmbeddedItem externalItem)
 			string typeName = type.FullName;
 			BindingFlags defaultBindingFlags = ReflectionHelpers.GetDefaultBindingFlags(instance);
 			IEnumerable<MethodInfo> methods = type.GetMethods(defaultBindingFlags)
-				.Where(m => !(m.Attributes.HasFlag(MethodAttributes.SpecialName)
-					&& (m.Name.StartsWith("get_") || m.Name.StartsWith("set_"))))
-				;
+				.Where(ReflectionHelpers.IsFullyFledgedMethod);
 			IEnumerable<IGrouping<string, MethodInfo>> methodGroups = methods.GroupBy(m => m.Name);
 
 			foreach (IGrouping<string, MethodInfo> methodGroup in methodGroups)

src/MsieJavaScriptEngine/JsRt/Ie/IeTypeMapper.cs

@@ -553,9 +553,7 @@ private void ProjectMethods(IeEmbeddedItem externalItem)
 			string typeName = type.FullName;
 			BindingFlags defaultBindingFlags = ReflectionHelpers.GetDefaultBindingFlags(instance);
 			IEnumerable<MethodInfo> methods = type.GetMethods(defaultBindingFlags)
-				.Where(m => !(m.Attributes.HasFlag(MethodAttributes.SpecialName)
-					&& (m.Name.StartsWith("get_") || m.Name.StartsWith("set_"))))
-				;
+				.Where(ReflectionHelpers.IsFullyFledgedMethod);
 			IEnumerable<IGrouping<string, MethodInfo>> methodGroups = methods.GroupBy(m => m.Name);
 
 			foreach (IGrouping<string, MethodInfo> methodGroup in methodGroups)

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -23,7 +23,7 @@
 		<PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
 		<PackageReleaseNotes>1. Fixed a error, that occurred in the `Classic` mode during calling an embedded delegate, which does not return a result;
 2. Fixed a error, that occurred during setting a value to field of embedded type;
-3. In version for .NET Core improved a performance of the embedding of objects and types.</PackageReleaseNotes>
+3. Improved a performance of the embedding of objects and types.</PackageReleaseNotes>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageOutputPath>../../nuget</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/MsieJavaScriptEngine/readme.txt

@@ -25,8 +25,7 @@
       delegate, which does not return a result;
    2. Fixed a error, that occurred during setting a value to field of embedded
       type;
-   3. In version for .NET Core improved a performance of the embedding of objects
-      and types.
+   3. Improved a performance of the embedding of objects and types.
 
    ============
    PROJECT SITE