In JavaScriptEngineSwitcher.ChakraCore fixed a wrong implementation of destruction of the embedded delegates

Author: Taritsyn

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/Helpers/ReflectionHelpers.cs

@@ -27,6 +27,20 @@ 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;
+		}
+
 		public static void FixFieldValueType(ref object value, FieldInfo field)
 		{
 			Type valueType = value.GetType();

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj

@@ -22,7 +22,8 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_ChakraCore_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;ChakraCore</PackageTags>
-		<PackageReleaseNotes>Reduced a memory consumption in cases, where not used the embedding of objects and types.</PackageReleaseNotes>
+		<PackageReleaseNotes>1. Reduced a memory consumption in cases, where not used the embedding of objects and types;
+2. Fixed a wrong implementation of destruction of the embedded delegates.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsValue.cs

@@ -393,24 +393,6 @@ public static JsValue CreateExternalObject(IntPtr data, JsFinalizeCallback final
 			return reference;
 		}
 
-		/// <summary>
-		/// Creates a new <c>Object</c> (with prototype) that stores some external data
-		/// </summary>
-		/// <remarks>
-		/// Requires an active script context.
-		/// </remarks>
-		/// <param name="data">External data that the object will represent. May be null.</param>
-		/// <param name="finalizer">A callback for when the object is finalized. May be null.</param>
-		/// <param name="prototype">Prototype object or null</param>
-		/// <returns>The new <c>Object</c></returns>
-		public static JsValue CreateExternalObjectWithPrototype(IntPtr data, JsFinalizeCallback finalizer, JsValue prototype)
-		{
-			JsValue reference;
-			JsErrorHelpers.ThrowIfError(NativeMethods.JsCreateExternalObjectWithPrototype(data, finalizer, prototype, out reference));
-
-			return reference;
-		}
-
 		/// <summary>
 		/// Creates a new JavaScript function
 		/// </summary>

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JsRt/NativeMethods.cs

@@ -148,10 +148,6 @@ internal static extern JsErrorCode JsGetPropertyIdType(JsPropertyId propertyId,
 		internal static extern JsErrorCode JsCreateExternalObject(IntPtr data,
 			JsFinalizeCallback finalizeCallback, out JsValue obj);
 
-		[DllImport(DllName.Universal)]
-		internal static extern JsErrorCode JsCreateExternalObjectWithPrototype(IntPtr data,
-			JsFinalizeCallback finalizeCallback, JsValue prototype, out JsValue obj);
-
 		[DllImport(DllName.Universal)]
 		internal static extern JsErrorCode JsConvertValueToObject(JsValue value, out JsValue obj);
 

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JsRt/TypeMapper.cs

@@ -313,12 +313,12 @@ private EmbeddedObject CreateEmbeddedFunction(Delegate del)
 				return resultValue;
 			};
 
-			JsValue functionValue = JsValue.CreateFunction(nativeFunction);
+			GCHandle delHandle = GCHandle.Alloc(del);
+			IntPtr delPtr = GCHandle.ToIntPtr(delHandle);
+			JsValue prototypeValue = JsValue.CreateExternalObject(delPtr, _embeddedObjectFinalizeCallback);
 
-			GCHandle objHandle = GCHandle.Alloc(del);
-			IntPtr objPtr = GCHandle.ToIntPtr(objHandle);
-			JsValue objValue = JsValue.CreateExternalObjectWithPrototype(objPtr,
-				_embeddedObjectFinalizeCallback, functionValue);
+			JsValue functionValue = JsValue.CreateFunction(nativeFunction);
+			functionValue.Prototype = prototypeValue;
 
 			var embeddedObject = new EmbeddedObject(del, functionValue,
 				new List<JsNativeFunction> { nativeFunction });
@@ -419,23 +419,22 @@ private EmbeddedType CreateEmbeddedType(Type type)
 				return resultValue;
 			};
 
-			JsValue constructorValue = JsValue.CreateFunction(nativeConstructorFunction);
-
 			string embeddedTypeKey = type.AssemblyQualifiedName;
 			GCHandle embeddedTypeKeyHandle = GCHandle.Alloc(embeddedTypeKey);
 			IntPtr embeddedTypeKeyPtr = GCHandle.ToIntPtr(embeddedTypeKeyHandle);
 			JsValue prototypeValue = JsValue.CreateExternalObject(embeddedTypeKeyPtr,
 				_embeddedTypeFinalizeCallback);
-			constructorValue.Prototype = prototypeValue;
-			prototypeValue.SetProperty("constructor", constructorValue, true);
 
-			var embeddedType = new EmbeddedType(type, constructorValue,
+			JsValue typeValue = JsValue.CreateFunction(nativeConstructorFunction);
+			typeValue.Prototype = prototypeValue;
+
+			var embeddedType = new EmbeddedType(type, typeValue,
 				new List<JsNativeFunction> { nativeConstructorFunction });
 
 			ProjectFields(embeddedType);
 			ProjectProperties(embeddedType);
 			ProjectMethods(embeddedType);
-			FreezeObject(constructorValue);
+			FreezeObject(typeValue);
 
 			return embeddedType;
 		}
@@ -697,9 +696,7 @@ private void ProjectMethods(EmbeddedItem 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)

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,8 +30,9 @@
    =============
    RELEASE NOTES
    =============
-   Reduced a memory consumption in cases, where not used the embedding of objects
-   and types.
+  1. Reduced a memory consumption in cases, where not used the embedding of objects
+     and types;
+  2. Fixed a wrong implementation of destruction of the embedded delegates.
 
    =============
    DOCUMENTATION