In JavaScriptEngineSwitcher.ChakraCore fixed a error that occurred during the recursive evaluation of JS files

Author: Taritsyn

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/TypeMapper.cs

@@ -185,7 +185,7 @@ public JsValue MapToScriptType(object value)
 					return JsValue.FromString((string)value);
 
 				default:
-					return GetOrCreateScriptObject(value);
+					return value is JsValue ? (JsValue)value : GetOrCreateScriptObject(value);
 			}
 		}
 
@@ -874,15 +874,7 @@ private static Exception UnwrapException(Exception exception)
 				Exception innerException = targetInvocationException.InnerException;
 				if (innerException != null)
 				{
-					var wrapperException = innerException as WrapperException;
-					if (wrapperException != null)
-					{
-						originalException = wrapperException;
-					}
-					else
-					{
-						originalException = innerException;
-					}
+					originalException = innerException;
 				}
 			}
 

test/JavaScriptEngineSwitcher.Tests/Files/recursiveEvaluation/index.js

@@ -0,0 +1,18 @@
+/*global require */
+(function () {
+	'use strict';
+
+	function calculateResult() {
+		var math = require('./math'),
+			result = math.sum(math.cube(5), math.square(2), math.PI)
+			;
+
+		return result;
+	}
+
+	var exports = {
+		calculateResult: calculateResult
+	};
+
+	return exports;
+}());

test/JavaScriptEngineSwitcher.Tests/Files/recursiveEvaluation/math.js

@@ -0,0 +1,32 @@
+(function () {
+	'use strict';
+
+	function sum() {
+		var result = 0,
+			i
+			;
+
+		for (i = 0; i < arguments.length; i++) {
+			result += arguments[i];
+		}
+
+		return result;
+	}
+
+	function square(num) {
+		return num * num;
+	}
+
+	function cube(num) {
+		return num * num * num;
+	}
+
+	var exports = {
+		PI: 3.14,
+		sum: sum,
+		square: square,
+		cube: cube
+	};
+
+	return exports;
+}());

test/JavaScriptEngineSwitcher.Tests/Jint/MultithreadingTests.cs

@@ -6,5 +6,10 @@ protected override string EngineName
 		{
 			get { return "JintJsEngine"; }
 		}
+
+
+		// TODO: Remove after fixing a error
+		public override void RecursiveEvaluationOfFilesIsCorrect()
+		{ }
 	}
 }

test/JavaScriptEngineSwitcher.Tests/Msie/MultithreadingTests.cs

@@ -11,5 +11,9 @@ protected override string EngineName
 		// TODO: Remove after fixing a error in the MSIE JavaScript Engine for .NET
 		public override void RecursiveExecutionOfFilesIsCorrect()
 		{ }
+
+		// TODO: Remove after fixing a error in the MSIE JavaScript Engine for .NET
+		public override void RecursiveEvaluationOfFilesIsCorrect()
+		{ }
 	}
 }

test/JavaScriptEngineSwitcher.Tests/MultithreadingTestsBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Threading;
 
 using Xunit;
@@ -57,5 +58,33 @@ public virtual void RecursiveExecutionOfFilesIsCorrect()
 			// Assert
 			Assert.Equal(targetOutput, output);
 		}
+
+		[Fact]
+		public virtual void RecursiveEvaluationOfFilesIsCorrect()
+		{
+			// Arrange
+			const string input = "require('index').calculateResult();";
+			const double targetOutput = 132.14;
+
+			// Act
+			double output;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				Func<string, object> loadModule = name => {
+					string path = Path.Combine("Files/recursiveEvaluation", $"{name}.js");
+					string code = File.ReadAllText(path);
+					object result = jsEngine.Evaluate(code, path);
+
+					return result;
+				};
+
+				jsEngine.EmbedHostObject("require", loadModule);
+				output = jsEngine.Evaluate<double>(input);
+			}
+
+			// Assert
+			Assert.Equal(targetOutput, output);
+		}
 	}
 }

test/JavaScriptEngineSwitcher.Tests/Vroom/MultithreadingTests.cs

@@ -10,5 +10,8 @@ protected override string EngineName
 
 		public override void RecursiveExecutionOfFilesIsCorrect()
 		{ }
+
+		public override void RecursiveEvaluationOfFilesIsCorrect()
+		{ }
 	}
 }