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

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/CustomCancellationConstraint.cs

@@ -10,10 +10,10 @@
     <NoWarn>$(NoWarn);CS1591;NU5104</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 3.0.0 Beta 1828).</Description>
+    <Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1914).</Description>
     <PackageIcon>icon.png</PackageIcon>
     <PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;Jint</PackageTags>
-    <PackageReleaseNotes>Added a ability to interrupt execution of the script.</PackageReleaseNotes>
+    <PackageReleaseNotes>Jint was updated to version 3.0.0 Beta 1914.</PackageReleaseNotes>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-1828" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-1914" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -4,7 +4,9 @@
 
 using Jint;
 using IOriginalPrimitiveInstance = Jint.Native.IPrimitiveInstance;
+using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint;
 using OriginalEngine = Jint.Engine;
+using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException;
 using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
 using OriginalMemoryLimitExceededException = Jint.Runtime.MemoryLimitExceededException;
 using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
@@ -63,7 +65,7 @@ public sealed class JintJsEngine : JsEngineBase
 		/// <summary>
 		/// Constraint for canceling of script execution
 		/// </summary>
-		private CustomCancellationConstraint _cancellationConstraint;
+		private OriginalCancellationConstraint _cancellationConstraint;
 
 		/// <summary>
 		/// Synchronizer of code execution
@@ -91,7 +93,7 @@ public JintJsEngine()
 		public JintJsEngine(JintSettings settings)
 		{
 			_cancellationTokenSource = new CancellationTokenSource();
-			_cancellationConstraint = new CustomCancellationConstraint(_cancellationTokenSource.Token);
+			_cancellationConstraint = new OriginalCancellationConstraint(_cancellationTokenSource.Token);
 
 			JintSettings jintSettings = settings ?? new JintSettings();
 
@@ -100,6 +102,7 @@ public JintJsEngine(JintSettings settings)
 				_jsEngine = new OriginalEngine(options => {
 					options
 						.AllowDebuggerStatement(jintSettings.AllowDebuggerStatement)
+						.WithoutConstraint(c => c is OriginalCancellationConstraint)
 						.Constraint(_cancellationConstraint)
 						.DebugMode(jintSettings.EnableDebugging)
 						.LimitMemory(jintSettings.MemoryLimit)
@@ -301,7 +304,7 @@ private WrapperRuntimeException WrapRuntimeException(OriginalRuntimeException or
 				wrapperRuntimeException = new WrapperRuntimeException(message, EngineName, EngineVersion,
 					originalRuntimeException);
 			}
-			else if (originalRuntimeException is ScriptExecutionCanceledException)
+			else if (originalRuntimeException is OriginalExecutionCanceledException)
 			{
 				_cancellationTokenSource = new CancellationTokenSource();
 				_cancellationConstraint.Reset(_cancellationTokenSource.Token);

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -12,12 +12,13 @@
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
-   Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1828).
+   Jint JavaScript Engine (http://github.com/sebastienros/jint) version
+   3.0.0 Beta 1914).
 
    =============
    RELEASE NOTES
    =============
-   Added a ability to interrupt execution of the script.
+   Jint was updated to version 3.0.0 Beta 1914.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.Jint/ScriptExecutionCanceledException.cs

@@ -101,7 +101,7 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
 			// Assert
 			Assert.NotNull(exception);
 			Assert.Equal("Runtime error", exception.Category);
-			Assert.Equal("items is null", exception.Description);
+			Assert.Equal("Cannot read property 'items' of null", exception.Description);
 			Assert.Equal("TypeError", exception.Type);
 			Assert.Equal("get-item.js", exception.DocumentName);
 			Assert.Equal(2, exception.LineNumber);