fix #310

Author: nilproject

NiL.JS/Extensions/JSValueExtensions.cs

@@ -155,7 +155,7 @@ public static T GetDefinedOr<T>(this JSValue self, T defaultValue)
 
             case TypeCode.Int16:
             {
-                return (T)(object)(Int16)Tools.JSObjectToInt32(self);
+                return (T)(object)(short)Tools.JSObjectToInt32(self);
             }
 
             case TypeCode.Int32:
@@ -170,16 +170,16 @@ public static T GetDefinedOr<T>(this JSValue self, T defaultValue)
 
             case TypeCode.Object:
             {
+                if (self._oValue is not null && typeof(T).IsAssignableFrom(self._oValue.GetType()))
+                    return (T)self._oValue;
+
                 var value = self.Value;
                 if (value is null)
                     return default(T);
 
                 if (value is Function && typeof(Delegate).IsAssignableFrom(typeof(T)))
                     return ((Function)value).MakeDelegate<T>();
 
-                if (typeof(T).IsAssignableFrom(self._oValue.GetType()))
-                    return (T)self._oValue;
-
                 if (typeof(T).IsAssignableFrom(value.GetType()))
                     return (T)value;
 

Tests/Extensions/JSValueExtensionsTests.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NiL.JS.Core;
+using NiL.JS.Extensions;
+
+namespace Tests.Extensions;
+
+[TestClass]
+public class JSValueExtensionsTests
+{
+    public static IEnumerable<object[]> TestData
+    {
+        get
+        {
+            yield return new object[] { (JSValue)true, true };
+            yield return new object[] { (JSValue)1, 1 };
+            yield return new object[] { (JSValue)"qwe", "qwe" };
+            yield return new object[] { (JSValue)1.2, 1.2 };
+        }
+    }
+
+    [TestMethod]
+    [DynamicData(nameof(TestData))]
+    public void ConvertJsValueToClrObjectShouldWork(JSValue value, object expected) => Assert.AreEqual(expected, value.As<object>());
+}