Corrected edge case with nested arrays parsing

loudenvier · Nov 22, 2023 · 6361926 · 6361926
1 parent 64173a7
commit 6361926
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 11 deletions.
diff --git a/NetDot/DotNotation.cs b/NetDot/DotNotation.cs
@@ -58,20 +58,14 @@ private static void ParseInternal(string singleLine, IDictionary<string, object>
                         list[member.Index] = new Dictionary<string, object>();
                     }
                     current = list;
-                    //StoreArrayItem((List<object?>)memberProp, member, isLast ? value : property);
                 } else {
+                    if (current is not IDictionary<string, object> dict) 
+                        dict = (IDictionary<string, object>)((List<object?>)current)[lastArrayIndex]!;
                     if (isLast) {
-                        if (current is IDictionary<string, object> dict)
-                            dict[member.Name] = value;
-                        else if (current is List<object?> list) {
-                            dict = (IDictionary<string, object>)list[lastArrayIndex]!;
-                            dict[member.Name] = value;
-                            //list[lastArrayIndex] = value;
-                        }
+                        dict[member.Name] = value;
                     } else {
-                        var dict = (IDictionary<string, object>)current;
                         var newProp = dict.ContainsKey(member.Name) ? dict[member.Name] : new Dictionary<string, object>(); 
-                        ((IDictionary<string, object>)current)[member.Name] = newProp;
+                        dict[member.Name] = newProp;
                         current = newProp;
                     }
                 }

diff --git a/NetDot/NetDot.csproj b/NetDot/NetDot.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
-        <VersionPrefix>1.2.0</VersionPrefix>
+        <VersionPrefix>1.2.1</VersionPrefix>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <Title>NetDot</Title>
         <Authors>felipemachado</Authors>

diff --git a/NetDotTests/DotNotationParsingtests.cs b/NetDotTests/DotNotationParsingtests.cs
@@ -275,6 +275,40 @@ public void ArrayItemCanBeComplex() {
             Assert.Equal("47", felipe["idade"]);
         }
         [Fact]
+        public void ArrayItemCanBeComplexAndHoldArraysOnTheirOwn() {
+            var dict = DotNotation.Parse("""
+                time.pessoa[0].nome=felipe
+                time.pessoa[0].amigos.principais[0].nome=ricardo
+                time.pessoa[0].amigos.principais[1].nome=claudio
+                """);
+            Assert.NotNull(dict);
+            Assert.Single(dict);
+            var time = dict["time"] as Dictionary<string, object>;
+            Assert.NotNull(time);
+            Assert.Single(time);
+            var pessoas = time["pessoa"] as List<object?>;
+            Assert.NotNull(pessoas);
+            Assert.Single(pessoas);
+            var felipe = pessoas[0] as Dictionary<string, object>;
+            Assert.NotNull(felipe);
+            Assert.Equal(2, felipe.Count);
+            Assert.Equal("felipe", felipe["nome"]);
+            var amigos = felipe["amigos"] as Dictionary<string, object>;
+            Assert.NotNull(amigos);
+            Assert.Single(amigos);
+            var principais = amigos["principais"] as List<object?>;
+            Assert.NotNull(principais);
+            Assert.Equal(2, principais.Count);
+            var ricardo = principais[0] as Dictionary<string, object>;
+            Assert.NotNull(ricardo);
+            Assert.Single(ricardo);
+            Assert.Equal("ricardo", ricardo["nome"]);
+            var claudio = principais[1] as Dictionary<string, object>;
+            Assert.NotNull(claudio);
+            Assert.Single(claudio);
+            Assert.Equal("claudio", claudio["nome"]);
+        }
+        [Fact]
         public void CanParseIntoExpandoObject() {
             dynamic pessoa = new ExpandoObject();
             dynamic result = DotNotation.Parse("""