Skip to content

fix: do not remap variable with Upload type #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devsergiy merged 2 commits into from
Jan 19, 2025
Merged

fix: do not remap variable with Upload type #1040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac9c64
fix: do not remap variable with Upload type
devsergiy Jan 19, 2025
5eff8de
chore: add comment about file upload spec
devsergiy Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions v2/pkg/astnormalization/variables_mapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package astnormalization

import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -33,6 +32,7 @@ func TestVariablesMapper(t *testing.T) {

type Mutation {
updateObject(name: String!, files: [Upload!]): Object!
uploadFile(file: Upload!): Object!
}

type Subscription {
Expand Down Expand Up @@ -465,6 +465,22 @@ func TestVariablesMapper(t *testing.T) {
"a": "varOne",
},
},
{
name: "13 Mutation with single file upload",
input: `
mutation MyMutation($file: Upload!) {
uploadFile(files: $file) {
name
}
}`,
output: `
mutation MyMutation($file: Upload!) {
uploadFile(files: $file) {
name
}
}`,
variablesMapping: map[string]string{},
},
}

for _, tc := range testCases {
Expand All @@ -474,11 +490,9 @@ func TestVariablesMapper(t *testing.T) {

normalizer.NormalizeNamedOperation(&operation, &definition, operation.OperationDefinitionNameBytes(0), report)
require.False(t, report.HasErrors())
fmt.Println("normalized", unsafeprinter.PrettyPrint(&operation))

variablesNormalizer.NormalizeOperation(&operation, &definition, report)
require.False(t, report.HasErrors())
fmt.Println("variables normalized", unsafeprinter.PrettyPrint(&operation))

mapping := variablesMapper.NormalizeOperation(&operation, &definition, report)
require.False(t, report.HasErrors())
Expand Down
3 changes: 1 addition & 2 deletions v2/pkg/astnormalization/variables_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package astnormalization

import (
"bytes"
"cmp"
"math"
"slices"
Expand Down Expand Up @@ -127,7 +126,7 @@ func (v *variablesMappingVisitor) EnterArgument(ref int) {
}

if v.operation.OperationDefinitions[v.operationRef].OperationType == ast.OperationTypeMutation &&
bytes.Equal(varNameBytes, []byte("files")) {
v.operation.ResolveTypeNameString(v.operation.VariableDefinitions[variableDefinitionRef].Type) == "Upload" {
// do not remap files variable
return
}
Expand Down
Loading