Fix binder.

SebastianStehle · Nov 27, 2023 · d96663e · d96663e
1 parent 57bb214
commit d96663e
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 70 deletions.
diff --git a/Mjml.Net.Generator/Template.handlebar b/Mjml.Net.Generator/Template.handlebar
@@ -63,43 +63,43 @@ public partial class {{className}}
 		if (source{{name}} != null)
 		{
 			{{#if isCustom }}
-			source{{name}} = {{customName}}.Coerce(source{{name}});
+			this.{{name}} = {{customName}}.Coerce(source{{name}});
 			{{/if}}
 			{{#unless isCustom }}
-			source{{name}} = AttributeTypes.{{defaultType}}.Coerce(source{{name}});
+			this.{{name}} = AttributeTypes.{{defaultType}}.Coerce(source{{name}});
 			{{/unless}}
-			{{#if isExpanded}}
-			this.{{name}} = source{{name}};
-			if ({{name}}Top == null || {{name}}Right == null || {{name}}Bottom == null || {{name}}Left == null) 
+		}
+		{{/each}}
+
+		{{#each expandedFields}}
+		if ({{name}} != null && ({{name}}Top == null || {{name}}Right == null || {{name}}Bottom == null || {{name}}Left == null)) 
+		{
+			{{#if isBorder }}
+			var (t, r, b, l) = BindingHelper.ParseShorthandBorder({{name}});
+			{{/if}}
+			{{#unless isBorder }}
+			var (t, r, b, l) = BindingHelper.ParseShorthandValue({{name}});
+			{{/unless}}
+
+			if ({{name}}Top == null)
 			{
-				{{#if isBorder }}
-				var (t, r, b, l) = BindingHelper.ParseShorthandBorder(source{{name}});
-				{{/if}}
-				{{#unless isBorder }}
-				var (t, r, b, l) = BindingHelper.ParseShorthandValue(source{{name}});
-				{{/unless}}
-
-				if ({{name}}Top == null)
-				{
-					{{name}}Top = t;
-				}
-
-				if ({{name}}Right == null)
-				{
-					{{name}}Right = r;
-				}
-
-				if ({{name}}Bottom == null)
-				{
-					{{name}}Bottom = b;
-				}
-
-				if ({{name}}Left == null)
-				{
-					{{name}}Left = l;
-				}
+				{{name}}Top = t;
+			}
+
+			if ({{name}}Right == null)
+			{
+				{{name}}Right = r;
+			}
+
+			if ({{name}}Bottom == null)
+			{
+				{{name}}Bottom = b;
+			}
+
+			if ({{name}}Left == null)
+			{
+				{{name}}Left = l;
 			}
-			{{/if}}
 		}
 		{{/each}}
 		{{#each textFields}}

diff --git a/Mjml.Net.Generator/TemplateField.cs b/Mjml.Net.Generator/TemplateField.cs
@@ -16,8 +16,6 @@ internal sealed record TemplateField
 
     public bool IsText { get; set; }
 
-    public bool IsExpanded { get; set; }
-
     public bool IsBorder => Attribute == "border";
 
     public bool IsCustom => CustomType != null;

diff --git a/Mjml.Net.Generator/TemplateModel.cs b/Mjml.Net.Generator/TemplateModel.cs
@@ -14,31 +14,67 @@ public IEnumerable<TemplateField> CustomTypes
     {
         get
         {
-            return Fields.Values.Where(x => x.IsCustom).OrderByDescending(x => x.Name);
+            return Fields.Values.Where(x => x.IsCustom).OrderBy(x => x.Name);
         }
     }
 
     public IEnumerable<TemplateField> DefaultTypes
     {
         get
         {
-            return Fields.Values.Where(x => !x.IsCustom).OrderByDescending(x => x.Name);
+            return Fields.Values.Where(x => !x.IsCustom).OrderBy(x => x.Name);
         }
     }
 
     public IEnumerable<TemplateField> NormalFields
     {
         get
         {
-            return Fields.Values.Where(x => !x.IsText).OrderByDescending(x => x.Name);
+            return Fields.Values.Where(x => !x.IsText).OrderBy(x => x.Name);
         }
     }
 
     public IEnumerable<TemplateField> TextFields
     {
         get
         {
-            return Fields.Values.Where(x => x.IsText).OrderByDescending(x => x.Name);
+            return Fields.Values.Where(x => x.IsText).OrderBy(x => x.Name);
+        }
+    }
+
+    public IEnumerable<TemplateField> ExpandedFields
+    {
+        get
+        {
+            foreach (var field in NormalFields)
+            {
+                bool IsCandidate(string name)
+                {
+                    if (field.Attribute.Contains(name) &&
+                       !field.Attribute.EndsWith($"{name}-top", StringComparison.Ordinal) &&
+                       !field.Attribute.EndsWith($"{name}-right", StringComparison.Ordinal) &&
+                       !field.Attribute.EndsWith($"{name}-bottom", StringComparison.Ordinal) &&
+                       !field.Attribute.EndsWith($"{name}-left", StringComparison.Ordinal))
+                    {
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                if (!IsCandidate("margin") && !IsCandidate("padding") && !IsCandidate("border"))
+                {
+                    continue;
+                }
+
+                if (Fields.ContainsKey($"{field.Name}Top") &&
+                    Fields.ContainsKey($"{field.Name}Right") &&
+                    Fields.ContainsKey($"{field.Name}Bottom") &&
+                    Fields.ContainsKey($"{field.Name}Left"))
+                {
+                    yield return field;
+                }
+            }
         }
     }
 
@@ -90,36 +126,6 @@ public static TemplateModel Build(INamedTypeSymbol classSymbol, IEnumerable<Fiel
             allFields[fieldInfo.Name] = fieldInfo;
         }
 
-        foreach (var field in allFields.Values)
-        {
-            bool IsCandidate(string name)
-            {
-                if (field.Attribute.Contains(name) &&
-                   !field.Attribute.EndsWith($"{name}-top", StringComparison.Ordinal) &&
-                   !field.Attribute.EndsWith($"{name}-right", StringComparison.Ordinal) &&
-                   !field.Attribute.EndsWith($"{name}-bottom", StringComparison.Ordinal) &&
-                   !field.Attribute.EndsWith($"{name}-left", StringComparison.Ordinal))
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            if (!IsCandidate("margin") && !IsCandidate("padding") && !IsCandidate("border"))
-            {
-                continue;
-            }
-
-            if (allFields.ContainsKey($"{field.Name}Top") &&
-                allFields.ContainsKey($"{field.Name}Right") &&
-                allFields.ContainsKey($"{field.Name}Bottom") &&
-                allFields.ContainsKey($"{field.Name}Left"))
-            {
-                field.IsExpanded = true;
-            }
-        }
-
         return new TemplateModel
         {
             Fields = allFields,

diff --git a/Mjml.Net/IType.cs b/Mjml.Net/IType.cs
@@ -4,7 +4,7 @@ public interface IType
 {
     bool Validate(string value, ref ValidationContext context);
 
-    string Coerce(string value)
+    public string Coerce(string value)
     {
         return value;
     }

diff --git a/Mjml.Net/Types/ColorType.cs b/Mjml.Net/Types/ColorType.cs
@@ -214,7 +214,7 @@ public bool Validate(string value, ref ValidationContext context)
 #endif
     }
 
-    public string CoerceColor(string value)
+    public string Coerce(string value)
     {
         var trimmed = value.AsSpan().Trim();