Skip to content

Commit e4a562b

Browse files
committed
skip internal directives in introspection
1 parent f2dcbb1 commit e4a562b

3 files changed

Lines changed: 11 additions & 15 deletions

File tree

v2/pkg/engine/datasourcetesting/datasourcetesting.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,7 @@ func RunTestWithVariables(definition, operation, operationName, variables string
198198
op.Input.Variables = []byte(variables)
199199
}
200200

201-
transformOptions := asttransform.Options{}
202-
if opts.withDefer {
203-
transformOptions.InternalDefer = true
204-
}
205-
206-
err := asttransform.MergeDefinitionWithBaseSchemaWithOptions(&def, transformOptions)
201+
err := asttransform.MergeDefinitionWithBaseSchema(&def)
207202
if err != nil {
208203
t.Fatal(err)
209204
}

v2/pkg/introspection/generator.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ func (i *introspectionVisitor) EnterDirectiveDefinition(ref int) {
329329
}
330330

331331
func (i *introspectionVisitor) LeaveDirectiveDefinition(ref int) {
332+
if strings.HasPrefix(i.currentDirective.Name, "__") {
333+
return
334+
}
332335
i.data.Schema.Directives = append(i.data.Schema.Directives, i.currentDirective)
333336
}
334337

v2/pkg/introspection/generator_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,24 @@ import (
66
"testing"
77

88
"github.com/jensneuse/diffview"
9+
"github.com/stretchr/testify/require"
910

1011
"github.com/wundergraph/graphql-go-tools/v2/pkg/astparser"
12+
"github.com/wundergraph/graphql-go-tools/v2/pkg/asttransform"
1113
"github.com/wundergraph/graphql-go-tools/v2/pkg/testing/goldie"
1214
)
1315

1416
func TestGenerator_Generate(t *testing.T) {
1517
starwarsSchemaBytes, err := os.ReadFile("./testdata/starwars.schema.graphql")
16-
if err != nil {
17-
panic(err)
18-
}
18+
require.NoError(t, err)
1919

2020
definition, report := astparser.ParseGraphqlDocumentBytes(starwarsSchemaBytes)
2121
if report.HasErrors() {
2222
t.Fatal(report)
2323
}
2424

25+
require.NoError(t, asttransform.MergeDefinitionWithBaseSchema(&definition))
26+
2527
gen := NewGenerator()
2628
var data Data
2729
gen.Generate(&definition, &report, &data)
@@ -30,16 +32,12 @@ func TestGenerator_Generate(t *testing.T) {
3032
}
3133

3234
outputPretty, err := json.MarshalIndent(data, "", " ")
33-
if err != nil {
34-
t.Fatal(err)
35-
}
35+
require.NoError(t, err)
3636

3737
goldie.Assert(t, "starwars_introspected", outputPretty)
3838
if t.Failed() {
3939
fixture, err := os.ReadFile("./fixtures/starwars_introspected.golden")
40-
if err != nil {
41-
t.Fatal(err)
42-
}
40+
require.NoError(t, err)
4341

4442
diffview.NewGoland().DiffViewBytes("startwars_introspected", fixture, outputPretty)
4543
}

0 commit comments

Comments
 (0)