Fix broken behavior for several options on the same node (#105)

## Summary:
Previously, we actually allowed you to put several genqlient directives
on the same node, but the semantics were undocumented (and somewhat
confusing, when it comes to `typename`).  In order to support directives
on input options, we're actually going to be encouraging this usage (see
notes in #14), so it's time to fix it.  To avoid confusion, I just had
conflicting directives be an error, rather than defining which one
"wins".  The same applies to specifying the same option several
times in one directive.

I also fixed two small bugs:
- `typename` on an operation would incorrectly cascade down to
  all input types in a query (causing conflicts).
- directive parse errors had useless positions, now they're correct

## Test plan:
make check


Author: benjaminjkraft

Reviewers: StevenACoffman, dnerdy, aberkan, jvoll, mahtabsabet, MiguelCastillo

Required Reviewers: 

Approved By: StevenACoffman, dnerdy

Checks:  Test (1.17),  Test (1.16),  Test (1.15),  Test (1.14),  Lint,  Test (1.17),  Test (1.16),  Test (1.15),  Test (1.14),  Lint

Pull Request URL: https://github.com/Khan/genqlient/pull/105
This commit is contained in:
Ben Kraft
2021-09-24 11:16:46 -07:00
committed by GitHub
parent 8de55d352e
commit 6e2b1a5811
13 changed files with 293 additions and 39 deletions
+7 -5
View File
@@ -290,7 +290,7 @@ func (g *generator) convertDefinition(
if options.TypeName != "" {
// If the user specified a name, use it!
name = options.TypeName
if namePrefix.head == name && namePrefix.tail == nil {
if namePrefix != nil && namePrefix.head == name && namePrefix.tail == nil {
// Special case: if this name is also the only component of the
// name-prefix, append the type-name anyway. This happens when you
// assign a type name to an interface type, and we are generating
@@ -367,10 +367,12 @@ func (g *generator) convertDefinition(
for i, field := range def.Fields {
goName := upperFirst(field.Name)
// Several of the arguments don't really make sense here
// There are no field-specific options for inputs (yet, see #14),
// but we still need to merge with an empty directive to clear out
// any query-options that shouldn't apply here (namely "typename").
fieldOptions := queryOptions.merge(newGenqlientDirective(pos))
// Several of the arguments don't really make sense here:
// (note field.Type is necessarily a scalar, input, or enum)
// - no field-specific options can apply, because this is
// a field in the type, not in the query (see also #14).
// - namePrefix is ignored for input types and enums (see
// names.go) and for scalars (they use client-specified
// names)
@@ -381,7 +383,7 @@ func (g *generator) convertDefinition(
// will be ignored? We know field.Type is a scalar, enum, or input
// type. But plumbing that is a bit tricky in practice.
fieldGoType, err := g.convertType(
namePrefix, field.Type, nil, queryOptions, queryOptions)
namePrefix, field.Type, nil, fieldOptions, queryOptions)
if err != nil {
return nil, err
}