Add GraphQL Extensions (#184)

This enables accessing the Extensions field, as defined in the response
format: https://spec.graphql.org/October2021/#sec-Response-Format

Extensions can be enabled using configuration option use_extensions.
This will change the return parameters of the generated client
functions. Making it a breaking change if enabled.

Since extensions are untyped as defined in the spec, the Client will
return an interface of type map[string]interface{}.

generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go

@@ -1348,13 +1348,9 @@ func (v *ComplexInlineFragmentsRootTopic) GetName() string { return v.Name }
 func ComplexInlineFragments(
 	client graphql.Client,
 ) (*ComplexInlineFragmentsResponse, error) {
-	var err error
-
-	var retval ComplexInlineFragmentsResponse
-	err = client.MakeRequest(
-		nil,
-		"ComplexInlineFragments",
-		`
+	req := &graphql.Request{
+		OpName: "ComplexInlineFragments",
+		Query: `
 query ComplexInlineFragments {
 	root {
 		id
@@ -1441,9 +1437,18 @@ query ComplexInlineFragments {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data ComplexInlineFragmentsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-ComplexNamedFragments.graphql-ComplexNamedFragments.graphql.go

@@ -1742,13 +1742,9 @@ func (v *VideoFieldsThumbnail) GetId() testutil.ID { return v.Id }
 func ComplexNamedFragments(
 	client graphql.Client,
 ) (*ComplexNamedFragmentsResponse, error) {
-	var err error
-
-	var retval ComplexNamedFragmentsResponse
-	err = client.MakeRequest(
-		nil,
-		"ComplexNamedFragments",
-		`
+	req := &graphql.Request{
+		OpName: "ComplexNamedFragments",
+		Query: `
 query ComplexNamedFragments {
 	... on Query {
 		... QueryFragment
@@ -1807,9 +1803,18 @@ fragment MoreVideoFields on Video {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data ComplexNamedFragmentsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-CustomMarshal.graphql-CustomMarshal.graphql.go

@@ -178,16 +178,9 @@ func CustomMarshal(
 	client graphql.Client,
 	date time.Time,
 ) (*CustomMarshalResponse, error) {
-	__input := __CustomMarshalInput{
-		Date: date,
-	}
-	var err error
-
-	var retval CustomMarshalResponse
-	err = client.MakeRequest(
-		nil,
-		"CustomMarshal",
-		`
+	req := &graphql.Request{
+		OpName: "CustomMarshal",
+		Query: `
 query CustomMarshal ($date: Date!) {
 	usersBornOn(date: $date) {
 		id
@@ -195,9 +188,21 @@ query CustomMarshal ($date: Date!) {
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__CustomMarshalInput{
+			Date: date,
+		},
+	}
+	var err error
+
+	var data CustomMarshalResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-CustomMarshalSlice.graphql-CustomMarshalSlice.graphql.go

@@ -208,25 +208,30 @@ func CustomMarshalSlice(
 	datesss [][][]time.Time,
 	datesssp [][][]*time.Time,
 ) (*CustomMarshalSliceResponse, error) {
-	__input := __CustomMarshalSliceInput{
-		Datesss:  datesss,
-		Datesssp: datesssp,
-	}
-	var err error
-
-	var retval CustomMarshalSliceResponse
-	err = client.MakeRequest(
-		nil,
-		"CustomMarshalSlice",
-		`
+	req := &graphql.Request{
+		OpName: "CustomMarshalSlice",
+		Query: `
 query CustomMarshalSlice ($datesss: [[[Date!]!]!]!, $datesssp: [[[Date!]!]!]!) {
 	acceptsListOfListOfListsOfDates(datesss: $datesss)
 	withPointer: acceptsListOfListOfListsOfDates(datesss: $datesssp)
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__CustomMarshalSliceInput{
+			Datesss:  datesss,
+			Datesssp: datesssp,
+		},
+	}
+	var err error
+
+	var data CustomMarshalSliceResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go

@@ -33,24 +33,29 @@ func convertTimezone(
 	dt time.Time,
 	tz string,
 ) (*convertTimezoneResponse, error) {
-	__input := __convertTimezoneInput{
-		Dt: dt,
-		Tz: tz,
-	}
-	var err error
-
-	var retval convertTimezoneResponse
-	err = client.MakeRequest(
-		nil,
-		"convertTimezone",
-		`
+	req := &graphql.Request{
+		OpName: "convertTimezone",
+		Query: `
 query convertTimezone ($dt: DateTime!, $tz: String) {
 	convert(dt: $dt, tz: $tz)
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__convertTimezoneInput{
+			Dt: dt,
+			Tz: tz,
+		},
+	}
+	var err error
+
+	var data convertTimezoneResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go

@@ -23,21 +23,26 @@ func (v *EmptyInterfaceResponse) GetGetComplexJunk() []map[string]*[]*map[string
 func EmptyInterface(
 	client graphql.Client,
 ) (*EmptyInterfaceResponse, error) {
-	var err error
-
-	var retval EmptyInterfaceResponse
-	err = client.MakeRequest(
-		nil,
-		"EmptyInterface",
-		`
+	req := &graphql.Request{
+		OpName: "EmptyInterface",
+		Query: `
 query EmptyInterface {
 	getJunk
 	getComplexJunk
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data EmptyInterfaceResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-Flatten.graphql-Flatten.graphql.go

@@ -269,13 +269,9 @@ func (v *VideoFieldsParentTopic) GetVideoChildren() []ChildVideoFields { return
 func ComplexNamedFragments(
 	client graphql.Client,
 ) (*InnerQueryFragment, error) {
-	var err error
-
-	var retval InnerQueryFragment
-	err = client.MakeRequest(
-		nil,
-		"ComplexNamedFragments",
-		`
+	req := &graphql.Request{
+		OpName: "ComplexNamedFragments",
+		Query: `
 query ComplexNamedFragments {
 	... QueryFragment
 }
@@ -311,9 +307,18 @@ fragment ChildVideoFields on Video {
 	name
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data InnerQueryFragment
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go

@@ -58,25 +58,30 @@ func InputEnumQuery(
 	client graphql.Client,
 	role Role,
 ) (*InputEnumQueryResponse, error) {
-	__input := __InputEnumQueryInput{
-		Role: role,
-	}
-	var err error
-
-	var retval InputEnumQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"InputEnumQuery",
-		`
+	req := &graphql.Request{
+		OpName: "InputEnumQuery",
+		Query: `
 query InputEnumQuery ($role: Role!) {
 	usersWithRole(role: $role) {
 		id
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__InputEnumQueryInput{
+			Role: role,
+		},
+	}
+	var err error
+
+	var data InputEnumQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go

@@ -181,25 +181,30 @@ func InputObjectQuery(
 	client graphql.Client,
 	query UserQueryInput,
 ) (*InputObjectQueryResponse, error) {
-	__input := __InputObjectQueryInput{
-		Query: query,
-	}
-	var err error
-
-	var retval InputObjectQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"InputObjectQuery",
-		`
+	req := &graphql.Request{
+		OpName: "InputObjectQuery",
+		Query: `
 query InputObjectQuery ($query: UserQueryInput) {
 	user(query: $query) {
 		id
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__InputObjectQueryInput{
+			Query: query,
+		},
+	}
+	var err error
+
+	var data InputObjectQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InterfaceListField.graphql-InterfaceListField.graphql.go

@@ -523,13 +523,9 @@ func (v *InterfaceListFieldWithPointerTopicChildrenVideo) GetName() string { ret
 func InterfaceListField(
 	client graphql.Client,
 ) (*InterfaceListFieldResponse, error) {
-	var err error
-
-	var retval InterfaceListFieldResponse
-	err = client.MakeRequest(
-		nil,
-		"InterfaceListField",
-		`
+	req := &graphql.Request{
+		OpName: "InterfaceListField",
+		Query: `
 query InterfaceListField {
 	root {
 		id
@@ -551,9 +547,18 @@ query InterfaceListField {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data InterfaceListFieldResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InterfaceListOfListsOfListsField.graphql-InterfaceListOfListsOfListsField.graphql.go

@@ -509,13 +509,9 @@ func (v *InterfaceListOfListOfListsFieldWithPointerVideo) GetName() *string { re
 func InterfaceListOfListOfListsField(
 	client graphql.Client,
 ) (*InterfaceListOfListOfListsFieldResponse, error) {
-	var err error
-
-	var retval InterfaceListOfListOfListsFieldResponse
-	err = client.MakeRequest(
-		nil,
-		"InterfaceListOfListOfListsField",
-		`
+	req := &graphql.Request{
+		OpName: "InterfaceListOfListOfListsField",
+		Query: `
 query InterfaceListOfListOfListsField {
 	listOfListsOfListsOfContent {
 		__typename
@@ -529,9 +525,18 @@ query InterfaceListOfListOfListsField {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data InterfaceListOfListOfListsFieldResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go

@@ -507,13 +507,9 @@ func (v *InterfaceNestingRootTopicChildrenVideo) GetParent() InterfaceNestingRoo
 func InterfaceNesting(
 	client graphql.Client,
 ) (*InterfaceNestingResponse, error) {
-	var err error
-
-	var retval InterfaceNestingResponse
-	err = client.MakeRequest(
-		nil,
-		"InterfaceNesting",
-		`
+	req := &graphql.Request{
+		OpName: "InterfaceNesting",
+		Query: `
 query InterfaceNesting {
 	root {
 		id
@@ -531,9 +527,18 @@ query InterfaceNesting {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data InterfaceNestingResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go

@@ -629,13 +629,9 @@ func (v *InterfaceNoFragmentsQueryWithPointerVideo) GetName() *string { return v
 func InterfaceNoFragmentsQuery(
 	client graphql.Client,
 ) (*InterfaceNoFragmentsQueryResponse, error) {
-	var err error
-
-	var retval InterfaceNoFragmentsQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"InterfaceNoFragmentsQuery",
-		`
+	req := &graphql.Request{
+		OpName: "InterfaceNoFragmentsQuery",
+		Query: `
 query InterfaceNoFragmentsQuery {
 	root {
 		id
@@ -658,9 +654,18 @@ query InterfaceNoFragmentsQuery {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data InterfaceNoFragmentsQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go

@@ -45,25 +45,30 @@ func ListInputQuery(
 	client graphql.Client,
 	names []string,
 ) (*ListInputQueryResponse, error) {
-	__input := __ListInputQueryInput{
-		Names: names,
-	}
-	var err error
-
-	var retval ListInputQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"ListInputQuery",
-		`
+	req := &graphql.Request{
+		OpName: "ListInputQuery",
+		Query: `
 query ListInputQuery ($names: [String]) {
 	user(query: {names:$names}) {
 		id
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__ListInputQueryInput{
+			Names: names,
+		},
+	}
+	var err error
+
+	var data ListInputQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go

@@ -19,20 +19,25 @@ func (v *ListOfListsOfListsResponse) GetListOfListsOfLists() [][][]string {
 func ListOfListsOfLists(
 	client graphql.Client,
 ) (*ListOfListsOfListsResponse, error) {
-	var err error
-
-	var retval ListOfListsOfListsResponse
-	err = client.MakeRequest(
-		nil,
-		"ListOfListsOfLists",
-		`
+	req := &graphql.Request{
+		OpName: "ListOfListsOfLists",
+		Query: `
 query ListOfListsOfLists {
 	listOfListsOfLists
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data ListOfListsOfListsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-MultipleDirectives.graphql-MultipleDirectives.graphql.go

@@ -330,17 +330,9 @@ func MultipleDirectives(
 	query MyInput,
 	queries []*UserQueryInput,
 ) (*MyMultipleDirectivesResponse, error) {
-	__input := __MultipleDirectivesInput{
-		Query:   query,
-		Queries: queries,
-	}
-	var err error
-
-	var retval MyMultipleDirectivesResponse
-	err = client.MakeRequest(
-		nil,
-		"MultipleDirectives",
-		`
+	req := &graphql.Request{
+		OpName: "MultipleDirectives",
+		Query: `
 query MultipleDirectives ($query: UserQueryInput, $queries: [UserQueryInput]) {
 	user(query: $query) {
 		id
@@ -350,9 +342,22 @@ query MultipleDirectives ($query: UserQueryInput, $queries: [UserQueryInput]) {
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__MultipleDirectivesInput{
+			Query:   query,
+			Queries: queries,
+		},
+	}
+	var err error
+
+	var data MyMultipleDirectivesResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go

@@ -227,20 +227,9 @@ func OmitEmptyQuery(
 	tz string,
 	tzNoOmitEmpty string,
 ) (*OmitEmptyQueryResponse, error) {
-	__input := __OmitEmptyQueryInput{
-		Query:         query,
-		Queries:       queries,
-		Dt:            dt,
-		Tz:            tz,
-		TzNoOmitEmpty: tzNoOmitEmpty,
-	}
-	var err error
-
-	var retval OmitEmptyQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"OmitEmptyQuery",
-		`
+	req := &graphql.Request{
+		OpName: "OmitEmptyQuery",
+		Query: `
 query OmitEmptyQuery ($query: UserQueryInput, $queries: [UserQueryInput], $dt: DateTime, $tz: String, $tzNoOmitEmpty: String) {
 	user(query: $query) {
 		id
@@ -252,9 +241,25 @@ query OmitEmptyQuery ($query: UserQueryInput, $queries: [UserQueryInput], $dt: D
 	convert2: maybeConvert(dt: $dt, tz: $tzNoOmitEmpty)
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__OmitEmptyQueryInput{
+			Query:         query,
+			Queries:       queries,
+			Dt:            dt,
+			Tz:            tz,
+			TzNoOmitEmpty: tzNoOmitEmpty,
+		},
+	}
+	var err error
+
+	var data OmitEmptyQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go

@@ -236,18 +236,9 @@ func PointersQuery(
 	dt time.Time,
 	tz *string,
 ) (*PointersQueryResponse, error) {
-	__input := __PointersQueryInput{
-		Query: query,
-		Dt:    dt,
-		Tz:    tz,
-	}
-	var err error
-
-	var retval PointersQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"PointersQuery",
-		`
+	req := &graphql.Request{
+		OpName: "PointersQuery",
+		Query: `
 query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) {
 	user(query: $query) {
 		id
@@ -262,9 +253,23 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) {
 	maybeConvert(dt: $dt, tz: $tz)
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__PointersQueryInput{
+			Query: query,
+			Dt:    dt,
+			Tz:    tz,
+		},
+	}
+	var err error
+
+	var data PointersQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go

@@ -233,18 +233,9 @@ func PointersQuery(
 	dt *time.Time,
 	tz string,
 ) (*PointersQueryResponse, error) {
-	__input := __PointersQueryInput{
-		Query: query,
-		Dt:    dt,
-		Tz:    tz,
-	}
-	var err error
-
-	var retval PointersQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"PointersQuery",
-		`
+	req := &graphql.Request{
+		OpName: "PointersQuery",
+		Query: `
 query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) {
 	user(query: $query) {
 		id
@@ -259,9 +250,23 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) {
 	maybeConvert(dt: $dt, tz: $tz)
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__PointersQueryInput{
+			Query: query,
+			Dt:    dt,
+			Tz:    tz,
+		},
+	}
+	var err error
+
+	var data PointersQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-Pokemon.graphql-Pokemon.graphql.go

@@ -75,16 +75,9 @@ func GetPokemonSiblings(
 	client graphql.Client,
 	input testutil.Pokemon,
 ) (*GetPokemonSiblingsResponse, error) {
-	__input := __GetPokemonSiblingsInput{
-		Input: input,
-	}
-	var err error
-
-	var retval GetPokemonSiblingsResponse
-	err = client.MakeRequest(
-		nil,
-		"GetPokemonSiblings",
-		`
+	req := &graphql.Request{
+		OpName: "GetPokemonSiblings",
+		Query: `
 query GetPokemonSiblings ($input: PokemonInput!) {
 	user(query: {hasPokemon:$input}) {
 		id
@@ -101,9 +94,21 @@ query GetPokemonSiblings ($input: PokemonInput!) {
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__GetPokemonSiblingsInput{
+			Input: input,
+		},
+	}
+	var err error
+
+	var data GetPokemonSiblingsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go

@@ -43,13 +43,9 @@ func (v *QueryWithAliasUser) GetOtherID() testutil.ID { return v.OtherID }
 func QueryWithAlias(
 	client graphql.Client,
 ) (*QueryWithAliasResponse, error) {
-	var err error
-
-	var retval QueryWithAliasResponse
-	err = client.MakeRequest(
-		nil,
-		"QueryWithAlias",
-		`
+	req := &graphql.Request{
+		OpName: "QueryWithAlias",
+		Query: `
 query QueryWithAlias {
 	User: user {
 		ID: id
@@ -57,9 +53,18 @@ query QueryWithAlias {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data QueryWithAliasResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go

@@ -43,13 +43,9 @@ func (v *QueryWithDoubleAliasUser) GetAlsoID() testutil.ID { return v.AlsoID }
 func QueryWithDoubleAlias(
 	client graphql.Client,
 ) (*QueryWithDoubleAliasResponse, error) {
-	var err error
-
-	var retval QueryWithDoubleAliasResponse
-	err = client.MakeRequest(
-		nil,
-		"QueryWithDoubleAlias",
-		`
+	req := &graphql.Request{
+		OpName: "QueryWithDoubleAlias",
+		Query: `
 query QueryWithDoubleAlias {
 	user {
 		ID: id
@@ -57,9 +53,18 @@ query QueryWithDoubleAlias {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data QueryWithDoubleAliasResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go

@@ -65,13 +65,9 @@ const (
 func QueryWithEnums(
 	client graphql.Client,
 ) (*QueryWithEnumsResponse, error) {
-	var err error
-
-	var retval QueryWithEnumsResponse
-	err = client.MakeRequest(
-		nil,
-		"QueryWithEnums",
-		`
+	req := &graphql.Request{
+		OpName: "QueryWithEnums",
+		Query: `
 query QueryWithEnums {
 	user {
 		roles
@@ -81,9 +77,18 @@ query QueryWithEnums {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data QueryWithEnumsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go

@@ -44,13 +44,9 @@ func (v *QueryWithSlicesUser) GetEmailsWithNullsOrNull() []string { return v.Ema
 func QueryWithSlices(
 	client graphql.Client,
 ) (*QueryWithSlicesResponse, error) {
-	var err error
-
-	var retval QueryWithSlicesResponse
-	err = client.MakeRequest(
-		nil,
-		"QueryWithSlices",
-		`
+	req := &graphql.Request{
+		OpName: "QueryWithSlices",
+		Query: `
 query QueryWithSlices {
 	user {
 		emails
@@ -60,9 +56,18 @@ query QueryWithSlices {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data QueryWithSlicesResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go

@@ -46,13 +46,9 @@ func (v *QueryWithStructsUserAuthMethodsAuthMethod) GetEmail() string { return v
 func QueryWithStructs(
 	client graphql.Client,
 ) (*QueryWithStructsResponse, error) {
-	var err error
-
-	var retval QueryWithStructsResponse
-	err = client.MakeRequest(
-		nil,
-		"QueryWithStructs",
-		`
+	req := &graphql.Request{
+		OpName: "QueryWithStructs",
+		Query: `
 query QueryWithStructs {
 	user {
 		authMethods {
@@ -62,9 +58,18 @@ query QueryWithStructs {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data QueryWithStructsResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-Recursion.graphql-Recursion.graphql.go

@@ -72,16 +72,9 @@ func Recursion(
 	client graphql.Client,
 	input RecursiveInput,
 ) (*RecursionResponse, error) {
-	__input := __RecursionInput{
-		Input: input,
-	}
-	var err error
-
-	var retval RecursionResponse
-	err = client.MakeRequest(
-		nil,
-		"Recursion",
-		`
+	req := &graphql.Request{
+		OpName: "Recursion",
+		Query: `
 query Recursion ($input: RecursiveInput!) {
 	recur(input: $input) {
 		rec {
@@ -94,9 +87,21 @@ query Recursion ($input: RecursiveInput!) {
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__RecursionInput{
+			Input: input,
+		},
+	}
+	var err error
+
+	var data RecursionResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go

@@ -242,13 +242,9 @@ func (v *SimpleInlineFragmentResponse) __premarshalJSON() (*__premarshalSimpleIn
 func SimpleInlineFragment(
 	client graphql.Client,
 ) (*SimpleInlineFragmentResponse, error) {
-	var err error
-
-	var retval SimpleInlineFragmentResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleInlineFragment",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleInlineFragment",
+		Query: `
 query SimpleInlineFragment {
 	randomItem {
 		__typename
@@ -263,9 +259,18 @@ query SimpleInlineFragment {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data SimpleInlineFragmentResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go

@@ -45,25 +45,30 @@ func SimpleInputQuery(
 	client graphql.Client,
 	name string,
 ) (*SimpleInputQueryResponse, error) {
-	__input := __SimpleInputQueryInput{
-		Name: name,
-	}
-	var err error
-
-	var retval SimpleInputQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleInputQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleInputQuery",
+		Query: `
 query SimpleInputQuery ($name: String!) {
 	user(query: {name:$name}) {
 		id
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__SimpleInputQueryInput{
+			Name: name,
+		},
+	}
+	var err error
+
+	var data SimpleInputQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go

@@ -49,16 +49,9 @@ func SimpleMutation(
 	client graphql.Client,
 	name string,
 ) (*SimpleMutationResponse, error) {
-	__input := __SimpleMutationInput{
-		Name: name,
-	}
-	var err error
-
-	var retval SimpleMutationResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleMutation",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleMutation",
+		Query: `
 mutation SimpleMutation ($name: String!) {
 	createUser(name: $name) {
 		id
@@ -66,9 +59,21 @@ mutation SimpleMutation ($name: String!) {
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__SimpleMutationInput{
+			Name: name,
+		},
+	}
+	var err error
+
+	var data SimpleMutationResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-SimpleNamedFragment.graphql-SimpleNamedFragment.graphql.go

@@ -549,13 +549,9 @@ func (v *VideoFieldsThumbnail) GetId() testutil.ID { return v.Id }
 func SimpleNamedFragment(
 	client graphql.Client,
 ) (*SimpleNamedFragmentResponse, error) {
-	var err error
-
-	var retval SimpleNamedFragmentResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleNamedFragment",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleNamedFragment",
+		Query: `
 query SimpleNamedFragment {
 	randomItem {
 		__typename
@@ -578,9 +574,18 @@ fragment VideoFields on Video {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data SimpleNamedFragmentResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go

@@ -36,22 +36,27 @@ func (v *SimpleQueryUser) GetId() testutil.ID { return v.Id }
 func SimpleQuery(
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-StructOption.graphql-StructOption.graphql.go

@@ -427,13 +427,9 @@ func (v *VideoFields) GetDuration() int { return v.Duration }
 func StructOption(
 	client graphql.Client,
 ) (*StructOptionResponse, error) {
-	var err error
-
-	var retval StructOptionResponse
-	err = client.MakeRequest(
-		nil,
-		"StructOption",
-		`
+	req := &graphql.Request{
+		OpName: "StructOption",
+		Query: `
 query StructOption {
 	root {
 		id
@@ -462,9 +458,18 @@ fragment VideoFields on Video {
 	duration
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data StructOptionResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go

@@ -40,13 +40,9 @@ func (v *TypeNameQueryUser) GetId() testutil.ID { return v.Id }
 func TypeNameQuery(
 	client graphql.Client,
 ) (*TypeNameQueryResponse, error) {
-	var err error
-
-	var retval TypeNameQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"TypeNameQuery",
-		`
+	req := &graphql.Request{
+		OpName: "TypeNameQuery",
+		Query: `
 query TypeNameQuery {
 	user {
 		__typename
@@ -54,9 +50,18 @@ query TypeNameQuery {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data TypeNameQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-TypeNames.graphql-TypeNames.graphql.go

@@ -267,13 +267,9 @@ func (v *User) GetName() string { return v.Name }
 func TypeNames(
 	client graphql.Client,
 ) (*Resp, error) {
-	var err error
-
-	var retval Resp
-	err = client.MakeRequest(
-		nil,
-		"TypeNames",
-		`
+	req := &graphql.Request{
+		OpName: "TypeNames",
+		Query: `
 query TypeNames {
 	user {
 		id
@@ -290,9 +286,18 @@ query TypeNames {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data Resp
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go

@@ -177,22 +177,27 @@ func (v *UnionNoFragmentsQueryResponse) __premarshalJSON() (*__premarshalUnionNo
 func UnionNoFragmentsQuery(
 	client graphql.Client,
 ) (*UnionNoFragmentsQueryResponse, error) {
-	var err error
-
-	var retval UnionNoFragmentsQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"UnionNoFragmentsQuery",
-		`
+	req := &graphql.Request{
+		OpName: "UnionNoFragmentsQuery",
+		Query: `
 query UnionNoFragmentsQuery {
 	randomLeaf {
 		__typename
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data UnionNoFragmentsQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go

@@ -65,13 +65,9 @@ func (v *UsesEnumTwiceQueryResponse) GetOtherUser() UsesEnumTwiceQueryOtherUser
 func UsesEnumTwiceQuery(
 	client graphql.Client,
 ) (*UsesEnumTwiceQueryResponse, error) {
-	var err error
-
-	var retval UsesEnumTwiceQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"UsesEnumTwiceQuery",
-		`
+	req := &graphql.Request{
+		OpName: "UsesEnumTwiceQuery",
+		Query: `
 query UsesEnumTwiceQuery {
 	Me: user {
 		roles
@@ -81,9 +77,18 @@ query UsesEnumTwiceQuery {
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data UsesEnumTwiceQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go

@@ -181,25 +181,30 @@ func unexported(
 	client graphql.Client,
 	query UserQueryInput,
 ) (*unexportedResponse, error) {
-	__input := __unexportedInput{
-		Query: query,
-	}
-	var err error
-
-	var retval unexportedResponse
-	err = client.MakeRequest(
-		nil,
-		"unexported",
-		`
+	req := &graphql.Request{
+		OpName: "unexported",
+		Query: `
 query unexported ($query: UserQueryInput) {
 	user(query: $query) {
 		id
 	}
 }
 `,
-		&retval,
-		&__input,
+		Variables: &__unexportedInput{
+			Query: query,
+		},
+	}
+	var err error
+
+	var data unexportedResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-ClientGetter-testdata-queries-generated.go

@@ -5,6 +5,7 @@ package queries
 import (
 	"context"
 
+	"github.com/Khan/genqlient/graphql"
 	"github.com/Khan/genqlient/internal/testutil"
 )
 
@@ -37,26 +38,33 @@ func (v *SimpleQueryUser) GetId() string { return v.Id }
 func SimpleQuery(
 	ctx context.Context,
 ) (*SimpleQueryResponse, error) {
-	var err error
-	client, err := testutil.GetClientFromContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+	var client graphql.Client
+
+	client, err = testutil.GetClientFromContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterCustomContext-testdata-queries-generated.go

@@ -5,6 +5,7 @@ package queries
 import (
 	"context"
 
+	"github.com/Khan/genqlient/graphql"
 	"github.com/Khan/genqlient/internal/testutil"
 )
 
@@ -40,26 +41,33 @@ func (v *SimpleQueryUser) GetId() string { return v.Id }
 func SimpleQuery(
 	ctx testutil.MyContext,
 ) (*SimpleQueryResponse, error) {
-	var err error
-	client, err := testutil.GetClientFromMyContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+	var client graphql.Client
+
+	client, err = testutil.GetClientFromMyContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-ClientGetterNoContext-testdata-queries-generated.go

@@ -3,6 +3,7 @@
 package queries
 
 import (
+	"github.com/Khan/genqlient/graphql"
 	"github.com/Khan/genqlient/internal/testutil"
 )
 
@@ -33,26 +34,33 @@ type SimpleQueryUser struct {
 func (v *SimpleQueryUser) GetId() string { return v.Id }
 
 func SimpleQuery() (*SimpleQueryResponse, error) {
-	var err error
-	client, err := testutil.GetClientFromNowhere()
-	if err != nil {
-		return nil, err
-	}
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+	var client graphql.Client
+
+	client, err = testutil.GetClientFromNowhere()
+	if err != nil {
+		return nil, err
+	}
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-CustomContext-testdata-queries-generated.go

@@ -42,22 +42,27 @@ func SimpleQuery(
 	ctx testutil.MyContext,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-DefaultConfig-testdata-queries-generated.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-ExportOperations-testdata-queries-generated.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-Extensions-testdata-queries-generated.go

@@ -0,0 +1,64 @@
+// Code generated by github.com/Khan/genqlient, DO NOT EDIT.
+
+package queries
+
+import (
+	"context"
+
+	"github.com/Khan/genqlient/graphql"
+)
+
+// SimpleQueryResponse is returned by SimpleQuery on success.
+type SimpleQueryResponse struct {
+	// user looks up a user by some stuff.
+	//
+	// See UserQueryInput for what stuff is supported.
+	// If query is null, returns the current user.
+	User SimpleQueryUser `json:"user"`
+}
+
+// GetUser returns SimpleQueryResponse.User, and is useful for accessing the field via an interface.
+func (v *SimpleQueryResponse) GetUser() SimpleQueryUser { return v.User }
+
+// SimpleQueryUser includes the requested fields of the GraphQL type User.
+// The GraphQL type's documentation follows.
+//
+// A User is a user!
+type SimpleQueryUser struct {
+	// id is the user's ID.
+	//
+	// It is stable, unique, and opaque, like all good IDs.
+	Id string `json:"id"`
+}
+
+// GetId returns SimpleQueryUser.Id, and is useful for accessing the field via an interface.
+func (v *SimpleQueryUser) GetId() string { return v.Id }
+
+func SimpleQuery(
+	ctx context.Context,
+	client graphql.Client,
+) (*SimpleQueryResponse, map[string]interface{}, error) {
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
+query SimpleQuery {
+	user {
+		id
+	}
+}
+`,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
+	)
+
+	return &data, resp.Extensions, err
+}
+

generate/testdata/snapshots/TestGenerateWithConfig-NoContext-testdata-queries-generated.go

@@ -35,22 +35,27 @@ func (v *SimpleQueryUser) GetId() string { return v.Id }
 func SimpleQuery(
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		nil,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
 		nil,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-PackageName-testdata-queries-myfile.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-StructReferences-testdata-queries-generated-structrefs.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-Subpackage-testdata-queries-mypkg-myfile.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }
 

generate/testdata/snapshots/TestGenerateWithConfig-SubpackageConfig-testdata-queries-mypkg-myfile.go

@@ -38,22 +38,27 @@ func SimpleQuery(
 	ctx context.Context,
 	client graphql.Client,
 ) (*SimpleQueryResponse, error) {
-	var err error
-
-	var retval SimpleQueryResponse
-	err = client.MakeRequest(
-		ctx,
-		"SimpleQuery",
-		`
+	req := &graphql.Request{
+		OpName: "SimpleQuery",
+		Query: `
 query SimpleQuery {
 	user {
 		id
 	}
 }
 `,
-		&retval,
-		nil,
+	}
+	var err error
+
+	var data SimpleQueryResponse
+	resp := &graphql.Response{Data: &data}
+
+	err = client.MakeRequest(
+		ctx,
+		req,
+		resp,
 	)
-	return &retval, err
+
+	return &data, err
 }