In JavaScriptEngineSwitcher.Jint added support of Jint version 3.0.0 Beta 2031

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/Helpers/JintJsErrorHelpers.cs

@@ -22,21 +22,26 @@ internal static class JintJsErrorHelpers
 
 		private const string OriginalAnonymousFunctionName = "(anonymous)";
 		private const string WrapperAnonymousFunctionName = "Anonymous function";
+		private const string DelegateFunctionName = "delegate";
 
 		/// <summary>
 		/// Regular expression for working with line of the script error location
 		/// </summary>
 		private static readonly Regex _errorLocationLineRegex =
 			new Regex(@"^[ ]{3}at " +
 				@"(?:" +
-					@"(?<functionName>" +
-						@"[\w][\w ]*" +
+					@"(?:" +
+						@"(?<functionName>" +
+							@"[\w][\w ]*" +
+							@"|" +
+							CommonRegExps.JsFullNamePattern +
+							@"|" +
+							Regex.Escape(OriginalAnonymousFunctionName) +
+						@") " +
+						@"\((?:" + CommonRegExps.JsFullNamePattern + @"(?:, " + CommonRegExps.JsFullNamePattern + @")*)?\)" +
 						@"|" +
-						CommonRegExps.JsFullNamePattern +
-						@"|" +
-						Regex.Escape(OriginalAnonymousFunctionName) +
+						@"(?<functionName>" + Regex.Escape(DelegateFunctionName) + @")" +
 					@") " +
-					@"(?:\(" + CommonRegExps.JsFullNamePattern + @"(?:, " + CommonRegExps.JsFullNamePattern + @")*\) )?" +
 				@")?" +
 				@"(?<documentName>" + CommonRegExps.DocumentNamePattern + @"):" +
 				@"(?<lineNumber>\d+)(?::(?<columnNumber>\d+))?$");
@@ -92,29 +97,18 @@ public static ErrorLocationItem[] ParseErrorLocation(string errorLocation)
 		/// Fixes a error location items
 		/// </summary>
 		/// <param name="errorLocationItems">An array of <see cref="ErrorLocationItem"/> instances</param>
-		/// <param name="currentDocumentName">Current document name</param>
-		public static void FixErrorLocationItems(ErrorLocationItem[] errorLocationItems, string currentDocumentName)
+		public static void FixErrorLocationItems(ErrorLocationItem[] errorLocationItems)
 		{
 			foreach (ErrorLocationItem errorLocationItem in errorLocationItems)
 			{
 				string functionName = errorLocationItem.FunctionName;
-				if (functionName.Length > 0)
-				{
-					if (functionName == OriginalAnonymousFunctionName)
-					{
-						errorLocationItem.FunctionName = WrapperAnonymousFunctionName;
-					}
-				}
-				else
+				if (functionName.Length == 0 || functionName == DelegateFunctionName)
 				{
 					errorLocationItem.FunctionName = "Global code";
 				}
-
-				if (errorLocationItem.DocumentName == ":0" && errorLocationItem.LineNumber == 1)
+				else if (functionName == OriginalAnonymousFunctionName)
 				{
-					errorLocationItem.DocumentName = currentDocumentName;
-					errorLocationItem.LineNumber = 0;
-					errorLocationItem.ColumnNumber = 0;
+					errorLocationItem.FunctionName = WrapperAnonymousFunctionName;
 				}
 			}
 		}

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -18,16 +18,15 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2002).</Description>
+    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2031).</Description>
     <PackageTags>$(PackageCommonTags);Jint</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>1. Runtime exceptions now contain a stack trace;
-2. In configuration settings of the Jint JS engine a `AllowDebuggerStatement` property has been returned so as not to break compatibility with previous versions.</PackageReleaseNotes>
+    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2031.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-2002" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2031" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -52,7 +52,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "3.0.0 Beta 2002";
+		private const string EngineVersion = "3.0.0 Beta 2031";
 
 		/// <summary>
 		/// Jint JS engine
@@ -255,7 +255,7 @@ private WrapperRuntimeException WrapRuntimeException(OriginalRuntimeException or
 					originalJavaScriptException.StackTrace);
 				if (callStackItems.Length > 0)
 				{
-					JintJsErrorHelpers.FixErrorLocationItems(callStackItems, documentName);
+					JintJsErrorHelpers.FixErrorLocationItems(callStackItems);
 					callStack = JsErrorHelpers.StringifyErrorLocationItems(callStackItems, true);
 				}
 

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -13,15 +13,12 @@
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
    Jint JavaScript Engine (http://github.com/sebastienros/jint) version
-   3.0.0 Beta 2002).
+   3.0.0 Beta 2031).
 
    =============
    RELEASE NOTES
    =============
-   1. Runtime exceptions now contain a stack trace;
-   2. In configuration settings of the Jint JS engine a `AllowDebuggerStatement`
-      property has been returned so as not to break compatibility with previous
-      versions.
+   Jint was updated to version 3.0.0 Beta 2031.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.V8/V8Settings.cs

@@ -68,7 +68,7 @@ public bool DisableGlobalMembers
 		/// or malicious script can still cause an application to fail by exhausting its address
 		/// space or total available memory. On-demand heap expansion is recommended for use in
 		/// conjunction with heap size monitoring (see <see cref="MaxHeapSize"/> property to help
-		/// contain runaway scripts.
+		/// contain runaway scripts).
 		/// </para>
 		/// </remarks>
 		public double HeapExpansionMultiplier

test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs

@@ -454,7 +454,7 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 			string targetOutput = "ReferenceError: bar is not defined" + Environment.NewLine +
 				"   at foo (functions.js:4:3)" + Environment.NewLine +
 				"   at Anonymous function (functions.js:12:2)" + Environment.NewLine +
-				"   at Global code (functions.js)"
+				"   at Global code (functions.js:13:2)"
 				;
 
 			JsRuntimeException exception = null;

test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs

@@ -89,17 +89,8 @@ public override void CallingOfEmbeddedDelegateWithMissingParameter()
 
 		#region Recursive calls
 
-		[Fact]
-		public override void RecursiveEvaluationOfFilesIsCorrect()
-		{ }
-
-		[Fact]
-		public override void RecursiveExecutionOfFilesIsCorrect()
-		{ }
-
 		#region Mapping of errors
 
-		/*
 		[Fact]
 		public void MappingCompilationErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 		{
@@ -182,7 +173,12 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 			Assert.Equal(10, exception.LineNumber);
 			Assert.Equal(4, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
-			Assert.Empty(exception.CallStack);
+			Assert.Equal(
+				"   at sum (math.js:10:4)" + Environment.NewLine +
+				"   at calculateResult (index.js:7:13)" + Environment.NewLine +
+				"   at Global code (Script Document:1:1)",
+				exception.CallStack
+			);
 		}
 
 		[Fact]
@@ -220,7 +216,6 @@ public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 			Assert.NotNull(exception);
 			Assert.StartsWith("Could not find file '", exception.Message);
 		}
-		*/
 
 		[Fact]
 		public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
@@ -297,8 +292,12 @@ public void MappingRuntimeErrorDuringRecursiveExecutionOfFilesIsCorrect()
 			Assert.Equal("second-file.js", exception.DocumentName);
 			Assert.Equal(1, exception.LineNumber);
 			Assert.Equal(1, exception.ColumnNumber);
-			Assert.Equal("", exception.SourceFragment);
-			Assert.Equal("   at Global code (second-file.js:1:1)", exception.CallStack
+			Assert.Empty(exception.SourceFragment);
+			Assert.Equal(
+				"   at Global code (second-file.js:1:1)" + Environment.NewLine +
+				"   at Global code (first-file.js:2:1)" + Environment.NewLine +
+				"   at Global code (main-file.js:2:1)",
+				exception.CallStack
 			);
 		}
 

test/JavaScriptEngineSwitcher.Tests/Jint/PrecompilationTests.cs

@@ -101,7 +101,7 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
 			// Assert
 			Assert.NotNull(exception);
 			Assert.Equal("Runtime error", exception.Category);
-			Assert.Equal("Cannot read property 'items' of null", exception.Description);
+			Assert.Equal("Cannot read property '5' of null", exception.Description);
 			Assert.Equal("TypeError", exception.Type);
 			Assert.Equal("get-item.js", exception.DocumentName);
 			Assert.Equal(2, exception.LineNumber);
@@ -110,7 +110,7 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
 			Assert.Equal(
 				"   at getItem (get-item.js:2:19)" + Environment.NewLine +
 				"   at Anonymous function (get-item.js:9:10)" + Environment.NewLine +
-				"   at Global code (get-item.js)",
+				"   at Global code (get-item.js:13:2)",
 				exception.CallStack
 			);
 		}
@@ -180,7 +180,7 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 			string targetOutput = "ReferenceError: middleName is not defined" + Environment.NewLine +
 				"   at getFullName (get-full-name.js:2:2)" + Environment.NewLine +
 				"   at Anonymous function (get-full-name.js:12:9)" + Environment.NewLine +
-				"   at Global code (get-full-name.js)"
+				"   at Global code (get-full-name.js:13:2)"
 				;
 
 			JsRuntimeException exception = null;