In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of March 19, 2021

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj

@@ -16,15 +16,14 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of August 3, 2020).</Description>
+    <Description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of March 19, 2021).</Description>
     <PackageTags>$(PackageCommonTags);Jurassic</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jurassic_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>1. Jurassic was updated to version of August 3, 2020;
-2. In configuration settings of the Jurassic JS engine was added one new non-standard property - `EnableHostCollectionsEmbeddingByValue` (default `false`).</PackageReleaseNotes>
+    <PackageReleaseNotes>Jurassic was updated to version of March 19, 2021.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jurassic.Unofficial" Version="2020.8.3.1" />
+    <PackageReference Include="Jurassic.Unofficial" Version="2021.3.19" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs

@@ -43,7 +43,7 @@ public sealed class JurassicJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "Aug 3, 2020";
+		private const string EngineVersion = "Mar 19, 2021";
 
 		/// <summary>
 		/// Jurassic JS engine
@@ -187,24 +187,23 @@ private static WrapperCompilationException WrapSyntaxException(
 			return wrapperCompilationException;
 		}
 
-		private static WrapperException WrapJavaScriptException(
+		private WrapperException WrapJavaScriptException(
 			OriginalJavaScriptException originalJavaScriptException)
 		{
 			WrapperException wrapperException;
 			string message = originalJavaScriptException.Message;
 			string messageWithCallStack = string.Empty;
-			string description = message;
-			string type = originalJavaScriptException.Name;
+			string description = originalJavaScriptException.ErrorMessage;
+			string type = originalJavaScriptException.ErrorType.ToString();
 			string documentName = originalJavaScriptException.SourcePath ?? string.Empty;
 			int lineNumber = originalJavaScriptException.LineNumber;
 			string callStack = string.Empty;
 
-			var errorValue = originalJavaScriptException.ErrorObject as OriginalErrorInstance;
+			object errorObject = originalJavaScriptException.GetErrorObject(_jsEngine);
+			var errorValue = errorObject as OriginalErrorInstance;
 			if (errorValue != null)
 			{
 				messageWithCallStack = errorValue.Stack;
-				description = !string.IsNullOrEmpty(errorValue.Message) ?
-					errorValue.Message : description;
 			}
 
 			if (!string.IsNullOrEmpty(type))

src/JavaScriptEngineSwitcher.Jurassic/readme.txt

@@ -5,23 +5,20 @@
 
    --------------------------------------------------------------------------------
 
-      Copyright (c) 2013-2019 Andrey Taritsyn - http://www.taritsyn.ru
+      Copyright (c) 2013-2021 Andrey Taritsyn - http://www.taritsyn.ru
 
 
    ===========
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper
    for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic)
-   version of August 3, 2020).
+   version of March 19, 2021).
 
    =============
    RELEASE NOTES
    =============
-   1. Jurassic was updated to version of August 3, 2020;
-   2. In configuration settings of the Jurassic JS engine was added one new
-      non-standard property - `EnableHostCollectionsEmbeddingByValue` (default
-      `false`).
+   Jurassic was updated to version of March 19, 2021.
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Jurassic/CommonTests.cs

@@ -81,7 +81,7 @@ public void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
 			// Assert
 			Assert.NotNull(exception);
 			Assert.Equal("Runtime error", exception.Category);
-			Assert.Equal("variable2 is not defined", exception.Description);
+			Assert.Equal("variable2 is not defined.", exception.Description);
 			Assert.Equal("ReferenceError", exception.Type);
 			Assert.Equal("variables.js", exception.DocumentName);
 			Assert.Equal(5, exception.LineNumber);
@@ -230,10 +230,8 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 
 	foo(a, b);
 })(foo);";
-			string targetOutput = "ReferenceError: bar is not defined" + Environment.NewLine +
-				"   at foo (functions.js:4)" + Environment.NewLine +
-				"   at Anonymous function (functions.js:12)" + Environment.NewLine +
-				"   at Global code (functions.js:8)"
+			string targetOutput = "ReferenceError: bar is not defined." + Environment.NewLine +
+				"   at Global code (functions.js:4)"
 				;
 
 			JsRuntimeException exception = null;

test/JavaScriptEngineSwitcher.Tests/Jurassic/Es5Tests.cs

@@ -29,7 +29,7 @@ public override void ObjectKeysMethodIsSupported()
 myObj.foo = 1;
 ";
 			const string input4B = "Object.keys(myObj).toString();";
-			const string targetOutput4 = "displayName,foo";
+			const string targetOutput4 = "foo";
 
 			// Act
 			string output1;

test/JavaScriptEngineSwitcher.Tests/Jurassic/PrecompilationTests.cs

@@ -107,9 +107,7 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
 			Assert.Equal(0, exception.ColumnNumber);
 			Assert.Empty(exception.SourceFragment);
 			Assert.Equal(
-				"   at getItem (get-item.js:2)" + Environment.NewLine +
-				"   at Anonymous function (get-item.js:9)" + Environment.NewLine +
-				"   at Global code (get-item.js:7)",
+				"   at getItem (get-item.js:2)",
 				exception.CallStack
 			);
 		}
@@ -176,10 +174,8 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
 
 	return getFullName(firstName, lastName);
 })(getFullName);";
-			string targetOutput = "ReferenceError: middleName is not defined" + Environment.NewLine +
-				"   at getFullName (get-full-name.js:2)" + Environment.NewLine +
-				"   at Anonymous function (get-full-name.js:12)" + Environment.NewLine +
-				"   at Global code (get-full-name.js:7)"
+			string targetOutput = "ReferenceError: middleName is not defined." + Environment.NewLine +
+				"   at Global code (get-full-name.js:2)"
 				;
 
 			JsRuntimeException exception = null;