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

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/CustomCancellationConstraint.cs

@@ -0,0 +1,36 @@
+using System.Threading;
+
+using OriginalConstraint = Jint.Constraint;
+using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException;
+
+namespace JavaScriptEngineSwitcher.Jint
+{
+	internal class CustomCancellationConstraint : OriginalConstraint
+	{
+		private CancellationToken _cancellationToken;
+
+
+		public CustomCancellationConstraint(CancellationToken cancellationToken)
+		{
+			_cancellationToken = cancellationToken;
+		}
+
+
+		public override void Check()
+		{
+			if (_cancellationToken.IsCancellationRequested)
+			{
+				throw new OriginalExecutionCanceledException();
+			}
+		}
+
+		public void Reset(CancellationToken cancellationToken)
+		{
+			_cancellationToken = cancellationToken;
+		}
+
+		public override void Reset()
+		{
+		}
+	}
+}

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -18,15 +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 2040).</Description>
+    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 2041).</Description>
     <PackageTags>$(PackageCommonTags);Jint</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>Now only one instance of JS parser per engine is used during pre-compilation of scripts.</PackageReleaseNotes>
+    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 2041.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-2040" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2041" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -3,7 +3,6 @@
 
 using Jint;
 using IOriginalPrimitiveInstance = Jint.Native.IPrimitiveInstance;
-using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint;
 using OriginalDebuggerEventHandler = Jint.Runtime.Debugger.DebugHandler.DebugEventHandler;
 using OriginalDebuggerStatementHandlingMode = Jint.Runtime.Debugger.DebuggerStatementHandling;
 using OriginalEngine = Jint.Engine;
@@ -13,9 +12,7 @@
 using OriginalMemoryLimitExceededException = Jint.Runtime.MemoryLimitExceededException;
 using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
 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,19 +49,13 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "3.0.0 Beta 2040";
+		private const string EngineVersion = "3.0.0 Beta 2041";
 
 		/// <summary>
 		/// Jint JS engine
 		/// </summary>
 		private OriginalEngine _jsEngine;
 
-		/// <summary>
-		/// Esprima .NET JS parser
-		/// </summary>
-		/// <remarks>Used for pre-compilation of scripts.</remarks>
-		private OriginalParser _jsParser;
-
 		/// <summary>
 		/// Token source for canceling of script execution
 		/// </summary>
@@ -73,7 +64,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Constraint for canceling of script execution
 		/// </summary>
-		private OriginalCancellationConstraint _cancellationConstraint;
+		private CustomCancellationConstraint _cancellationConstraint;
 
 		/// <summary>
 		/// Debugger break callback
@@ -90,11 +81,6 @@ public sealed class JintJsEngine : JsEngineBase
 		/// </summary>
 		private readonly object _executionSynchronizer = new object();
 
-		/// <summary>
-		/// Synchronizer of script pre-compilation
-		/// </summary>
-		private readonly object _precompilationSynchronizer = new object();
-
 		/// <summary>
 		/// Unique document name manager
 		/// </summary>
@@ -116,7 +102,7 @@ public JintJsEngine()
 		public JintJsEngine(JintSettings settings)
 		{
 			_cancellationTokenSource = new CancellationTokenSource();
-			_cancellationConstraint = new OriginalCancellationConstraint(_cancellationTokenSource.Token);
+			_cancellationConstraint = new CustomCancellationConstraint(_cancellationTokenSource.Token);
 
 			JintSettings jintSettings = settings ?? new JintSettings();
 			_debuggerBreakCallback = jintSettings.DebuggerBreakCallback;
@@ -128,7 +114,7 @@ public JintJsEngine(JintSettings settings)
 			{
 				_jsEngine = new OriginalEngine(options => {
 					options
-						.WithoutConstraint(c => c is OriginalCancellationConstraint)
+						.WithoutConstraint(c => c is CustomCancellationConstraint)
 						.Constraint(_cancellationConstraint)
 						.DebuggerStatementHandling(debuggerStatementHandlingMode)
 						.DebugMode(jintSettings.EnableDebugging)
@@ -206,7 +192,7 @@ private static WrapperCompilationException WrapParserException(OriginalParserExc
 		{
 			string description = originalParserException.Description;
 			string type = JsErrorType.Syntax;
-			string documentName = originalParserException.SourceText;
+			string documentName = originalParserException.SourceLocation ?? string.Empty;
 			int lineNumber = originalParserException.LineNumber;
 			int columnNumber = originalParserException.Column;
 			string message = JsErrorHelpers.GenerateScriptErrorMessage(type, description, documentName, lineNumber,
@@ -363,21 +349,13 @@ protected override IPrecompiledScript InnerPrecompile(string code, string docume
 			OriginalParsedScript parsedScript;
 			string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
 
-			lock (_precompilationSynchronizer)
+			try
 			{
-				if (_jsParser == null)
-				{
-					_jsParser = new OriginalParser(OriginalParserOptions.Default);
-				}
-
-				try
-				{
-					parsedScript = _jsParser.ParseScript(code, uniqueDocumentName);
-				}
-				catch (OriginalParserException e)
-				{
-					throw WrapParserException(e);
-				}
+				parsedScript = OriginalEngine.PrepareScript(code, uniqueDocumentName);
+			}
+			catch (OriginalParserException e)
+			{
+				throw WrapParserException(e);
 			}
 
 			return new JintPrecompiledScript(parsedScript);
@@ -725,7 +703,6 @@ public override void Dispose()
 						_jsEngine = null;
 					}
 
-					_jsParser = null;
 					_debuggerStepCallback = null;
 					_debuggerBreakCallback = null;
 					_cancellationConstraint = null;

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -13,13 +13,12 @@
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
    Jint JavaScript Engine (http://github.com/sebastienros/jint) version
-   3.0.0 Beta 2040).
+   3.0.0 Beta 2041).
 
    =============
    RELEASE NOTES
    =============
-   Now only one instance of JS parser per engine is used during pre-compilation of
-   scripts.
+   Jint was updated to version 3.0.0 Beta 2041.
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs

@@ -88,7 +88,7 @@ public void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
 			Assert.Equal("ReferenceError", exception.Type);
 			Assert.Equal("variables.js", exception.DocumentName);
 			Assert.Equal(5, exception.LineNumber);
-			Assert.Equal(1, exception.ColumnNumber);
+			Assert.Equal(15, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
 			Assert.Equal("   at Global code (variables.js:5:15)", exception.CallStack);
 		}

test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs

@@ -171,7 +171,7 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
 			Assert.Equal("ReferenceError", exception.Type);
 			Assert.Equal("math.js", exception.DocumentName);
 			Assert.Equal(10, exception.LineNumber);
-			Assert.Equal(4, exception.ColumnNumber);
+			Assert.Equal(14, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
 			Assert.Equal(
 				"   at sum (math.js:10:14)" + Environment.NewLine +