Merge pull request #94 from NeonGraal/union-tests

Improve Union tests from samples

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

@@ -57,6 +57,7 @@ private void CheckTypedParentType(ParentUsage<TAst> input, TContext context, boo
           onParent?.Invoke(parentType);
         }
       }
+
       return;
     }
 

src/GqlPlus.Verifier/Verifying/Schema/Simple/VerifyUnionTypes.cs

@@ -22,6 +22,8 @@ protected override UsageContext MakeContext(IGqlpUnion usage, IGqlpType[] aliase
 
   protected override void UsageValue(IGqlpUnion usage, UsageContext context)
   {
+    base.UsageValue(usage, context);
+
     foreach (IGqlpUnionItem member in usage.Items) {
       context.AddError(usage, "Union", $"'{member.Name}' not defined", CheckMember(usage.Name, member, context, CheckTypeLabel));
     }
@@ -31,9 +33,7 @@ protected override void UsageValue(IGqlpUnion usage, UsageContext context)
     }
 
     void CheckTypeLabel(string name, IGqlpType type)
-    {
-      context.AddError(usage, "union", $"Type kind mismatch for {name}. Found {type?.Label}", type is not IGqlpSimple and not IGqlpTypeSpecial);
-    }
+      => context.AddError(usage, "union", $"Type kind mismatch for {name}. Found {type?.Label}", type is not IGqlpSimple and not IGqlpTypeSpecial);
   }
 
   private static bool CheckMember(string name, IGqlpUnionItem member, UsageContext context, Action<string, IGqlpType>? checkType = null)

test/GqlPlus.ComponentTestBase/BuildData.t4

@@ -17,7 +17,7 @@ private void BuildData(string directory, string prefix) {
   var gitFile = samplesDir.GetFiles("git-details.txt")[0];
   string gitDetails;
   using (var gitText = gitFile.OpenText()) {
-    gitDetails = gitText.ReadToEnd();
+    gitDetails = gitText.ReadToEnd().Trim();
   }#>
 // Generated from <#= relative #>
 // Collected from <#= gitDetails #>

test/GqlPlus.ComponentTestBase/OperationData.gen.cs

@@ -1,6 +1,5 @@
 // Generated from .\test\GqlPlus.ComponentTestBase\Samples\Operation
-// Collected from 5e5c83d  (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples
-
+// Collected from 247728f  (HEAD -> union-tests, origin/union-tests) 2025-02-08 Improve Union parent samples
 
 namespace GqlPlus;
 

test/GqlPlus.ComponentTestBase/SampleChecks.cs

@@ -1,7 +1,5 @@
 using GqlPlus.Abstractions;
 
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
 namespace GqlPlus;
 
 public class SampleChecks

test/GqlPlus.ComponentTestBase/SampleData.gen.cs

@@ -1,6 +1,5 @@
 // Generated from .\test\GqlPlus.ComponentTestBase\Samples
-// Collected from 5e5c83d  (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples
-
+// Collected from 247728f  (HEAD -> union-tests, origin/union-tests) 2025-02-08 Improve Union parent samples
 
 namespace GqlPlus;
 

test/GqlPlus.ComponentTestBase/SampleSchemaChecks.cs

@@ -3,8 +3,6 @@
 using GqlPlus.Result;
 using GqlPlus.Token;
 
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
 namespace GqlPlus;
 
 public class SampleSchemaChecks(

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidObjects/field-alias.graphql+

@@ -1,2 +1,2 @@
-object Test { field1[alias]: Test }
-object Test { field2[alias]: Test[] }
+object Test { field1 [alias]: Test }
+object Test { field2 [alias]: Test[] }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidObjects/parent-field-alias-more.graphql+

@@ -1,4 +1,4 @@
-object Test { :Recurse field1[alias]: Test }
+object Test { :Recurse field1 [alias]: Test }
 object Recurse { :More }
 object More { :Parent }
-object Parent { field2[alias]: Parent }
+object Parent { field2 [alias]: Parent }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidObjects/parent-field-alias-recurse.graphql+

@@ -1,3 +1,3 @@
-object Test { :Recurse field1[alias]: Test }
+object Test { :Recurse field1 [alias]: Test }
 object Recurse { :Parent }
-object Parent { field2[alias]: Parent }
+object Parent { field2 [alias]: Parent }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidObjects/parent-field-alias.graphql+

@@ -1,3 +1,3 @@
 object Test { :Parent }
-object Test { field1[alias]: Test }
-object Parent { field2[alias]: Parent }
+object Test { field1 [alias]: Test }
+object Parent { field2 [alias]: Parent }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-dup-alias.graphql+

@@ -0,0 +1,2 @@
+union Test [a] { Bad }
+union Dup [a] { Test }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-dup-alias.verify-errors

@@ -0,0 +1,2 @@
+Multiple Unions with alias 'a' found. Names 'Test' 'Dup',
+Multiple Types with alias 'a' found. Names 'Test' 'Dup'

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-diff.graphql+

@@ -0,0 +1,3 @@
+union Test { :Parent Number }
+union Test { Number }
+union Parent { String }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-diff.verify-errors

@@ -0,0 +1,3 @@
+Multiple Unions with name 'Test' can't be merged.,
+Group of Union for 'Test' is not singular Parent['', 'Parent'],
+Multiple Types with name 'Test' can't be merged.

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-more.graphql+

@@ -1,4 +1,4 @@
-union Test { :Parent }
+union Test { :Parent String }
 union Parent { More }
-union More { :Bad }
+union More { :Bad String }
 union Bad { Test }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-recurse.graphql+

@@ -1,3 +1,3 @@
-union Test { :Parent }
+union Test { :Parent String }
 union Parent { Bad }
 union Bad { Test }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-undef.graphql+

@@ -0,0 +1 @@
+union Test { :Parent Number }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-undef.verify-errors

@@ -0,0 +1 @@
+Invalid Union Parent. 'Parent' not defined.

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-wrong.graphql+

@@ -0,0 +1,2 @@
+union Test { :Parent Number }
+output Parent { }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent-wrong.verify-errors

@@ -0,0 +1 @@
+Invalid Union Parent. 'Parent' invalid type. Found 'Output'.

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-parent.graphql+

@@ -1,2 +1,2 @@
-union Test { :Parent }
+union Test { :Parent String }
 union Parent { Test }

test/GqlPlus.ComponentTestBase/Samples/Schema/InvalidSimple/union-recurse-parent.graphql+

@@ -1,3 +1,3 @@
 union Test { Bad }
-union Bad { :Parent }
+union Bad { :Parent String }
 union Parent { Test }

test/GqlPlus.ComponentTestBase/Samples/Schema/ValidMerges/union-alias.graphql+

@@ -0,0 +1,2 @@
+union UnDiff [UnA1] { Boolean }
+union UnDiff [UnA2] { Number }

test/GqlPlus.ComponentTestBase/Samples/Schema/ValidMerges/union-same-parent.graphql+

@@ -0,0 +1,3 @@
+union UnSameParent { :UnParent Boolean }
+union UnSameParent { :UnParent Boolean }
+union UnParent { String }

test/GqlPlus.ComponentTestBase/Samples/Schema/ValidSimple/union-parent-dup.graphql+

@@ -0,0 +1,2 @@
+union UnionPrnt { :PrntUnion Number }
+union PrntUnion { Number }

test/GqlPlus.ComponentTestBase/Samples/git-details.txt

@@ -1 +1 @@
-5e5c83d  (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples
+247728f  (HEAD -> union-tests, origin/union-tests) 2025-02-08 Improve Union parent samples

test/GqlPlus.ComponentTestBase/SchemaData.gen.cs

@@ -1,6 +1,5 @@
 // Generated from .\test\GqlPlus.ComponentTestBase\Samples\Schema
-// Collected from 5e5c83d  (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples
-
+// Collected from 247728f  (HEAD -> union-tests, origin/union-tests) 2025-02-08 Improve Union parent samples
 
 namespace GqlPlus;
 
@@ -141,11 +140,15 @@ public SchemaInvalidSimpleData()
     Add("enum-parent-diff");
     Add("enum-parent-undef");
     Add("enum-parent-wrong");
+    Add("union-dup-alias");
     Add("union-more");
     Add("union-more-parent");
     Add("union-parent");
+    Add("union-parent-diff");
     Add("union-parent-more");
     Add("union-parent-recurse");
+    Add("union-parent-undef");
+    Add("union-parent-wrong");
     Add("union-recurse");
     Add("union-recurse-parent");
     Add("union-self");
@@ -220,8 +223,10 @@ public SchemaValidMergesData()
     Add("output-field-enum-alias");
     Add("output-field-enum-value");
     Add("output-field-param");
+    Add("union-alias");
     Add("union-diff");
     Add("union-same");
+    Add("union-same-parent");
   }
 }
 
@@ -301,5 +306,6 @@ public SchemaValidSimpleData()
     Add("enum-parent-alias");
     Add("enum-parent-dup");
     Add("union-parent");
+    Add("union-parent-dup");
   }
 }

test/GqlPlus.ComponentTestBase/SchemaDataBase.cs

@@ -1,11 +1,8 @@
 using GqlPlus.Abstractions.Schema;
-using GqlPlus.Merging;
 using GqlPlus.Parsing;
 using GqlPlus.Result;
 using GqlPlus.Token;
 
-using Grpc.Core;
-
 namespace GqlPlus;
 
 public class SchemaDataBase(
@@ -30,7 +27,7 @@ protected static IEnumerable<string> ReplaceKeys(IDictionary<string, string> inp
         : [k])
       .Order();
 
-  protected async static Task<IEnumerable<string>> ReplaceSchemaKeys(string group)
+  protected static async Task<IEnumerable<string>> ReplaceSchemaKeys(string group)
   {
     IEnumerable<Task<(string input, string file)>> tasks = SchemaValidData
       .Files[group]

test/GqlPlus.Modeller.ComponentTests/BuiltInTests.cs

@@ -69,7 +69,6 @@ public void ModelAllBasicTypes()
       Declarations = BuiltIn.Basic
     };
 
-
     ITypesContext context = renderer.Context();
     RenderStructure result = renderer.RenderAst(schema, context);
 

test/GqlPlus.Modeller.ComponentTests/SampleModelTests.cs

@@ -1,6 +1,4 @@
-using FluentAssertions.Execution;
-
-using GqlPlus;
+using GqlPlus;
 using GqlPlus.Abstractions.Schema;
 using GqlPlus.Convert;
 using GqlPlus.Parsing;

test/GqlPlus.Modeller.ComponentTests/SchemaJsonTests.cs

@@ -2,7 +2,6 @@
 using GqlPlus.Convert;
 using GqlPlus.Merging;
 using GqlPlus.Parsing;
-using GqlPlus.Resolving;
 using GqlPlus.Result;
 
 namespace GqlPlus;

test/GqlPlus.Modeller.ComponentTests/SchemaJsonTests/!ALL.verified.json

@@ -10572,6 +10572,7 @@
     },
     "UnDiff": {
       "$tag": "_TypeUnion",
+      "aliases": ["UnA1", "UnA2"],
       "allItems": [
         {
           "$tag": "_UnionMember",
@@ -10609,12 +10610,21 @@
           "$tag": "_UnionMember",
           "name": "String",
           "union": "UnionPrnt"
+        },
+        {
+          "$tag": "_UnionMember",
+          "name": "Number",
+          "union": "UnionPrnt"
         }
       ],
       "items": [
         {
           "$tag": "_Aliased",
           "value": "String"
+        },
+        {
+          "$tag": "_Aliased",
+          "value": "Number"
         }
       ],
       "name": "UnionPrnt",
@@ -10625,6 +10635,24 @@
       },
       "typeKind": "Union"
     },
+    "UnParent": {
+      "$tag": "_TypeUnion",
+      "allItems": [
+        {
+          "$tag": "_UnionMember",
+          "name": "String",
+          "union": "UnParent"
+        }
+      ],
+      "items": [
+        {
+          "$tag": "_Aliased",
+          "value": "String"
+        }
+      ],
+      "name": "UnParent",
+      "typeKind": "Union"
+    },
     "UnSame": {
       "$tag": "_TypeUnion",
       "allItems": [
@@ -10642,6 +10670,34 @@
       ],
       "name": "UnSame",
       "typeKind": "Union"
+    },
+    "UnSameParent": {
+      "$tag": "_TypeUnion",
+      "allItems": [
+        {
+          "$tag": "_UnionMember",
+          "name": "String",
+          "union": "UnParent"
+        },
+        {
+          "$tag": "_UnionMember",
+          "name": "Boolean",
+          "union": "UnSameParent"
+        }
+      ],
+      "items": [
+        {
+          "$tag": "_Aliased",
+          "value": "Boolean"
+        }
+      ],
+      "name": "UnSameParent",
+      "parent": {
+        "$tag": "_TypeRef(_SimpleKind)",
+        "name": "UnParent",
+        "typeKind": "Union"
+      },
+      "typeKind": "Union"
     }
   }
 }

test/GqlPlus.Modeller.ComponentTests/SchemaJsonTests/!Merges.verified.json

@@ -1106,6 +1106,7 @@
     },
     "UnDiff": {
       "$tag": "_TypeUnion",
+      "aliases": ["UnA1", "UnA2"],
       "allItems": [
         {
           "$tag": "_UnionMember",
@@ -1131,6 +1132,24 @@
       "name": "UnDiff",
       "typeKind": "Union"
     },
+    "UnParent": {
+      "$tag": "_TypeUnion",
+      "allItems": [
+        {
+          "$tag": "_UnionMember",
+          "name": "String",
+          "union": "UnParent"
+        }
+      ],
+      "items": [
+        {
+          "$tag": "_Aliased",
+          "value": "String"
+        }
+      ],
+      "name": "UnParent",
+      "typeKind": "Union"
+    },
     "UnSame": {
       "$tag": "_TypeUnion",
       "allItems": [
@@ -1148,6 +1167,34 @@
       ],
       "name": "UnSame",
       "typeKind": "Union"
+    },
+    "UnSameParent": {
+      "$tag": "_TypeUnion",
+      "allItems": [
+        {
+          "$tag": "_UnionMember",
+          "name": "String",
+          "union": "UnParent"
+        },
+        {
+          "$tag": "_UnionMember",
+          "name": "Boolean",
+          "union": "UnSameParent"
+        }
+      ],
+      "items": [
+        {
+          "$tag": "_Aliased",
+          "value": "Boolean"
+        }
+      ],
+      "name": "UnSameParent",
+      "parent": {
+        "$tag": "_TypeRef(_SimpleKind)",
+        "name": "UnParent",
+        "typeKind": "Union"
+      },
+      "typeKind": "Union"
     }
   }
 }