only write ',' when an element was written

edgedb · Apr 17, 2024 · e65d9bb · e65d9bb
1 parent 912f81e
commit e65d9bb
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/EdgeDB.Net.QueryBuilder/Grammar/Terms.cs b/src/EdgeDB.Net.QueryBuilder/Grammar/Terms.cs
@@ -64,9 +64,10 @@ public static QueryWriter Shape<T>(this QueryWriter writer, string name, T[] ele
 
                 for (var i = 0; i < elements.Length; i++)
                 {
-                    func(writer, elements[i]);
+                    var iLocal = i;
+                    var isEmpty = writer.AppendIsEmpty(Value.Of(writer => func(writer, elements[iLocal])));
 
-                    if (i + 1 < elements.Length)
+                    if (!isEmpty && i + 1 < elements.Length)
                         writer.Append(", ");
                 }
 
@@ -86,9 +87,11 @@ public static QueryWriter Shape<T>(this QueryWriter writer, string name, params
 
                 for (var i = 0; i < elements.Length; i++)
                 {
-                    elements[i].Write(writer);
+                    var iLocal = i;
 
-                    if (i + 1 != elements.Length)
+                    var isEmpty = writer.AppendIsEmpty(Value.Of(writer => elements[iLocal].Write(writer)));
+
+                    if (!isEmpty && i + 1 != elements.Length)
                         writer.Append(", ");
                 }