From 28aafc79a9f9065f7cb7e8bb2df49e5795896aeb Mon Sep 17 00:00:00 2001 From: zholti <104837016+zholti@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:30:35 -0700 Subject: [PATCH] bugfix: local variable 'data' colliding with argument name (#291) This PR makes [THIS ISSUE](https://github.com/Khan/genqlient/issues/279) a lot less likely to occur. The local name "data" in generated functions was colliding with arguments called "data". Note that no explicit name collision check was added, but "data" inside the function was just renamed to "data_" to make it less likely to collide with arguments. --------- Co-authored-by: Ben Kraft --- docs/CHANGELOG.md | 1 + example/generated.go | 44 +-- generate/operation.go.tmpl | 30 +- .../MutationArgsWithCollidingNames.graphql | 5 + generate/testdata/queries/schema.graphql | 5 +- ....graphql-ComplexInlineFragments.graphql.go | 18 +- ...s.graphql-ComplexNamedFragments.graphql.go | 18 +- ...ovariantInterfaceImplementation.graphql.go | 18 +- ...omMarshal.graphql-CustomMarshal.graphql.go | 18 +- ...lice.graphql-CustomMarshalSlice.graphql.go | 18 +- ...erate-DateTime.graphql-DateTime.graphql.go | 18 +- ...nterface.graphql-EmptyInterface.graphql.go | 18 +- ...enerate-Flatten.graphql-Flatten.graphql.go | 18 +- ...tGenerate-Hasura.graphql-Hasura.graphql.go | 18 +- ...ate-InputEnum.graphql-InputEnum.graphql.go | 18 +- ...InputObject.graphql-InputObject.graphql.go | 18 +- ...ield.graphql-InterfaceListField.graphql.go | 18 +- ...nterfaceListOfListsOfListsField.graphql.go | 18 +- ...esting.graphql-InterfaceNesting.graphql.go | 18 +- ...ts.graphql-InterfaceNoFragments.graphql.go | 18 +- ...ate-ListInput.graphql-ListInput.graphql.go | 18 +- ...ists.graphql-ListOfListsOfLists.graphql.go | 18 +- ...ives.graphql-MultipleDirectives.graphql.go | 18 +- ...-MutationArgsWithCollidingNames.graphql.go | 93 +++++ ...utationArgsWithCollidingNames.graphql.json | 9 + ...ate-Omitempty.graphql-Omitempty.graphql.go | 18 +- ...erate-Pointers.graphql-Pointers.graphql.go | 18 +- ...rsInline.graphql-PointersInline.graphql.go | 18 +- ...enerate-Pokemon.graphql-Pokemon.graphql.go | 18 +- ...ithAlias.graphql-QueryWithAlias.graphql.go | 18 +- ...as.graphql-QueryWithDoubleAlias.graphql.go | 18 +- ...ithEnums.graphql-QueryWithEnums.graphql.go | 18 +- ...hSlices.graphql-QueryWithSlices.graphql.go | 18 +- ...tructs.graphql-QueryWithStructs.graphql.go | 18 +- ...ate-Recursion.graphql-Recursion.graphql.go | 18 +- ...nt.graphql-SimpleInlineFragment.graphql.go | 18 +- ...SimpleInput.graphql-SimpleInput.graphql.go | 18 +- ...Mutation.graphql-SimpleMutation.graphql.go | 18 +- ...ent.graphql-SimpleNamedFragment.graphql.go | 18 +- ...SimpleQuery.graphql-SimpleQuery.graphql.go | 18 +- ...e.graphql-SimpleQueryNoOverride.graphql.go | 18 +- ...leQueryWithPointerFalseOverride.graphql.go | 18 +- ...ructOption.graphql-StructOption.graphql.go | 18 +- ...erate-TypeName.graphql-TypeName.graphql.go | 18 +- ...ate-TypeNames.graphql-TypeNames.graphql.go | 18 +- ...gments.graphql-UnionNoFragments.graphql.go | 18 +- ...EnumTwice.graphql-UsesEnumTwice.graphql.go | 18 +- ...e-unexported.graphql-unexported.graphql.go | 18 +- ...ClientGetter-testdata-queries-generated.go | 28 +- ...ustomContext-testdata-queries-generated.go | 28 +- ...terNoContext-testdata-queries-generated.go | 24 +- ...ustomContext-testdata-queries-generated.go | 22 +- ...extWithAlias-testdata-queries-generated.go | 22 +- ...efaultConfig-testdata-queries-generated.go | 22 +- ...RawCasingAll-testdata-queries-generated.go | 22 +- ...singSpecific-testdata-queries-generated.go | 22 +- ...rtOperations-testdata-queries-generated.go | 22 +- ...g-Extensions-testdata-queries-generated.go | 22 +- ...ig-NoContext-testdata-queries-generated.go | 18 +- ...ionalGeneric-testdata-queries-generated.go | 44 +-- ...ionalPointer-testdata-queries-generated.go | 88 ++--- ...ptionalValue-testdata-queries-generated.go | 44 +-- ...kageBindings-testdata-queries-generated.go | 22 +- ...fig-PackageName-testdata-queries-myfile.go | 22 +- ...ctReferences-testdata-queries-generated.go | 44 +-- ...ionalPointer-testdata-queries-generated.go | 44 +-- ...ubpackage-testdata-queries-mypkg-myfile.go | 22 +- ...ageConfig-testdata-queries-mypkg-myfile.go | 22 +- internal/integration/generated.go | 330 +++++++++--------- 69 files changed, 985 insertions(+), 874 deletions(-) create mode 100644 generate/testdata/queries/MutationArgsWithCollidingNames.graphql create mode 100644 generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.go create mode 100644 generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.json diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f0199ee0..bec20ef4 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -29,6 +29,7 @@ When releasing a new version: ### Bug fixes: - The presence of negative pointer directives, i.e., `# @genqlient(pointer: false)` are now respected even in the when `optional: pointer` is set in the configuration file. +- Made name collisions between query/mutation arguments and local function variables less likely. ## v0.6.0 diff --git a/example/generated.go b/example/generated.go index 7c1c0f39..c13d33b5 100644 --- a/example/generated.go +++ b/example/generated.go @@ -81,29 +81,29 @@ query getUser ($Login: String!) { // getUser gets the given user's name from their username. func getUser( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, Login string, ) (*getUserResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "getUser", Query: getUser_Operation, Variables: &__getUserInput{ Login: Login, }, } - var err error + var err_ error - var data getUserResponse - resp := &graphql.Response{Data: &data} + var data_ getUserResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by getViewer. @@ -117,23 +117,23 @@ query getViewer { ` func getViewer( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*getViewerResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "getViewer", Query: getViewer_Operation, } - var err error + var err_ error - var data getViewerResponse - resp := &graphql.Response{Data: &data} + var data_ getViewerResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/operation.go.tmpl b/generate/operation.go.tmpl index 48221cda..a89b83c7 100644 --- a/generate/operation.go.tmpl +++ b/generate/operation.go.tmpl @@ -4,10 +4,10 @@ const {{.Name}}_Operation = `{{$.Body}}` {{.Doc}} func {{.Name}}( {{if ne .Config.ContextType "-" -}} - ctx {{ref .Config.ContextType}}, + ctx_ {{ref .Config.ContextType}}, {{end}} {{- if not .Config.ClientGetter -}} - client {{ref "github.com/Khan/genqlient/graphql.Client"}}, + client_ {{ref "github.com/Khan/genqlient/graphql.Client"}}, {{end}} {{- if .Input -}} {{- range .Input.Fields -}} @@ -16,7 +16,7 @@ func {{.Name}}( {{end -}} {{end -}} ) (*{{.ResponseName}}, {{if .Config.Extensions -}}map[string]interface{},{{end}} error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "{{.Name}}", Query: {{.Name}}_Operation, {{if .Input -}} @@ -27,23 +27,23 @@ func {{.Name}}( }, {{end -}} } - var err error + var err_ error {{if .Config.ClientGetter -}} - var client graphql.Client + var client_ graphql.Client - client, err = {{ref .Config.ClientGetter}}({{if ne .Config.ContextType "-"}}ctx{{else}}{{end}}) - if err != nil { - return nil, {{if .Config.Extensions -}}nil,{{end -}} err + client_, err_ = {{ref .Config.ClientGetter}}({{if ne .Config.ContextType "-"}}ctx_{{else}}{{end}}) + if err_ != nil { + return nil, {{if .Config.Extensions -}}nil,{{end -}} err_ } {{end}} - var data {{.ResponseName}} - resp := &graphql.Response{Data: &data} + var data_ {{.ResponseName}} + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - {{if ne .Config.ContextType "-"}}ctx{{else}}nil{{end}}, - req, - resp, + err_ = client_.MakeRequest( + {{if ne .Config.ContextType "-"}}ctx_{{else}}nil{{end}}, + req_, + resp_, ) - return &data, {{if .Config.Extensions -}}resp.Extensions,{{end -}} err + return &data_, {{if .Config.Extensions -}}resp_.Extensions,{{end -}} err_ } diff --git a/generate/testdata/queries/MutationArgsWithCollidingNames.graphql b/generate/testdata/queries/MutationArgsWithCollidingNames.graphql new file mode 100644 index 00000000..cbe35f49 --- /dev/null +++ b/generate/testdata/queries/MutationArgsWithCollidingNames.graphql @@ -0,0 +1,5 @@ +mutation MutationArgsWithCollidingNames($data: String!, $req: Int, $resp: Int, $client: String) { + updateUser(data: $data, req: $req, resp: $resp, client: $client) { + id + } +} diff --git a/generate/testdata/queries/schema.graphql b/generate/testdata/queries/schema.graphql index 6e783de9..17db360a 100644 --- a/generate/testdata/queries/schema.graphql +++ b/generate/testdata/queries/schema.graphql @@ -184,7 +184,10 @@ type Query { } type Mutation { - createUser(name: String!, email: String): User + createUser(name: String!, email: String): User + # The following query is non-sensical, but tests that argument names don't + # collide with local var names in generated functions + updateUser(data: String!, req: Int, resp: Int, client: String): User } input getPokemonBoolExp { diff --git a/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go index 2afdeb4a..5cd21cd9 100644 --- a/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go @@ -1435,23 +1435,23 @@ query ComplexInlineFragments { // versa, because gqlparser doesn't support interfaces that implement other // interfaces yet. func ComplexInlineFragments( - client graphql.Client, + client_ graphql.Client, ) (*ComplexInlineFragmentsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ComplexInlineFragments", Query: ComplexInlineFragments_Operation, } - var err error + var err_ error - var data ComplexInlineFragmentsResponse - resp := &graphql.Response{Data: &data} + var data_ ComplexInlineFragmentsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-ComplexNamedFragments.graphql-ComplexNamedFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-ComplexNamedFragments.graphql-ComplexNamedFragments.graphql.go index dbddcee6..5e7350c9 100644 --- a/generate/testdata/snapshots/TestGenerate-ComplexNamedFragments.graphql-ComplexNamedFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ComplexNamedFragments.graphql-ComplexNamedFragments.graphql.go @@ -1801,23 +1801,23 @@ fragment MoreVideoFields on Video { ` func ComplexNamedFragments( - client graphql.Client, + client_ graphql.Client, ) (*ComplexNamedFragmentsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ComplexNamedFragments", Query: ComplexNamedFragments_Operation, } - var err error + var err_ error - var data ComplexNamedFragmentsResponse - resp := &graphql.Response{Data: &data} + var data_ ComplexNamedFragmentsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-CovariantInterfaceImplementation.graphql-CovariantInterfaceImplementation.graphql.go b/generate/testdata/snapshots/TestGenerate-CovariantInterfaceImplementation.graphql-CovariantInterfaceImplementation.graphql.go index 419ae10e..74aa5774 100644 --- a/generate/testdata/snapshots/TestGenerate-CovariantInterfaceImplementation.graphql-CovariantInterfaceImplementation.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-CovariantInterfaceImplementation.graphql-CovariantInterfaceImplementation.graphql.go @@ -2393,23 +2393,23 @@ fragment TopicFields on Topic { ` func CovariantInterfaceImplementation( - client graphql.Client, + client_ graphql.Client, ) (*CovariantInterfaceImplementationResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "CovariantInterfaceImplementation", Query: CovariantInterfaceImplementation_Operation, } - var err error + var err_ error - var data CovariantInterfaceImplementationResponse - resp := &graphql.Response{Data: &data} + var data_ CovariantInterfaceImplementationResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-CustomMarshal.graphql-CustomMarshal.graphql.go b/generate/testdata/snapshots/TestGenerate-CustomMarshal.graphql-CustomMarshal.graphql.go index c848ad7d..7f67c02b 100644 --- a/generate/testdata/snapshots/TestGenerate-CustomMarshal.graphql-CustomMarshal.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-CustomMarshal.graphql-CustomMarshal.graphql.go @@ -185,27 +185,27 @@ query CustomMarshal ($date: Date!) { ` func CustomMarshal( - client graphql.Client, + client_ graphql.Client, date time.Time, ) (*CustomMarshalResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "CustomMarshal", Query: CustomMarshal_Operation, Variables: &__CustomMarshalInput{ Date: date, }, } - var err error + var err_ error - var data CustomMarshalResponse - resp := &graphql.Response{Data: &data} + var data_ CustomMarshalResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-CustomMarshalSlice.graphql-CustomMarshalSlice.graphql.go b/generate/testdata/snapshots/TestGenerate-CustomMarshalSlice.graphql-CustomMarshalSlice.graphql.go index 0d72eb32..0ed6becd 100644 --- a/generate/testdata/snapshots/TestGenerate-CustomMarshalSlice.graphql-CustomMarshalSlice.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-CustomMarshalSlice.graphql-CustomMarshalSlice.graphql.go @@ -212,11 +212,11 @@ query CustomMarshalSlice ($datesss: [[[Date!]!]!]!, $datesssp: [[[Date!]!]!]!) { ` func CustomMarshalSlice( - client graphql.Client, + client_ graphql.Client, datesss [][][]time.Time, datesssp [][][]*time.Time, ) (*CustomMarshalSliceResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "CustomMarshalSlice", Query: CustomMarshalSlice_Operation, Variables: &__CustomMarshalSliceInput{ @@ -224,17 +224,17 @@ func CustomMarshalSlice( Datesssp: datesssp, }, } - var err error + var err_ error - var data CustomMarshalSliceResponse - resp := &graphql.Response{Data: &data} + var data_ CustomMarshalSliceResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go index 97554da8..3bf23904 100644 --- a/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go @@ -36,11 +36,11 @@ query convertTimezone ($dt: DateTime!, $tz: String) { ` func convertTimezone( - client graphql.Client, + client_ graphql.Client, dt time.Time, tz string, ) (*convertTimezoneResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "convertTimezone", Query: convertTimezone_Operation, Variables: &__convertTimezoneInput{ @@ -48,17 +48,17 @@ func convertTimezone( Tz: tz, }, } - var err error + var err_ error - var data convertTimezoneResponse - resp := &graphql.Response{Data: &data} + var data_ convertTimezoneResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go index 0f798d72..95d902d3 100644 --- a/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go @@ -29,23 +29,23 @@ query EmptyInterface { ` func EmptyInterface( - client graphql.Client, + client_ graphql.Client, ) (*EmptyInterfaceResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "EmptyInterface", Query: EmptyInterface_Operation, } - var err error + var err_ error - var data EmptyInterfaceResponse - resp := &graphql.Response{Data: &data} + var data_ EmptyInterfaceResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-Flatten.graphql-Flatten.graphql.go b/generate/testdata/snapshots/TestGenerate-Flatten.graphql-Flatten.graphql.go index a18b8576..c05e913d 100644 --- a/generate/testdata/snapshots/TestGenerate-Flatten.graphql-Flatten.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Flatten.graphql-Flatten.graphql.go @@ -305,23 +305,23 @@ fragment ChildVideoFields on Video { ` func ComplexNamedFragments( - client graphql.Client, + client_ graphql.Client, ) (*InnerQueryFragment, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ComplexNamedFragments", Query: ComplexNamedFragments_Operation, } - var err error + var err_ error - var data InnerQueryFragment - resp := &graphql.Response{Data: &data} + var data_ InnerQueryFragment + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-Hasura.graphql-Hasura.graphql.go b/generate/testdata/snapshots/TestGenerate-Hasura.graphql-Hasura.graphql.go index 313b82e9..d1dc4269 100644 --- a/generate/testdata/snapshots/TestGenerate-Hasura.graphql-Hasura.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Hasura.graphql-Hasura.graphql.go @@ -92,27 +92,27 @@ query GetPokemon ($where: getPokemonBoolExp!) { ` func GetPokemon( - client graphql.Client, + client_ graphql.Client, where *GetPokemonBoolExp, ) (*GetPokemonResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "GetPokemon", Query: GetPokemon_Operation, Variables: &__GetPokemonInput{ Where: where, }, } - var err error + var err_ error - var data GetPokemonResponse - resp := &graphql.Response{Data: &data} + var data_ GetPokemonResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go index f51591a0..49e46c3e 100644 --- a/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go @@ -64,27 +64,27 @@ query InputEnumQuery ($role: Role!) { ` func InputEnumQuery( - client graphql.Client, + client_ graphql.Client, role Role, ) (*InputEnumQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InputEnumQuery", Query: InputEnumQuery_Operation, Variables: &__InputEnumQueryInput{ Role: role, }, } - var err error + var err_ error - var data InputEnumQueryResponse - resp := &graphql.Response{Data: &data} + var data_ InputEnumQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go index e5f2aa03..9209e04f 100644 --- a/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go @@ -187,27 +187,27 @@ query InputObjectQuery ($query: UserQueryInput) { ` func InputObjectQuery( - client graphql.Client, + client_ graphql.Client, query UserQueryInput, ) (*InputObjectQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InputObjectQuery", Query: InputObjectQuery_Operation, Variables: &__InputObjectQueryInput{ Query: query, }, } - var err error + var err_ error - var data InputObjectQueryResponse - resp := &graphql.Response{Data: &data} + var data_ InputObjectQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InterfaceListField.graphql-InterfaceListField.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceListField.graphql-InterfaceListField.graphql.go index fb2fc307..c5dcb077 100644 --- a/generate/testdata/snapshots/TestGenerate-InterfaceListField.graphql-InterfaceListField.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceListField.graphql-InterfaceListField.graphql.go @@ -545,23 +545,23 @@ query InterfaceListField { ` func InterfaceListField( - client graphql.Client, + client_ graphql.Client, ) (*InterfaceListFieldResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InterfaceListField", Query: InterfaceListField_Operation, } - var err error + var err_ error - var data InterfaceListFieldResponse - resp := &graphql.Response{Data: &data} + var data_ InterfaceListFieldResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InterfaceListOfListsOfListsField.graphql-InterfaceListOfListsOfListsField.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceListOfListsOfListsField.graphql-InterfaceListOfListsOfListsField.graphql.go index 8b5a6074..2d13e431 100644 --- a/generate/testdata/snapshots/TestGenerate-InterfaceListOfListsOfListsField.graphql-InterfaceListOfListsOfListsField.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceListOfListsOfListsField.graphql-InterfaceListOfListsOfListsField.graphql.go @@ -523,23 +523,23 @@ query InterfaceListOfListOfListsField { ` func InterfaceListOfListOfListsField( - client graphql.Client, + client_ graphql.Client, ) (*InterfaceListOfListOfListsFieldResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InterfaceListOfListOfListsField", Query: InterfaceListOfListOfListsField_Operation, } - var err error + var err_ error - var data InterfaceListOfListOfListsFieldResponse - resp := &graphql.Response{Data: &data} + var data_ InterfaceListOfListOfListsFieldResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go index 2ad66424..5f872086 100644 --- a/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go @@ -525,23 +525,23 @@ query InterfaceNesting { ` func InterfaceNesting( - client graphql.Client, + client_ graphql.Client, ) (*InterfaceNestingResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InterfaceNesting", Query: InterfaceNesting_Operation, } - var err error + var err_ error - var data InterfaceNestingResponse - resp := &graphql.Response{Data: &data} + var data_ InterfaceNestingResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go index 84b2037d..bd4c7f02 100644 --- a/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go @@ -652,23 +652,23 @@ query InterfaceNoFragmentsQuery { ` func InterfaceNoFragmentsQuery( - client graphql.Client, + client_ graphql.Client, ) (*InterfaceNoFragmentsQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InterfaceNoFragmentsQuery", Query: InterfaceNoFragmentsQuery_Operation, } - var err error + var err_ error - var data InterfaceNoFragmentsQueryResponse - resp := &graphql.Response{Data: &data} + var data_ InterfaceNoFragmentsQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go index 8cb888db..2d3dfc18 100644 --- a/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go @@ -51,27 +51,27 @@ query ListInputQuery ($names: [String]) { ` func ListInputQuery( - client graphql.Client, + client_ graphql.Client, names []string, ) (*ListInputQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ListInputQuery", Query: ListInputQuery_Operation, Variables: &__ListInputQueryInput{ Names: names, }, } - var err error + var err_ error - var data ListInputQueryResponse - resp := &graphql.Response{Data: &data} + var data_ ListInputQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go index 806e81a4..e536cf61 100644 --- a/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go @@ -24,23 +24,23 @@ query ListOfListsOfLists { ` func ListOfListsOfLists( - client graphql.Client, + client_ graphql.Client, ) (*ListOfListsOfListsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ListOfListsOfLists", Query: ListOfListsOfLists_Operation, } - var err error + var err_ error - var data ListOfListsOfListsResponse - resp := &graphql.Response{Data: &data} + var data_ ListOfListsOfListsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-MultipleDirectives.graphql-MultipleDirectives.graphql.go b/generate/testdata/snapshots/TestGenerate-MultipleDirectives.graphql-MultipleDirectives.graphql.go index 356eef40..2859adec 100644 --- a/generate/testdata/snapshots/TestGenerate-MultipleDirectives.graphql-MultipleDirectives.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-MultipleDirectives.graphql-MultipleDirectives.graphql.go @@ -338,11 +338,11 @@ query MultipleDirectives ($query: UserQueryInput, $queries: [UserQueryInput]) { ` func MultipleDirectives( - client graphql.Client, + client_ graphql.Client, query MyInput, queries []*UserQueryInput, ) (*MyMultipleDirectivesResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "MultipleDirectives", Query: MultipleDirectives_Operation, Variables: &__MultipleDirectivesInput{ @@ -350,17 +350,17 @@ func MultipleDirectives( Queries: queries, }, } - var err error + var err_ error - var data MyMultipleDirectivesResponse - resp := &graphql.Response{Data: &data} + var data_ MyMultipleDirectivesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.go b/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.go new file mode 100644 index 00000000..be34cf2c --- /dev/null +++ b/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.go @@ -0,0 +1,93 @@ +// Code generated by github.com/Khan/genqlient, DO NOT EDIT. + +package test + +import ( + "github.com/Khan/genqlient/graphql" + "github.com/Khan/genqlient/internal/testutil" +) + +// MutationArgsWithCollidingNamesResponse is returned by MutationArgsWithCollidingNames on success. +type MutationArgsWithCollidingNamesResponse struct { + UpdateUser MutationArgsWithCollidingNamesUpdateUser `json:"updateUser"` +} + +// GetUpdateUser returns MutationArgsWithCollidingNamesResponse.UpdateUser, and is useful for accessing the field via an interface. +func (v *MutationArgsWithCollidingNamesResponse) GetUpdateUser() MutationArgsWithCollidingNamesUpdateUser { + return v.UpdateUser +} + +// MutationArgsWithCollidingNamesUpdateUser includes the requested fields of the GraphQL type User. +// The GraphQL type's documentation follows. +// +// A User is a user! +type MutationArgsWithCollidingNamesUpdateUser struct { + // id is the user's ID. + // + // It is stable, unique, and opaque, like all good IDs. + Id testutil.ID `json:"id"` +} + +// GetId returns MutationArgsWithCollidingNamesUpdateUser.Id, and is useful for accessing the field via an interface. +func (v *MutationArgsWithCollidingNamesUpdateUser) GetId() testutil.ID { return v.Id } + +// __MutationArgsWithCollidingNamesInput is used internally by genqlient +type __MutationArgsWithCollidingNamesInput struct { + Data string `json:"data"` + Req int `json:"req"` + Resp int `json:"resp"` + Client string `json:"client"` +} + +// GetData returns __MutationArgsWithCollidingNamesInput.Data, and is useful for accessing the field via an interface. +func (v *__MutationArgsWithCollidingNamesInput) GetData() string { return v.Data } + +// GetReq returns __MutationArgsWithCollidingNamesInput.Req, and is useful for accessing the field via an interface. +func (v *__MutationArgsWithCollidingNamesInput) GetReq() int { return v.Req } + +// GetResp returns __MutationArgsWithCollidingNamesInput.Resp, and is useful for accessing the field via an interface. +func (v *__MutationArgsWithCollidingNamesInput) GetResp() int { return v.Resp } + +// GetClient returns __MutationArgsWithCollidingNamesInput.Client, and is useful for accessing the field via an interface. +func (v *__MutationArgsWithCollidingNamesInput) GetClient() string { return v.Client } + +// The query or mutation executed by MutationArgsWithCollidingNames. +const MutationArgsWithCollidingNames_Operation = ` +mutation MutationArgsWithCollidingNames ($data: String!, $req: Int, $resp: Int, $client: String) { + updateUser(data: $data, req: $req, resp: $resp, client: $client) { + id + } +} +` + +func MutationArgsWithCollidingNames( + client_ graphql.Client, + data string, + req int, + resp int, + client string, +) (*MutationArgsWithCollidingNamesResponse, error) { + req_ := &graphql.Request{ + OpName: "MutationArgsWithCollidingNames", + Query: MutationArgsWithCollidingNames_Operation, + Variables: &__MutationArgsWithCollidingNamesInput{ + Data: data, + Req: req, + Resp: resp, + Client: client, + }, + } + var err_ error + + var data_ MutationArgsWithCollidingNamesResponse + resp_ := &graphql.Response{Data: &data_} + + err_ = client_.MakeRequest( + nil, + req_, + resp_, + ) + + return &data_, err_ +} + diff --git a/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.json b/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.json new file mode 100644 index 00000000..44b41889 --- /dev/null +++ b/generate/testdata/snapshots/TestGenerate-MutationArgsWithCollidingNames.graphql-MutationArgsWithCollidingNames.graphql.json @@ -0,0 +1,9 @@ +{ + "operations": [ + { + "operationName": "MutationArgsWithCollidingNames", + "query": "\nmutation MutationArgsWithCollidingNames ($data: String!, $req: Int, $resp: Int, $client: String) {\n\tupdateUser(data: $data, req: $req, resp: $resp, client: $client) {\n\t\tid\n\t}\n}\n", + "sourceLocation": "testdata/queries/MutationArgsWithCollidingNames.graphql" + } + ] +} diff --git a/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go index 11c7fb0d..a0f3cf1c 100644 --- a/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go @@ -234,14 +234,14 @@ query OmitEmptyQuery ($query: UserQueryInput, $queries: [UserQueryInput], $dt: D ` func OmitEmptyQuery( - client graphql.Client, + client_ graphql.Client, query UserQueryInput, queries []UserQueryInput, dt time.Time, tz string, tzNoOmitEmpty string, ) (*OmitEmptyQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "OmitEmptyQuery", Query: OmitEmptyQuery_Operation, Variables: &__OmitEmptyQueryInput{ @@ -252,17 +252,17 @@ func OmitEmptyQuery( TzNoOmitEmpty: tzNoOmitEmpty, }, } - var err error + var err_ error - var data OmitEmptyQueryResponse - resp := &graphql.Response{Data: &data} + var data_ OmitEmptyQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go index 10058d8e..7b402734 100644 --- a/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go @@ -248,12 +248,12 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) { ` func PointersQuery( - client graphql.Client, + client_ graphql.Client, query *UserQueryInput, dt time.Time, tz *string, ) (*PointersQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "PointersQuery", Query: PointersQuery_Operation, Variables: &__PointersQueryInput{ @@ -262,17 +262,17 @@ func PointersQuery( Tz: tz, }, } - var err error + var err_ error - var data PointersQueryResponse - resp := &graphql.Response{Data: &data} + var data_ PointersQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go index 99de5637..b365f376 100644 --- a/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go @@ -245,12 +245,12 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) { ` func PointersQuery( - client graphql.Client, + client_ graphql.Client, query *UserQueryInput, dt *time.Time, tz string, ) (*PointersQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "PointersQuery", Query: PointersQuery_Operation, Variables: &__PointersQueryInput{ @@ -259,17 +259,17 @@ func PointersQuery( Tz: tz, }, } - var err error + var err_ error - var data PointersQueryResponse - resp := &graphql.Response{Data: &data} + var data_ PointersQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-Pokemon.graphql-Pokemon.graphql.go b/generate/testdata/snapshots/TestGenerate-Pokemon.graphql-Pokemon.graphql.go index a14a99f1..9f1b108d 100644 --- a/generate/testdata/snapshots/TestGenerate-Pokemon.graphql-Pokemon.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Pokemon.graphql-Pokemon.graphql.go @@ -91,27 +91,27 @@ query GetPokemonSiblings ($input: PokemonInput!) { ` func GetPokemonSiblings( - client graphql.Client, + client_ graphql.Client, input testutil.Pokemon, ) (*GetPokemonSiblingsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "GetPokemonSiblings", Query: GetPokemonSiblings_Operation, Variables: &__GetPokemonSiblingsInput{ Input: input, }, } - var err error + var err_ error - var data GetPokemonSiblingsResponse - resp := &graphql.Response{Data: &data} + var data_ GetPokemonSiblingsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go index f8ef2c8d..0a71a8a6 100644 --- a/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go @@ -51,23 +51,23 @@ query QueryWithAlias { ` func QueryWithAlias( - client graphql.Client, + client_ graphql.Client, ) (*QueryWithAliasResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithAlias", Query: QueryWithAlias_Operation, } - var err error + var err_ error - var data QueryWithAliasResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithAliasResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go index 575e5088..f921fc5b 100644 --- a/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go @@ -51,23 +51,23 @@ query QueryWithDoubleAlias { ` func QueryWithDoubleAlias( - client graphql.Client, + client_ graphql.Client, ) (*QueryWithDoubleAliasResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithDoubleAlias", Query: QueryWithDoubleAlias_Operation, } - var err error + var err_ error - var data QueryWithDoubleAliasResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithDoubleAliasResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go index 73289662..b3b0a42a 100644 --- a/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go @@ -75,23 +75,23 @@ query QueryWithEnums { ` func QueryWithEnums( - client graphql.Client, + client_ graphql.Client, ) (*QueryWithEnumsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithEnums", Query: QueryWithEnums_Operation, } - var err error + var err_ error - var data QueryWithEnumsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithEnumsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go index 0552e564..8c2b7a6c 100644 --- a/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go @@ -54,23 +54,23 @@ query QueryWithSlices { ` func QueryWithSlices( - client graphql.Client, + client_ graphql.Client, ) (*QueryWithSlicesResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithSlices", Query: QueryWithSlices_Operation, } - var err error + var err_ error - var data QueryWithSlicesResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithSlicesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go index dcb209f9..8146c982 100644 --- a/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go @@ -56,23 +56,23 @@ query QueryWithStructs { ` func QueryWithStructs( - client graphql.Client, + client_ graphql.Client, ) (*QueryWithStructsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithStructs", Query: QueryWithStructs_Operation, } - var err error + var err_ error - var data QueryWithStructsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithStructsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-Recursion.graphql-Recursion.graphql.go b/generate/testdata/snapshots/TestGenerate-Recursion.graphql-Recursion.graphql.go index a04627f7..9c479e0c 100644 --- a/generate/testdata/snapshots/TestGenerate-Recursion.graphql-Recursion.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Recursion.graphql-Recursion.graphql.go @@ -84,27 +84,27 @@ query Recursion ($input: RecursiveInput!) { ` func Recursion( - client graphql.Client, + client_ graphql.Client, input RecursiveInput, ) (*RecursionResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "Recursion", Query: Recursion_Operation, Variables: &__RecursionInput{ Input: input, }, } - var err error + var err_ error - var data RecursionResponse - resp := &graphql.Response{Data: &data} + var data_ RecursionResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go index be156a31..0d3fb543 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go @@ -257,23 +257,23 @@ query SimpleInlineFragment { ` func SimpleInlineFragment( - client graphql.Client, + client_ graphql.Client, ) (*SimpleInlineFragmentResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleInlineFragment", Query: SimpleInlineFragment_Operation, } - var err error + var err_ error - var data SimpleInlineFragmentResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleInlineFragmentResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go index 2a48f8a7..f6e475ef 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go @@ -51,27 +51,27 @@ query SimpleInputQuery ($name: String!) { ` func SimpleInputQuery( - client graphql.Client, + client_ graphql.Client, name string, ) (*SimpleInputQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleInputQuery", Query: SimpleInputQuery_Operation, Variables: &__SimpleInputQueryInput{ Name: name, }, } - var err error + var err_ error - var data SimpleInputQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleInputQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go index f99df88a..f87244ca 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go @@ -56,27 +56,27 @@ mutation SimpleMutation ($name: String!) { // It has a long doc-comment, to test that we handle that correctly. // What a long comment indeed. func SimpleMutation( - client graphql.Client, + client_ graphql.Client, name string, ) (*SimpleMutationResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleMutation", Query: SimpleMutation_Operation, Variables: &__SimpleMutationInput{ Name: name, }, } - var err error + var err_ error - var data SimpleMutationResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleMutationResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleNamedFragment.graphql-SimpleNamedFragment.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleNamedFragment.graphql-SimpleNamedFragment.graphql.go index febf1123..c0ee3322 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleNamedFragment.graphql-SimpleNamedFragment.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleNamedFragment.graphql-SimpleNamedFragment.graphql.go @@ -572,23 +572,23 @@ fragment VideoFields on Video { ` func SimpleNamedFragment( - client graphql.Client, + client_ graphql.Client, ) (*SimpleNamedFragmentResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleNamedFragment", Query: SimpleNamedFragment_Operation, } - var err error + var err_ error - var data SimpleNamedFragmentResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleNamedFragmentResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go index 0d6c0040..ddb81cfa 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go @@ -43,23 +43,23 @@ query SimpleQuery { ` func SimpleQuery( - client graphql.Client, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleQueryNoOverride.graphql-SimpleQueryNoOverride.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleQueryNoOverride.graphql-SimpleQueryNoOverride.graphql.go index 5a27e897..64581688 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleQueryNoOverride.graphql-SimpleQueryNoOverride.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleQueryNoOverride.graphql-SimpleQueryNoOverride.graphql.go @@ -48,23 +48,23 @@ query SimpleQueryNoOverride { ` func SimpleQueryNoOverride( - client graphql.Client, + client_ graphql.Client, ) (*SimpleQueryNoOverrideResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQueryNoOverride", Query: SimpleQueryNoOverride_Operation, } - var err error + var err_ error - var data SimpleQueryNoOverrideResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryNoOverrideResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-SimpleQueryWithPointerFalseOverride.graphql-SimpleQueryWithPointerFalseOverride.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleQueryWithPointerFalseOverride.graphql-SimpleQueryWithPointerFalseOverride.graphql.go index 8bb9e368..6c26ddb0 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleQueryWithPointerFalseOverride.graphql-SimpleQueryWithPointerFalseOverride.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleQueryWithPointerFalseOverride.graphql-SimpleQueryWithPointerFalseOverride.graphql.go @@ -50,23 +50,23 @@ query SimpleQueryWithPointerFalseOverride { ` func SimpleQueryWithPointerFalseOverride( - client graphql.Client, + client_ graphql.Client, ) (*SimpleQueryWithPointerFalseOverrideResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQueryWithPointerFalseOverride", Query: SimpleQueryWithPointerFalseOverride_Operation, } - var err error + var err_ error - var data SimpleQueryWithPointerFalseOverrideResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryWithPointerFalseOverrideResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-StructOption.graphql-StructOption.graphql.go b/generate/testdata/snapshots/TestGenerate-StructOption.graphql-StructOption.graphql.go index 1cf05a36..55e0bfdd 100644 --- a/generate/testdata/snapshots/TestGenerate-StructOption.graphql-StructOption.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-StructOption.graphql-StructOption.graphql.go @@ -456,23 +456,23 @@ fragment VideoFields on Video { ` func StructOption( - client graphql.Client, + client_ graphql.Client, ) (*StructOptionResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "StructOption", Query: StructOption_Operation, } - var err error + var err_ error - var data StructOptionResponse - resp := &graphql.Response{Data: &data} + var data_ StructOptionResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go index 174d5584..af67320a 100644 --- a/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go @@ -48,23 +48,23 @@ query TypeNameQuery { ` func TypeNameQuery( - client graphql.Client, + client_ graphql.Client, ) (*TypeNameQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "TypeNameQuery", Query: TypeNameQuery_Operation, } - var err error + var err_ error - var data TypeNameQueryResponse - resp := &graphql.Response{Data: &data} + var data_ TypeNameQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-TypeNames.graphql-TypeNames.graphql.go b/generate/testdata/snapshots/TestGenerate-TypeNames.graphql-TypeNames.graphql.go index b05f5d5f..04bcec44 100644 --- a/generate/testdata/snapshots/TestGenerate-TypeNames.graphql-TypeNames.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-TypeNames.graphql-TypeNames.graphql.go @@ -284,23 +284,23 @@ query TypeNames { ` func TypeNames( - client graphql.Client, + client_ graphql.Client, ) (*Resp, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "TypeNames", Query: TypeNames_Operation, } - var err error + var err_ error - var data Resp - resp := &graphql.Response{Data: &data} + var data_ Resp + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go index 8c570a86..d52f31ae 100644 --- a/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go @@ -184,23 +184,23 @@ query UnionNoFragmentsQuery { ` func UnionNoFragmentsQuery( - client graphql.Client, + client_ graphql.Client, ) (*UnionNoFragmentsQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "UnionNoFragmentsQuery", Query: UnionNoFragmentsQuery_Operation, } - var err error + var err_ error - var data UnionNoFragmentsQueryResponse - resp := &graphql.Response{Data: &data} + var data_ UnionNoFragmentsQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go index d3f81e7c..69c2113e 100644 --- a/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go @@ -75,23 +75,23 @@ query UsesEnumTwiceQuery { ` func UsesEnumTwiceQuery( - client graphql.Client, + client_ graphql.Client, ) (*UsesEnumTwiceQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "UsesEnumTwiceQuery", Query: UsesEnumTwiceQuery_Operation, } - var err error + var err_ error - var data UsesEnumTwiceQueryResponse - resp := &graphql.Response{Data: &data} + var data_ UsesEnumTwiceQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go index c16bfcbd..f3e1f54a 100644 --- a/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go @@ -187,27 +187,27 @@ query unexported ($query: UserQueryInput) { ` func unexported( - client graphql.Client, + client_ graphql.Client, query UserQueryInput, ) (*unexportedResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "unexported", Query: unexported_Operation, Variables: &__unexportedInput{ Query: query, }, } - var err error + var err_ error - var data unexportedResponse - resp := &graphql.Response{Data: &data} + var data_ unexportedResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetter-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetter-testdata-queries-generated.go index bed38980..4ef93ec9 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetter-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetter-testdata-queries-generated.go @@ -45,29 +45,29 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, + ctx_ context.Context, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error - var client graphql.Client + var err_ error + var client_ graphql.Client - client, err = testutil.GetClientFromContext(ctx) - if err != nil { - return nil, err + client_, err_ = testutil.GetClientFromContext(ctx_) + if err_ != nil { + return nil, err_ } - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterCustomContext-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterCustomContext-testdata-queries-generated.go index 252030c9..2a16c728 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterCustomContext-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterCustomContext-testdata-queries-generated.go @@ -48,29 +48,29 @@ query SimpleQuery { ` func SimpleQuery( - ctx testutil.MyContext, + ctx_ testutil.MyContext, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error - var client graphql.Client + var err_ error + var client_ graphql.Client - client, err = testutil.GetClientFromMyContext(ctx) - if err != nil { - return nil, err + client_, err_ = testutil.GetClientFromMyContext(ctx_) + if err_ != nil { + return nil, err_ } - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterNoContext-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterNoContext-testdata-queries-generated.go index 65121f73..a34cf8d1 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterNoContext-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterNoContext-testdata-queries-generated.go @@ -43,27 +43,27 @@ query SimpleQuery { ` func SimpleQuery() (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error - var client graphql.Client + var err_ error + var client_ graphql.Client - client, err = testutil.GetClientFromNowhere() - if err != nil { - return nil, err + client_, err_ = testutil.GetClientFromNowhere() + if err_ != nil { + return nil, err_ } - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-CustomContext-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-CustomContext-testdata-queries-generated.go index 37386223..e9618132 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-CustomContext-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-CustomContext-testdata-queries-generated.go @@ -48,24 +48,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx testutil.MyContext, - client graphql.Client, + ctx_ testutil.MyContext, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-CustomContextWithAlias-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-CustomContextWithAlias-testdata-queries-generated.go index a3f043b8..a6d2535a 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-CustomContextWithAlias-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-CustomContextWithAlias-testdata-queries-generated.go @@ -48,24 +48,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx junkfunname.MyContext, - client graphql.Client, + ctx_ junkfunname.MyContext, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-DefaultConfig-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-DefaultConfig-testdata-queries-generated.go index b1cb7ebe..2a18a3b9 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-DefaultConfig-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-DefaultConfig-testdata-queries-generated.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingAll-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingAll-testdata-queries-generated.go index f168b1a8..3d296e52 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingAll-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingAll-testdata-queries-generated.go @@ -77,24 +77,24 @@ query QueryWithEnums { ` func QueryWithEnums( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithEnumsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithEnums", Query: QueryWithEnums_Operation, } - var err error + var err_ error - var data QueryWithEnumsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithEnumsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingSpecific-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingSpecific-testdata-queries-generated.go index f168b1a8..3d296e52 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingSpecific-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-EnumRawCasingSpecific-testdata-queries-generated.go @@ -77,24 +77,24 @@ query QueryWithEnums { ` func QueryWithEnums( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithEnumsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithEnums", Query: QueryWithEnums_Operation, } - var err error + var err_ error - var data QueryWithEnumsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithEnumsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-ExportOperations-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-ExportOperations-testdata-queries-generated.go index b1cb7ebe..2a18a3b9 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-ExportOperations-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-ExportOperations-testdata-queries-generated.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-Extensions-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-Extensions-testdata-queries-generated.go index 1383c1ef..da4a5d05 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-Extensions-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-Extensions-testdata-queries-generated.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-NoContext-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-NoContext-testdata-queries-generated.go index fe97b8c8..01005a7f 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-NoContext-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-NoContext-testdata-queries-generated.go @@ -42,23 +42,23 @@ query SimpleQuery { ` func SimpleQuery( - client graphql.Client, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( + err_ = client_.MakeRequest( nil, - req, - resp, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalGeneric-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalGeneric-testdata-queries-generated.go index 24cbd221..5d7d29cf 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalGeneric-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalGeneric-testdata-queries-generated.go @@ -92,29 +92,29 @@ query ListInputQuery ($names: [String]) { ` func ListInputQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, names []testutil.Option[string], ) (*ListInputQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ListInputQuery", Query: ListInputQuery_Operation, Variables: &__ListInputQueryInput{ Names: names, }, } - var err error + var err_ error - var data ListInputQueryResponse - resp := &graphql.Response{Data: &data} + var data_ ListInputQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by QueryWithSlices. @@ -130,24 +130,24 @@ query QueryWithSlices { ` func QueryWithSlices( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithSlicesResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithSlices", Query: QueryWithSlices_Operation, } - var err error + var err_ error - var data QueryWithSlicesResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithSlicesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalPointer-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalPointer-testdata-queries-generated.go index e547f818..781bc540 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalPointer-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalPointer-testdata-queries-generated.go @@ -149,29 +149,29 @@ query ListInputQuery ($names: [String]) { ` func ListInputQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, names []*string, ) (*ListInputQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ListInputQuery", Query: ListInputQuery_Operation, Variables: &__ListInputQueryInput{ Names: names, }, } - var err error + var err_ error - var data ListInputQueryResponse - resp := &graphql.Response{Data: &data} + var data_ ListInputQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by QueryWithSlices. @@ -187,25 +187,25 @@ query QueryWithSlices { ` func QueryWithSlices( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithSlicesResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithSlices", Query: QueryWithSlices_Operation, } - var err error + var err_ error - var data QueryWithSlicesResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithSlicesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by SimpleQueryNoOverride. @@ -219,25 +219,25 @@ query SimpleQueryNoOverride { ` func SimpleQueryNoOverride( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryNoOverrideResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQueryNoOverride", Query: SimpleQueryNoOverride_Operation, } - var err error + var err_ error - var data SimpleQueryNoOverrideResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryNoOverrideResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by SimpleQueryWithPointerFalseOverride. @@ -251,24 +251,24 @@ query SimpleQueryWithPointerFalseOverride { ` func SimpleQueryWithPointerFalseOverride( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryWithPointerFalseOverrideResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQueryWithPointerFalseOverride", Query: SimpleQueryWithPointerFalseOverride_Operation, } - var err error + var err_ error - var data SimpleQueryWithPointerFalseOverrideResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryWithPointerFalseOverrideResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalValue-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalValue-testdata-queries-generated.go index 336bd4db..82416cda 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-OptionalValue-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-OptionalValue-testdata-queries-generated.go @@ -87,29 +87,29 @@ query ListInputQuery ($names: [String]) { ` func ListInputQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, names []string, ) (*ListInputQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "ListInputQuery", Query: ListInputQuery_Operation, Variables: &__ListInputQueryInput{ Names: names, }, } - var err error + var err_ error - var data ListInputQueryResponse - resp := &graphql.Response{Data: &data} + var data_ ListInputQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by QueryWithSlices. @@ -125,24 +125,24 @@ query QueryWithSlices { ` func QueryWithSlices( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithSlicesResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithSlices", Query: QueryWithSlices_Operation, } - var err error + var err_ error - var data QueryWithSlicesResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithSlicesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-PackageBindings-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-PackageBindings-testdata-queries-generated.go index 5838a0ad..9340d5e6 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-PackageBindings-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-PackageBindings-testdata-queries-generated.go @@ -45,24 +45,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-PackageName-testdata-queries-myfile.go b/generate/testdata/snapshots/TestGenerateWithConfig-PackageName-testdata-queries-myfile.go index d3308f7d..4d382768 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-PackageName-testdata-queries-myfile.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-PackageName-testdata-queries-myfile.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-StructReferences-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-StructReferences-testdata-queries-generated.go index 6686c7ef..8365a6f5 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-StructReferences-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-StructReferences-testdata-queries-generated.go @@ -236,29 +236,29 @@ query InputObjectQuery ($query: UserQueryInput) { ` func InputObjectQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, query *UserQueryInput, ) (*InputObjectQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InputObjectQuery", Query: InputObjectQuery_Operation, Variables: &__InputObjectQueryInput{ Query: query, }, } - var err error + var err_ error - var data InputObjectQueryResponse - resp := &graphql.Response{Data: &data} + var data_ InputObjectQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by QueryWithStructs. @@ -274,24 +274,24 @@ query QueryWithStructs { ` func QueryWithStructs( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithStructsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithStructs", Query: QueryWithStructs_Operation, } - var err error + var err_ error - var data QueryWithStructsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithStructsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-StructReferencesAndOptionalPointer-testdata-queries-generated.go b/generate/testdata/snapshots/TestGenerateWithConfig-StructReferencesAndOptionalPointer-testdata-queries-generated.go index 704d3a72..61c785f9 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-StructReferencesAndOptionalPointer-testdata-queries-generated.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-StructReferencesAndOptionalPointer-testdata-queries-generated.go @@ -239,29 +239,29 @@ query InputObjectQuery ($query: UserQueryInput) { ` func InputObjectQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, query *UserQueryInput, ) (*InputObjectQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "InputObjectQuery", Query: InputObjectQuery_Operation, Variables: &__InputObjectQueryInput{ Query: query, }, } - var err error + var err_ error - var data InputObjectQueryResponse - resp := &graphql.Response{Data: &data} + var data_ InputObjectQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by QueryWithStructs. @@ -277,24 +277,24 @@ query QueryWithStructs { ` func QueryWithStructs( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*QueryWithStructsResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "QueryWithStructs", Query: QueryWithStructs_Operation, } - var err error + var err_ error - var data QueryWithStructsResponse - resp := &graphql.Response{Data: &data} + var data_ QueryWithStructsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-Subpackage-testdata-queries-mypkg-myfile.go b/generate/testdata/snapshots/TestGenerateWithConfig-Subpackage-testdata-queries-mypkg-myfile.go index d3308f7d..4d382768 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-Subpackage-testdata-queries-mypkg-myfile.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-Subpackage-testdata-queries-mypkg-myfile.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/generate/testdata/snapshots/TestGenerateWithConfig-SubpackageConfig-testdata-queries-mypkg-myfile.go b/generate/testdata/snapshots/TestGenerateWithConfig-SubpackageConfig-testdata-queries-mypkg-myfile.go index d3308f7d..4d382768 100644 --- a/generate/testdata/snapshots/TestGenerateWithConfig-SubpackageConfig-testdata-queries-mypkg-myfile.go +++ b/generate/testdata/snapshots/TestGenerateWithConfig-SubpackageConfig-testdata-queries-mypkg-myfile.go @@ -44,24 +44,24 @@ query SimpleQuery { ` func SimpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*SimpleQueryResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "SimpleQuery", Query: SimpleQuery_Operation, } - var err error + var err_ error - var data SimpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ SimpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/internal/integration/generated.go b/internal/integration/generated.go index bce3bf0e..1f0e079d 100644 --- a/internal/integration/generated.go +++ b/internal/integration/generated.go @@ -3089,29 +3089,29 @@ mutation createUser ($user: NewUser!) { ` func createUser( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, user NewUser, ) (*createUserResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "createUser", Query: createUser_Operation, Variables: &__createUserInput{ User: user, }, } - var err error + var err_ error - var data createUserResponse - resp := &graphql.Response{Data: &data} + var data_ createUserResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by failingQuery. @@ -3125,25 +3125,25 @@ query failingQuery { ` func failingQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*failingQueryResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "failingQuery", Query: failingQuery_Operation, } - var err error + var err_ error - var data failingQueryResponse - resp := &graphql.Response{Data: &data} + var data_ failingQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithCustomMarshal. @@ -3158,29 +3158,29 @@ query queryWithCustomMarshal ($date: Date!) { ` func queryWithCustomMarshal( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, date time.Time, ) (*queryWithCustomMarshalResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithCustomMarshal", Query: queryWithCustomMarshal_Operation, Variables: &__queryWithCustomMarshalInput{ Date: date, }, } - var err error + var err_ error - var data queryWithCustomMarshalResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithCustomMarshalResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithCustomMarshalOptional. @@ -3195,12 +3195,12 @@ query queryWithCustomMarshalOptional ($date: Date, $id: ID) { ` func queryWithCustomMarshalOptional( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, date *time.Time, id *string, ) (*queryWithCustomMarshalOptionalResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithCustomMarshalOptional", Query: queryWithCustomMarshalOptional_Operation, Variables: &__queryWithCustomMarshalOptionalInput{ @@ -3208,18 +3208,18 @@ func queryWithCustomMarshalOptional( Id: id, }, } - var err error + var err_ error - var data queryWithCustomMarshalOptionalResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithCustomMarshalOptionalResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithCustomMarshalSlice. @@ -3234,29 +3234,29 @@ query queryWithCustomMarshalSlice ($dates: [Date!]!) { ` func queryWithCustomMarshalSlice( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, dates []time.Time, ) (*queryWithCustomMarshalSliceResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithCustomMarshalSlice", Query: queryWithCustomMarshalSlice_Operation, Variables: &__queryWithCustomMarshalSliceInput{ Dates: dates, }, } - var err error + var err_ error - var data queryWithCustomMarshalSliceResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithCustomMarshalSliceResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithFlatten. @@ -3305,29 +3305,29 @@ fragment FriendsFields on User { ` func queryWithFlatten( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ids []string, ) (*QueryFragment, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithFlatten", Query: queryWithFlatten_Operation, Variables: &__queryWithFlattenInput{ Ids: ids, }, } - var err error + var err_ error - var data QueryFragment - resp := &graphql.Response{Data: &data} + var data_ QueryFragment + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithFragments. @@ -3370,29 +3370,29 @@ query queryWithFragments ($ids: [ID!]!) { ` func queryWithFragments( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ids []string, ) (*queryWithFragmentsResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithFragments", Query: queryWithFragments_Operation, Variables: &__queryWithFragmentsInput{ Ids: ids, }, } - var err error + var err_ error - var data queryWithFragmentsResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithFragmentsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithInterfaceListField. @@ -3407,29 +3407,29 @@ query queryWithInterfaceListField ($ids: [ID!]!) { ` func queryWithInterfaceListField( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ids []string, ) (*queryWithInterfaceListFieldResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithInterfaceListField", Query: queryWithInterfaceListField_Operation, Variables: &__queryWithInterfaceListFieldInput{ Ids: ids, }, } - var err error + var err_ error - var data queryWithInterfaceListFieldResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithInterfaceListFieldResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithInterfaceListPointerField. @@ -3444,29 +3444,29 @@ query queryWithInterfaceListPointerField ($ids: [ID!]!) { ` func queryWithInterfaceListPointerField( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ids []string, ) (*queryWithInterfaceListPointerFieldResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithInterfaceListPointerField", Query: queryWithInterfaceListPointerField_Operation, Variables: &__queryWithInterfaceListPointerFieldInput{ Ids: ids, }, } - var err error + var err_ error - var data queryWithInterfaceListPointerFieldResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithInterfaceListPointerFieldResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithInterfaceNoFragments. @@ -3485,29 +3485,29 @@ query queryWithInterfaceNoFragments ($id: ID!) { ` func queryWithInterfaceNoFragments( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, id string, ) (*queryWithInterfaceNoFragmentsResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithInterfaceNoFragments", Query: queryWithInterfaceNoFragments_Operation, Variables: &__queryWithInterfaceNoFragmentsInput{ Id: id, }, } - var err error + var err_ error - var data queryWithInterfaceNoFragmentsResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithInterfaceNoFragmentsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithNamedFragments. @@ -3550,29 +3550,29 @@ fragment MoreUserFields on User { ` func queryWithNamedFragments( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ids []string, ) (*queryWithNamedFragmentsResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithNamedFragments", Query: queryWithNamedFragments_Operation, Variables: &__queryWithNamedFragmentsInput{ Ids: ids, }, } - var err error + var err_ error - var data queryWithNamedFragmentsResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithNamedFragmentsResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithOmitempty. @@ -3587,29 +3587,29 @@ query queryWithOmitempty ($id: ID) { ` func queryWithOmitempty( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, id string, ) (*queryWithOmitemptyResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithOmitempty", Query: queryWithOmitempty_Operation, Variables: &__queryWithOmitemptyInput{ Id: id, }, } - var err error + var err_ error - var data queryWithOmitemptyResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithOmitemptyResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by queryWithVariables. @@ -3624,29 +3624,29 @@ query queryWithVariables ($id: ID!) { ` func queryWithVariables( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, id string, ) (*queryWithVariablesResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "queryWithVariables", Query: queryWithVariables_Operation, Variables: &__queryWithVariablesInput{ Id: id, }, } - var err error + var err_ error - var data queryWithVariablesResponse - resp := &graphql.Response{Data: &data} + var data_ queryWithVariablesResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by simpleQuery. @@ -3661,25 +3661,25 @@ query simpleQuery { ` func simpleQuery( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*simpleQueryResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "simpleQuery", Query: simpleQuery_Operation, } - var err error + var err_ error - var data simpleQueryResponse - resp := &graphql.Response{Data: &data} + var data_ simpleQueryResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ } // The query or mutation executed by simpleQueryExt. @@ -3694,23 +3694,23 @@ query simpleQueryExt { ` func simpleQueryExt( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, ) (*simpleQueryExtResponse, map[string]interface{}, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "simpleQueryExt", Query: simpleQueryExt_Operation, } - var err error + var err_ error - var data simpleQueryExtResponse - resp := &graphql.Response{Data: &data} + var data_ simpleQueryExtResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, resp.Extensions, err + return &data_, resp_.Extensions, err_ }