In JavaScriptEngineSwitcher.V8 fixed a error, that occurred during parsing of the original error message

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.nuspec

@@ -12,10 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>JavaScriptEngineSwitcher.V8 contains adapter `V8JsEngine` (wrapper for the Microsoft ClearScript.V8 (http://clearscript.codeplex.com) version 5.4.7 with support of V8 version 5.3.332.45). For correct working of the Microsoft ClearScript.V8 require assemblies `msvcp120.dll` and `msvcr120.dll` from the Visual C++ Redistributable Packages for Visual Studio 2013.</description>
 		<summary>JavaScriptEngineSwitcher.V8 contains adapter `V8JsEngine` (wrapper for the Microsoft ClearScript.V8 version 5.4.7 with support of V8 version 5.3.332.45).</summary>
-		<releaseNotes>1. Removed dependency on `System.Configuration.dll` (no longer supported configuration by using the `Web.config` and `App.config` files);
-2. Added support of .NET Framework 4.5.1;
-3. Microsoft ClearScript.V8 was updated to version 5.4.7 (support of V8 version 5.3.332.45);
-4. In configuration settings of the V8 JS engine was changed type of `DebugPort` property from `int` to `ushort`.</releaseNotes>
+		<releaseNotes>Fixed a error, that occurred during parsing of the original error  message.</releaseNotes>
 		<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript V8 ClearScript</tags>

NuGet/JavaScriptEngineSwitcher.V8/readme.txt

@@ -20,13 +20,7 @@
    =============
    RELEASE NOTES
    =============
-   1. Removed dependency on `System.Configuration.dll` (no longer supported
-      configuration by using the `Web.config` and `App.config` files);
-   2. Added support of .NET Framework 4.5.1;
-   3. Microsoft ClearScript.V8 was updated to version 5.4.7 (support of V8 version
-      5.3.332.45);
-   4. In configuration settings of the V8 JS engine was changed type of `DebugPort`
-      property from `int` to `ushort`.
+   Fixed a error, that occurred during parsing of the original error  message.
 
    ====================
    POST-INSTALL ACTIONS

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsValue.cs

@@ -303,9 +303,7 @@ public static JsValue FromInt32(int value)
 		public static JsValue FromString(string value)
 		{
 			JsValue reference;
-			JsErrorCode errorCode;
-
-			errorCode = Utils.IsWindows() ?
+			JsErrorCode errorCode = Utils.IsWindows() ?
 				NativeMethods.JsPointerToString(value, new UIntPtr((uint)value.Length), out reference)
 				:
 				NativeMethods.JsPointerToStringUtf8(value, new UIntPtr((uint)value.Length), out reference)

src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs

@@ -49,7 +49,7 @@ public sealed class V8JsEngine : JsEngineBase
 		/// </summary>
 		private static readonly Regex _errorStringRegex =
 			new Regex(@"at (?:[A-Za-z_\$][0-9A-Za-z_\$]* )?" +
-				@"\(?Script Document(?:\s*\[\d+\])?:(?<lineNumber>\d+):(?<columnNumber>\d+)\)?");
+				@"\(?Script Document(?:\s*\[(temp|\d+)\])?:(?<lineNumber>\d+):(?<columnNumber>\d+)\)?");
 
 		/// <summary>
 		/// Synchronizer of code execution

test/JavaScriptEngineSwitcher.Tests/CommonTestsBase.cs

@@ -786,5 +786,78 @@ public virtual void GarbageCollectionIsCorrect()
 		}
 
 		#endregion
+
+		#region Mapping errors
+
+		[Fact]
+		public virtual void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
+		{
+			// Arrange
+			const string input = @"var $variable1 = 611;
+var _variable2 = 711;
+var @variable3 = 678;
+
+$variable1 + _variable2 - variable3;";
+
+			JsRuntimeException exception = null;
+
+			// Act
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					int result = jsEngine.Evaluate<int>(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.NotEmpty(exception.Message);
+			Assert.Equal(3, exception.LineNumber);
+			Assert.Equal(5, exception.ColumnNumber);
+		}
+
+		public virtual void MappingRuntimeErrorDuringExecutionOfCodeIsCorrect()
+		{
+			// Arrange
+			const string input = @"function factorial(value) {
+	if (value <= 0) {
+		throw new Error(""The value must be greater than or equal to zero."");
+	}
+
+	return value !== 1 ? value * factorial(value - 1) : 1;
+}
+
+factorial(5);
+factorial(@);
+factorial(0);";
+
+			JsRuntimeException exception = null;
+
+			// Act
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					jsEngine.Execute(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.NotEmpty(exception.Message);
+			Assert.Equal(10, exception.LineNumber);
+			Assert.Equal(11, exception.ColumnNumber);
+		}
+
+		#endregion
 	}
 }

test/JavaScriptEngineSwitcher.Tests/Jurassic/CommonTests.cs

@@ -1,10 +1,88 @@
-namespace JavaScriptEngineSwitcher.Tests.Jurassic
+using Xunit;
+
+using JavaScriptEngineSwitcher.Core;
+
+namespace JavaScriptEngineSwitcher.Tests.Jurassic
 {
 	public class CommonTests : CommonTestsBase
 	{
 		protected override string EngineName
 		{
 			get { return "JurassicJsEngine"; }
 		}
+
+
+		#region Mapping errors
+
+		[Fact]
+		public override void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
+		{
+			// Arrange
+			const string input = @"var $variable1 = 611;
+var _variable2 = 711;
+var @variable3 = 678;
+
+$variable1 + _variable2 - variable3;";
+
+			JsRuntimeException exception = null;
+
+			// Act
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					int result = jsEngine.Evaluate<int>(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.NotEmpty(exception.Message);
+			Assert.Equal(3, exception.LineNumber);
+			Assert.Equal(0, exception.ColumnNumber);
+		}
+
+		public override void MappingRuntimeErrorDuringExecutionOfCodeIsCorrect()
+		{
+			// Arrange
+			const string input = @"function factorial(value) {
+	if (value <= 0) {
+		throw new Error(""The value must be greater than or equal to zero."");
+	}
+
+	return value !== 1 ? value * factorial(value - 1) : 1;
+}
+
+factorial(5);
+factorial(@);
+factorial(0);";
+
+			JsRuntimeException exception = null;
+
+			// Act
+			using (var jsEngine = CreateJsEngine())
+			{
+				try
+				{
+					jsEngine.Execute(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.NotEmpty(exception.Message);
+			Assert.Equal(10, exception.LineNumber);
+			Assert.Equal(0, exception.ColumnNumber);
+		}
+
+		#endregion
 	}
 }