In JavaScriptEngineSwitcher.Yantra added support for the YantraJS version 1.2.334

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

src/JavaScriptEngineSwitcher.Yantra/YantraJsEngine.cs

@@ -21,13 +21,13 @@
 using OriginalException = YantraJS.Core.JSException;
 using OriginalFunction = YantraJS.Core.JSFunction;
 using OriginalJsonObject = YantraJS.Core.JSJSON;
+using OriginalKeyString = YantraJS.Core.KeyString;
 using OriginalTypeConverter = YantraJS.Utils.TypeConverter;
 using OriginalUndefined = YantraJS.Core.JSUndefined;
 using OriginalValue = YantraJS.Core.JSValue;
 
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Core.Constants;
-using JavaScriptEngineSwitcher.Core.Extensions;
 using JavaScriptEngineSwitcher.Core.Helpers;
 using JavaScriptEngineSwitcher.Core.Utilities;
 
@@ -54,7 +54,7 @@ public sealed class YantraJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "1.2.316";
+		private const string EngineVersion = "1.2.334";
 
 		/// <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["stack"].AsStringOrDefault()
+					errorValue.Stack ?? errorValue[OriginalKeyString.stack].AsStringOrDefault()
 					;
 				string rawCallStack = GetRawCallStack(message, messageWithType, messageWithCallStack);
 
@@ -483,13 +483,15 @@ private OriginalValue InnerEvaluateWithoutResultConversion(string expression, st
 		private OriginalValue InnerCallFunctionWithoutResultConversion(string functionName, params object[] args)
 		{
 			OriginalValue resultValue;
+			OriginalKeyString functionKeyName = functionName.ToKeyString();
 			OriginalValue[] processedArgs = MapToScriptType(args);
 
 			try
 			{
 				lock (_executionSynchronizer)
 				{
-					resultValue = _jsContext.InvokeMethod(functionName, new OriginalArguments(_jsContext, processedArgs));
+					resultValue = _jsContext.InvokeMethod(functionKeyName,
+						new OriginalArguments(_jsContext, processedArgs));
 				}
 			}
 			catch (OriginalException e)
@@ -515,12 +517,13 @@ private OriginalValue InnerCallFunctionWithoutResultConversion(string functionNa
 		private OriginalValue InnerGetVariableValueWithoutResultConversion(string variableName)
 		{
 			OriginalValue variableValue;
+			OriginalKeyString variableKeyName = variableName.ToKeyString();
 
 			try
 			{
 				lock (_executionSynchronizer)
 				{
-					variableValue = _jsContext[variableName];
+					variableValue = _jsContext[variableKeyName];
 				}
 			}
 			catch (OriginalException e)
@@ -625,10 +628,11 @@ protected override bool InnerHasVariable(string variableName)
 			try
 			{
 				OriginalValue variableValue;
+				OriginalKeyString variableKeyName = variableName.ToKeyString();
 
 				lock (_executionSynchronizer)
 				{
-					variableValue = _jsContext[variableName];
+					variableValue = _jsContext[variableKeyName];
 				}
 
 				result = !variableValue.IsUndefined;
@@ -659,13 +663,14 @@ protected override T InnerGetVariableValue<T>(string variableName)
 
 		protected override void InnerSetVariableValue(string variableName, object value)
 		{
+			OriginalKeyString variableKeyName = variableName.ToKeyString();
 			OriginalValue processedValue = MapToScriptType(value);
 
 			try
 			{
 				lock (_executionSynchronizer)
 				{
-					_jsContext[variableName] = processedValue;
+					_jsContext[variableKeyName] = processedValue;
 				}
 			}
 			catch (OriginalException e)
@@ -676,11 +681,13 @@ protected override void InnerSetVariableValue(string variableName, object value)
 
 		protected override void InnerRemoveVariable(string variableName)
 		{
+			OriginalKeyString variableKeyName = variableName.ToKeyString();
+
 			try
 			{
 				lock (_executionSynchronizer)
 				{
-					_jsContext.Delete(variableName);
+					_jsContext.Delete(variableKeyName);
 				}
 			}
 			catch (OriginalException e)
@@ -691,7 +698,9 @@ protected override void InnerRemoveVariable(string variableName)
 
 		protected override void InnerEmbedHostObject(string itemName, object value)
 		{
+			OriginalKeyString itemKeyName = itemName.ToKeyString();
 			OriginalValue processedValue;
+
 			if (value is Delegate)
 			{
 				processedValue = CreateEmbeddedFunction((Delegate)value);
@@ -705,8 +714,7 @@ protected override void InnerEmbedHostObject(string itemName, object value)
 			{
 				lock (_executionSynchronizer)
 				{
-					_jsContext[itemName] = processedValue;
-
+					_jsContext[itemKeyName] = processedValue;
 				}
 			}
 			catch (OriginalException e)
@@ -717,13 +725,14 @@ protected override void InnerEmbedHostObject(string itemName, object value)
 
 		protected override void InnerEmbedHostType(string itemName, Type type)
 		{
+			OriginalKeyString itemKeyName = itemName.ToKeyString();
 			OriginalValue processedValue = OriginalClrType.From(type);
 
 			try
 			{
 				lock (_executionSynchronizer)
 				{
-					_jsContext[itemName] = processedValue;
+					_jsContext[itemKeyName] = processedValue;
 				}
 			}
 			catch (OriginalException e)

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.316).
+   YantraJS (https://github.com/yantrajs/yantra) version 1.2.334).
 
    =============
    RELEASE NOTES
    =============
-   YantraJS was updated to version 1.2.316.
+   YantraJS was updated to version 1.2.334.
 
    =============
    DOCUMENTATION