fix some type conversions

nilproject · Aug 2, 2023 · 97cb9ce · 97cb9ce
1 parent bc98e02
commit 97cb9ce
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/NiL.JS/Core/Tools.cs b/NiL.JS/Core/Tools.cs
@@ -676,6 +676,7 @@ internal static object ConvertJStoObj(JSValue jsobj, Type targetType, bool hight
 
                         if (targetType.GetTypeInfo().IsEnum)
                         {
+#if NET461 || NET48
                             try
                             {
                                 return Enum.Parse(targetType, jsobj.Value.ToString());
@@ -684,12 +685,19 @@ internal static object ConvertJStoObj(JSValue jsobj, Type targetType, bool hight
                             {
                                 return null;
                             }
+#else
+                            if (Enum.TryParse(targetType, jsobj.Value.ToString(), out object result))
+                                return result;
+#endif
                         }
 
                         if (targetType == typeof(Guid))
                         {
                             return Guid.Parse(jsobj.Value.ToString());
                         }
+
+                        if (targetType == typeof(bool))
+                            return bool.TryParse(jsobj.Value.ToString(), out var result) ? result : null;
                     }
 
                     if (targetType == typeof(string))
@@ -800,7 +808,9 @@ internal static object ConvertJStoObj(JSValue jsobj, Type targetType, bool hight
 
                 if (value is BaseLibrary.Array array)
                 {
-                    if (hightLoyalty || elementType == typeof(JSValue))
+                    if (hightLoyalty
+                        || elementType == typeof(JSValue)
+                        || elementType == typeof(object))
                     {
                         if (targetType.IsAssignableFrom(elementType.MakeArrayType()))
                         {

diff --git a/Tests/OverloadedMethods.cs b/Tests/OverloadedMethods.cs
@@ -18,6 +18,11 @@ public int Method()
                 return 0;
             }
 
+            public int Method(int[] a)
+            {
+                return 3;
+            }
+
             public int Method(int a, int b)
             {
                 return 2;
@@ -64,5 +69,17 @@ public void OverloadedMethods_2()
 
             Assert.AreEqual(2, result.Value);
         }
+
+        [TestMethod]
+        public void OverloadedMethods_3()
+        {
+            var context = new Context();
+            var instance = new Class();
+
+            context.DefineVariable($"{nameof(instance)}").Assign(Context.CurrentGlobalContext.ProxyValue(instance));
+            var result = context.Eval($"{nameof(instance)}.{nameof(instance.Method)}([1, 2])");
+
+            Assert.AreEqual(3, result.Value);
+        }
     }
 }