Skip to content

Commit a897adc

Browse files
committed
Bug where scalar args cant be visited when the AST is an object
1 parent a6c4461 commit a897adc

2 files changed

Lines changed: 39 additions & 6 deletions

File tree

‎src/main/java/graphql/analysis/NodeVisitorWithTypeTracking.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,16 @@ public TraversalControl visitArgument(Argument argument, TraverserContext<Node>
211211
public TraversalControl visitObjectField(ObjectField node, TraverserContext<Node> context) {
212212

213213
QueryVisitorFieldArgumentInputValueImpl inputValue = context.getVarFromParents(QueryVisitorFieldArgumentInputValue.class);
214-
GraphQLInputObjectType inputObjectType = (GraphQLInputObjectType) GraphQLTypeUtil.unwrapAll(inputValue.getInputType());
215-
GraphQLInputObjectField inputObjectTypeField = inputObjectType.getField(node.getName());
216-
217-
inputValue = inputValue.incompleteNewChild(inputObjectTypeField);
218-
219-
context.setVar(QueryVisitorFieldArgumentInputValue.class, inputValue);
214+
GraphQLUnmodifiedType unmodifiedType = unwrapAll(inputValue.getInputType());
215+
//
216+
// technically a scalar type can have an AST object field - eg field( arg : Json) -> field(arg : { ast : "here" })
217+
if (unmodifiedType instanceof GraphQLInputObjectType) {
218+
GraphQLInputObjectType inputObjectType = (GraphQLInputObjectType) unmodifiedType;
219+
GraphQLInputObjectField inputObjectTypeField = inputObjectType.getField(node.getName());
220+
221+
inputValue = inputValue.incompleteNewChild(inputObjectTypeField);
222+
context.setVar(QueryVisitorFieldArgumentInputValue.class, inputValue);
223+
}
220224
return TraversalControl.CONTINUE;
221225
}
222226

‎src/test/groovy/graphql/analysis/QueryTraverserTest.groovy‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import spock.lang.Unroll
2626

2727
import static graphql.schema.GraphQLList.list
2828
import static graphql.schema.GraphQLNonNull.nonNull
29+
import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring
2930
import static graphql.util.TraverserContext.Phase.ENTER
3031
import static graphql.util.TraverserContext.Phase.LEAVE
3132
import static java.util.Collections.emptyMap
@@ -1654,5 +1655,33 @@ class QueryTraverserTest extends Specification {
16541655
16551656
}
16561657
1658+
def "can copy with Scalar ObjectField visits"() {
1659+
given:
1660+
def schema = TestUtil.schema('''
1661+
scalar JSON
1662+
1663+
type Query{
1664+
field(arg : JSON): String
1665+
}
1666+
''', newRuntimeWiring().scalar(TestUtil.mockScalar("JSON")).build())
1667+
def visitor = mockQueryVisitor()
1668+
def query = createQuery('''
1669+
{field(arg : {a : "x", b : "y"}) }
1670+
''')
1671+
QueryTraverser queryTraversal = QueryTraverser.newQueryTraverser()
1672+
.schema(schema)
1673+
.document(query)
1674+
.variables(emptyMap())
1675+
.build()
1676+
when:
1677+
queryTraversal.visitPreOrder(visitor)
1678+
1679+
then:
1680+
1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it ->
1681+
it.fieldDefinition.name == "field"
1682+
})
1683+
1684+
}
1685+
16571686
16581687
}

0 commit comments

Comments
 (0)