agent_patch
runs/2026-02-28__13-38-10__gpt-5-1-codex-mini/flux-pr-1099/flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/agent-logs/agent.patch
39432 bytes
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/pkg/astvalidation/operation_rule_valid_arguments.go b/app/pkg/astvalidation/operation_rule_valid_arguments.go
index f352260..086810b 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/pkg/astvalidation/operation_rule_valid_arguments.go
+++ b/app/pkg/astvalidation/operation_rule_valid_arguments.go
@@ -1,184 +1,7 @@
package astvalidation
-import (
- "bytes"
- "fmt"
-
- "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 validates if arguments are valid: values and variables have compatible types.
+// This rule now reuses the Values rule to avoid duplicated logic.
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
- }
+ return Values()
}
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/pkg/astvalidation/operation_rule_values.go b/app/pkg/astvalidation/operation_rule_values.go
index 3ae503a..9cb7b2a 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/pkg/astvalidation/operation_rule_values.go
+++ b/app/pkg/astvalidation/operation_rule_values.go
@@ -51,19 +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)
+ _, 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.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type)
+ v.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type, definition)
}
func (v *valuesVisitor) valueSatisfiesOperationType(value ast.Value, operationTypeRef int) bool {
@@ -151,7 +147,10 @@ func (v *valuesVisitor) valueSatisfiesOperationListType(value ast.Value, operati
return valid
}
-func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int) bool {
+func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int, inputValueDefinitionRef int) bool {
+ if value.Kind == ast.ValueKindVariable {
+ return v.variableValueSatisfiesInputValueDefinitionType(value, definitionTypeRef, inputValueDefinitionRef)
+ }
switch v.definition.Types[definitionTypeRef].TypeKind {
case ast.TypeKindNonNull:
return v.valuesSatisfiesNonNullType(value, definitionTypeRef)
@@ -166,29 +165,11 @@ 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)
+ return v.valueSatisfiesInputValueDefinitionType(value, v.definition.Types[definitionTypeRef].OfType, ast.InvalidRef)
}
func (v *valuesVisitor) valuesSatisfiesNamedType(value ast.Value, definitionTypeRef int) bool {
@@ -209,37 +190,12 @@ 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
}
if value.Kind != ast.ValueKindList {
- return v.valueSatisfiesInputValueDefinitionType(value, listItemType)
+ return v.valueSatisfiesInputValueDefinitionType(value, listItemType, ast.InvalidRef)
}
if v.definition.Types[listItemType].TypeKind == ast.TypeKindNonNull {
@@ -254,7 +210,7 @@ func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRe
for _, i := range v.operation.ListValues[value.Ref].Refs {
listValue := v.operation.Value(i)
- if !v.valueSatisfiesInputValueDefinitionType(listValue, listItemType) {
+ if !v.valueSatisfiesInputValueDefinitionType(listValue, listItemType, ast.InvalidRef) {
valid = false
}
}
@@ -262,6 +218,66 @@ func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRe
return valid
}
+func (v *valuesVisitor) variableValueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int, inputValueDefinitionRef int) bool {
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
+ if !ok {
+ v.handleTypeError(value, definitionTypeRef)
+ return false
+ }
+
+ expectedType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
+ hasDefaultValue := v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) ||
+ v.inputValueDefinitionHasValidDefaultValue(inputValueDefinitionRef)
+
+ if !v.operationTypeSatisfiesDefinitionType(variableTypeRef, expectedType, hasDefaultValue) {
+ v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
+ return false
+ }
+
+ return true
+}
+
+func (v *valuesVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
+ opKind := v.operation.Types[operationTypeRef].TypeKind
+ defKind := v.operation.Types[definitionTypeRef].TypeKind
+
+ if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
+ definitionTypeRef = v.operation.Types[definitionTypeRef].OfType
+ }
+
+ for {
+ if operationTypeRef == ast.InvalidRef || definitionTypeRef == ast.InvalidRef {
+ return false
+ }
+ opKind = v.operation.Types[operationTypeRef].TypeKind
+ defKind = v.operation.Types[definitionTypeRef].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[definitionTypeRef].Name))
+ }
+
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ definitionTypeRef = v.operation.Types[definitionTypeRef].OfType
+ }
+}
+
+func (v *valuesVisitor) inputValueDefinitionHasValidDefaultValue(ref int) bool {
+ if ref == ast.InvalidRef {
+ return false
+ }
+ defaultValue := v.definition.InputValueDefinitions[ref].DefaultValue
+ return defaultValue.IsDefined && defaultValue.Value.Kind != ast.ValueKindNull
+}
+
func (v *valuesVisitor) valueSatisfiesTypeDefinitionNode(value ast.Value, definitionTypeRef int, node ast.Node) bool {
switch node.Kind {
case ast.NodeKindEnumTypeDefinition:
@@ -275,11 +291,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 +308,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 +415,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
@@ -500,7 +502,7 @@ func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast
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.valueSatisfiesInputValueDefinitionType(value, definitionTypeRef, inputValueDefinition)
}
}
@@ -513,25 +515,6 @@ 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)
- 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) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
-
- return true
-}
-
func (v *valuesVisitor) handleTypeError(value ast.Value, definitionTypeRef int) {
printedValue, printedType, ok := v.printValueAndUnderlyingType(value, definitionTypeRef)
if !ok {
@@ -588,11 +571,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-1-codex-mini/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-1-codex-mini/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-1-codex-mini/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go b/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
index 0608211..086810b 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
+++ b/app/v2/pkg/astvalidation/operation_rule_valid_arguments.go
@@ -1,184 +1,7 @@
package astvalidation
-import (
- "bytes"
- "fmt"
-
- "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 validates if arguments are valid: values and variables have compatible types.
+// This rule now reuses the Values rule to avoid duplicated logic.
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
- }
+ return Values()
}
diff --git a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/v2/pkg/astvalidation/operation_rule_values.go b/app/v2/pkg/astvalidation/operation_rule_values.go
index 3b6d7b5..2b91c15 100644
--- a/tmp/agent-patch-flux-pr-1099.1-of-1.2026-02-28__13-38-10__gpt-5-1-codex-mini/app/v2/pkg/astvalidation/operation_rule_values.go
+++ b/app/v2/pkg/astvalidation/operation_rule_values.go
@@ -53,19 +53,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)
+ _, 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.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type)
+ v.valueSatisfiesInputValueDefinitionType(value, v.definition.InputValueDefinitions[definition].Type, definition)
}
func (v *valuesVisitor) valueSatisfiesOperationType(value ast.Value, operationTypeRef int) bool {
@@ -153,7 +149,10 @@ func (v *valuesVisitor) valueSatisfiesOperationListType(value ast.Value, operati
return valid
}
-func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int) bool {
+func (v *valuesVisitor) valueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int, inputValueDefinitionRef int) bool {
+ if value.Kind == ast.ValueKindVariable {
+ return v.variableValueSatisfiesInputValueDefinitionType(value, definitionTypeRef, inputValueDefinitionRef)
+ }
switch v.definition.Types[definitionTypeRef].TypeKind {
case ast.TypeKindNonNull:
return v.valuesSatisfiesNonNullType(value, definitionTypeRef)
@@ -168,29 +167,11 @@ 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)
+ return v.valueSatisfiesInputValueDefinitionType(value, v.definition.Types[definitionTypeRef].OfType, ast.InvalidRef)
}
func (v *valuesVisitor) valuesSatisfiesNamedType(value ast.Value, definitionTypeRef int) bool {
@@ -211,33 +192,12 @@ 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
}
if value.Kind != ast.ValueKindList {
- return v.valueSatisfiesInputValueDefinitionType(value, listItemType)
+ return v.valueSatisfiesInputValueDefinitionType(value, listItemType, ast.InvalidRef)
}
if v.definition.Types[listItemType].TypeKind == ast.TypeKindNonNull {
@@ -252,7 +212,7 @@ func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRe
for _, i := range v.operation.ListValues[value.Ref].Refs {
listValue := v.operation.Value(i)
- if !v.valueSatisfiesInputValueDefinitionType(listValue, listItemType) {
+ if !v.valueSatisfiesInputValueDefinitionType(listValue, listItemType, ast.InvalidRef) {
valid = false
}
}
@@ -260,6 +220,66 @@ func (v *valuesVisitor) valueSatisfiesListType(value ast.Value, definitionTypeRe
return valid
}
+func (v *valuesVisitor) variableValueSatisfiesInputValueDefinitionType(value ast.Value, definitionTypeRef int, inputValueDefinitionRef int) bool {
+ variableDefinitionRef, variableTypeRef, _, ok := v.operationVariableType(value.Ref)
+ if !ok {
+ v.handleTypeError(value, definitionTypeRef)
+ return false
+ }
+
+ expectedType := v.importer.ImportType(definitionTypeRef, v.definition, v.operation)
+ hasDefaultValue := v.operation.VariableDefinitionHasDefaultValue(variableDefinitionRef) ||
+ v.inputValueDefinitionHasValidDefaultValue(inputValueDefinitionRef)
+
+ if !v.operationTypeSatisfiesDefinitionType(variableTypeRef, expectedType, hasDefaultValue) {
+ v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
+ return false
+ }
+
+ return true
+}
+
+func (v *valuesVisitor) operationTypeSatisfiesDefinitionType(operationTypeRef int, definitionTypeRef int, hasDefaultValue bool) bool {
+ opKind := v.operation.Types[operationTypeRef].TypeKind
+ defKind := v.operation.Types[definitionTypeRef].TypeKind
+
+ if opKind != ast.TypeKindNonNull && defKind == ast.TypeKindNonNull && hasDefaultValue {
+ definitionTypeRef = v.operation.Types[definitionTypeRef].OfType
+ }
+
+ for {
+ if operationTypeRef == ast.InvalidRef || definitionTypeRef == ast.InvalidRef {
+ return false
+ }
+ opKind = v.operation.Types[operationTypeRef].TypeKind
+ defKind = v.operation.Types[definitionTypeRef].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[definitionTypeRef].Name))
+ }
+
+ operationTypeRef = v.operation.Types[operationTypeRef].OfType
+ definitionTypeRef = v.operation.Types[definitionTypeRef].OfType
+ }
+}
+
+func (v *valuesVisitor) inputValueDefinitionHasValidDefaultValue(ref int) bool {
+ if ref == ast.InvalidRef {
+ return false
+ }
+ defaultValue := v.definition.InputValueDefinitions[ref].DefaultValue
+ return defaultValue.IsDefined && defaultValue.Value.Kind != ast.ValueKindNull
+}
+
func (v *valuesVisitor) valueSatisfiesTypeDefinitionNode(value ast.Value, definitionTypeRef int, node ast.Node) bool {
switch node.Kind {
case ast.NodeKindEnumTypeDefinition:
@@ -273,11 +293,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 +311,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 +418,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
@@ -499,7 +505,7 @@ func (v *valuesVisitor) objectValueSatisfiesInputValueDefinition(objectValue ast
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.valueSatisfiesInputValueDefinitionType(value, definitionTypeRef, inputValueDefinition)
}
}
@@ -512,25 +518,6 @@ 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)
- 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) {
- v.handleVariableHasIncompatibleTypeError(value, definitionTypeRef)
- return false
- }
-
- return true
-}
-
func (v *valuesVisitor) handleTypeError(value ast.Value, definitionTypeRef int) {
printedValue, printedType, ok := v.printValueAndUnderlyingType(value, definitionTypeRef)
if !ok {
@@ -587,11 +574,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-1-codex-mini/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-1-codex-mini/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())