Merge branch 'main' into include

# Conflicts:
#	test/GqlPlus.ComponentTestBase/Samples/git-details.txt

Author: NeonGraal

GqlPlus.sln

@@ -78,7 +78,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GqlPlus.Abstractions.ClassT
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GqlPlus.TestGenerators", "test\GqlPlus.TestGenerators\GqlPlus.TestGenerators.csproj", "{B061A811-3DBB-4E5A-AD96-91F0A74FE3C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GqlPlus.TestGeneratorsTests", "test\GqlPlus.TestGeneratorsTests\GqlPlus.TestGeneratorsTests.csproj", "{BB113C8C-1B2C-4815-A4DF-051F9237AF0E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GqlPlus.TestGenerators.Tests", "test\GqlPlus.TestGenerators.Tests\GqlPlus.TestGenerators.Tests.csproj", "{BB113C8C-1B2C-4815-A4DF-051F9237AF0E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GqlPlus.PolyFill", "src\GqlPlus.PolyFill\GqlPlus.PolyFill.csproj", "{44D55F97-4EBA-48C8-A72C-7FBC12A44719}"
 EndProject

coverage.runsettings

@@ -11,7 +11,8 @@
             <ModulePaths>
               <Include>
                 <ModulePath>.*\\GqlPlus\.Abstractions\.dll$</ModulePath>
-                <ModulePath>.*\\GqlPlus\.Generators\.dll$</ModulePath>
+                <ModulePath>.*\\GqlPlus\.Converter\.Json\.dll$</ModulePath>
+                <ModulePath>.*\\GqlPlus\.Converter\.Yaml\.dll$</ModulePath>
                 <ModulePath>.*\\GqlPlus\.Modeller\.dll$</ModulePath>
                 <ModulePath>.*\\GqlPlus\.Parser\.dll$</ModulePath>
                 <ModulePath>.*\\GqlPlus\.Verifier\.dll$</ModulePath>

src/GqlPlus.Abstractions/GeneralHelpers.cs

@@ -1,5 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using System.Runtime.CompilerServices;
+using GqlPlus.Structures;
 
 namespace GqlPlus;
 
@@ -8,6 +10,27 @@ public static class GeneralHelpers
   public static TResult[] ArrayOf<TResult>(this IEnumerable<object>? items)
     => [.. items?.OfType<TResult>() ?? []];
 
+  public static string[]? FlagNames<TEnum>(this TEnum flagValue)
+    where TEnum : Enum
+  {
+    Type type = typeof(TEnum);
+    if (!type.GetCustomAttributes<FlagsAttribute>().Any()) {
+      return null;
+    }
+
+    int flags = (int)(object)flagValue;
+    List<string> result = [];
+
+    foreach (object? value in Enum.GetValues(type)) {
+      int flag = (int)value;
+      if (flag.IsSingleFlag() && (flags & flag) == flag) {
+        result.Add(Enum.GetName(type, flag));
+      }
+    }
+
+    return [.. result];
+  }
+
   public static string Joined(this IEnumerable<string?>? items, string by = " ")
     => string.Join(by,
       items?.Where(i => !string.IsNullOrWhiteSpace(i))

src/GqlPlus.Abstractions/GqlPlus.Abstractions.csproj

@@ -2,8 +2,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

src/GqlPlus.Abstractions/Structures/StructureHelper.cs

@@ -55,6 +55,9 @@ public static Structured RenderEnum<TEnum>(this TEnum value)
   internal static bool BothValued<T>([NotNullWhen(true)] this T? left, [NotNullWhen(true)] T? right)
     => left is not null && right is not null;
 
+  internal static bool BothAny<T>([NotNullWhen(true)] this IEnumerable<T>? left, [NotNullWhen(true)] IEnumerable<T>? right)
+    => left.BothValued(right) && left.Any() && right.Any();
+
   public static bool IsSingleFlag(this int flag)
   {
     while (flag > 0) {

src/GqlPlus.Abstractions/Structures/StructureValue.cs

@@ -1,7 +1,7 @@
 namespace GqlPlus.Structures;
 
-#pragma warning disable CA1036 // Override methods on comparable types
-public sealed record class StructureValue
+//  #pragma warning disable CA1036 // Override methods on comparable types
+public sealed class StructureValue
   : IComparable<StructureValue>
   , IEquatable<StructureValue>
 {
@@ -39,6 +39,7 @@ public int CompareTo(StructureValue? other)
       : -1
     : -1;
 
+  public override bool Equals(object obj) => Equals(obj as StructureValue);
   public bool Equals(StructureValue? other)
     => string.Equals(Tag, other?.Tag, StringComparison.Ordinal) && (Boolean.BothValued(other?.Boolean) ? Boolean.Value == other.Boolean
       : Number.BothValued(other?.Number) ? Number.Value == other.Number
@@ -51,20 +52,11 @@ public override int GetHashCode()
       Identifier?.GetHashCode() ?? 0,
       Text?.GetHashCode() ?? 0);
 
-  public string AsString
-  {
-    get {
-      if (Identifier is not null) {
-        return Identifier;
-      } else if (Boolean is not null) {
-        return Boolean.Value.TrueFalse();
-      } else if (Number is not null) {
-        return $"{Number}";
-      } else if (Text is not null) {
-        return Text;
-      }
-
-      return string.Empty;
-    }
-  }
+  public string AsString => this switch {
+    { Boolean: not null } => Boolean.Value.TrueFalse(),
+    { Identifier: not null } => Identifier,
+    { Number: not null } => $"{Number}",
+    { Text: not null } => Text,
+    _ => string.Empty,
+  };
 }

src/GqlPlus.Abstractions/Structures/Structured.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 
 namespace GqlPlus.Structures;
 
@@ -89,20 +88,16 @@ public Structured AddIf(bool optional, Func<Structured, Structured>? onTrue = nu
   public Structured AddSet<TEnum>(string key, TEnum set, string? tag = null, bool flow = true)
     where TEnum : Enum
   {
-    Type type = typeof(TEnum);
+    string[]? flags = set.FlagNames();
 
-    if (type.GetCustomAttributes<FlagsAttribute>().Any()) {
-      int flags = (int)(object)set;
+    if (flags is not null) {
       Dict result = [];
 
-      foreach (object? value in Enum.GetValues(type)) {
-        int flag = (int)value;
-        if (flag.IsSingleFlag() && (flags & flag) == flag) {
-          result.Add(new(Enum.GetName(type, value)), new("_"));
-        }
+      foreach (string flag in flags) {
+        result.Add(new(flag), new("_"));
       }
 
-      return Add(key, new(result, $"_Set({tag ?? type.TypeTag()})", flow: flow));
+      return Add(key, new(result, $"_Set({tag ?? typeof(TEnum).TypeTag()})", flow: flow));
     }
 
     return this;
@@ -111,16 +106,13 @@ public Structured AddSet<TEnum>(string key, TEnum set, string? tag = null, bool
   public bool Equals(Structured? other)
     => string.Equals(Tag, other?.Tag, StringComparison.Ordinal)
       && (Value.BothValued(other?.Value) ? Value.Equals(other.Value)
-      : List.BothValued(other?.List) ? List.SequenceEqual(other.List)
-      : Map.BothValued(other?.Map) && Map.Equals(other.Map));
+      : List.BothAny(other?.List) ? List.SequenceEqual(other.List)
+      : Map.BothAny(other?.Map) && Map.Equals(other.Map));
 
   public override bool Equals(object? obj)
     => Equals(obj as Structured);
   public override int GetHashCode()
-    => HashCode.Combine(Tag,
-      Value?.GetHashCode() ?? 0,
-      List?.GetHashCode() ?? 0,
-      Map?.GetHashCode() ?? 0);
+    => HashCode.Combine(Tag, Value?.GetHashCode() ?? 0, List.GetHashCode(), Map.GetHashCode());
 }
 
 #pragma warning disable CA1034 // Nested types should not be visible
@@ -134,10 +126,16 @@ internal sealed class Dict
     internal Dict() : base() { }
     internal Dict(IDictionary<TValue, TObject> dictionary)
       : base(dictionary) { }
+
+    public bool Equals(IDict other)
+      => other is not null
+      && Keys.OrderedEqual(other.Keys)
+      && Keys.All(k => this[k].Equals(other[k]));
   }
 
   public interface IDict
     : IDictionary<TValue, TObject>
+    , IEquatable<IDict>
   { }
 
   public TValue? Value { get; }

src/GqlPlus.Converter.Json/Convert/RenderJsonConverter.cs

@@ -5,10 +5,6 @@ internal abstract class RenderJsonConverter<T>
 {
   protected void WriteValue(Utf8JsonWriter writer, StructureValue value)
   {
-    if (value is null || value.IsEmpty) {
-      return;
-    }
-
     if (value.Identifier is not null) {
       writer.WriteStringValue(value.Identifier);
     } else if (value.Boolean is not null) {

src/GqlPlus.Converter.Json/Convert/RenderStructureJsonConverter.cs

@@ -1,36 +1,45 @@
-namespace GqlPlus.Convert;
+using System.Diagnostics.CodeAnalysis;
+
+namespace GqlPlus.Convert;
 internal class RenderStructureJsonConverter
   : RenderJsonConverter<Structured>
 {
   internal static RenderValueJsonConverter ValueConverter { get; } = new();
 
+  [ExcludeFromCodeCoverage]
   public override Structured? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
   public override void Write(Utf8JsonWriter writer, Structured value, JsonSerializerOptions options)
   {
-    if (value is null || value.IsEmpty) {
-      return;
-    }
-
     bool plain = string.IsNullOrWhiteSpace(value.Tag);
 
     if (value.List.Count > 0) {
       WriteList(writer, value.List, options);
       return;
-    } else if (value.Map.Count > 0) {
-      Structured first = value.Map.First().Value;
-      if (value.Map.Count == 1 && !plain && string.IsNullOrWhiteSpace(first.Tag) && first.Value is not null) {
-        StartTaggedValue(writer, value.Tag);
-        WriteValue(writer, first.Value);
-        writer.WriteEndObject();
-      } else {
-        WriteMap(writer, value.Map, value.Tag, options);
-      }
-    } else if (value.Value is not null) {
+    }
+
+    if (value.Map.Count > 0) {
+      WriteMap(writer, value, options, plain);
+      return;
+    }
+
+    if (value.Value is not null) {
       ValueConverter.Write(writer, value.Value, options);
     }
   }
 
-  private void WriteMap(Utf8JsonWriter writer, Structured<StructureValue, Structured>.IDict map, string tag, JsonSerializerOptions options)
+  private void WriteMap(Utf8JsonWriter writer, Structured value, JsonSerializerOptions options, bool plain)
+  {
+    Structured first = value.Map.First().Value;
+    if (value.Map.Count == 1 && !plain && string.IsNullOrWhiteSpace(first.Tag) && first.Value is not null) {
+      StartTaggedValue(writer, value.Tag);
+      WriteValue(writer, first.Value);
+      writer.WriteEndObject();
+    } else {
+      WriteFullMap(writer, value.Map, value.Tag, options);
+    }
+  }
+
+  private void WriteFullMap(Utf8JsonWriter writer, Structured<StructureValue, Structured>.IDict map, string tag, JsonSerializerOptions options)
   {
     writer.WriteStartObject();
 

src/GqlPlus.Converter.Json/Convert/RenderValueJsonConverter.cs

@@ -1,15 +1,14 @@
-namespace GqlPlus.Convert;
+using System.Diagnostics.CodeAnalysis;
+
+namespace GqlPlus.Convert;
 
 internal class RenderValueJsonConverter
   : RenderJsonConverter<StructureValue>
 {
+  [ExcludeFromCodeCoverage]
   public override StructureValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
   public override void Write(Utf8JsonWriter writer, StructureValue value, JsonSerializerOptions options)
   {
-    if (value is null || value.IsEmpty) {
-      return;
-    }
-
     if (string.IsNullOrWhiteSpace(value.Tag)) {
       WriteValue(writer, value);
       return;

src/GqlPlus.Converter.Json/GqlPlus.Converter.Json.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="9.0.3" />
+    <PackageReference Include="System.Text.Json" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

src/GqlPlus.Converter.Yaml/Convert/RenderYaml.cs

@@ -32,7 +32,4 @@ static RenderYaml()
 
   public static string ToYaml(this Structured model, bool wrapped)
     => (wrapped ? YamlWrapped : YamlFull).Serialize(model);
-
-  public static string YamlJoin(this IEnumerable<string> list, string start, string end)
-    => start + string.Join(", ", list ?? []) + end;
 }

src/GqlPlus.Converter.Yaml/Convert/RenderYamlTypeConverter.cs

@@ -1,4 +1,5 @@
-using YamlDotNet.Core.Events;
+using System.Diagnostics.CodeAnalysis;
+using YamlDotNet.Core.Events;
 
 namespace GqlPlus.Convert;
 
@@ -24,8 +25,11 @@ internal class RenderYamlTypeConverter
 {
   public bool Accepts(Type type) => type == typeof(Structured);
 
+  [ExcludeFromCodeCoverage]
   public object? ReadYaml(IParser parser, Type type) => throw new NotImplementedException();
+  [ExcludeFromCodeCoverage]
   public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => throw new NotImplementedException();
+
   public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
   {
     if (value is Structured model) {

src/GqlPlus.Modeller/Convert/RenderLines.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using GqlPlus.Ast;
 
 namespace GqlPlus.Convert;
 
@@ -142,7 +141,7 @@ private static void WriteMap(StringBuilder sb, string tag, Structured<StructureV
     }
   }
 
-  private static char[] s_special = ['{', '}', '[', ']', '&', '*', '#', '?', '|', '-', '<', '>', '=', '!', '%', '@', ':', '`', ','];
+  private static readonly char[] s_special = ['{', '}', '[', ']', '&', '*', '#', '?', '|', '-', '<', '>', '=', '!', '%', '@', ':', '`', ','];
 
   private static void WriteValue(StringBuilder sb, StructureValue value, string suffix, int indent)
   {

src/GqlPlus.Parser/GqlPlus.Parser.csproj

@@ -2,7 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

src/GqlPlus.Parser/Merging/Globals/MergeCategories.cs

@@ -7,9 +7,9 @@ internal class MergeCategories(
   ILoggerFactory logger
 ) : AstAliasedMerger<IGqlpSchemaCategory>(logger)
 {
-  public override ITokenMessages CanMerge(IEnumerable<IGqlpSchemaCategory> items)
-    => base.CanMerge(items)
-      .Add(items.CanMergeStruct(item => item.CategoryOption));
+  protected override ITokenMessages CanMergeGroup(IGrouping<string, IGqlpSchemaCategory> group)
+    => base.CanMergeGroup(group)
+      .Add(group.CanMergeStruct(item => item.CategoryOption));
 
   protected override string ItemMatchName => "Output~Modifiers~Option";
   protected override string ItemMatchKey(IGqlpSchemaCategory item)

src/GqlPlus.Parser/Merging/Objects/MergeOutputFields.cs

@@ -1,5 +1,4 @@
 using GqlPlus.Abstractions.Schema;
-using GqlPlus.Ast;
 using GqlPlus.Ast.Schema.Objects;
 
 namespace GqlPlus.Merging.Objects;

src/GqlPlus.Verifier/Verifying/Schema/UsageContext.cs

@@ -110,10 +110,6 @@ internal static TContext CheckType<TContext, TObjBase>(this TContext context, TO
     where TContext : UsageContext
     where TObjBase : IGqlpObjType
   {
-    if (type is null) {
-      return context;
-    }
-
     string typeName = (type.IsTypeParam ? "$" : "") + type.Name;
     if (context.GetType(typeName, out IGqlpDescribed? value)) {
       CheckTypeArgs(AddCheckError, type, check, value);

test/Directory.Build.targets

@@ -9,7 +9,7 @@
 
   <ItemGroup Condition="$(IsTestProject) == true">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="xunit.v3" Version="2.0.0" />
+    <PackageReference Include="xunit.v3" Version="2.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>