address feedback

fix
sebastienros · Aug 17, 2024 · 654d557 · 654d557
1 parent c2d36eb
commit 654d557
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/Jint.Tests/Runtime/InteropTests.cs b/Jint.Tests/Runtime/InteropTests.cs
@@ -3499,7 +3499,7 @@ public void ShouldNotSeeClrMethods()
     {
         var engine = new Engine(opt =>
         {
-            
+            opt.Interop.ObjectWrapperReportedMemberTypes = MemberTypes.Field | MemberTypes.Property;
         });
 
         engine.SetValue("clrInstance", new ClrMembersVisibilityTestClass());
@@ -3510,25 +3510,43 @@ public void ShouldNotSeeClrMethods()
          var props = obj.GetOwnProperties().ToList();
 
          Assert.Equal(props.Count, 1);
+         props.Should().ContainSingle(x => x.Key == "A");
     }
 
     [Fact]
     public void ShouldSeeClrMethods()
     {
-        var engine = new Engine(opt =>
-        {
-            opt.Interop.ObjectWrapperReportedMemberTypes = MemberTypes.Method | MemberTypes.Field | MemberTypes.Property;
-        });
+        var engine = new Engine();
 
         engine.SetValue("clrInstance", new ClrMembersVisibilityTestClass());
-
-        var getValue = engine.Evaluate("clrInstance.get_A()");
-        Assert.Equal(getValue, 10);
 
         var val = engine.GetValue("clrInstance");
         var obj = val.AsObject();
         var props = obj.GetOwnProperties().ToList();
 
-        Assert.Equal(props.Count, 8); // A get/set + F + GetType + ToString + Equals + GetHashCode
+        Assert.Equal(props.Count, 2);
+        props.Should().ContainSingle(x => x.Key.AsString() == "A");
+        props.Should().ContainSingle(x => x.Key.AsString() == "F");
+    }
+
+    private class ClrMembersVisibilityTestClass2
+    {
+        public int Get_A { get; set; } = 5;
+    }
+
+    [Fact]
+    public void ShouldSeeClrMethods2()
+    {
+        var engine = new Engine();
+
+        engine.SetValue("clrInstance", new ClrMembersVisibilityTestClass2());
+
+        var val = engine.GetValue("clrInstance");
+
+        var obj = val.AsObject();
+        var props = obj.GetOwnProperties().ToList();
+
+        Assert.Equal(props.Count, 1);
+        props.Should().ContainSingle(x => x.Key == "Get_A");
     }
 }
diff --git a/Jint/Options.cs b/Jint/Options.cs
@@ -370,7 +370,7 @@ public class InteropOptions
         /// Supported values are: <see cref="MemberTypes.Field"/>, <see cref="MemberTypes.Property"/>, <see cref="MemberTypes.Method"/>.
         /// All other values are ignored.
         /// </summary>
-        public MemberTypes ObjectWrapperReportedMemberTypes { get; set; } = MemberTypes.Field | MemberTypes.Property;
+        public MemberTypes ObjectWrapperReportedMemberTypes { get; set; } = MemberTypes.Field | MemberTypes.Property | MemberTypes.Method;
     }
 
     public class ConstraintOptions

diff --git a/Jint/Runtime/Interop/ObjectWrapper.cs b/Jint/Runtime/Interop/ObjectWrapper.cs
@@ -282,6 +282,11 @@ private IEnumerable<JsValue> EnumerateOwnPropertyKeys(Types types)
             {
                 foreach (var m in ClrType.GetMethods(BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public))
                 {
+                    if (m.IsSpecialName || m.DeclaringType == typeof(object))
+                    {
+                        continue;
+                    }
+
                     var jsString = JsString.Create(m.Name);
                     yield return jsString;
                 }