In version for .NET Framework was fixed a error that occurred during the recursive execution and evaluation of JS files

Author: Taritsyn

src/MsieJavaScriptEngine/Helpers/TypeMappingHelpers.cs

@@ -29,7 +29,8 @@ public static object MapToScriptType(object value, JsEngineMode engineMode)
 				return null;
 			}
 
-			if (TypeConverter.IsPrimitiveType(value.GetType()))
+			Type type = value.GetType();
+			if (TypeConverter.IsPrimitiveType(type) || type.FullName == "System.__ComObject")
 			{
 				return value;
 			}

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -21,7 +21,7 @@
 		<RepositoryUrl>https://github.com/Taritsyn/MsieJavaScriptEngine</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
-		<PackageReleaseNotes>In version for .NET Core was fixed a error that occurred during the recursive execution and evaluation of JS files.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed a error that occurred during the recursive execution and evaluation of JS files (while without correct handling of host exceptions).</PackageReleaseNotes>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageOutputPath>../../nuget</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/MsieJavaScriptEngine/readme.txt

@@ -21,8 +21,8 @@
    =============
    RELEASE NOTES
    =============
-   In version for .NET Core was fixed a error that occurred during the recursive
-   execution and evaluation of JS files.
+   Fixed a error that occurred during the recursive execution and evaluation of JS
+   files (while without correct handling of host exceptions).
 
    ============
    PROJECT SITE

test/MsieJavaScriptEngine.Test.ChakraActiveScript/InteropTests.cs

@@ -1,4 +1,7 @@
-using NUnit.Framework;
+using System;
+using System.IO;
+
+using NUnit.Framework;
 
 using MsieJavaScriptEngine.Test.Common;
 
@@ -8,5 +11,61 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript
 	public class InteropTests : InteropTestsBase
 	{
 		protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;
+
+
+		#region Embedding of objects
+
+		#region Recursive calls
+
+		#region Mapping of errors
+
+		[Test]
+		public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
+		{
+			// Arrange
+			string directoryPath = GetAbsolutePath("SharedFiles/recursiveEvaluation/runtimeError");
+			const string input = "require('index').calculateResult();";
+
+			// Act
+			JsRuntimeException exception = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					Func<string, object> loadModule = path => {
+						string absolutePath = Path.Combine(directoryPath, $"{path}.js");
+						string code = File.ReadAllText(absolutePath);
+						object result = jsEngine.Evaluate(code, absolutePath);
+
+						return result;
+					};
+
+					jsEngine.EmbedHostObject("require", loadModule);
+					double output = jsEngine.Evaluate<double>(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.AreEqual("Runtime error", exception.Category);
+			Assert.AreEqual("'argumens' is undefined", exception.Description);
+			Assert.AreEqual("ReferenceError", exception.Type);
+			Assert.AreEqual("math.js", exception.DocumentName);
+			Assert.AreEqual(10, exception.LineNumber);
+			Assert.AreEqual(4, exception.ColumnNumber);
+			Assert.IsEmpty(exception.SourceFragment);
+			Assert.IsEmpty(exception.CallStack);
+		}
+
+		#endregion
+
+		#endregion
+
+		#endregion
 	}
 }

test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/InteropTests.cs

@@ -1,8 +1,6 @@
-#if NETCOREAPP
-using System;
+using System;
 using System.IO;
 
-#endif
 using NUnit.Framework;
 
 using MsieJavaScriptEngine.Test.Common;
@@ -13,10 +11,10 @@ namespace MsieJavaScriptEngine.Test.ChakraEdgeJsRt
 	public class InteropTests : InteropTestsBase
 	{
 		protected override JsEngineMode EngineMode => JsEngineMode.ChakraEdgeJsRt;
-#if NETCOREAPP
 
 
 		#region Embedding of objects
+#if NETCOREAPP
 
 		#region Delegates
 
@@ -42,6 +40,7 @@ public void EmbeddedInstanceOfDelegateHasFunctionPrototype()
 		}
 
 		#endregion
+#endif
 
 		#region Recursive calls
 
@@ -100,6 +99,5 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 		#endregion
 
 		#endregion
-#endif
 	}
 }

test/MsieJavaScriptEngine.Test.ChakraIeJsRt/InteropTests.cs

@@ -1,8 +1,6 @@
-#if NETCOREAPP
-using System;
+using System;
 using System.IO;
 
-#endif
 using NUnit.Framework;
 
 using MsieJavaScriptEngine.Test.Common;
@@ -13,10 +11,10 @@ namespace MsieJavaScriptEngine.Test.ChakraIeJsRt
 	public class InteropTests : InteropTestsBase
 	{
 		protected override JsEngineMode EngineMode => JsEngineMode.ChakraIeJsRt;
-#if NETCOREAPP
 
 
 		#region Embedding of objects
+#if NETCOREAPP
 
 		#region Delegates
 
@@ -42,6 +40,7 @@ public void EmbeddedInstanceOfDelegateHasFunctionPrototype()
 		}
 
 		#endregion
+#endif
 
 		#region Recursive calls
 
@@ -100,6 +99,5 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 		#endregion
 
 		#endregion
-#endif
 	}
 }

test/MsieJavaScriptEngine.Test.Classic/InteropTests.cs

@@ -1,4 +1,7 @@
-using NUnit.Framework;
+using System;
+using System.IO;
+
+using NUnit.Framework;
 
 using MsieJavaScriptEngine.Test.Common;
 
@@ -8,5 +11,61 @@ namespace MsieJavaScriptEngine.Test.Classic
 	public class InteropTests : InteropTestsBase
 	{
 		protected override JsEngineMode EngineMode => JsEngineMode.Classic;
+
+
+		#region Embedding of objects
+
+		#region Recursive calls
+
+		#region Mapping of errors
+
+		[Test]
+		public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
+		{
+			// Arrange
+			string directoryPath = GetAbsolutePath("SharedFiles/recursiveEvaluation/runtimeError");
+			const string input = "require('index').calculateResult();";
+
+			// Act
+			JsRuntimeException exception = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					Func<string, object> loadModule = path => {
+						string absolutePath = Path.Combine(directoryPath, $"{path}.js");
+						string code = File.ReadAllText(absolutePath);
+						object result = jsEngine.Evaluate(code, absolutePath);
+
+						return result;
+					};
+
+					jsEngine.EmbedHostObject("require", loadModule);
+					double output = jsEngine.Evaluate<double>(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.AreEqual("Runtime error", exception.Category);
+			Assert.AreEqual("'argumens' is undefined", exception.Description);
+			Assert.AreEqual("TypeError", exception.Type);
+			Assert.AreEqual("math.js", exception.DocumentName);
+			Assert.AreEqual(10, exception.LineNumber);
+			Assert.AreEqual(4, exception.ColumnNumber);
+			Assert.IsEmpty(exception.SourceFragment);
+			Assert.IsEmpty(exception.CallStack);
+		}
+
+		#endregion
+
+		#endregion
+
+		#endregion
 	}
 }

test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs

@@ -638,7 +638,6 @@ public virtual void InteractionOfEmbeddedCustomValueTypeAndDelegateInstancesIsCo
 		}
 
 		#endregion
-#if NETCOREAPP
 
 		#region Recursive calls
 
@@ -698,7 +697,6 @@ public virtual void RecursiveExecutionOfFilesIsCorrect()
 		}
 
 		#endregion
-#endif
 
 		#region Removal