In JavaScriptEngineSwitcher.Yantra added support of YantraJS version 1.2.129

Author: Taritsyn

src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj

@@ -14,13 +14,13 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Yantra contains adapter `YantraJsEngine` (wrapper for the Yantra JavaScript Engine (https://yantrajs.com) version 1.2.121).</Description>
+    <Description>JavaScriptEngineSwitcher.Yantra contains adapter `YantraJsEngine` (wrapper for the Yantra JavaScript Engine (https://yantrajs.com) version 1.2.129).</Description>
     <PackageTags>$(PackageCommonTags);Yantra;YantraJS</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Yantra_Logo128x128.png</PackageIconFullPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YantraJS.Core" Version="1.2.121" />
+    <PackageReference Include="YantraJS.Core" Version="1.2.129" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>

src/JavaScriptEngineSwitcher.Yantra/YantraJsEngine.cs

@@ -47,7 +47,7 @@ public sealed class YantraJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "1.2.121";
+		private const string EngineVersion = "1.2.129";
 
 		/// <summary>
 		/// Regular expression for working with the error message
@@ -148,7 +148,7 @@ private static OriginalValue[] MapToScriptType(object[] args)
 		/// <returns>The mapped value</returns>
 		private static object MapToHostType(OriginalValue value)
 		{
-			object result;
+			object result = value;
 
 			if (value.IsNull)
 			{
@@ -170,24 +170,23 @@ private static object MapToHostType(OriginalValue value)
 			{
 				result = value.ToString();
 			}
-			else if (value is OriginalDate)
-			{
-				var jsDate = (OriginalDate)value;
-				result = jsDate.DateTime;
-			}
-			else if (value is OriginalClrProxy)
-			{
-				var clrProxy = (OriginalClrProxy)value;
-				result = clrProxy.Target;
-			}
-			else if (value is OriginalClrType)
+			else if (value.IsFunction && value is OriginalClrType)
 			{
 				var clrType = (OriginalClrType)value;
 				result = clrType.Type;
 			}
-			else
+			else if (value.IsObject)
 			{
-				result = value;
+				if (value is OriginalDate)
+				{
+					var jsDate = (OriginalDate)value;
+					result = jsDate.DateTime;
+				}
+				else if (value is OriginalClrProxy)
+				{
+					var clrProxy = (OriginalClrProxy)value;
+					result = clrProxy.Target;
+				}
 			}
 
 			return result;
@@ -396,16 +395,16 @@ private void OnConsoleWrite(OriginalContext context, string type, in OriginalArg
 
 				if (processedArg is OriginalValue)
 				{
-					if (arg.IsFunction)
+					if (arg.IsSymbol)
 					{
-						var jsFunction = (OriginalFunction)arg;
-						processedArg = string.Format("[Function: {0}]", jsFunction.name);
+						processedArg = string.Format("Symbol({0})", arg.ToString());
 					}
-					else if (arg.IsSymbol)
+					else if (arg.IsFunction)
 					{
-						processedArg = string.Format("Symbol({0})", arg.ToString());
+						var jsFunction = (OriginalFunction)arg;
+						processedArg = string.Format("[Function: {0}]", jsFunction.name);
 					}
-					else if (arg.IsObject || arg.IsArray)
+					else if (arg.IsObject)
 					{
 						processedArg = OriginalJsonObject.Stringify(arg);
 					}

src/JavaScriptEngineSwitcher.Yantra/readme.txt

@@ -12,7 +12,7 @@
    DESCRIPTION
    ===========
    JavaScriptEngineSwitcher.Yantra contains adapter `YantraJsEngine` (wrapper for the
-   Yantra JavaScript Engine (https://yantrajs.com) version 1.2.121).
+   Yantra JavaScript Engine (https://yantrajs.com) version 1.2.129).
 
    =============
    DOCUMENTATION