In JavaScriptEngineSwitcher.Jint changed a implementation of the InnerCallFunction method

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -3,7 +3,6 @@
 using System.Text;
 
 using Jint;
-using IOriginalCallable = Jint.Native.ICallable;
 using OriginalEngine = Jint.Engine;
 using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
 using OriginalMemoryLimitExceededException = Jint.Runtime.MemoryLimitExceededException;
@@ -101,10 +100,13 @@ public JintJsEngine(JintSettings settings)
 						.Strict(jintSettings.StrictMode)
 						.TimeoutInterval(jintSettings.TimeoutInterval)
 						;
+
 					if (jintSettings.RegexTimeoutInterval.HasValue)
 					{
 						options.RegexTimeoutInterval(jintSettings.RegexTimeoutInterval.Value);
 					}
+
+					options.AddObjectConverter(new UndefinedConverter());
 				});
 			}
 			catch (Exception e)
@@ -140,11 +142,6 @@ private static OriginalParserOptions CreateParserOptions(string documentName)
 		/// <returns>The mapped value</returns>
 		private OriginalValue MapToScriptType(object value)
 		{
-			if (value is Undefined)
-			{
-				return OriginalValue.Undefined;
-			}
-
 			return OriginalValue.FromObject(_jsEngine, value);
 		}
 
@@ -539,29 +536,11 @@ protected override object InnerCallFunction(string functionName, params object[]
 					throw WrapJavaScriptException(e);
 				}
 
-				var callable = functionValue.TryCast<IOriginalCallable>();
-				if (callable == null)
-				{
-					throw new WrapperRuntimeException(
-						string.Format(CoreStrings.Runtime_FunctionNotExist, functionName));
-				}
-
-				int argumentCount = args.Length;
-				var processedArgs = new OriginalValue[argumentCount];
-
-				if (argumentCount > 0)
-				{
-					for (int argumentIndex = 0; argumentIndex < argumentCount; argumentIndex++)
-					{
-						processedArgs[argumentIndex] = MapToScriptType(args[argumentIndex]);
-					}
-				}
-
 				OriginalValue resultValue;
 
 				try
 				{
-					resultValue = callable.Call(functionValue, processedArgs);
+					resultValue = _jsEngine.Invoke(functionValue, args);
 				}
 				catch (OriginalJavaScriptException e)
 				{
@@ -583,6 +562,11 @@ protected override object InnerCallFunction(string functionName, params object[]
 				{
 					throw WrapTimeoutException(e);
 				}
+				catch (ArgumentException e) when (e.Message == "Can only invoke functions")
+				{
+					throw new WrapperRuntimeException(
+						string.Format(CoreStrings.Runtime_FunctionNotExist, functionName));
+				}
 
 				result = MapToHostType(resultValue);
 			}

src/JavaScriptEngineSwitcher.Jint/UndefinedConverter.cs

@@ -0,0 +1,26 @@
+using IOriginalObjectConverter = Jint.Runtime.Interop.IObjectConverter;
+using OriginalEngine = Jint.Engine;
+using OriginalValue = Jint.Native.JsValue;
+
+using JavaScriptEngineSwitcher.Core;
+
+namespace JavaScriptEngineSwitcher.Jint
+{
+	/// <summary>
+	/// Converts a <see cref="Undefined"/> instance to a <see cref="OriginalValue"/> instance
+	/// </summary>
+	internal sealed class UndefinedConverter : IOriginalObjectConverter
+	{
+		public bool TryConvert(OriginalEngine engine, object value, out OriginalValue result)
+		{
+			if (value is Undefined)
+			{
+				result = OriginalValue.Undefined;
+				return true;
+			}
+
+			result = OriginalValue.Null;
+			return false;
+		}
+	}
+}