In JavaScriptEngineSwitcher.Jint:

Taritsyn · Taritsyn · commit 9c144b25cc0c · 2019-10-03T22:06:41.000+03:00
1. Jint was updated to version 3.0.0 Beta 1598;
	2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/App_Start/JsEngineSwitcherConfig.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/App_Start/JsEngineSwitcherConfig.cs
@@ -1,6 +1,5 @@
 ﻿using JavaScriptEngineSwitcher.ChakraCore;
 using JavaScriptEngineSwitcher.Core;
-using JavaScriptEngineSwitcher.Jint;
 using JavaScriptEngineSwitcher.Jurassic;
 using JavaScriptEngineSwitcher.Msie;
 using JavaScriptEngineSwitcher.NiL;
@@ -14,7 +13,6 @@ public static void Configure(IJsEngineSwitcher engineSwitcher)
 		{
 			engineSwitcher.EngineFactories
 				.AddChakraCore()
-				.AddJint()
 				.AddJurassic()
 				.AddMsie(new MsieSettings
 				{
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj
@@ -120,10 +120,6 @@
       <Project>{13559975-f99d-4b93-bf46-227c0b6e0dfb}</Project>
       <Name>JavaScriptEngineSwitcher.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jint\JavaScriptEngineSwitcher.Jint.csproj">
-      <Project>{22d73c6e-5f35-497b-a93b-f9eaaae4ddaa}</Project>
-      <Name>JavaScriptEngineSwitcher.Jint</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.csproj">
       <Project>{d31b5a77-8018-4d76-b372-325564385b2d}</Project>
       <Name>JavaScriptEngineSwitcher.Jurassic</Name>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj
@@ -34,7 +34,6 @@
 
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
-		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
 		<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Startup.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Startup.cs
@@ -7,7 +7,6 @@
 
 using JavaScriptEngineSwitcher.ChakraCore;
 using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;
-using JavaScriptEngineSwitcher.Jint;
 using JavaScriptEngineSwitcher.Msie;
 using JavaScriptEngineSwitcher.NiL;
 using JavaScriptEngineSwitcher.Sample.Logic.Services;
@@ -55,7 +54,6 @@ public void ConfigureServices(IServiceCollection services)
 				options.DefaultEngineName = ChakraCoreJsEngine.EngineName
 			)
 				.AddChakraCore()
-				.AddJint()
 				.AddMsie(options =>
 				{
 					options.EngineMode = JsEngineMode.ChakraIeJsRt;
diff --git a/src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj b/src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj
@@ -3,15 +3,17 @@
 	<PropertyGroup>
 		<Product>JS Engine Switcher: Jint</Product>
 		<VersionPrefix>3.1.0</VersionPrefix>
-		<TargetFrameworks>net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<NoWarn>$(NoWarn);CS1591;NU5125</NoWarn>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
-		<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.11.58).</Description>
+		<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1598).</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;Jint</PackageTags>
+		<PackageReleaseNotes>1. Jint was updated to version 3.0.0 Beta 1598;
+2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />
@@ -21,7 +23,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-		<PackageReference Include="Jint" Version="2.11.58" />
+		<PackageReference Include="Esprima" Version="1.0.0-beta-1202" />
+		<PackageReference Include="Jint" Version="3.0.0-beta-1598" />
 
 		<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
 	</ItemGroup>
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs b/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs
@@ -2,14 +2,15 @@
 using System.Collections.Generic;
 using System.Text;
 
+using Jint;
 using IOriginalCallable = Jint.Native.ICallable;
 using OriginalEngine = Jint.Engine;
 using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
 using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
-using OriginalParser = Jint.Parser.JavaScriptParser;
-using OriginalParserException = Jint.Parser.ParserException;
-using OriginalParserOptions = Jint.Parser.ParserOptions;
-using OriginalProgram = Jint.Parser.Ast.Program;
+using OriginalParser = Esprima.JavaScriptParser;
+using OriginalParserException = Esprima.ParserException;
+using OriginalParserOptions = Esprima.ParserOptions;
+using OriginalProgram = Esprima.Ast.Program;
 using OriginalRecursionDepthOverflowException = Jint.Runtime.RecursionDepthOverflowException;
 using OriginalStatementsCountOverflowException = Jint.Runtime.StatementsCountOverflowException;
 using OriginalTypeReference = Jint.Runtime.Interop.TypeReference;
@@ -45,7 +46,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "2.11.58";
+		private const string EngineVersion = "3.0.0 Beta 1598";
 
 		/// <summary>
 		/// Jint JS engine
@@ -103,6 +104,18 @@ public JintJsEngine(JintSettings settings)
 		}
 
 
+		private OriginalParserOptions CreateParserOptions(string source)
+		{
+			var parserOptions = new OriginalParserOptions(source)
+			{
+				AdaptRegexp = true,
+				Tolerant = true,
+				Loc = true
+			};
+
+			return parserOptions;
+		}
+
 		#region Mapping
 
 		/// <summary>
@@ -151,7 +164,7 @@ private static WrapperCompilationException WrapParserException(OriginalParserExc
 		{
 			string description = originalParserException.Description;
 			string type = JsErrorType.Syntax;
-			string documentName = originalParserException.Source;
+			string documentName = originalParserException.SourceText;
 			int lineNumber = originalParserException.LineNumber;
 			int columnNumber = originalParserException.Column;
 			string message = JsErrorHelpers.GenerateScriptErrorMessage(type, description, documentName, lineNumber,
@@ -319,12 +332,9 @@ protected override IPrecompiledScript InnerPrecompile(string code, string docume
 			{
 				try
 				{
-					var parserOptions = new OriginalParserOptions
-					{
-						Source = uniqueDocumentName
-					};
-					var parser = new OriginalParser();
-					program = parser.Parse(code, parserOptions);
+					var parserOptions = CreateParserOptions(uniqueDocumentName);
+					var parser = new OriginalParser(code, parserOptions);
+					program = parser.ParseProgram();
 				}
 				catch (OriginalParserException e)
 				{
@@ -351,10 +361,7 @@ protected override object InnerEvaluate(string expression, string documentName)
 
 				try
 				{
-					var parserOptions = new OriginalParserOptions
-					{
-						Source = uniqueDocumentName
-					};
+					var parserOptions = CreateParserOptions(uniqueDocumentName);
 					resultValue = _jsEngine.Execute(expression, parserOptions).GetCompletionValue();
 				}
 				catch (OriginalParserException e)
@@ -409,10 +416,7 @@ protected override void InnerExecute(string code, string documentName)
 			{
 				try
 				{
-					var parserOptions = new OriginalParserOptions
-					{
-						Source = uniqueDocumentName
-					};
+					var parserOptions = CreateParserOptions(uniqueDocumentName);
 					_jsEngine.Execute(code, parserOptions);
 				}
 				catch (OriginalParserException e)
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintPrecompiledScript.cs b/src/JavaScriptEngineSwitcher.Jint/JintPrecompiledScript.cs
@@ -1,4 +1,4 @@
-﻿using OriginalProgram = Jint.Parser.Ast.Program;
+﻿using OriginalProgram = Esprima.Ast.Program;
 
 using JavaScriptEngineSwitcher.Core;
 
diff --git a/src/JavaScriptEngineSwitcher.Jint/readme.txt b/src/JavaScriptEngineSwitcher.Jint/readme.txt
@@ -12,7 +12,13 @@
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
-   Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.11.58).
+   Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1598).
+
+   =============
+   RELEASE NOTES
+   =============
+   1. Jint was updated to version 3.0.0 Beta 1598;
+   2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.
 
    =============
    DOCUMENTATION
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -22,7 +22,6 @@
 
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
-		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
@@ -34,6 +33,7 @@
 		<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x64" Version="3.1.5" />
 		<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x86" Version="3.1.5" />
 
+		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
 	</ItemGroup>
@@ -50,6 +50,7 @@
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
 
+		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
 		<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
 	</ItemGroup>
 
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NETCOREAPP1_0
+using System;
 
 using Xunit;
 
@@ -393,4 +394,5 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/Es5Tests.cs b/test/JavaScriptEngineSwitcher.Tests/Jint/Es5Tests.cs
@@ -1,4 +1,5 @@
-﻿using Xunit;
+﻿#if !NETCOREAPP1_0
+using Xunit;
 
 namespace JavaScriptEngineSwitcher.Tests.Jint
 {
@@ -56,4 +57,5 @@ public override void ObjectKeysMethodIsSupported()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NETCOREAPP1_0
+using System;
 using System.IO;
 
 using Xunit;
@@ -263,4 +264,5 @@ public void MappingHostErrorDuringRecursiveExecutionOfFilesIsCorrect()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/MultithreadingTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jint/MultithreadingTests.cs
@@ -1,4 +1,5 @@
-﻿namespace JavaScriptEngineSwitcher.Tests.Jint
+﻿#if !NETCOREAPP1_0
+namespace JavaScriptEngineSwitcher.Tests.Jint
 {
 	public class MultithreadingTests : MultithreadingTestsBase
 	{
@@ -7,4 +8,5 @@ protected override string EngineName
 			get { return "JintJsEngine"; }
 		}
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jint/PrecompilationTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jint/PrecompilationTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NETCOREAPP1_0
+using System;
 
 using Xunit;
 
@@ -55,11 +56,11 @@ function s4() {
 			Assert.Null(precompiledScript);
 			Assert.NotNull(exception);
 			Assert.Equal("Compilation error", exception.Category);
-			Assert.Equal("Unexpected token ;", exception.Description);
+			Assert.Equal("Unexpected token }", exception.Description);
 			Assert.Equal("SyntaxError", exception.Type);
 			Assert.Equal("guid.js", exception.DocumentName);
-			Assert.Equal(6, exception.LineNumber);
-			Assert.Equal(4, exception.ColumnNumber);
+			Assert.Equal(7, exception.LineNumber);
+			Assert.Equal(2, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
 		}
 
@@ -129,8 +130,8 @@ public void GenerationOfCompilationErrorMessageIsCorrect()
 
 	return result;
 }";
-			string targetOutput = "SyntaxError: Illegal return statement" + Environment.NewLine +
-				"   at make-id.js:11:8"
+			string targetOutput = "SyntaxError: Unexpected token }" + Environment.NewLine +
+				"   at make-id.js:12:1"
 				;
 
 			IPrecompiledScript precompiledScript = null;
@@ -199,4 +200,5 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 
 		#endregion
 	}
-}
+}
+#endif
diff --git a/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs b/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs
@@ -5,8 +5,8 @@
 using JavaScriptEngineSwitcher.ChakraCore;
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Core.Utilities;
-using JavaScriptEngineSwitcher.Jint;
 #if !NETCOREAPP1_0
+using JavaScriptEngineSwitcher.Jint;
 using JavaScriptEngineSwitcher.Jurassic;
 #endif
 using JavaScriptEngineSwitcher.Msie;
@@ -33,8 +33,8 @@ public static void Initialize()
 #endif
 				JsEngineSwitcher.Current.EngineFactories
 					.AddChakraCore()
-					.AddJint()
 #if !NETCOREAPP1_0
+					.AddJint()
 					.AddJurassic()
 #endif
 					.AddMsie(new MsieSettings

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using JavaScriptEngineSwitcher.ChakraCore;`
`2`	`2`	`using JavaScriptEngineSwitcher.Core;`
`3`		`-using JavaScriptEngineSwitcher.Jint;`
`4`	`3`	`using JavaScriptEngineSwitcher.Jurassic;`
`5`	`4`	`using JavaScriptEngineSwitcher.Msie;`
`6`	`5`	`using JavaScriptEngineSwitcher.NiL;`
`@@ -14,7 +13,6 @@ public static void Configure(IJsEngineSwitcher engineSwitcher)`
`14`	`13`	`{`
`15`	`14`	`engineSwitcher.EngineFactories`
`16`	`15`	`.AddChakraCore()`
`17`		`- .AddJint()`
`18`	`16`	`.AddJurassic()`
`19`	`17`	`.AddMsie(new MsieSettings`
`20`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`using JavaScriptEngineSwitcher.ChakraCore;`
`9`	`9`	`using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;`
`10`		`-using JavaScriptEngineSwitcher.Jint;`
`11`	`10`	`using JavaScriptEngineSwitcher.Msie;`
`12`	`11`	`using JavaScriptEngineSwitcher.NiL;`
`13`	`12`	`using JavaScriptEngineSwitcher.Sample.Logic.Services;`
`@@ -55,7 +54,6 @@ public void ConfigureServices(IServiceCollection services)`
`55`	`54`	`options.DefaultEngineName = ChakraCoreJsEngine.EngineName`
`56`	`55`	`)`
`57`	`56`	`.AddChakraCore()`
`58`		`- .AddJint()`
`59`	`57`	`.AddMsie(options =>`
`60`	`58`	`{`
`61`	`59`	`options.EngineMode = JsEngineMode.ChakraIeJsRt;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using OriginalProgram = Jint.Parser.Ast.Program;`
	`1`	`+using OriginalProgram = Esprima.Ast.Program;`
`2`	`2`
`3`	`3`	`using JavaScriptEngineSwitcher.Core;`
`4`	`4`