In JavaScriptEngineSwitcher.ChakraCore fixed a error #68 “Embedded delegates are no longer linked with the Function prototype”

Author: Taritsyn

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

@@ -22,7 +22,7 @@ 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>ChakraCore was updated to version 1.11.6.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed a error #68 “Embedded delegates are no longer linked with the `Function` prototype”.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

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

@@ -21,6 +21,11 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 	/// </summary>
 	internal sealed class TypeMapper : IDisposable
 	{
+		/// <summary>
+		/// Name of property to store the external object
+		/// </summary>
+		private const string ExternalObjectPropertyName = "_JavaScriptEngineSwitcher_externalObject";
+
 		/// <summary>
 		/// Storage for lazy-initialized embedded objects
 		/// </summary>
@@ -200,7 +205,7 @@ public JsValue[] MapToScriptType(object[] args)
 		public object MapToHostType(JsValue value)
 		{
 			JsValueType valueType = value.ValueType;
-			object result;
+			object result = null;
 
 			switch (valueType)
 			{
@@ -219,8 +224,18 @@ public object MapToHostType(JsValue value)
 				case JsValueType.String:
 					result = value.ToString();
 					break;
-				case JsValueType.Object:
 				case JsValueType.Function:
+					JsPropertyId externalObjectPropertyId = JsPropertyId.FromString(ExternalObjectPropertyName);
+					if (value.HasProperty(externalObjectPropertyId))
+					{
+						JsValue externalObjectValue = value.GetProperty(externalObjectPropertyId);
+						result = externalObjectValue.HasExternalData ?
+							GCHandle.FromIntPtr(externalObjectValue.ExternalData).Target : null;
+					}
+
+					result = result ?? value.ConvertToObject();
+					break;
+				case JsValueType.Object:
 				case JsValueType.Error:
 				case JsValueType.Array:
 				case JsValueType.Symbol:
@@ -311,10 +326,10 @@ private EmbeddedObject CreateEmbeddedFunction(Delegate del)
 
 			GCHandle delHandle = GCHandle.Alloc(del);
 			IntPtr delPtr = GCHandle.ToIntPtr(delHandle);
-			JsValue prototypeValue = JsValue.CreateExternalObject(delPtr, _embeddedObjectFinalizeCallback);
+			JsValue objValue = JsValue.CreateExternalObject(delPtr, _embeddedObjectFinalizeCallback);
 
 			JsValue functionValue = JsValue.CreateFunction(nativeFunction);
-			functionValue.Prototype = prototypeValue;
+			SetNonEnumerableProperty(functionValue, ExternalObjectPropertyName, objValue);
 
 			var embeddedObject = new EmbeddedObject(del, functionValue,
 				new List<JsNativeFunction> { nativeFunction });
@@ -415,14 +430,12 @@ private EmbeddedType CreateEmbeddedType(Type type)
 				return resultValue;
 			};
 
-			string embeddedTypeKey = type.AssemblyQualifiedName;
-			GCHandle embeddedTypeKeyHandle = GCHandle.Alloc(embeddedTypeKey);
-			IntPtr embeddedTypeKeyPtr = GCHandle.ToIntPtr(embeddedTypeKeyHandle);
-			JsValue prototypeValue = JsValue.CreateExternalObject(embeddedTypeKeyPtr,
-				_embeddedTypeFinalizeCallback);
+			GCHandle embeddedTypeHandle = GCHandle.Alloc(type);
+			IntPtr embeddedTypePtr = GCHandle.ToIntPtr(embeddedTypeHandle);
+			JsValue objValue = JsValue.CreateExternalObject(embeddedTypePtr, _embeddedTypeFinalizeCallback);
 
 			JsValue typeValue = JsValue.CreateFunction(nativeConstructorFunction);
-			typeValue.Prototype = prototypeValue;
+			SetNonEnumerableProperty(typeValue, ExternalObjectPropertyName, objValue);
 
 			var embeddedType = new EmbeddedType(type, typeValue,
 				new List<JsNativeFunction> { nativeConstructorFunction });
@@ -442,8 +455,9 @@ private void EmbeddedTypeFinalizeCallback(IntPtr ptr)
 				return;
 			}
 
-			GCHandle embeddedTypeKeyHandle = GCHandle.FromIntPtr(ptr);
-			var embeddedTypeKey = (string)embeddedTypeKeyHandle.Target;
+			GCHandle embeddedTypeHandle = GCHandle.FromIntPtr(ptr);
+			var type = (Type)embeddedTypeHandle.Target;
+			string embeddedTypeKey = type.AssemblyQualifiedName;
 			var lazyEmbeddedTypes = _lazyEmbeddedTypes;
 
 			if (!string.IsNullOrEmpty(embeddedTypeKey) && lazyEmbeddedTypes != null)
@@ -456,7 +470,7 @@ private void EmbeddedTypeFinalizeCallback(IntPtr ptr)
 				}
 			}
 
-			embeddedTypeKeyHandle.Free();
+			embeddedTypeHandle.Free();
 		}
 
 		private void ProjectFields(EmbeddedItem externalItem)
@@ -772,7 +786,7 @@ private object[] GetHostItemMemberArguments(JsValue[] args)
 		}
 
 		[MethodImpl((MethodImplOptions)256 /* AggressiveInlining */)]
-		private void FreezeObject(JsValue objValue)
+		private static void FreezeObject(JsValue objValue)
 		{
 			JsValue freezeMethodValue = JsValue.GlobalObject
 				.GetProperty("Object")
@@ -781,6 +795,18 @@ private void FreezeObject(JsValue objValue)
 			freezeMethodValue.CallFunction(objValue);
 		}
 
+		[MethodImpl((MethodImplOptions)256 /* AggressiveInlining */)]
+		private static void SetNonEnumerableProperty(JsValue objValue, string name, JsValue value)
+		{
+			JsValue descriptorValue = JsValue.CreateObject();
+			descriptorValue.SetProperty("enumerable", JsValue.False, true);
+			descriptorValue.SetProperty("writable", JsValue.True, true);
+
+			JsPropertyId id = JsPropertyId.FromString(name);
+			objValue.DefineProperty(id, descriptorValue);
+			objValue.SetProperty(id, value, true);
+		}
+
 		#region IDisposable implementation
 
 		/// <summary>

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

@@ -30,7 +30,8 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.11.6.
+   Fixed a error #68 “Embedded delegates are no longer linked with the `Function`
+   prototype”.
 
    =============
    DOCUMENTATION