Fix handling of member expression as object property key (#975)

sebastienros · Oct 12, 2021 · d932de7 · d932de7
1 parent 7a74e0c
commit d932de7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/Jint.Tests/Runtime/EngineTests.cs b/Jint.Tests/Runtime/EngineTests.cs
@@ -2744,6 +2744,31 @@ public void RecursiveCallStack()
             Assert.Equal(1389, result);
         }
 
+        [Fact]
+        public void MemberExpressionInObjectProperty()
+        {
+            var engine = new Engine();
+            dynamic result = engine.Evaluate(@"
+                const colorMap = {
+                    Red: ""red"",
+                    Orange: ""orange"",
+                    White: ""white"",
+                };
+
+                Object
+                    .keys(colorMap)
+                    .reduce((agg, next) => {
+                          return {...agg, ...{ [colorMap[next]]: next } };
+                    },
+                    {});
+                ")
+                .ToObject();
+
+            Assert.Equal("Red", result.red);
+            Assert.Equal("Orange", result.orange);
+            Assert.Equal("White", result.white);
+        }
+
         private class Wrapper
         {
             public Testificate Test { get; set; }

diff --git a/Jint/EsprimaExtensions.cs b/Jint/EsprimaExtensions.cs
@@ -48,7 +48,7 @@ or Nodes.BinaryExpression
                 or Nodes.UpdateExpression
                 or Nodes.AssignmentExpression
                 or Nodes.UnaryExpression
-                || expression is StaticMemberExpression)
+                or Nodes.MemberExpression)
             {
                 propertyKey = TypeConverter.ToPropertyKey(JintExpression.Build(engine, expression).GetValue());
                 return true;