Merge branch 'master' into nithin/add-tracing-to-response

wundergraph · Nov 14, 2023 · c5d2f96 · c5d2f96
2 parents 87270c7 + aaa3d9a
commit c5d2f96
Show file tree

Hide file tree

Showing 8 changed files with 693 additions and 337 deletions.
diff --git a/v2/pkg/astjson/astjson.go b/v2/pkg/astjson/astjson.go
@@ -161,6 +161,10 @@ func (j *JSON) ObjectFieldKey(objectFieldRef int) []byte {
 	return j.storage[j.Nodes[objectFieldRef].keyStart:j.Nodes[objectFieldRef].keyEnd]
 }
 
+func (j *JSON) ObjectFieldValue(objectFieldRef int) int {
+	return j.Nodes[objectFieldRef].ObjectFieldValue
+}
+
 type Node struct {
 	Kind             NodeKind
 	ObjectFieldValue int

diff --git a/v2/pkg/astprinter/astprinter.go b/v2/pkg/astprinter/astprinter.go
@@ -1024,7 +1024,9 @@ func (p *printVisitor) LeaveSchemaExtension(ref int) {
 	if p.indent != nil {
 		p.write(literal.LINETERMINATOR)
 	}
-	p.write(literal.RBRACE)
+	if len(p.document.SchemaExtensions[ref].SchemaDefinition.RootOperationTypeDefinitions.Refs) > 0 {
+		p.write(literal.RBRACE)
+	}
 	if !p.document.NodeIsLastRootNode(ast.Node{Kind: ast.NodeKindSchemaExtension, Ref: ref}) {
 		if p.indent != nil {
 			p.write(literal.LINETERMINATOR)

diff --git a/v2/pkg/astprinter/astprinter_test.go b/v2/pkg/astprinter/astprinter_test.go
@@ -209,6 +209,11 @@ vary: [String]! = []) on QUERY directive @include(if: Boolean!) repeatable on FI
 					subscription: Subscription
 				}`, `extend schema @foo {query: Query mutation: Mutation subscription: Subscription}`)
 	})
+
+	t.Run("schema extension only directives", func(t *testing.T) {
+		run(t, `extend schema @foo `, `extend schema @foo `)
+	})
+
 	t.Run("object type definition", func(t *testing.T) {
 		run(t, `
 				type Foo {

diff --git a/v2/pkg/engine/plan/configuration_visitor.go b/v2/pkg/engine/plan/configuration_visitor.go
@@ -671,7 +671,7 @@ func (c *configurationVisitor) handleMissingPath(typeName string, fieldName stri
 		}
 	}
 
-	c.walker.StopWithInternalErr(errors.Wrap(fmt.Errorf("could not plan a field %s.%s on a path %s", typeName, fieldName, currentPath), "configurationVisitor.handleMissingPath"))
+	c.walker.StopWithInternalErr(errors.Wrap(fmt.Errorf("could not plan field %s.%s on path %s", typeName, fieldName, currentPath), "configurationVisitor.handleMissingPath"))
 }
 
 func (c *configurationVisitor) LeaveField(ref int) {

diff --git a/v2/pkg/engine/plan/planner_closer_test.go b/v2/pkg/engine/plan/planner_closer_test.go
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	c.walker.StopWithInternalErr(errors.Wrap(fmt.Errorf("could not plan a field %s.%s on a path %s", typeName, fieldName, currentPath), "configurationVisitor.handleMissingPath"))
+    	c.walker.StopWithInternalErr(errors.Wrap(fmt.Errorf("could not plan field %s.%s on path %s", typeName, fieldName, currentPath), "configurationVisitor.handleMissingPath"))
     }
     func (c *configurationVisitor) LeaveField(ref int) {
@@ Expand Down @@