feat: add field argument mapping

v2/pkg/ast/path.go

@@ -128,7 +128,7 @@ func (p Path) String() string {
 	return out
 }
 
-func (p Path) DotDelimitedString() string {
+func (p Path) DotDelimitedString(useFragmentRefs bool) string {
 	builder := strings.Builder{}
 
 	toGrow := 0
@@ -160,7 +160,9 @@ func (p Path) DotDelimitedString() string {
 			}
 		case InlineFragmentName:
 			builder.WriteString(InlineFragmentPathPrefix)
-			builder.WriteString(strconv.Itoa(p[i].FragmentRef))
+			if useFragmentRefs {
+				builder.WriteString(strconv.Itoa(p[i].FragmentRef))
+			}
 			builder.WriteString(unsafebytes.BytesToString(p[i].FieldName))
 		}
 	}

v2/pkg/astnormalization/astnormalization.go

@@ -70,7 +70,6 @@ package astnormalization
 
 import (
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
-	"github.com/wundergraph/graphql-go-tools/v2/pkg/astnormalization/uploads"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/astvisitor"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/operationreport"
 )
@@ -245,7 +244,8 @@ func (o *OperationNormalizer) setupOperationWalkers() {
 
 	if o.options.extractVariables {
 		extractVariablesWalker := astvisitor.NewWalkerWithID(8, "ExtractVariables")
-		extractVariables(&extractVariablesWalker)
+		// disabling field arg mapping as it's only necessary on the variable normalizer
+		extractVariables(&extractVariablesWalker, false)
 		o.operationWalkers = append(o.operationWalkers, walkerStage{
 			name:   "extractVariables",
 			walker: &extractVariablesWalker,
@@ -353,7 +353,7 @@ type VariablesNormalizer struct {
 	variablesExtractionVisitor *variablesExtractionVisitor
 }
 
-func NewVariablesNormalizer() *VariablesNormalizer {
+func NewVariablesNormalizer(withFieldArgMapping bool) *VariablesNormalizer {
 	// delete unused modifying variables refs,
 	// so it is safer to run it sequentially with the extraction
 	thirdDeleteUnused := astvisitor.NewWalkerWithID(8, "DeleteUnusedVariables")
@@ -367,7 +367,7 @@ func NewVariablesNormalizer() *VariablesNormalizer {
 	detectVariableUsage(&firstDetectUnused, del)
 
 	secondExtract := astvisitor.NewWalkerWithID(8, "ExtractVariables")
-	variablesExtractionVisitor := extractVariables(&secondExtract)
+	variablesExtractionVisitor := extractVariables(&secondExtract, withFieldArgMapping)
 	extractVariablesDefaultValue(&secondExtract)
 
 	fourthCoerce := astvisitor.NewWalkerWithID(0, "VariablesCoercion")
@@ -382,22 +382,25 @@ func NewVariablesNormalizer() *VariablesNormalizer {
 	}
 }
 
-func (v *VariablesNormalizer) NormalizeOperation(operation, definition *ast.Document, report *operationreport.Report) []uploads.UploadPathMapping {
+func (v *VariablesNormalizer) NormalizeOperation(operation, definition *ast.Document, report *operationreport.Report) VariablesNormalizerResult {
 	v.firstDetectUnused.Walk(operation, definition, report)
 	if report.HasErrors() {
-		return nil
+		return VariablesNormalizerResult{}
 	}
 	v.secondExtract.Walk(operation, definition, report)
 	if report.HasErrors() {
-		return nil
+		return VariablesNormalizerResult{}
 	}
 	v.thirdDeleteUnused.Walk(operation, definition, report)
 	if report.HasErrors() {
-		return nil
+		return VariablesNormalizerResult{}
 	}
 	v.fourthCoerce.Walk(operation, definition, report)
 
-	return v.variablesExtractionVisitor.uploadsPath
+	return VariablesNormalizerResult{
+		UploadsMapping:       v.variablesExtractionVisitor.uploadsPath,
+		FieldArgumentMapping: v.variablesExtractionVisitor.fieldArgumentMapping.result,
+	}
 }
 
 type fragmentCycleVisitor struct {