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

Author: Taritsyn

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.302"
+    "version": "6.0.400"
   }
 }

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -18,17 +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 2039).</Description>
+    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2040).</Description>
     <PackageTags>$(PackageCommonTags);Jint</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>1. Jint was updated to version 3.0.0 Beta 2039;
-2. No longer supports a .NET Framework 4.6.1;
-3. Added support of .NET Framework 4.6.2.</PackageReleaseNotes>
+    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2040.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-2039" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2040" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -15,7 +15,6 @@
 using OriginalParsedScript = Esprima.Ast.Script;
 using OriginalParser = Esprima.JavaScriptParser;
 using OriginalParserException = Esprima.ParserException;
-using OriginalParserOptions = Esprima.ParserOptions;
 using OriginalRecursionDepthOverflowException = Jint.Runtime.RecursionDepthOverflowException;
 using OriginalRuntimeException = Jint.Runtime.JintException;
 using OriginalStatementsCountOverflowException = Jint.Runtime.StatementsCountOverflowException;
@@ -52,7 +51,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "3.0.0 Beta 2039";
+		private const string EngineVersion = "3.0.0 Beta 2040";
 
 		/// <summary>
 		/// Jint JS engine
@@ -153,22 +152,6 @@ public JintJsEngine(JintSettings settings)
 		}
 
 
-		/// <summary>
-		/// Creates a Esprima .NET parser options with document name and special settings for the Jint
-		/// </summary>
-		/// <param name="documentName">Document name</param>
-		/// <returns>Esprima .NET parser options with document name and special settings for the Jint</returns>
-		private static OriginalParserOptions CreateParserOptions(string documentName)
-		{
-			var parserOptions = new OriginalParserOptions(documentName)
-			{
-				AdaptRegexp = true,
-				Tolerant = true
-			};
-
-			return parserOptions;
-		}
-
 		#region Mapping
 
 		/// <summary>
@@ -367,12 +350,11 @@ protected override IPrecompiledScript InnerPrecompile(string code, string docume
 		{
 			OriginalParsedScript parsedScript;
 			string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
-			OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);
 
 			try
 			{
-				var parser = new OriginalParser(code, parserOptions);
-				parsedScript = parser.ParseScript();
+				var parser = new OriginalParser();
+				parsedScript = parser.ParseScript(code, uniqueDocumentName);
 			}
 			catch (OriginalParserException e)
 			{
@@ -391,15 +373,14 @@ protected override object InnerEvaluate(string expression, string documentName)
 		{
 			object result;
 			string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
-			OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);
 
 			lock (_executionSynchronizer)
 			{
 				OriginalValue resultValue;
 
 				try
 				{
-					resultValue = _jsEngine.Evaluate(expression, parserOptions);
+					resultValue = _jsEngine.Evaluate(expression, uniqueDocumentName);
 				}
 				catch (OriginalParserException e)
 				{
@@ -440,13 +421,12 @@ protected override void InnerExecute(string code)
 		protected override void InnerExecute(string code, string documentName)
 		{
 			string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
-			OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);
 
 			lock (_executionSynchronizer)
 			{
 				try
 				{
-					_jsEngine.Execute(code, parserOptions);
+					_jsEngine.Execute(code, uniqueDocumentName);
 				}
 				catch (OriginalParserException e)
 				{

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -13,14 +13,12 @@
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
    Jint JavaScript Engine (http://github.com/sebastienros/jint) version
-   3.0.0 Beta 2039).
+   3.0.0 Beta 2040).
 
    =============
    RELEASE NOTES
    =============
-   1. Jint was updated to version 3.0.0 Beta 2039;
-   2. No longer supports a .NET Framework 4.6.1;
-   3. Added support of .NET Framework 4.6.2.
+   Jint was updated to version 3.0.0 Beta 2040.
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs

@@ -217,7 +217,7 @@ public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 			Assert.StartsWith("Could not find file '", exception.Message);
 		}
 
-		/*[Fact]
+		[Fact]
 		public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
 		{
 			// Arrange
@@ -248,11 +248,11 @@ public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
 			// Assert
 			Assert.NotNull(exception);
 			Assert.Equal("Compilation error", exception.Category);
-			Assert.Equal("Unexpected token ILLEGAL", exception.Description);
+			Assert.Equal("Unexpected number", exception.Description);
 			Assert.Equal("SyntaxError", exception.Type);
 			Assert.Equal("second-file.js", exception.DocumentName);
 			Assert.Equal(1, exception.LineNumber);
-			Assert.Equal(6, exception.ColumnNumber);
+			Assert.Equal(8, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
 		}
 
@@ -332,7 +332,7 @@ public void MappingHostErrorDuringRecursiveExecutionOfFilesIsCorrect()
 			// Assert
 			Assert.NotNull(exception);
 			Assert.Equal("File '" + directoryPath + "/second-file.jsx' not exist.", exception.Message);
-		}*/
+		}
 
 		#endregion