In JavaScriptEngineSwitcher.Yantra added support of YantraJS version 1.2.143

Author: Taritsyn

src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj

@@ -14,13 +14,14 @@
   <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.129).</Description>
+    <Description>JavaScriptEngineSwitcher.Yantra contains adapter `YantraJsEngine` (wrapper for the Yantra JavaScript Engine (https://yantrajs.com) version 1.2.143).</Description>
     <PackageTags>$(PackageCommonTags);Yantra;YantraJS</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Yantra_Logo128x128.png</PackageIconFullPath>
+    <PackageReleaseNotes>YantraJS was updated to version 1.2.143.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YantraJS.Core" Version="1.2.129" />
+    <PackageReference Include="YantraJS.Core" Version="1.2.143" />
 
     <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.129";
+		private const string EngineVersion = "1.2.143";
 
 		/// <summary>
 		/// Regular expression for working with the error message
@@ -172,15 +172,13 @@ private static object MapToHostType(OriginalValue value)
 			}
 			else if (value.IsFunction && value is OriginalClrType)
 			{
-				var clrType = (OriginalClrType)value;
-				result = clrType.Type;
+				result = value.ForceConvert(typeof(Type));
 			}
 			else if (value.IsObject)
 			{
 				if (value is OriginalDate)
 				{
-					var jsDate = (OriginalDate)value;
-					result = jsDate.DateTime;
+					result = value.ForceConvert(typeof(DateTime));
 				}
 				else if (value is OriginalClrProxy)
 				{

src/JavaScriptEngineSwitcher.Yantra/readme.txt

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

test/JavaScriptEngineSwitcher.Tests/Yantra/ConsoleTests.cs

@@ -1,5 +1,6 @@
 #if NET471 || NETCOREAPP3_1_OR_GREATER
 using System;
+using System.Globalization;
 using System.Text;
 
 using Xunit;
@@ -55,7 +56,7 @@ function calculateIncomeTax(salary) {
 console.log('Папа у Васи силен в', favoriteSchoolSubject);
 console.log('Страница в Википедии:', wikipediaPageUrl);";
 			string targetOutput = "undefined null {\"city\":\"Тамбов\",\"street\":\"Магистральная\"," +
-				"\"houseNumber\":\"41к7\",\"apartmentNumber\":115} [\"Мурзик\",\"Шарик\"] True 698426795 22000,82 " +
+				"\"houseNumber\":\"41к7\",\"apartmentNumber\":115} [\"Мурзик\",\"Шарик\"] True 698426795 22000.82 " +
 				"Василий Пупкин Symbol(id) 1990-03-14T21:00:00.0000000Z" + Environment.NewLine +
 				"Функция для расчета подоходного налога: [Function: calculateIncomeTax]" + Environment.NewLine +
 				"Папа у Васи силен в System.Math" + Environment.NewLine +
@@ -198,17 +199,26 @@ public void Log(string type, object[] args)
 						_buffer.Append(" ");
 					}
 
-					object arg = args[argIndex];
-					if (arg is DateTime)
-					{
-						var dateTime = (DateTime)arg;
-						DateTime universalDateTime = dateTime.ToUniversalTime();
+					object arg = args[argIndex] ?? "null";
+					var formattableArg = arg as IFormattable;
 
-						_buffer.Append(universalDateTime.ToString("O"));
+					if (formattableArg != null)
+					{
+						if (formattableArg is DateTime)
+						{
+							var dateTime = (DateTime)formattableArg;
+							DateTime universalDateTime = dateTime.ToUniversalTime();
+
+							_buffer.Append(universalDateTime.ToString("O", CultureInfo.InvariantCulture));
+						}
+						else
+						{
+							_buffer.Append(formattableArg.ToString("G", CultureInfo.InvariantCulture));
+						}
 					}
 					else
 					{
-						_buffer.Append(arg != null ? arg.ToString() : "null");
+						_buffer.Append(arg.ToString());
 					}
 				}