In JavaScriptEngineSwitcher.Yantra added support for the YantraJS version 1.2.342

Author: Taritsyn

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.334.</PackageReleaseNotes>
+    <PackageReleaseNotes>YantraJS was updated to version 1.2.342.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YantraJS.Core" Version="1.2.334" />
+    <PackageReference Include="YantraJS.Core" Version="1.2.342" />
 
     <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://github.com/yantrajs/yantra) version 1.2.334).
+JavaScriptEngineSwitcher.Yantra contains a `YantraJsEngine` adapter (wrapper for the [YantraJS](https://github.com/yantrajs/yantra) version 1.2.342).

src/JavaScriptEngineSwitcher.Yantra/YantraJsEngine.cs

@@ -54,7 +54,7 @@ public sealed class YantraJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "1.2.334";
+		private const string EngineVersion = "1.2.342";
 
 		/// <summary>
 		/// Regular expression for working with the error message
@@ -332,7 +332,7 @@ private WrapperException WrapJsException(OriginalException originalException)
 				string messageWithCallStack = type == JsErrorType.Syntax ?
 					originalException.JSStackTrace.AsStringOrDefault()
 					:
-					errorValue.Stack ?? errorValue[OriginalKeyString.stack].AsStringOrDefault()
+					errorValue[OriginalKeyString.stack].AsStringOrDefault()
 					;
 				string rawCallStack = GetRawCallStack(message, messageWithType, messageWithCallStack);
 
@@ -395,8 +395,18 @@ private WrapperException WrapJsException(OriginalException originalException)
 
 		private static string GetRawCallStack(string message, string messageWithType, string messageWithCallStack)
 		{
-			string baseMessage = messageWithCallStack.StartsWith(messageWithType) ? messageWithType : message;
-			string rawCallStack = JsErrorHelpers.GetErrorLocationFromMessage(messageWithCallStack, baseMessage);
+			const string errorFunctionTypePrefix = "Function: ";
+			string processedMessageWithCallStack = messageWithCallStack;
+
+			if (messageWithCallStack.StartsWith(errorFunctionTypePrefix))
+			{
+				processedMessageWithCallStack = messageWithCallStack.Substring(errorFunctionTypePrefix.Length);
+			}
+
+			string baseMessage = processedMessageWithCallStack.StartsWith(messageWithType) ?
+				messageWithType : message;
+			string rawCallStack = JsErrorHelpers.GetErrorLocationFromMessage(processedMessageWithCallStack,
+				baseMessage);
 
 			return rawCallStack;
 		}

src/JavaScriptEngineSwitcher.Yantra/readme.txt

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