V13/j object sorting (#695)

* Sort JObject properties in nested/blocks on export

* tidy up Json Conversion

uSync.Core/DataTypes/ConfigurationSerializerBase.cs

@@ -13,7 +13,7 @@ public virtual object DeserializeConfig(string config, Type configType)
 
         public virtual string SerializeConfig(object configuration)
         {
-            return JsonConvert.SerializeObject(configuration, Formatting.Indented);
+            return JsonConvert.SerializeObject(configuration, Formatting.Indented, uSyncConstants.uSyncJsonSettings);
         }
 
     }

uSync.Core/Extensions/ChangeListExtensions.cs

@@ -37,8 +37,8 @@ public static void AddUpdateJson(this List<uSyncChange> changes, string name, ob
 
         public static void AddUpdateJson(this List<uSyncChange> changes, string name, object oldValue, object newValue, string path, bool success)
         {
-            var oldJson = JsonConvert.SerializeObject(oldValue, Formatting.Indented);
-            var newJson = JsonConvert.SerializeObject(newValue, Formatting.Indented);
+            var oldJson = JsonConvert.SerializeObject(oldValue, Formatting.Indented, uSyncConstants.uSyncJsonSettings);
+            var newJson = JsonConvert.SerializeObject(newValue, Formatting.Indented, uSyncConstants.uSyncJsonSettings);
             AddUpdate(changes, name, oldJson, newJson, path, success);
         }
 

uSync.Core/Extensions/JsonExtensions.cs

@@ -1,6 +1,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+using System.Linq;
+
 using Umbraco.Extensions;
 
 namespace uSync.Core
@@ -181,5 +183,20 @@ public static TObject GetValueAs<TObject>(this object value)
 
         public static bool IsAngularExpression(this string value)
             => value.StartsWith("{{") && value.EndsWith("}}");
+
+        /// <summary>
+        ///  performs an inplace sort of the properties in a JObject
+        /// </summary>
+        public static void SortByName(this JObject item)
+        {
+            var properties = item.Properties().OrderBy(x => x.Name).ToList();
+            item.RemoveAll();
+            foreach (var property in properties)
+            {
+                item.Add(property);
+            }
+        }
+
+
     }
 }

uSync.Core/Mapping/SyncNestedValueMapperBase.cs

@@ -78,6 +78,9 @@ protected JObject GetImportProperties(JObject item, IContentType docType)
         /// </summary>
         protected JObject GetExportProperties(JObject item, IContentType docType)
         {
+            // we want JObjects to be sorted. 
+            item.SortByName();
+
             foreach (var property in docType.CompositionPropertyTypes)
             {
                 if (item.ContainsKey(property.Alias))

uSync.Core/uSyncConstants.cs

@@ -1,7 +1,15 @@
-namespace uSync.Core
+using Newtonsoft.Json;
+using uSync.Core.Json;
+
+namespace uSync.Core
 {
     public static partial class uSyncConstants
     {
+        public static JsonSerializerSettings uSyncJsonSettings = new JsonSerializerSettings()
+        {
+            ContractResolver = new uSyncContractResolver()
+        };
+
         public static class Xml
         {
             public const string Key = "Key";