Fixed upload scalar on SS (#5329)

ChilliCream · Aug 22, 2022 · 0576961 · 0576961
1 parent 82d3330
commit 0576961
Show file tree

Hide file tree

Showing 12 changed files with 1,038 additions and 39 deletions.
diff --git a/src/StrawberryShake/Client/src/Transport.InMemory/DependencyInjection/InMemoryClient.cs b/src/StrawberryShake/Client/src/Transport.InMemory/DependencyInjection/InMemoryClient.cs
@@ -152,9 +152,9 @@ await interceptor
     {
         value = (source, key) switch
         {
-            (Dictionary<string, object?> s, string prop) => s[prop],
-            (List<object> l, int i) => l[i],
-            _ => null,
+            (Dictionary<string, object?> s, string prop) when s.ContainsKey(prop) => s[prop],
+            (List<object> l, int i) when i < l.Count => l[i],
+            _ => null
         };
     }
 

diff --git a/...rryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationServiceGenerator.cs b/...rryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationServiceGenerator.cs
@@ -446,7 +446,7 @@ private MethodBuilder CreateRequestMethod(OperationDescriptor descriptor)
             }
             else if (argument.Type.NamedType() is not ScalarTypeDescriptor { Name: "Upload" })
             {
-                return;
+                continue;
             }
 
             classBuilder

diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Mappers/OperationDescriptorMapper.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Mappers/OperationDescriptorMapper.cs
@@ -25,7 +25,7 @@ public static void Map(ClientModel model, IMapperContext context)
                         var namedTypeDescriptor =
                             context.Types.Single(type => type.Name.EqualsOrdinal(typeName));
 
-                        hasUpload = namedTypeDescriptor.HasUpload();
+                        hasUpload = hasUpload || namedTypeDescriptor.HasUpload();
 
                         return new PropertyDescriptor(
                             arg.Name,

diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/InputGeneratorTests.cs b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/InputGeneratorTests.cs
@@ -229,4 +229,40 @@ scalar Upload
                 ",
             "extend schema @key(fields: \"id\")");
     }
+
+    [Fact]
+    public void Operation_With_FirstNonUpload()
+    {
+        AssertResult(
+            @"query test(
+                    $string: String!
+                    $upload: Upload!) {
+                    foo(string: $string upload: $upload)
+                }",
+            @"type Query {
+                    foo(string: String! upload: Upload!): String
+                }
+
+                scalar Upload
+                ",
+            "extend schema @key(fields: \"id\")");
+    }
+
+    [Fact]
+    public void Operation_With_LastNonUpload()
+    {
+        AssertResult(
+            @"query test(
+                    $upload: Upload!
+                    $string: String!) {
+                    foo(string: $string upload: $upload)
+                }",
+            @"type Query {
+                    foo(string: String! upload: Upload!): String
+                }
+
+                scalar Upload
+                ",
+            "extend schema @key(fields: \"id\")");
+    }
 }
diff --git a/...wberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/TestGeneration.cs b/...wberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/TestGeneration.cs
@@ -264,13 +264,15 @@ public class TestGeneration
             */
     private const string UploadQueries = @"
         query TestUpload(
+                $nonUpload: String
                 $single: Upload
                 $list: [Upload]
                 $nested: [[Upload]]
                 $object: TestInput
                 $objectList: [TestInput]
                 $objectNested: [[TestInput]]) {
             upload(
+                nonUpload: $nonUpload
                 single: $single
                 list: $list
                 nested: $nested
@@ -281,6 +283,7 @@ public class TestGeneration
     private const string UploadSchema = @"
         type Query {
             upload(
+                nonUpload: String
                 single: Upload
                 list: [Upload]
                 nested: [[Upload]]

diff --git a/...ke/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/UploadScalarTest.Client.cs b/...ke/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/UploadScalarTest.Client.cs
diff --git a/...erryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/UploadScalarTest.cs b/...erryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/UploadScalarTest.cs
@@ -23,6 +23,7 @@ public async Task Execute_UploadScalar_Argument()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             new Upload(data, "test-file"),
             null,
             null,
@@ -47,6 +48,7 @@ public async Task Execute_UploadScalarList_Argument()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             new Upload?[] { new Upload(dataA, "A"), new Upload(dataB, "B") },
             null,
@@ -71,6 +73,7 @@ public async Task Execute_UploadScalarNested_Argument()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             null,
             new[] { new Upload?[] { new Upload(dataA, "A"), new Upload(dataB, "B") } },
@@ -94,6 +97,7 @@ public async Task Execute_Input_Argument()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             null,
             null,
@@ -123,6 +127,7 @@ public async Task Execute_InputList_Argument()
         using var dataB = CreateStream("b");
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             null,
             null,
@@ -163,6 +168,7 @@ public async Task Execute_InputNested_Argument()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             null,
             null,
@@ -220,6 +226,7 @@ public async Task Execute_ListWorksWithNull()
 
         // act
         var result = await client.TestUpload.ExecuteAsync(
+            "foo",
             null,
             new Upload?[] { new Upload(dataA, "A"), null, new Upload(dataB, "B") },
             null,