set opname

This commit is contained in:
Ben Kraft
2021-03-30 11:27:43 -07:00
parent e3f6afeb78
commit 2c52314494
17 changed files with 23 additions and 2 deletions
+2
View File
@@ -31,6 +31,7 @@ func getViewer(
var retval getViewerResponse var retval getViewerResponse
err := client.MakeRequest( err := client.MakeRequest(
ctx, ctx,
"getViewer",
` `
query getViewer { query getViewer {
viewer { viewer {
@@ -57,6 +58,7 @@ func getUser(
var retval getUserResponse var retval getUserResponse
err := client.MakeRequest( err := client.MakeRequest(
ctx, ctx,
"getUser",
` `
query getUser ($Login: String!) { query getUser ($Login: String!) {
user(login: $Login) { user(login: $Login) {
+1
View File
@@ -40,6 +40,7 @@ func {{.Name}}(
var retval {{.ResponseName}} var retval {{.ResponseName}}
err := {{if $.Config.ClientGetter}}{{$.Config.ClientGetter}}{{else}}client{{end}}.MakeRequest( err := {{if $.Config.ClientGetter}}{{$.Config.ClientGetter}}{{else}}client{{end}}.MakeRequest(
{{if $.Config.ContextType}}ctx{{else}}nil{{end}}, {{if $.Config.ContextType}}ctx{{else}}nil{{end}},
"{{.Name}}",
`{{.Body}}`, `{{.Body}}`,
&retval, &retval,
{{if .Args}}variables{{else}}nil{{end}}, {{if .Args}}variables{{else}}nil{{end}},
+1
View File
@@ -40,6 +40,7 @@ func InputObjectQuery(
var retval InputObjectQueryResponse var retval InputObjectQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"InputObjectQuery",
` `
query InputObjectQuery ($query: UserQueryInput) { query InputObjectQuery ($query: UserQueryInput) {
user(query: $query) { user(query: $query) {
+1
View File
@@ -99,6 +99,7 @@ func InterfaceNoFragmentsQuery(
var retval InterfaceNoFragmentsQueryResponse var retval InterfaceNoFragmentsQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"InterfaceNoFragmentsQuery",
` `
query InterfaceNoFragmentsQuery { query InterfaceNoFragmentsQuery {
root { root {
+1
View File
@@ -25,6 +25,7 @@ func ListInputQuery(
var retval ListInputQueryResponse var retval ListInputQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"ListInputQuery",
` `
query ListInputQuery ($names: [String]) { query ListInputQuery ($names: [String]) {
user(query: {names:$names}) { user(query: {names:$names}) {
+1
View File
@@ -20,6 +20,7 @@ func QueryWithAlias(
var retval QueryWithAliasResponse var retval QueryWithAliasResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"QueryWithAlias",
` `
query QueryWithAlias { query QueryWithAlias {
User: user { User: user {
+1
View File
@@ -21,6 +21,7 @@ func QueryWithDoubleAlias(
var retval QueryWithDoubleAliasResponse var retval QueryWithDoubleAliasResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"QueryWithDoubleAlias",
` `
query QueryWithDoubleAlias { query QueryWithDoubleAlias {
user { user {
+1
View File
@@ -27,6 +27,7 @@ func QueryWithEnums(
var retval QueryWithEnumsResponse var retval QueryWithEnumsResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"QueryWithEnums",
` `
query QueryWithEnums { query QueryWithEnums {
user { user {
+1
View File
@@ -23,6 +23,7 @@ func QueryWithSlices(
var retval QueryWithSlicesResponse var retval QueryWithSlicesResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"QueryWithSlices",
` `
query QueryWithSlices { query QueryWithSlices {
user { user {
+1
View File
@@ -25,6 +25,7 @@ func QueryWithStructs(
var retval QueryWithStructsResponse var retval QueryWithStructsResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"QueryWithStructs",
` `
query QueryWithStructs { query QueryWithStructs {
user { user {
+1
View File
@@ -25,6 +25,7 @@ func SimpleInputQuery(
var retval SimpleInputQueryResponse var retval SimpleInputQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"SimpleInputQuery",
` `
query SimpleInputQuery ($name: String!) { query SimpleInputQuery ($name: String!) {
user(query: {name:$name}) { user(query: {name:$name}) {
+1
View File
@@ -20,6 +20,7 @@ func SimpleQuery(
var retval SimpleQueryResponse var retval SimpleQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"SimpleQuery",
` `
query SimpleQuery { query SimpleQuery {
user { user {
+1
View File
@@ -21,6 +21,7 @@ func TypeNameQuery(
var retval TypeNameQueryResponse var retval TypeNameQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"TypeNameQuery",
` `
query TypeNameQuery { query TypeNameQuery {
user { user {
+1
View File
@@ -77,6 +77,7 @@ func UnionNoFragmentsQuery(
var retval UnionNoFragmentsQueryResponse var retval UnionNoFragmentsQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"UnionNoFragmentsQuery",
` `
query UnionNoFragmentsQuery { query UnionNoFragmentsQuery {
randomLeaf { randomLeaf {
+1
View File
@@ -39,6 +39,7 @@ func UsesEnumTwiceQuery(
var retval UsesEnumTwiceQueryResponse var retval UsesEnumTwiceQueryResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"UsesEnumTwiceQuery",
` `
query UsesEnumTwiceQuery { query UsesEnumTwiceQuery {
Me: user { Me: user {
+1
View File
@@ -40,6 +40,7 @@ func unexported(
var retval unexportedResponse var retval unexportedResponse
err := client.MakeRequest( err := client.MakeRequest(
nil, nil,
"unexported",
` `
query unexported ($query: UserQueryInput) { query unexported ($query: UserQueryInput) {
user(query: $query) { user(query: $query) {
+6 -2
View File
@@ -40,6 +40,7 @@ type Client interface {
// (Errors are returned.) But again, MakeRequest may customize this. // (Errors are returned.) But again, MakeRequest may customize this.
MakeRequest( MakeRequest(
ctx context.Context, ctx context.Context,
opName string,
query string, query string,
retval interface{}, retval interface{},
variables map[string]interface{}, variables map[string]interface{},
@@ -68,10 +69,12 @@ func NewClient(endpoint string, httpClient *http.Client) Client {
return &client{endpoint, http.MethodPost, httpClient} return &client{endpoint, http.MethodPost, httpClient}
} }
// TODO: set OperationName?
type payload struct { type payload struct {
Query string `json:"query"` Query string `json:"query"`
Variables map[string]interface{} `json:"variables"` Variables map[string]interface{} `json:"variables"`
// OpName is only required if there are multiple queries in the document,
// but we set it unconditionally, because that's easier.
OpName string `json:"operationName"`
} }
type response struct { type response struct {
@@ -79,10 +82,11 @@ type response struct {
Errors gqlerror.List `json:"errors"` Errors gqlerror.List `json:"errors"`
} }
func (c *client) MakeRequest(ctx context.Context, query string, retval interface{}, variables map[string]interface{}) error { func (c *client) MakeRequest(ctx context.Context, opName string, query string, retval interface{}, variables map[string]interface{}) error {
body, err := json.Marshal(payload{ body, err := json.Marshal(payload{
Query: query, Query: query,
Variables: variables, Variables: variables,
OpName: opName,
}) })
if err != nil { if err != nil {
return err return err