Fixed enum discovery in StrawBerry Shake (#3552)

ChilliCream · Apr 19, 2021 · cb60fbd · cb60fbd
1 parent a217b70
commit cb60fbd
Show file tree

Hide file tree

Showing 12 changed files with 1,402 additions and 24 deletions.
diff --git a/...tion/src/CodeGeneration.CSharp/Generators/TypeMapperGenerator_EntityOrUnionDataHandler.cs b/...tion/src/CodeGeneration.CSharp/Generators/TypeMapperGenerator_EntityOrUnionDataHandler.cs
@@ -74,12 +74,12 @@ private void AddEntityOrUnionDataHandler(
 
             IfBuilder ifBuilder = IfBuilder
                 .New()
-                .SetCondition($"{parameterName}.EntityId is {{ }}")
+                .SetCondition($"{parameterName}.EntityId is {{ }} id")
                 .AddCode(MethodCallBuilder
                     .New()
                     .SetReturn()
                     .SetMethodName(entityDataHandlerMethodName)
-                    .AddArgument($"{parameterName}.EntityId")
+                    .AddArgument("id")
                     .AddArgument(_snapshot))
                 .AddIfElse(IfBuilder
                     .New()

diff --git a/...yShake/CodeGeneration/src/CodeGeneration/Analyzers/DocumentAnalyzer.CollectOutputTypes.cs b/...yShake/CodeGeneration/src/CodeGeneration/Analyzers/DocumentAnalyzer.CollectOutputTypes.cs
@@ -146,5 +146,5 @@ private static void EnqueueFields(
             }
         }
     }
-   
+
 }
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Analyzers/EnumTypeUsageAnalyzer.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Analyzers/EnumTypeUsageAnalyzer.cs
@@ -26,7 +26,8 @@ public void Analyze(DocumentNode document)
         }
 
         protected override void VisitOperationDefinition(
-            OperationDefinitionNode node, object? context)
+            OperationDefinitionNode node,
+            object? context)
         {
             ObjectType operationType = _schema.GetOperationType(node.Operation);
 
@@ -41,8 +42,8 @@ protected override void VisitVariableDefinition(
             VariableDefinitionNode node,
             object? context)
         {
-            if (_schema.TryGetType(node.Type.NamedType().Name.Value, out INamedType type)
-                && type is IInputType inputType)
+            if (_schema.TryGetType(node.Type.NamedType().Name.Value, out INamedType type) &&
+                type is IInputType inputType)
             {
                 VisitInputType(inputType);
             }
@@ -52,8 +53,8 @@ protected override void VisitField(FieldNode node, object? context)
         {
             IType currentType = _typeContext.Peek();
 
-            if (currentType is IComplexOutputType complexType
-                && complexType.Fields.TryGetField(node.Name.Value, out IOutputField? field))
+            if (currentType is IComplexOutputType complexType &&
+                complexType.Fields.TryGetField(node.Name.Value, out IOutputField? field))
             {
                 INamedType fieldType = field.Type.NamedType();
                 if (fieldType is IInputType inputType)
@@ -75,8 +76,7 @@ protected override void VisitFragmentDefinition(
             FragmentDefinitionNode node,
             object? context)
         {
-            INamedType type = _schema!.GetType<INamedType>(
-                node.TypeCondition.Name.Value);
+            INamedType type = _schema!.GetType<INamedType>(node.TypeCondition.Name.Value);
 
             _typeContext.Push(type);
 
@@ -117,5 +117,23 @@ private void VisitInputObjectType(InputObjectType type)
                 VisitInputType(field.Type);
             }
         }
+
+        protected override void VisitInlineFragment(
+            InlineFragmentNode node,
+            object? context)
+        {
+            if (node.TypeCondition != null)
+            {
+                INamedType type = _schema!.GetType<INamedType>(node.TypeCondition.Name.Value);
+                _typeContext.Push(type);
+            }
+
+            base.VisitInlineFragment(node, context);
+
+            if (node.TypeCondition != null)
+            {
+                _typeContext.Pop();
+            }
+        }
     }
 }
diff --git a/...rawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/EntityOrIdGeneratorTests.cs b/...rawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/EntityOrIdGeneratorTests.cs
@@ -1,3 +1,4 @@
+using ChilliCream.Testing;
 using Xunit;
 using static StrawberryShake.CodeGeneration.CSharp.GeneratorTestHelper;
 
@@ -101,6 +102,63 @@ type Quox2 {
                 "extend schema @key(fields: \"id\")");
         }
 
+        [Fact]
+        public void UnionWithNestedObject()
+        {
+            AssertResult(
+                @"
+                mutation StoreUserSettingFor(
+                    $userId: Int!,
+                    $customerId: Int!,
+                    $input: StoreUserSettingForInput!) {
+                    storeUserSettingFor(userId: $userId, customerId: $customerId, input: $input) {
+                        ... on UserSettingSuccess {id}
+                        ... on UserSettingError {errors {code message}}
+                    }
+                }
+                ",
+                @"
+                type Query {
+                    foo: String
+                }
+
+                type Mutation {
+                    storeUserSettingFor(
+                        userId: Int!
+                        customerId: Int!
+                        input: StoreUserSettingForInput!): UserSettingResult!
+                }
+
+                union UserSettingResult = UserSettingSuccess | UserSettingError
+
+                input StoreUserSettingForInput {
+                  portal: String
+                  mobile: String
+                }
+
+                type UserSettingSuccess {
+                  id: Int!
+                }
+
+                type UserSettingError {
+                  errors: [ErrorNode!]!
+                }
+
+                type ErrorNode {
+                    code: ErrorCode
+                    message: String
+                }
+
+                enum ErrorCode {
+                  UNKNOWN
+                  MISSING_ARGUMENT
+                  INVALID_ARGUMENT
+                  FAILED
+                }
+                ",
+                "extend schema @key(fields: \"id\")");
+        }
+
         [Fact]
         public void UnionListInEntity()
         {

diff --git a/.../CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/EntityIdOrDataTest.Client.cs b/.../CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/EntityIdOrDataTest.Client.cs
@@ -791,9 +791,9 @@ public GetFooResult Create(global::StrawberryShake.IOperationResultDataInfo data
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::StrawberryShake.CodeGeneration.CSharp.Integration.EntityIdOrData.State.IBarData d)
             {

diff --git a/...st/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.InterfaceField.snap b/...st/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.InterfaceField.snap
@@ -747,9 +747,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {

diff --git a/...est/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.InterfaceList.snap b/...est/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.InterfaceList.snap
@@ -769,9 +769,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {

diff --git a/...eneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.NonNullableValueTypeId.snap b/...eneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.NonNullableValueTypeId.snap
@@ -690,9 +690,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {

diff --git a/...n/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionField.snap b/...n/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionField.snap
@@ -684,9 +684,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {

diff --git a/...on/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionList.snap b/...on/test/CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionList.snap
@@ -706,9 +706,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {

diff --git a/...CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionListInEntity.snap b/...CodeGeneration.CSharp.Tests/__snapshots__/EntityOrIdGeneratorTests.UnionListInEntity.snap
@@ -893,9 +893,9 @@ namespace Foo.Bar.State
             {
             }
 
-            )
+            id)
             {
-                return MapIGetFoo_Test_FooData(data.Value.EntityId, snapshot);
+                return MapIGetFoo_Test_FooData(id, snapshot);
             }
             else if (data.Value.Data is global::Foo.Bar.State.IBarData d)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,5 +146,5 @@ private static void EnqueueFields( @@
                 }
             }
         }
     }