In JavaScriptEngineSwitcher.Yantra added support for the YantraJS version 1.2.218

Author: Taritsyn

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.303"
+    "version": "8.0.400"
   }
 }

src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj

@@ -19,11 +19,11 @@
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Yantra_Logo128x128.png</PackageIconFullPath>
     <Description>JavaScriptEngineSwitcher.Yantra contains a `YantraJsEngine` adapter (wrapper for the YantraJS).</Description>
     <PackageTags>$(PackageCommonTags);Yantra;YantraJS</PackageTags>
-    <PackageReleaseNotes>YantraJS was updated to version 1.2.209.</PackageReleaseNotes>
+    <PackageReleaseNotes>YantraJS was updated to version 1.2.218.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YantraJS.Core" Version="1.2.209" />
+    <PackageReference Include="YantraJS.Core" Version="1.2.218" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Yantra/PACKAGE-DESCRIPTION.md

@@ -1 +1 @@
-JavaScriptEngineSwitcher.Yantra contains a `YantraJsEngine` adapter (wrapper for the [YantraJS](https://yantrajs.com) version 1.2.209).
+JavaScriptEngineSwitcher.Yantra contains a `YantraJsEngine` adapter (wrapper for the [YantraJS](https://yantrajs.com) version 1.2.218).

src/JavaScriptEngineSwitcher.Yantra/YantraJsEngine.cs

@@ -12,6 +12,7 @@
 using OriginalClrType = YantraJS.Core.Clr.ClrType;
 using OriginalContext = YantraJS.Core.JSContext;
 using OriginalDate = YantraJS.Core.JSDate;
+using OriginalError = YantraJS.Core.JSError;
 using OriginalException = YantraJS.Core.JSException;
 using OriginalFunction = YantraJS.Core.JSFunction;
 using OriginalJsonObject = YantraJS.Core.JSJSON;
@@ -21,6 +22,7 @@
 
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Core.Constants;
+using JavaScriptEngineSwitcher.Core.Extensions;
 using JavaScriptEngineSwitcher.Core.Helpers;
 using JavaScriptEngineSwitcher.Core.Utilities;
 
@@ -47,7 +49,7 @@ public sealed class YantraJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "1.2.209";
+		private const string EngineVersion = "1.2.218";
 
 		/// <summary>
 		/// Regular expression for working with the error message
@@ -305,11 +307,11 @@ private WrapperException WrapJsException(OriginalException originalException)
 			int columnNumber = 0;
 			ErrorLocationItem[] callStackItems = null;
 
-			OriginalValue errorValue = originalException.Error;
+			var errorValue = originalException.Error as OriginalError;
 			if (errorValue != null)
 			{
-				message = errorValue.ToString();
-				Match messageMatch = _errorMessageRegex.Match(message);
+				string messageWithType = errorValue.ToString();
+				Match messageMatch = _errorMessageRegex.Match(messageWithType);
 
 				if (messageMatch.Success)
 				{
@@ -322,7 +324,20 @@ private WrapperException WrapJsException(OriginalException originalException)
 						int.Parse(messageGroups["columnNumber"].Value) : 0;
 				}
 
-				string rawCallStack = errorValue["stack"].AsStringOrDefault();
+				string rawCallStack;
+
+				if (type == JsErrorType.Syntax)
+				{
+					rawCallStack = originalException.JSStackTrace.AsStringOrDefault();
+				}
+				else
+				{
+					string messageWithTypeAndCallStack = errorValue.Stack ?? errorValue["stack"].AsStringOrDefault();
+					rawCallStack = messageWithTypeAndCallStack
+						.TrimStart(messageWithType)
+						.TrimStart(new char[] { '\n', '\r' })
+						;
+				}
 
 				callStackItems = YantraJsErrorHelpers.ParseErrorLocation(rawCallStack);
 				callStackItems = YantraJsErrorHelpers.FilterErrorLocationItems(callStackItems);

src/JavaScriptEngineSwitcher.Yantra/readme.txt

@@ -12,12 +12,12 @@
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.Yantra contains a `YantraJsEngine` adapter (wrapper for the
-   YantraJS (https://yantrajs.com) version 1.2.209).
+   YantraJS (https://yantrajs.com) version 1.2.218).
 
    =============
    RELEASE NOTES
    =============
-   YantraJS was updated to version 1.2.209.
+   YantraJS was updated to version 1.2.218.
 
    =============
    DOCUMENTATION