support for DynamicValue-->DefaultValue for yaml/json/xml (#95)

Author: steveshortt

Synapse.Core/Classes/DynamicValue.cs

@@ -23,6 +23,7 @@ public bool TryGetDefaultValue(out object value)
 
             return ok;
         }
+        internal bool DefaultAllowNull { get { return Default.Value != null || Default.AllowNull; } }
 
         public override string ToString()
         {

Synapse.Core/Utilities/XmlHelpers.cs

@@ -198,17 +198,26 @@ static int FindElementIndex(XmlElement element)
             throw new ArgumentException( "Couldn't find element within parent" );
         }
 
-        public static void Merge(ref XmlDocument source, List<DynamicValue> patch, Dictionary<string, string> values)
+        public static void Merge(ref XmlDocument source, List<DynamicValue> dynamicValues, Dictionary<string, string> values)
         {
             if( source == null ) { throw new ArgumentException( "Source cannot be null.", "source" ); }
-            if( patch == null ) { throw new ArgumentException( "Patch cannot be null.", "patch" ); }
-            if( values == null ) { throw new ArgumentException( "Values cannot be null.", "values" ); }
 
-            foreach( DynamicValue dv in patch )
+            //if there's nothing to do, get out!
+            if( dynamicValues == null || dynamicValues?.Count == 0 )
+                return;
+
+            foreach( DynamicValue dv in dynamicValues )
             {
-                if( values.ContainsKey( dv.Source ) )
+                string value = null;
+                if( (values?.ContainsKey( dv.Source )).Value && !string.IsNullOrWhiteSpace( values[dv.Source] ) )
+                    value = values[dv.Source];
+
+                if( string.IsNullOrWhiteSpace( value ) && dv.TryGetDefaultValue( out object defaultValue ) )
+                    if( defaultValue != null )
+                        value = defaultValue.ToString();
+
+                if( !string.IsNullOrWhiteSpace( value ) || dv.DefaultAllowNull )
                 {
-                    string value = values[dv.Source];
                     if( !dv.Validate( value, out string validationErrorMessage ) )
                         throw new ArgumentException( validationErrorMessage );
 

Synapse.Core/Utilities/YamlHelpers.cs

@@ -121,10 +121,11 @@ public static void Merge(ref Dictionary<object, object> source, List<DynamicValu
                 if( (values?.ContainsKey( dv.Source )).Value && !string.IsNullOrWhiteSpace( values[dv.Source] ) )
                     val = values[dv.Source];
 
-                if( string.IsNullOrWhiteSpace( val ) && dv.TryGetDefaultValue( out object defaultValue ))
-                    val = Serialize( defaultValue );
+                if( string.IsNullOrWhiteSpace( val ) && dv.TryGetDefaultValue( out object defaultValue ) )
+                    if( defaultValue != null )
+                        val = Serialize( defaultValue );
 
-                if( !string.IsNullOrWhiteSpace( val ) )
+                if( !string.IsNullOrWhiteSpace( val ) || dv.DefaultAllowNull )
                 {
                     if( !dv.Validate( val, out string validationErrorMessage ) )
                         throw new ArgumentException( validationErrorMessage );
@@ -391,7 +392,7 @@ internal static void ApplyPatchValues(List<object> source, List<object> patch, I
                                 ApplyPatchValues( (List<object>)listItemValue[patchKey], (List<object>)patchValue, dv );
                         }
                         else //if( patchValue is 'the value' )
-                            listItemValue[patchKey] = patchValue;
+                            listItemValue[patchKey] = RegexReplaceOrValue( listItemValue[patchKey], patchValue, dv );
                     }
                     else if( source[i] is List<object> )
                         //recurse back in
@@ -434,12 +435,13 @@ internal static object RegexReplaceOrValue(object input, object replacement, IRe
             {
                 if( rv.HasReplace )
                 {
+                    string repl = $"{replacement}";
                     if( rv.IsBase64Encode )
-                        replacement = CryptoHelpers.Encode( replacement.ToString() );
-                    value = Regex.Replace( input.ToString(), rv.Replace, replacement.ToString(), RegexOptions.IgnoreCase );
+                        repl = CryptoHelpers.Encode( repl );
+                    value = Regex.Replace( input.ToString(), rv.Replace, repl, RegexOptions.IgnoreCase );
                 }
                 else if( rv.IsBase64Encode )
-                    value = CryptoHelpers.Encode( value.ToString() );
+                    value = CryptoHelpers.Encode( $"{value}" );
             }
 
             return value;