JSON Formatter was not sorting array values. (#610)

DevToys-app · Jul 23, 2022 · baedeaf · baedeaf
1 parent 2a2211b
commit baedeaf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs b/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs
@@ -213,6 +213,16 @@ private static void SortJsonPropertiesAlphabetically(JObject jObject)
                 {
                     SortJsonPropertiesAlphabetically(obj);
                 }
+                else if (property.Value is JArray array)
+                {
+                    foreach (JToken? arrayItem in array)
+                    {
+                        if (arrayItem is JObject arrayObj)
+                        {
+                            SortJsonPropertiesAlphabetically(arrayObj);
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs b/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs
@@ -73,7 +73,9 @@ public void FormatDoesNotAlterateDateTimes(string input, string expectedResult)
         }
 
         [DataTestMethod]
-        [DataRow("{\"Email\":\"john@mail.com\",\"Website\":\"http://samplewebsite.com\",\"Name\":\"John Smith\",\"Phone\":\"(50)345872\"}", "{\"Email\":\"john@mail.com\",\"Name\":\"John Smith\",\"Phone\":\"(50)345872\",\"Website\":\"http://samplewebsite.com\"}")]
+        [DataRow(
+            "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}",
+            "{\"a\":\"asdf\",\"array\":[{\"a\":\"asdf\",\"array\":[],\"b\":33,\"c\":545}],\"b\":33,\"c\":545}")]
         public void FormatSortPropertiesAlphabetically(string input, string expectedResult)
         {
             Assert.AreEqual(expectedResult, JsonHelper.Format(input, Indentation.Minified, sortProperties: true));