Merge branch 'master' into fix/interface-objects

Author: devsergiy

release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "v2": "2.0.0-rc.148",
+  "v2": "2.0.0-rc.149",
   "execution": "1.2.0"
 }

v2/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.0.0-rc.149](https://github.com/wundergraph/graphql-go-tools/compare/v2.0.0-rc.148...v2.0.0-rc.149) (2025-02-07)
+
+
+### Bug Fixes
+
+* extracting object input with optional variable values ([#1056](https://github.com/wundergraph/graphql-go-tools/issues/1056)) ([3325eac](https://github.com/wundergraph/graphql-go-tools/commit/3325eac3f1dc70069e8057972bf1da5f7324402a))
+
 ## [2.0.0-rc.148](https://github.com/wundergraph/graphql-go-tools/compare/v2.0.0-rc.147...v2.0.0-rc.148) (2025-02-07)
 
 

v2/pkg/ast/ast_value.go

@@ -175,13 +175,22 @@ func (d *Document) writeJSONValue(buf *bytes.Buffer, value Value) error {
 	case ValueKindObject:
 		buf.WriteByte(literal.LBRACE_BYTE)
 		for ii, ref := range d.ObjectValues[value.Ref].Refs {
+			objFieldValue := d.ObjectFieldValue(ref)
+			if objFieldValue.Kind == ValueKindVariable {
+				variableName := d.Input.ByteSliceString(d.VariableValues[objFieldValue.Ref].Name)
+				_, dataType, _, _ := jsonparser.Get(d.Input.Variables, variableName)
+				if dataType == jsonparser.NotExist {
+					continue
+				}
+			}
+
 			if ii > 0 {
 				buf.WriteByte(literal.COMMA_BYTE)
 			}
 			fieldNameBytes := d.ObjectFieldNameBytes(ref)
 			buf.Write(quotes.WrapBytes(fieldNameBytes))
 			buf.WriteByte(literal.COLON_BYTE)
-			if err := d.writeJSONValue(buf, d.ObjectFieldValue(ref)); err != nil {
+			if err := d.writeJSONValue(buf, objFieldValue); err != nil {
 				return err
 			}
 		}

v2/pkg/astnormalization/astnormalization_test.go

@@ -856,7 +856,7 @@ func TestVariablesNormalizer(t *testing.T) {
 
 	out := unsafeprinter.Print(&operationDocument)
 	assert.Equal(t, `mutation HttpBinPost($bar: String!, $a: HttpBinPostInput){httpBinPost(input: $a){headers {userAgent} data {foo}}}`, out)
-	require.Equal(t, `{"a":{"foo":"bar","bar":null}}`, string(operationDocument.Input.Variables))
+	require.Equal(t, `{"a":{"foo":"bar"}}`, string(operationDocument.Input.Variables))
 }
 
 func BenchmarkAstNormalization(b *testing.B) {