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

Taritsyn · Taritsyn · commit fef69f84740b · 2022-08-28T20:55:00.000+03:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.302"
+    "version": "6.0.400"
   }
 }
diff --git a/src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj b/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>
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs b/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)
 				{
diff --git a/src/JavaScriptEngineSwitcher.Jint/readme.txt b/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
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs b/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
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.302"`
	`3`	`+ "version": "6.0.400"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`using OriginalParsedScript = Esprima.Ast.Script;`
`16`	`16`	`using OriginalParser = Esprima.JavaScriptParser;`
`17`	`17`	`using OriginalParserException = Esprima.ParserException;`
`18`		`-using OriginalParserOptions = Esprima.ParserOptions;`
`19`	`18`	`using OriginalRecursionDepthOverflowException = Jint.Runtime.RecursionDepthOverflowException;`
`20`	`19`	`using OriginalRuntimeException = Jint.Runtime.JintException;`
`21`	`20`	`using OriginalStatementsCountOverflowException = Jint.Runtime.StatementsCountOverflowException;`
`@@ -52,7 +51,7 @@ public sealed class JintJsEngine : JsEngineBase`
`52`	`51`	`/// <summary>`
`53`	`52`	`/// Version of original JS engine`
`54`	`53`	`/// </summary>`
`55`		`- private const string EngineVersion = "3.0.0 Beta 2039";`
	`54`	`+ private const string EngineVersion = "3.0.0 Beta 2040";`
`56`	`55`
`57`	`56`	`/// <summary>`
`58`	`57`	`/// Jint JS engine`
`@@ -153,22 +152,6 @@ public JintJsEngine(JintSettings settings)`
`153`	`152`	`}`
`154`	`153`
`155`	`154`
`156`		`- /// <summary>`
`157`		`- /// Creates a Esprima .NET parser options with document name and special settings for the Jint`
`158`		`- /// </summary>`
`159`		`- /// <param name="documentName">Document name</param>`
`160`		`- /// <returns>Esprima .NET parser options with document name and special settings for the Jint</returns>`
`161`		`- private static OriginalParserOptions CreateParserOptions(string documentName)`
`162`		`- {`
`163`		`- var parserOptions = new OriginalParserOptions(documentName)`
`164`		`- {`
`165`		`- AdaptRegexp = true,`
`166`		`- Tolerant = true`
`167`		`- };`
`168`		`-`
`169`		`- return parserOptions;`
`170`		`- }`
`171`		`-`
`172`	`155`	`#region Mapping`
`173`	`156`
`174`	`157`	`/// <summary>`
`@@ -367,12 +350,11 @@ protected override IPrecompiledScript InnerPrecompile(string code, string docume`
`367`	`350`	`{`
`368`	`351`	`OriginalParsedScript parsedScript;`
`369`	`352`	`string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);`
`370`		`- OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);`
`371`	`353`
`372`	`354`	`try`
`373`	`355`	`{`
`374`		`- var parser = new OriginalParser(code, parserOptions);`
`375`		`- parsedScript = parser.ParseScript();`
	`356`	`+ var parser = new OriginalParser();`
	`357`	`+ parsedScript = parser.ParseScript(code, uniqueDocumentName);`
`376`	`358`	`}`
`377`	`359`	`catch (OriginalParserException e)`
`378`	`360`	`{`
`@@ -391,15 +373,14 @@ protected override object InnerEvaluate(string expression, string documentName)`
`391`	`373`	`{`
`392`	`374`	`object result;`
`393`	`375`	`string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);`
`394`		`- OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);`
`395`	`376`
`396`	`377`	`lock (_executionSynchronizer)`
`397`	`378`	`{`
`398`	`379`	`OriginalValue resultValue;`
`399`	`380`
`400`	`381`	`try`
`401`	`382`	`{`
`402`		`- resultValue = _jsEngine.Evaluate(expression, parserOptions);`
	`383`	`+ resultValue = _jsEngine.Evaluate(expression, uniqueDocumentName);`
`403`	`384`	`}`
`404`	`385`	`catch (OriginalParserException e)`
`405`	`386`	`{`
`@@ -440,13 +421,12 @@ protected override void InnerExecute(string code)`
`440`	`421`	`protected override void InnerExecute(string code, string documentName)`
`441`	`422`	`{`
`442`	`423`	`string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);`
`443`		`- OriginalParserOptions parserOptions = CreateParserOptions(uniqueDocumentName);`
`444`	`424`
`445`	`425`	`lock (_executionSynchronizer)`
`446`	`426`	`{`
`447`	`427`	`try`
`448`	`428`	`{`
`449`		`- _jsEngine.Execute(code, parserOptions);`
	`429`	`+ _jsEngine.Execute(code, uniqueDocumentName);`
`450`	`430`	`}`
`451`	`431`	`catch (OriginalParserException e)`
`452`	`432`	`{`