tests tests tests tests

Author: quinchs

Discord.Net.ComponentDesigner.sln.DotSettings.user

@@ -16,7 +16,7 @@ public static class Constants
     public const int SELECT_MIN_VALUES = 0;
     public const int SELECT_MAX_VALUES = 25;
 
-    public const int MAX_MEDIA_ITEMS = 25;
+    public const int MAX_MEDIA_ITEMS = 10;
     public const int MAX_MEDIA_ITEM_DESCRIPTION_LENGTH = 1024;
 
     public const int MAX_SECTION_CHILDREN = 3;

src/Discord.Net.ComponentDesigner.Generator/Constants.cs

@@ -360,15 +360,6 @@ public static Diagnostic CreateParsingDiagnostic(CXDiagnostic diagnostic, Locati
         true
     );
 
-    public static readonly DiagnosticDescriptor ButtonCannotHaveALabelAndEmoji = new(
-        "DC0039",
-        "Buttons can't have a label and emoji",
-        "Buttons can't have both a label and an emoji",
-        "Components",
-        DiagnosticSeverity.Error,
-        true
-    );
-    
     public static readonly DiagnosticDescriptor CardinalityForcedToRuntime = new(
         "DC0040",
         "Cardinality forced to runtime check",
@@ -386,4 +377,31 @@ public static Diagnostic CreateParsingDiagnostic(CXDiagnostic diagnostic, Locati
         DiagnosticSeverity.Error,
         true
     );
+    
+    public static readonly DiagnosticDescriptor ComponentDoesntAllowChildren = new(
+        "DC0042",
+        "Component doesn't allow children",
+        "'{0}' doesn't allow children",
+        "Components",
+        DiagnosticSeverity.Error,
+        true
+    );
+    
+    public static readonly DiagnosticDescriptor MediaGalleryIsEmpty = new(
+        "DC0043",
+        "Empty media gallery",
+        "A media gallery must have at least one 'media-gallery-item'",
+        "Components",
+        DiagnosticSeverity.Error,
+        true
+    );
+    
+    public static readonly DiagnosticDescriptor TooManyItemsInMediaGallery = new(
+        "DC0043",
+        "Too many items in media gallery",
+        $"A media gallery can have at most {Constants.MAX_MEDIA_ITEMS} 'media-gallery-item's",
+        "Components",
+        DiagnosticSeverity.Error,
+        true
+    );
 }

src/Discord.Net.ComponentDesigner.Generator/Diagnostics.cs

@@ -11,6 +11,7 @@
 
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
+        <NoWarn>RS1035</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

src/Discord.Net.ComponentDesigner.Generator/Discord.Net.ComponentDesigner.Generator.csproj

@@ -12,7 +12,6 @@ namespace Discord.CX;
 
 public readonly struct CXGraph
 {
-
     public bool HasErrors => Diagnostics.Any(x => x.Severity is DiagnosticSeverity.Error);
     public IReadOnlyList<Diagnostic> Diagnostics
         => [.._diagnostics, ..RootNodes.SelectMany(x => x.Diagnostics)];

src/Discord.Net.ComponentDesigner.Generator/Graph/CXGraph.cs

@@ -167,9 +167,14 @@ private RenderedInterceptor CreateRender(CancellationToken token = default)
                 UsesDesigner
             );
         }
-
+        
         var context = new ComponentContext(Graph);
 
+        foreach (var node in Graph.RootNodes)
+        {
+            node.UpdateState(context);
+        }
+
         Graph.Validate(context);
 
         if (context.HasErrors || Graph.HasErrors)

src/Discord.Net.ComponentDesigner.Generator/Graph/CXGraphManager.cs

@@ -32,6 +32,7 @@ public sealed override string Render(ComponentState state, ComponentContext cont
 
     public virtual void Validate(TState state, ComponentContext context)
     {
+        base.Validate(state, context);
     }
 
     public sealed override void Validate(ComponentState state, ComponentContext context)
@@ -47,6 +48,8 @@ public abstract class ComponentNode
 
     public virtual IReadOnlyList<ComponentProperty> Properties { get; } = [];
 
+    protected virtual bool AllowChildrenInCX => HasChildren;
+    
     public virtual void Validate(ComponentState state, ComponentContext context)
     {
         // validate properties
@@ -62,9 +65,9 @@ public virtual void Validate(ComponentState state, ComponentContext context)
             }
         }
 
-        // report any unknown properties
         if (state.Source is CXElement element)
         {
+            // report any unknown properties
             foreach (var attribute in element.Attributes)
             {
                 if (!TryGetPropertyFromName(attribute.Identifier.Value, out _))
@@ -77,6 +80,16 @@ public virtual void Validate(ComponentState state, ComponentContext context)
                     );
                 }
             }
+            
+            // report invalid children
+            if (!AllowChildrenInCX && !HasChildren && element.Children.Count > 0)
+            {
+                context.AddDiagnostic(
+                    Diagnostics.ComponentDoesntAllowChildren,
+                    element.Children,
+                    Name
+                );
+            }
         }
     }
 

src/Discord.Net.ComponentDesigner.Generator/Nodes/ComponentNode.cs

@@ -19,6 +19,7 @@ public sealed class ComponentProperty
     public IReadOnlyList<string> Aliases { get; }
 
     public bool IsOptional { get; }
+    public bool RequiresValue { get; }
     public string DotnetPropertyName { get; }
     public string DotnetParameterName { get; }
     public PropertyRenderer Renderer { get; }
@@ -28,6 +29,7 @@ public sealed class ComponentProperty
     public ComponentProperty(
         string name,
         bool isOptional = false,
+        bool requiresValue = true,
         IEnumerable<string>? aliases = null,
         IEnumerable<PropertyValidator>? validators = null,
         PropertyRenderer? renderer = null,
@@ -38,6 +40,7 @@ public ComponentProperty(
         Name = name;
         Aliases = [..aliases ?? []];
         IsOptional = isOptional;
+        RequiresValue = requiresValue;
         DotnetPropertyName = dotnetPropertyName ?? name;
         DotnetParameterName = dotnetParameterName ?? name;
         Renderer = renderer ?? Renderers.CreateDefault(this);

src/Discord.Net.ComponentDesigner.Generator/Nodes/ComponentProperty.cs

@@ -22,6 +22,8 @@ public CXValue? Value
 
     public bool HasValue => Value is not null;
 
+    public bool CanOmitFromSource => Property.IsOptional && !IsSpecified;
+
     public bool TryGetLiteralValue(out string value)
     {
         switch (Value)
@@ -58,17 +60,14 @@ public void ReportPropertyConfigurationDiagnostics(
             );
         }
 
-        if (requiresValue.HasValue)
+        if (requiresValue.HasValue && Attribute is not null && Value is null)
         {
-            if (Value is null or CXValue.Invalid && requiresValue.Value)
-            {
-                context.AddDiagnostic(
-                    Diagnostics.MissingRequiredProperty,
-                    Attribute ?? state.Source,
-                    state.OwningNode?.Inner.Name,
-                    Property.Name
-                );
-            }
+            context.AddDiagnostic(
+                Diagnostics.MissingRequiredProperty,
+                Attribute ?? state.Source,
+                state.OwningNode?.Inner.Name,
+                Property.Name
+            );
         }
     }
 }

src/Discord.Net.ComponentDesigner.Generator/Nodes/ComponentPropertyValue.cs

@@ -84,7 +84,7 @@ public void RequireOneOf(ComponentContext context, params ReadOnlySpan<Component
 
             sb.Append(properties[i].Name);
 
-            if (sb.Length < properties.Length - 1) sb.Append('\'');
+            if (i < properties.Length - 1) sb.Append('\'');
         }
 
         context.AddDiagnostic(
@@ -135,17 +135,16 @@ public string RenderProperties(
 
             var propertyValue = GetProperty(property);
 
-            if (propertyValue?.Value is null) continue;
-
+            if(propertyValue.CanOmitFromSource) continue;
+            
             var prefix = asInitializers
                 ? $"{property.DotnetPropertyName} = "
                 : $"{property.DotnetParameterName}: ";
 
             values.Add($"{prefix}{property.Renderer(context, propertyValue)}");
         }
 
-        var joiner = asInitializers ? string.Empty : ",";
-        return string.Join($"{joiner}\n", values);
+        return string.Join($",{Environment.NewLine}", values);
     }
 
     public string RenderInitializer(
@@ -175,7 +174,7 @@ public string RenderChildren(ComponentContext context, Func<CXGraph.Node, bool>?
         if (predicate is not null) children = children.Where(predicate);
 
         return string.Join(
-            ",\n",
+            $",{Environment.NewLine}",
             children.Select(x => x.Render(context))
         );
     }