fix bugs, add new syntax

Author: quinchs

Discord.Net.ComponentDesigner.sln.DotSettings.user

@@ -76,8 +76,9 @@ Valid children of an element are:
 ### Attributes
 
 Attributes consist of a name and an optional value, valid values can be:
-- A string literal.
-- An interpolation
+- A [string literal](#string-literals).
+- An [interpolation](#interpolation-syntax)
+- An [inline element](#inline-elements-in-attributes)
 
 
 ```xml
@@ -87,9 +88,22 @@ Attributes consist of a name and an optional value, valid values can be:
     baz={123}
     switch1
     switch2
+    inline=(<Foo/>)
 />
 ```
 
+
+#### Inline elements in attributes
+
+Inline elements are valid for attribute values, and are defined as one [element](#elements) wrapped in parenthesis `()`:
+
+```xml
+<Example
+    foo=(<Bar/>)
+/>
+```
+
+
 ### String literals
 
 String literals are text and/or interpolations wrapped in quotes. You can either use a single quote or a double quote to denote a string literal. The quote character can be used to simply escapes; double quotes don't need to be escaped in a single-quote literal, and vice versa.

README.md

@@ -87,7 +87,9 @@ public static MessageComponent LocationListItem(Location location, int index, in
             content = cx(
                 $"""
                  <section
-                     accessory={cx($"<thumbnail url={location.Icon} />")}
+                     accessory=(
+                        <thumbnail url={location.Icon} />
+                     )
                  >
                      {content}
                  </section>
@@ -144,9 +146,9 @@ public static MessageComponent PackHeader(Pack pack)
         return cx(
             $"""
              <section
-                accessory={cx(
-                    $"<thumbnail url={pack.Icon} />"
-                )}
+                accessory=(
+                    <thumbnail url={pack.Icon} />
+                )
              >
                  {packHeaderText}
              </section>

Sandbox/Examples/Spyfall/PackExample.cs

@@ -1,5 +1,29 @@
 using Discord;
 using Discord.CX.Parser;
+using Sandbox.Examples.Spyfall;
 using static Discord.ComponentDesigner;
 
-Console.WriteLine("Hello world");
+var pack = new Pack(
+    Guid.NewGuid(),
+    "Example",
+    "Description",
+    null,
+    [
+        new Location(
+            Guid.NewGuid(),
+            "Location1",
+            null,
+            [
+                new Role(Guid.NewGuid(), "Role1", 100, null),
+                new Role(Guid.NewGuid(), "Role2", 100, null),
+            ],
+            100
+        )
+    ],
+    new(Guid.NewGuid(), "author", 123),
+    DateTimeOffset.Now
+);
+
+var x = PackExample.CreatePackInfo(pack, 0);
+
+Console.WriteLine(x);

Sandbox/Program.cs

@@ -368,4 +368,22 @@ public static Diagnostic CreateParsingDiagnostic(CXDiagnostic diagnostic, Locati
         DiagnosticSeverity.Error,
         true
     );
+    
+    public static readonly DiagnosticDescriptor CardinalityForcedToRuntime = new(
+        "DC0040",
+        "Cardinality forced to runtime check",
+        "'{0}' can be more than 1 component, a runtime check will occur to enforce a single component",
+        "Components",
+        DiagnosticSeverity.Warning,
+        true
+    );
+    
+    public static readonly DiagnosticDescriptor LabelComponentDuplicate = new(
+        "DC0041",
+        "Duplicate component definition",
+        "A label cannot specify 'component' both in an attribute and in the children",
+        "Components",
+        DiagnosticSeverity.Error,
+        true
+    );
 }

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

@@ -157,6 +157,7 @@ out var inner
                             inner,
                             state,
                             [],
+                            [],
                             parent
                         )
                     ];
@@ -209,13 +210,34 @@ out componentNode
 
                 if (state is null) return [];
 
+                var attributeNodes = new List<Node>();
                 var nodeChildren = new List<Node>();
                 var node = map[element] = state.OwningNode = new(
                     componentNode,
                     state,
                     nodeChildren,
+                    attributeNodes,
                     parent
                 );
+                
+                foreach (var attribute in element.Attributes)
+                {
+                    if (attribute.Value is CXValue.Element nestedElement)
+                    {
+                        attributeNodes.AddRange(
+                            CreateNodes(
+                                manager,
+                                nestedElement.Value,
+                                node,
+                                reusedNodes,
+                                oldGraph,
+                                map,
+                                diagnostics,
+                                incrementalParseResult
+                            )
+                        );
+                    }
+                }
 
                 nodeChildren.AddRange(
                     children
@@ -251,10 +273,15 @@ public sealed class Node
         public ComponentNode Inner { get; }
         public ComponentState State => _state;
         public IReadOnlyList<Node> Children { get; }
+        public IReadOnlyList<Node> AttributeNodes { get; }
         public Node? Parent { get; }
 
         public IReadOnlyList<Diagnostic> Diagnostics
-            => [.._diagnostics, ..Children.SelectMany(x => x.Diagnostics)];
+            => [
+                .._diagnostics, 
+                ..AttributeNodes.SelectMany(x => x.Diagnostics),
+                ..Children.SelectMany(x => x.Diagnostics)
+            ];
 
         public bool Incremental { get; }
 
@@ -267,6 +294,7 @@ public Node(
             ComponentNode inner,
             ComponentState state,
             IReadOnlyList<Node> children,
+            IReadOnlyList<Node> attributeNodes,
             Node? parent = null,
             IReadOnlyList<Diagnostic>? diagnostics = null,
             bool incremental = false,
@@ -276,6 +304,7 @@ public Node(
             Inner = inner;
             _state = state;
             Children = children;
+            AttributeNodes = attributeNodes;
             Parent = parent;
             _diagnostics = [..diagnostics ?? []];
             _render = render;
@@ -284,7 +313,9 @@ public Node(
 
         public void UpdateState(ComponentContext context)
         {
-            // update children first
+            foreach (var attributeNode in AttributeNodes)
+                attributeNode.UpdateState(context);
+            
             foreach (var node in Children)
                 node.UpdateState(context);
 
@@ -306,6 +337,7 @@ public void Validate(ComponentContext context)
             using (context.CreateDiagnosticScope(_diagnostics))
             {
                 Inner.Validate(State, context);
+                foreach (var attributeNode in AttributeNodes) attributeNode.Validate(context);
                 foreach (var child in Children) child.Validate(context);
             }
         }
@@ -364,6 +396,7 @@ public Node Reuse(Node? parent, IncrementalParseResult parseResult, CXGraphManag
                 Inner,
                 State,
                 Children,
+                AttributeNodes,
                 parent,
                 diagnostics,
                 true,

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

@@ -6,7 +6,8 @@ namespace Discord.CX.Nodes;
 
 public sealed record ComponentPropertyValue(
     ComponentProperty Property,
-    CXAttribute? Attribute
+    CXAttribute? Attribute,
+    CXGraph.Node? Node = null
 )
 {
     private CXValue? _value;

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

@@ -33,7 +33,15 @@ public ComponentPropertyValue GetProperty(ComponentProperty property)
                 property.Name == x.Identifier.Value || property.Aliases.Contains(x.Identifier.Value)
             );
 
-        return _properties[property] = new(property, attribute);
+        CXGraph.Node? node = null;
+        
+        if (attribute?.Value is CXValue.Element element)
+        {
+            node = OwningNode?.AttributeNodes
+                .FirstOrDefault(x => ReferenceEquals(x.State.Source, element.Value));
+        }
+
+        return _properties[property] = new(property, attribute, node);
     }
 
     public void ReportPropertyNotAllowed(ComponentProperty property, ComponentContext context)