ensure wrapped .NET dictionaries are not array-like

sebastienros · Jun 1, 2021 · 2894370 · 2894370
1 parent 214063c
commit 2894370
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Jint.Tests/Runtime/InteropTests.cs b/Jint.Tests/Runtime/InteropTests.cs
@@ -2556,5 +2556,12 @@ public void ObjectWrapperOverridingEquality()
             Assert.Equal(1, _engine.Evaluate("arr.indexOf(b)").AsNumber());
             Assert.True(_engine.Evaluate("arr.includes(b)").AsBoolean());
         }
+
+        [Fact]
+        public void ObjectWrapperWrappingDictionaryShouldNotBeArrayLike()
+        {
+            var wrapper = new ObjectWrapper(_engine, new Dictionary<string, object>());
+            Assert.False(wrapper.IsArrayLike);
+        }
     }
 }
diff --git a/Jint.Tests/Runtime/PromiseTests.cs b/Jint.Tests/Runtime/PromiseTests.cs
@@ -504,7 +504,11 @@ public void PromiseRaceMixturePromisesNoPromises_ResolvesCorrectly4()
         public void PromiseRegression_SingleElementArrayWithClrDictionaryInPromiseAll()
         {
             var engine = new Engine();
-            var dictionary = new Dictionary<string, object>() { { "Value 1", 1 }, { "Value 2", "a string" } };
+            var dictionary = new Dictionary<string, object>
+            {
+                { "Value 1", 1 },
+                { "Value 2", "a string" }
+            };
             engine.SetValue("clrDictionary", dictionary);
 
             var resultAsObject = engine

diff --git a/Jint/Runtime/Interop/TypeDescriptor.cs b/Jint/Runtime/Interop/TypeDescriptor.cs
@@ -26,6 +26,12 @@ public static TypeDescriptor Get(Type type)
 
         private static bool DetermineIfObjectIsArrayLikeClrCollection(Type type)
         {
+            if (typeof(IDictionary).IsAssignableFrom(type))
+            {
+                // dictionaries are considered normal-object-like
+                return false;
+            }
+
             if (typeof(ICollection).IsAssignableFrom(type))
             {
                 return true;