agent_patch
runs/2026-02-28__13-38-10__gpt-5-4/flux-pr-1099/flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/agent-logs/agent.patch
40681 bytes
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_rule_valid_arguments.go b/app/pkg/astvalidation/operation_rule_valid_arguments.go
index f352260..d35d951 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_rule_valid_arguments.go
+++ b/app/pkg/astvalidation/operation_rule_valid_arguments.go
@@ -1,184 +1,10 @@
package astvalidation
-import (
- "bytes"
- "fmt"
+import "github.com/wundergraph/graphql-go-tools/pkg/astvisitor"
- "github.com/wundergraph/graphql-go-tools/pkg/ast"
- "github.com/wundergraph/graphql-go-tools/pkg/astvisitor"
- "github.com/wundergraph/graphql-go-tools/pkg/operationreport"
-)
-
-// ValidArguments validates if arguments are valid: values and variables has compatible types
-// deep variables comparison is handled by Values
+// ValidArguments is kept as a compatibility alias; variable validation is handled by Values.
func ValidArguments() Rule {
return func(walker *astvisitor.Walker) {
- visitor := validArgumentsVisitor{
- Walker: walker,
- }
- walker.RegisterEnterDocumentVisitor(&visitor)
- walker.RegisterEnterArgumentVisitor(&visitor)
- }
-}
-
-type validArgumentsVisitor struct {
- *astvisitor.Walker
- operation, definition *ast.Document
-}
-
-func (v *validArgumentsVisitor) EnterDocument(operation, definition *ast.Document) {
- v.operation = operation
- v.definition = definition
-}
-
-func (v *validArgumentsVisitor) EnterArgument(ref int) {
- definitionRef, exists := v.ArgumentInputValueDefinition(ref)
-
- if !exists {
- return
- }
-
- value := v.operation.ArgumentValue(ref)
- v.validateIfValueSatisfiesInputFieldDefinition(value, definitionRef)
-}
-
-func (v *validArgumentsVisitor) validateIfValueSatisfiesInputFieldDefinition(value ast.Value, inputValueDefinitionRef int) {
- var (
- satisfied bool
- operationTypeRef int
- variableDefinitionRef int
- )
-
- switch value.Kind {
- case ast.ValueKindVariable:
- satisfied, operationTypeRef, variableDefinitionRef = v.variableValueSatisfiesInputValueDefinition(value.Ref, inputValueDefinitionRef)
- case ast.ValueKindEnum,
- ast.ValueKindNull,
- ast.ValueKindBoolean,
- ast.ValueKindInteger,
- ast.ValueKindString,
- ast.ValueKindFloat,
- ast.ValueKindObject,
- ast.ValueKindList:
- // this types of values are covered by Values() / valuesVisitor
- return
- default:
- v.StopWithInternalErr(fmt.Errorf("validateIfValueSatisfiesInputFieldDefinition: not implemented for value.Kind: %s", value.Kind))
- return
- }
-
- if satisfied {
- return
- }
-
- if operationTypeRef == ast.InvalidRef {
- // variable is not defined on operation
- return
- }
-
- printedValue, err := v.operation.PrintValueBytes(value, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- typeRef := v.definition.InputValueDefinitionType(inputValueDefinitionRef)
- expectedTypeName, err := v.definition.PrintTypeBytes(typeRef, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- actualTypeName, err := v.operation.PrintTypeBytes(operationTypeRef, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- v.StopWithExternalErr(operationreport.ErrVariableTypeDoesntSatisfyInputValueDefinition(printedValue, actualTypeName, expectedTypeName, value.Position, v.operation.VariableDefinitions[variableDefinitionRef].VariableValue.Position))
-}
-
-func (v *validArgumentsVisitor) variableValueSatisfiesInputValueDefinition(variableValue, inputValueDefinition int) (satisfies bool, operationTypeRef int, variableDefRef int) {
- variableDefinitionRef, exists := v.variableDefinition(variableValue)
- if !exists {
- return false, ast.InvalidRef, variableDefinitionRef
- }
-
- operationTypeRef = v.operation.VariableDefinitions[variableDefinitionRef].Type
- definitionTypeRef := v.definition.InputValueDefinitions[inputValueDefinition].Type
-
- hasDefaultValue := v.validDefaultValue(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue) ||
- v.validDefaultValue(v.definition.InputValueDefinitions[inputValueDefinition].DefaultValue)
-
- return v.operationTypeSatisfiesDefinitionType(operationTypeRef, definitionTypeRef, hasDefaultValue), operationTypeRef, variableDefinitionRef
-}
-
-func (v *validArgumentsVisitor) variableDefinition(variableValueRef int) (ref int, exists bool) {
- variableName := v.operation.VariableValueNameBytes(variableValueRef)
-
- if v.Ancestors[0].Kind == ast.NodeKindOperationDefinition {
- return v.operation.VariableDefinitionByNameAndOperation(v.Ancestors[0].Ref, variableName)
- }
-
- for opDefRef := 0; opDefRef < len(v.operation.OperationDefinitions); opDefRef++ {
- ref, exists = v.operation.VariableDefinitionByNameAndOperation(opDefRef, variableName)
- if exists {
- return
- }
- }
-
- return ast.InvalidRef, false
-}
-
-func (v *validArgumentsVisitor) validDefaultValue(value ast.DefaultValue) bool {
- return value.IsDefined && value.Value.Kind != ast.ValueKindNull
-}
-
-func (v *validArgumentsVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
- opKind := v.operation.Types[operationTypeRef].TypeKind
- defKind := v.definition.Types[definitionTypeRef].TypeKind
-
- // A nullable op type is compatible with a non-null def type if the def has
- // a default value. Strip the def non-null and continue comparing. This
- // logic is only valid before any unnesting of types occurs, which is why
- // it's outside the for loop below.
- //
- // Example:
- // Op: someField(arg: Boolean): String
- // Def: someField(arg: Boolean! = false): String # Boolean! -> Boolean
- if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
- definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
- }
-
- // Unnest the op and def arg types until a named type is reached,
- // then compare.
- for {
- if operationTypeRef == -1 || definitionTypeRef == -1 {
- return false
- }
- opKind = v.operation.Types[operationTypeRef].TypeKind
- defKind = v.definition.Types[definitionTypeRef].TypeKind
-
- // If the op arg type is stricter than the def arg type, that's okay.
- // Strip the op non-null and continue comparing.
- //
- // Example:
- // Op: someField(arg: Boolean!): String # Boolean! -> Boolean
- // Def: someField(arg: Boolean): String
- if opKind == ast.TypeKindNonNull && defKind != ast.TypeKindNonNull {
- operationTypeRef = v.operation.Types[operationTypeRef].OfType
- continue
- }
-
- if opKind != defKind {
- return false
- }
- if opKind == ast.TypeKindNamed {
- // defKind is also a named type because at this point both kinds
- // are the same! Compare the names.
-
- return bytes.Equal(v.operation.Input.ByteSlice(v.operation.Types[operationTypeRef].Name),
- v.definition.Input.ByteSlice(v.definition.Types[definitionTypeRef].Name))
- }
- // Both types are non-null or list. Unnest and continue comparing.
- operationTypeRef = v.operation.Types[operationTypeRef].OfType
- definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
+ Values()(walker)
}
}
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_rule_values.go b/app/pkg/astvalidation/operation_rule_values.go
index 3ae503a..0795012 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_rule_values.go
+++ b/app/pkg/astvalidation/operation_rule_values.go
@@ -49,21 +49,15 @@ func (v *valuesVisitor) EnterArgument(ref int) {
}
value := v.operation.ArgumentValue(ref)
- if value.Kind == ast.ValueKindVariable {
- variableName := v.operation.VariableValueNameBytes(value.Ref)
- variableDefinition, exists := v.operation.VariableDefinitionByNameAndOperation(v.Ancestors[0].Ref, variableName)
- if !exists {
- operationName := v.operation.OperationDefinitionNameBytes(v.Ancestors[0].Ref)
- v.StopWithExternalErr(operationreport.ErrVariableNotDefinedOnOperation(variableName, operationName))
- return
- }
- if !v.operation.VariableDefinitions[variableDefinition].DefaultValue.IsDefined {
- return // variable has no default value, deep type check not required
- }
- value = v.operation.VariableDefinitions[variableDefinition].DefaultValue.Value
- }
+ v.valueSatisfiesInputValueDefinition(value, definition)
+}
- v.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type)
+func (v *valuesVisitor) valueSatisfiesInputValueDefinition(value ast.Value, inputValueDefinitionRef int) bool {
+ return v.valueSatisfiesInputType(
+ value,
+ v.definition.InputValueDefinitions[inputValueDefinitionRef].Type,
+ v.validDefaultValue(v.definition.InputValueDefinitions[inputValueDefinitionRef].DefaultValue),
+ )
}
func (v *valuesVisitor) valueSatisfiesOperationType(value ast.Value, operationTypeRef int) bool {
@@ -152,6 +146,14 @@ func (v *valuesVisitor) valueSatisfiesOperationListType(value ast.Value, operati
}
func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int) bool {
+ return v.valueSatisfiesInputType(value, definitionTypeRef, false)
+}
+
+func (v *valuesVisitor) valueSatisfiesInputType(value ast.Value, definitionTypeRef int, hasLocationDefaultValue bool) bool {
+ if value.Kind == ast.ValueKindVariable {
+ return v.variableValueSatisfiesDefinitionType(value, definitionTypeRef, hasLocationDefaultValue)
+ }
+
switch v.definition.Types[definitionTypeRef].TypeKind {
case ast.TypeKindNonNull:
return v.valuesSatisfiesNonNullType(value, definitionTypeRef)
@@ -166,27 +168,9 @@ func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value,
}
func (v *valuesVisitor) valuesSatisfiesNonNullType(value ast.Value, definitionTypeRef int) bool {
- switch value.Kind {
- case ast.ValueKindNull:
+ if value.Kind == ast.ValueKindNull {
v.handleUnexpectedNullError(value, definitionTypeRef)
return false
- case ast.ValueKindVariable:
- variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
- if !ok {
- v.handleTypeError(value, definitionTypeRef)
- return false
- }
-
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- importedDefinitionType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
- if !v.operation.TypesAreEqualDeep(importedDefinitionType, variableTypeRef) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
- return true
}
return v.valueSatisfiesInputValueDefinitionType(value, v.definition.Types[definitionTypeRef].OfType)
}
@@ -208,32 +192,6 @@ func (v *valuesVisitor) valuesSatisfiesNamedType(value ast.Value, definitionType
}
func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRef int, listItemType int) bool {
-
- if value.Kind == ast.ValueKindVariable {
- variableDefinitionRef, actualType, _, ok := v.operationVariableType(value.Ref)
- if !ok {
- v.handleTypeError(value, definitionTypeRef)
- return false
- }
-
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- expectedType := v.importer.ImportType(listItemType, v.definition, v.operation)
- if v.operation.Types[actualType].TypeKind == ast.TypeKindNonNull {
- actualType = v.operation.Types[actualType].OfType
- }
- if v.operation.Types[actualType].TypeKind == ast.TypeKindList {
- actualType = v.operation.Types[actualType].OfType
- }
- if !v.operation.TypesAreEqualDeep(expectedType, actualType) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
- return true
- }
-
if value.Kind == ast.ValueKindNull {
return true
}
@@ -275,11 +233,6 @@ func (v *valuesVisitor) valueSatisfiesTypeDefinitionNode(value ast.Value, defini
}
func (v *valuesVisitor) valueSatisfiesEnum(value ast.Value, definitionTypeRef int, node ast.Node) bool {
- if value.Kind == ast.ValueKindVariable {
- expectedTypeName := node.NameBytes(v.definition)
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, expectedTypeName)
- }
-
if value.Kind != ast.ValueKindEnum {
v.handleUnexpectedEnumValueError(value, definitionTypeRef)
return false
@@ -297,10 +250,6 @@ func (v *valuesVisitor) valueSatisfiesEnum(value ast.Value, definitionTypeRef in
func (v *valuesVisitor) valueSatisfiesScalar(value ast.Value, definitionTypeRef int, scalar int) bool {
scalarName := v.definition.ScalarTypeDefinitionNameBytes(scalar)
- if value.Kind == ast.ValueKindVariable {
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, scalarName)
- }
-
switch {
case bytes.Equal(scalarName, literal.ID):
return v.valueSatisfiesScalarID(value, definitionTypeRef)
@@ -408,11 +357,6 @@ func (v *valuesVisitor) valueSatisfiesScalarString(value ast.Value, definitionTy
}
func (v *valuesVisitor) valueSatisfiesInputObjectTypeDefinition(value ast.Value, definitionTypeRef int, inputObjectTypeDefinition int) bool {
- if value.Kind == ast.ValueKindVariable {
- expectedTypeName := v.definition.InputObjectTypeDefinitionNameBytes(inputObjectTypeDefinition)
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, expectedTypeName)
- }
-
if value.Kind != ast.ValueKindObject {
v.handleNotObjectTypeError(value, definitionTypeRef)
return false
@@ -495,12 +439,11 @@ func (v *valuesVisitor) objectFieldDefined(objectField, inputObjectTypeDefinitio
func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast.Value, inputObjectDefinition, inputValueDefinition int) bool {
name := v.definition.InputValueDefinitionNameBytes(inputValueDefinition)
- definitionTypeRef := v.definition.InputValueDefinitionType(inputValueDefinition)
for _, i := range v.operation.ObjectValues[objectValue.Ref].Refs {
if bytes.Equal(name, v.operation.ObjectFieldNameBytes(i)) {
value := v.operation.ObjectFieldValue(i)
- return v.valueSatisfiesInputValueDefinitionType(value, definitionTypeRef)
+ return v.valueSatisfiesInputValueDefinition(value, inputValueDefinition)
}
}
@@ -513,18 +456,14 @@ func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast
return true
}
-func (v *valuesVisitor) variableValueHasMatchingTypeName(value ast.Value, definitionTypeRef int, expectedTypeName []byte) bool {
- variableDefinitionRef, _, actualTypeName, ok := v.operationVariableType(value.Ref)
+func (v *valuesVisitor) variableValueSatisfiesDefinitionType(value ast.Value, definitionTypeRef int, hasLocationDefaultValue bool) bool {
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
if !ok {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
return false
}
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- if !bytes.Equal(actualTypeName, expectedTypeName) {
+ hasDefaultValue := v.validDefaultValue(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue) || hasLocationDefaultValue
+ if !v.operationTypeSatisfiesDefinitionType(variableTypeRef, definitionTypeRef, hasDefaultValue) {
v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
return false
}
@@ -532,6 +471,49 @@ func (v *valuesVisitor) variableValueHasMatchingTypeName(value ast.Value, defini
return true
}
+func (v *valuesVisitor) validDefaultValue(value ast.DefaultValue) bool {
+ return value.IsDefined && value.Value.Kind != ast.ValueKindNull
+}
+
+func (v *valuesVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
+ opKind := v.operation.Types[operationTypeRef].TypeKind
+ defKind := v.definition.Types[definitionTypeRef].TypeKind
+
+ if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
+ definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
+ }
+
+ importedDefinitionType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
+
+ for {
+ if operationTypeRef == ast.InvalidRef || importedDefinitionType == ast.InvalidRef {
+ return false
+ }
+
+ opKind = v.operation.Types[operationTypeRef].TypeKind
+ defKind = v.operation.Types[importedDefinitionType].TypeKind
+
+ if opKind == ast.TypeKindNonNull && defKind != ast.TypeKindNonNull {
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ continue
+ }
+
+ if opKind != defKind {
+ return false
+ }
+
+ if opKind == ast.TypeKindNamed {
+ return bytes.Equal(
+ v.operation.Input.ByteSlice(v.operation.Types[operationTypeRef].Name),
+ v.operation.Input.ByteSlice(v.operation.Types[importedDefinitionType].Name),
+ )
+ }
+
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ importedDefinitionType = v.operation.Types[importedDefinitionType].OfType
+ }
+}
+
func (v *valuesVisitor) handleTypeError(value ast.Value, definitionTypeRef int) {
printedValue, printedType, ok := v.printValueAndUnderlyingType(value, definitionTypeRef)
if !ok {
@@ -588,11 +570,16 @@ func (v *valuesVisitor) handleVariableHasIncompatibleTypeError(value ast.Value,
return
}
- variableDefinitionRef, _, actualTypeName, ok := v.operationVariableType(value.Ref)
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
if !ok {
return
}
+ actualTypeName, err := v.operation.PrintTypeBytes(variableTypeRef, nil)
+ if v.HandleInternalErr(err) {
+ return
+ }
+
v.Report.AddExternalError(operationreport.ErrVariableTypeDoesntSatisfyInputValueDefinition(
printedValue,
actualTypeName,
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_validation.go b/app/pkg/astvalidation/operation_validation.go
index 0057127..6293024 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_validation.go
+++ b/app/pkg/astvalidation/operation_validation.go
@@ -23,7 +23,6 @@ func DefaultOperationValidator() *OperationValidator {
validator.RegisterRule(FieldSelections())
validator.RegisterRule(FieldSelectionMerging())
validator.RegisterRule(KnownArguments())
- validator.RegisterRule(ValidArguments())
validator.RegisterRule(Values())
validator.RegisterRule(ArgumentUniqueness())
validator.RegisterRule(RequiredArguments())
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_validation_test.go b/app/pkg/astvalidation/operation_validation_test.go
index 20c9f13..cf326db 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/operation_validation_test.go
+++ b/app/pkg/astvalidation/operation_validation_test.go
@@ -3870,6 +3870,30 @@ func TestExecutionValidation(t *testing.T) {
`Variable "$a" of type "Boolean" used in position expecting type "[String]"`,
))
})
+
+ t.Run("complex nested optionalListOfOptionalStrings of type [String] should accept more restrictive type [String!]!", func(t *testing.T) {
+ runWithDefinition(t, `
+ scalar String
+
+ schema {
+ query: Query
+ }
+
+ type Query {
+ nested(input: NestedInput): String
+ }
+
+ input NestedInput {
+ optionalListOfOptionalStrings: [String]
+ }
+ `, `
+ query Q($a: [String!]!) {
+ nested(input: {
+ optionalListOfOptionalStrings: $a
+ })
+ }
+ `, Values(), Valid)
+ })
})
})
}
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/reference/testsgo/harness_test.go b/app/pkg/astvalidation/reference/testsgo/harness_test.go
index 19150b0..0c409cb 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astvalidation/reference/testsgo/harness_test.go
+++ b/app/pkg/astvalidation/reference/testsgo/harness_test.go
@@ -86,7 +86,7 @@ var rulesMap = map[string][]astvalidation.Rule{
ValuesOfCorrectTypeRule: {astvalidation.Values()},
VariablesAreInputTypesRule: {astvalidation.VariablesAreInputTypes()},
KnownTypeNamesOperationRule: {astvalidation.VariablesAreInputTypes(), astvalidation.Fragments()},
- VariablesInAllowedPositionRule: {astvalidation.ValidArguments(), astvalidation.Values()},
+ VariablesInAllowedPositionRule: {astvalidation.Values()},
// fragments rules
FragmentsOnCompositeTypesRule: {astvalidation.Fragments()},
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go b/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
index 0608211..01b8eeb 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
+++ b/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
@@ -1,184 +1,10 @@
package astvalidation
-import (
- "bytes"
- "fmt"
+import "github.com/wundergraph/graphql-go-tools/v2/pkg/astvisitor"
- "github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
- "github.com/wundergraph/graphql-go-tools/v2/pkg/astvisitor"
- "github.com/wundergraph/graphql-go-tools/v2/pkg/operationreport"
-)
-
-// ValidArguments validates if arguments are valid: values and variables has compatible types
-// deep variables comparison is handled by Values
+// ValidArguments is kept as a compatibility alias; variable validation is handled by Values.
func ValidArguments() Rule {
return func(walker *astvisitor.Walker) {
- visitor := validArgumentsVisitor{
- Walker: walker,
- }
- walker.RegisterEnterDocumentVisitor(&visitor)
- walker.RegisterEnterArgumentVisitor(&visitor)
- }
-}
-
-type validArgumentsVisitor struct {
- *astvisitor.Walker
- operation, definition *ast.Document
-}
-
-func (v *validArgumentsVisitor) EnterDocument(operation, definition *ast.Document) {
- v.operation = operation
- v.definition = definition
-}
-
-func (v *validArgumentsVisitor) EnterArgument(ref int) {
- definitionRef, exists := v.ArgumentInputValueDefinition(ref)
-
- if !exists {
- return
- }
-
- value := v.operation.ArgumentValue(ref)
- v.validateIfValueSatisfiesInputFieldDefinition(value, definitionRef)
-}
-
-func (v *validArgumentsVisitor) validateIfValueSatisfiesInputFieldDefinition(value ast.Value, inputValueDefinitionRef int) {
- var (
- satisfied bool
- operationTypeRef int
- variableDefinitionRef int
- )
-
- switch value.Kind {
- case ast.ValueKindVariable:
- satisfied, operationTypeRef, variableDefinitionRef = v.variableValueSatisfiesInputValueDefinition(value.Ref, inputValueDefinitionRef)
- case ast.ValueKindEnum,
- ast.ValueKindNull,
- ast.ValueKindBoolean,
- ast.ValueKindInteger,
- ast.ValueKindString,
- ast.ValueKindFloat,
- ast.ValueKindObject,
- ast.ValueKindList:
- // this types of values are covered by Values() / valuesVisitor
- return
- default:
- v.StopWithInternalErr(fmt.Errorf("validateIfValueSatisfiesInputFieldDefinition: not implemented for value.Kind: %s", value.Kind))
- return
- }
-
- if satisfied {
- return
- }
-
- if operationTypeRef == ast.InvalidRef {
- // variable is not defined
- return
- }
-
- printedValue, err := v.operation.PrintValueBytes(value, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- typeRef := v.definition.InputValueDefinitionType(inputValueDefinitionRef)
- expectedTypeName, err := v.definition.PrintTypeBytes(typeRef, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- actualTypeName, err := v.operation.PrintTypeBytes(operationTypeRef, nil)
- if v.HandleInternalErr(err) {
- return
- }
-
- v.StopWithExternalErr(operationreport.ErrVariableTypeDoesntSatisfyInputValueDefinition(printedValue, actualTypeName, expectedTypeName, value.Position, v.operation.VariableDefinitions[variableDefinitionRef].VariableValue.Position))
-}
-
-func (v *validArgumentsVisitor) variableValueSatisfiesInputValueDefinition(variableValue, inputValueDefinition int) (satisfies bool, operationTypeRef int, variableDefRef int) {
- variableDefinitionRef, exists := v.variableDefinition(variableValue)
- if !exists {
- return false, ast.InvalidRef, variableDefinitionRef
- }
-
- operationTypeRef = v.operation.VariableDefinitions[variableDefinitionRef].Type
- definitionTypeRef := v.definition.InputValueDefinitions[inputValueDefinition].Type
-
- hasDefaultValue := v.validDefaultValue(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue) ||
- v.validDefaultValue(v.definition.InputValueDefinitions[inputValueDefinition].DefaultValue)
-
- return v.operationTypeSatisfiesDefinitionType(operationTypeRef, definitionTypeRef, hasDefaultValue), operationTypeRef, variableDefinitionRef
-}
-
-func (v *validArgumentsVisitor) variableDefinition(variableValueRef int) (ref int, exists bool) {
- variableName := v.operation.VariableValueNameBytes(variableValueRef)
-
- if v.Ancestors[0].Kind == ast.NodeKindOperationDefinition {
- return v.operation.VariableDefinitionByNameAndOperation(v.Ancestors[0].Ref, variableName)
- }
-
- for opDefRef := 0; opDefRef < len(v.operation.OperationDefinitions); opDefRef++ {
- ref, exists = v.operation.VariableDefinitionByNameAndOperation(opDefRef, variableName)
- if exists {
- return
- }
- }
-
- return ast.InvalidRef, false
-}
-
-func (v *validArgumentsVisitor) validDefaultValue(value ast.DefaultValue) bool {
- return value.IsDefined && value.Value.Kind != ast.ValueKindNull
-}
-
-func (v *validArgumentsVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
- opKind := v.operation.Types[operationTypeRef].TypeKind
- defKind := v.definition.Types[definitionTypeRef].TypeKind
-
- // A nullable op type is compatible with a non-null def type if the def has
- // a default value. Strip the def non-null and continue comparing. This
- // logic is only valid before any unnesting of types occurs, which is why
- // it's outside the for loop below.
- //
- // Example:
- // Op: someField(arg: Boolean): String
- // Def: someField(arg: Boolean! = false): String # Boolean! -> Boolean
- if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
- definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
- }
-
- // Unnest the op and def arg types until a named type is reached,
- // then compare.
- for {
- if operationTypeRef == -1 || definitionTypeRef == -1 {
- return false
- }
- opKind = v.operation.Types[operationTypeRef].TypeKind
- defKind = v.definition.Types[definitionTypeRef].TypeKind
-
- // If the op arg type is stricter than the def arg type, that's okay.
- // Strip the op non-null and continue comparing.
- //
- // Example:
- // Op: someField(arg: Boolean!): String # Boolean! -> Boolean
- // Def: someField(arg: Boolean): String
- if opKind == ast.TypeKindNonNull && defKind != ast.TypeKindNonNull {
- operationTypeRef = v.operation.Types[operationTypeRef].OfType
- continue
- }
-
- if opKind != defKind {
- return false
- }
- if opKind == ast.TypeKindNamed {
- // defKind is also a named type because at this point both kinds
- // are the same! Compare the names.
-
- return bytes.Equal(v.operation.Input.ByteSlice(v.operation.Types[operationTypeRef].Name),
- v.definition.Input.ByteSlice(v.definition.Types[definitionTypeRef].Name))
- }
- // Both types are non-null or list. Unnest and continue comparing.
- operationTypeRef = v.operation.Types[operationTypeRef].OfType
- definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
+ Values()(walker)
}
}
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_rule_values.go b/app/v2/pkg/astvalidation/operation_rule_values.go
index 3b6d7b5..24f58dc 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_rule_values.go
+++ b/app/v2/pkg/astvalidation/operation_rule_values.go
@@ -51,21 +51,15 @@ func (v *valuesVisitor) EnterArgument(ref int) {
}
value := v.operation.ArgumentValue(ref)
- if value.Kind == ast.ValueKindVariable {
- variableName := v.operation.VariableValueNameBytes(value.Ref)
- variableDefinition, exists := v.operation.VariableDefinitionByNameAndOperation(v.Ancestors[0].Ref, variableName)
- if !exists {
- operationName := v.operation.OperationDefinitionNameBytes(v.Ancestors[0].Ref)
- v.StopWithExternalErr(operationreport.ErrVariableNotDefinedOnOperation(variableName, operationName))
- return
- }
- if !v.operation.VariableDefinitions[variableDefinition].DefaultValue.IsDefined {
- return // variable has no default value, deep type check not required
- }
- value = v.operation.VariableDefinitions[variableDefinition].DefaultValue.Value
- }
+ v.valueSatisfiesInputValueDefinition(value, definition)
+}
- v.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type)
+func (v *valuesVisitor) valueSatisfiesInputValueDefinition(value ast.Value, inputValueDefinitionRef int) bool {
+ return v.valueSatisfiesInputType(
+ value,
+ v.definition.InputValueDefinitions[inputValueDefinitionRef].Type,
+ v.validDefaultValue(v.definition.InputValueDefinitions[inputValueDefinitionRef].DefaultValue),
+ )
}
func (v *valuesVisitor) valueSatisfiesOperationType(value ast.Value, operationTypeRef int) bool {
@@ -154,6 +148,14 @@ func (v *valuesVisitor) valueSatisfiesOperationListType(value ast.Value, operati
}
func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int) bool {
+ return v.valueSatisfiesInputType(value, definitionTypeRef, false)
+}
+
+func (v *valuesVisitor) valueSatisfiesInputType(value ast.Value, definitionTypeRef int, hasLocationDefaultValue bool) bool {
+ if value.Kind == ast.ValueKindVariable {
+ return v.variableValueSatisfiesDefinitionType(value, definitionTypeRef, hasLocationDefaultValue)
+ }
+
switch v.definition.Types[definitionTypeRef].TypeKind {
case ast.TypeKindNonNull:
return v.valuesSatisfiesNonNullType(value, definitionTypeRef)
@@ -168,27 +170,9 @@ func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value,
}
func (v *valuesVisitor) valuesSatisfiesNonNullType(value ast.Value, definitionTypeRef int) bool {
- switch value.Kind {
- case ast.ValueKindNull:
+ if value.Kind == ast.ValueKindNull {
v.handleUnexpectedNullError(value, definitionTypeRef)
return false
- case ast.ValueKindVariable:
- variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
- if !ok {
- v.handleTypeError(value, definitionTypeRef)
- return false
- }
-
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- importedDefinitionType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
- if !v.operation.TypesAreEqualDeep(importedDefinitionType, variableTypeRef) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
- return true
}
return v.valueSatisfiesInputValueDefinitionType(value, v.definition.Types[definitionTypeRef].OfType)
}
@@ -210,28 +194,6 @@ func (v *valuesVisitor) valuesSatisfiesNamedType(value ast.Value, definitionType
}
func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRef int, listItemType int) bool {
-
- if value.Kind == ast.ValueKindVariable {
- variableDefinitionRef, actualType, _, ok := v.operationVariableType(value.Ref)
- if !ok {
- v.handleTypeError(value, definitionTypeRef)
- return false
- }
-
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- expectedType := v.importer.ImportType(listItemType, v.definition, v.operation)
- actualType = v.operation.ResolveUnderlyingType(actualType)
-
- if !v.operation.TypesAreEqualDeep(expectedType, actualType) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
- return true
- }
-
if value.Kind == ast.ValueKindNull {
return true
}
@@ -273,11 +235,6 @@ func (v *valuesVisitor) valueSatisfiesTypeDefinitionNode(value ast.Value, defini
}
func (v *valuesVisitor) valueSatisfiesEnum(value ast.Value, definitionTypeRef int, node ast.Node) bool {
- if value.Kind == ast.ValueKindVariable {
- expectedTypeName := node.NameBytes(v.definition)
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, expectedTypeName)
- }
-
if value.Kind != ast.ValueKindEnum {
v.handleUnexpectedEnumValueError(value, definitionTypeRef)
return false
@@ -296,10 +253,6 @@ func (v *valuesVisitor) valueSatisfiesEnum(value ast.Value, definitionTypeRef in
func (v *valuesVisitor) valueSatisfiesScalar(value ast.Value, definitionTypeRef int, scalar int) bool {
scalarName := v.definition.ScalarTypeDefinitionNameBytes(scalar)
- if value.Kind == ast.ValueKindVariable {
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, scalarName)
- }
-
switch {
case bytes.Equal(scalarName, literal.ID):
return v.valueSatisfiesScalarID(value, definitionTypeRef)
@@ -407,11 +360,6 @@ func (v *valuesVisitor) valueSatisfiesScalarString(value ast.Value, definitionTy
}
func (v *valuesVisitor) valueSatisfiesInputObjectTypeDefinition(value ast.Value, definitionTypeRef int, inputObjectTypeDefinition int) bool {
- if value.Kind == ast.ValueKindVariable {
- expectedTypeName := v.definition.InputObjectTypeDefinitionNameBytes(inputObjectTypeDefinition)
- return v.variableValueHasMatchingTypeName(value, definitionTypeRef, expectedTypeName)
- }
-
if value.Kind != ast.ValueKindObject {
v.handleNotObjectTypeError(value, definitionTypeRef)
return false
@@ -494,12 +442,11 @@ func (v *valuesVisitor) objectFieldDefined(objectField, inputObjectTypeDefinitio
func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast.Value, inputObjectDefinition, inputValueDefinition int) bool {
name := v.definition.InputValueDefinitionNameBytes(inputValueDefinition)
- definitionTypeRef := v.definition.InputValueDefinitionType(inputValueDefinition)
for _, i := range v.operation.ObjectValues[objectValue.Ref].Refs {
if bytes.Equal(name, v.operation.ObjectFieldNameBytes(i)) {
value := v.operation.ObjectFieldValue(i)
- return v.valueSatisfiesInputValueDefinitionType(value, definitionTypeRef)
+ return v.valueSatisfiesInputValueDefinition(value, inputValueDefinition)
}
}
@@ -512,18 +459,14 @@ func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast
return true
}
-func (v *valuesVisitor) variableValueHasMatchingTypeName(value ast.Value, definitionTypeRef int, expectedTypeName []byte) bool {
- variableDefinitionRef, _, actualTypeName, ok := v.operationVariableType(value.Ref)
+func (v *valuesVisitor) variableValueSatisfiesDefinitionType(value ast.Value, definitionTypeRef int, hasLocationDefaultValue bool) bool {
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
if !ok {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
return false
}
- if v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) {
- return v.valueSatisfiesInputValueDefinitionType(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue.Value, definitionTypeRef)
- }
-
- if !bytes.Equal(actualTypeName, expectedTypeName) {
+ hasDefaultValue := v.validDefaultValue(v.operation.VariableDefinitions[variableDefinitionRef].DefaultValue) || hasLocationDefaultValue
+ if !v.operationTypeSatisfiesDefinitionType(variableTypeRef, definitionTypeRef, hasDefaultValue) {
v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
return false
}
@@ -531,6 +474,49 @@ func (v *valuesVisitor) variableValueHasMatchingTypeName(value ast.Value, defini
return true
}
+func (v *valuesVisitor) validDefaultValue(value ast.DefaultValue) bool {
+ return value.IsDefined && value.Value.Kind != ast.ValueKindNull
+}
+
+func (v *valuesVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
+ opKind := v.operation.Types[operationTypeRef].TypeKind
+ defKind := v.definition.Types[definitionTypeRef].TypeKind
+
+ if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
+ definitionTypeRef = v.definition.Types[definitionTypeRef].OfType
+ }
+
+ importedDefinitionType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
+
+ for {
+ if operationTypeRef == ast.InvalidRef || importedDefinitionType == ast.InvalidRef {
+ return false
+ }
+
+ opKind = v.operation.Types[operationTypeRef].TypeKind
+ defKind = v.operation.Types[importedDefinitionType].TypeKind
+
+ if opKind == ast.TypeKindNonNull && defKind != ast.TypeKindNonNull {
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ continue
+ }
+
+ if opKind != defKind {
+ return false
+ }
+
+ if opKind == ast.TypeKindNamed {
+ return bytes.Equal(
+ v.operation.Input.ByteSlice(v.operation.Types[operationTypeRef].Name),
+ v.operation.Input.ByteSlice(v.operation.Types[importedDefinitionType].Name),
+ )
+ }
+
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ importedDefinitionType = v.operation.Types[importedDefinitionType].OfType
+ }
+}
+
func (v *valuesVisitor) handleTypeError(value ast.Value, definitionTypeRef int) {
printedValue, printedType, ok := v.printValueAndUnderlyingType(value, definitionTypeRef)
if !ok {
@@ -587,11 +573,16 @@ func (v *valuesVisitor) handleVariableHasIncompatibleTypeError(value ast.Value,
return
}
- variableDefinitionRef, _, actualTypeName, ok := v.operationVariableType(value.Ref)
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
if !ok {
return
}
+ actualTypeName, err := v.operation.PrintTypeBytes(variableTypeRef, nil)
+ if v.HandleInternalErr(err) {
+ return
+ }
+
v.Report.AddExternalError(operationreport.ErrVariableTypeDoesntSatisfyInputValueDefinition(
printedValue,
actualTypeName,
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_validation.go b/app/v2/pkg/astvalidation/operation_validation.go
index fa1546c..b33c80b 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/operation_validation.go
+++ b/app/v2/pkg/astvalidation/operation_validation.go
@@ -39,7 +39,6 @@ func DefaultOperationValidator(options ...Option) *OperationValidator {
validator.RegisterRule(FieldSelections(opts))
validator.RegisterRule(FieldSelectionMerging())
validator.RegisterRule(KnownArguments())
- validator.RegisterRule(ValidArguments())
validator.RegisterRule(Values())
validator.RegisterRule(ArgumentUniqueness())
validator.RegisterRule(RequiredArguments())
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/reference/testsgo/harness_test.go b/app/v2/pkg/astvalidation/reference/testsgo/harness_test.go
index 00566f0..6f18dbf 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/v2/pkg/astvalidation/reference/testsgo/harness_test.go
+++ b/app/v2/pkg/astvalidation/reference/testsgo/harness_test.go
@@ -86,7 +86,7 @@ var rulesMap = map[string][]astvalidation.Rule{
ValuesOfCorrectTypeRule: {astvalidation.Values()},
VariablesAreInputTypesRule: {astvalidation.VariablesAreInputTypes()},
KnownTypeNamesOperationRule: {astvalidation.VariablesAreInputTypes(), astvalidation.Fragments()},
- VariablesInAllowedPositionRule: {astvalidation.ValidArguments(), astvalidation.Values()},
+ VariablesInAllowedPositionRule: {astvalidation.Values()},
// fragments rules
FragmentsOnCompositeTypesRule: {astvalidation.Fragments()},