Skip to content

Commit 893f9a7

Browse files
committed
Include default directives if they are not provided (#548)
1 parent f11362a commit 893f9a7

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/main/com/intellij/lang/jsgraphql/types/schema/idl/SchemaGenerator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ public GraphQLSchema makeExecutableSchema(Options options,
8888
TypeDefinitionRegistry typeRegistryCopy = new TypeDefinitionRegistry();
8989
typeRegistryCopy.merge(typeRegistry);
9090

91+
schemaGeneratorHelper.addDirectivesIncludedByDefault(typeRegistryCopy);
92+
9193
List<GraphQLError> errors = typeChecker.checkTypeRegistry(typeRegistryCopy, wiring);
9294

9395
Map<String, OperationTypeDefinition> operationTypeDefinitions = SchemaExtensionsChecker.gatherOperationDefs(typeRegistry);

src/main/com/intellij/lang/jsgraphql/types/schema/idl/SchemaGeneratorHelper.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,9 +1248,12 @@ Set<GraphQLDirective> buildAdditionalDirectives(BuildContext buildCtx) {
12481248
}
12491249

12501250
void addDirectivesIncludedByDefault(TypeDefinitionRegistry typeRegistry) {
1251-
// we synthesize this into the type registry - no need for them to add it
1252-
typeRegistry.add(DEPRECATED_DIRECTIVE_DEFINITION);
1253-
typeRegistry.add(SPECIFIED_BY_DIRECTIVE_DEFINITION);
1251+
if (typeRegistry.getDirectiveDefinition(DEPRECATED_DIRECTIVE_DEFINITION.getName()).isEmpty()) {
1252+
typeRegistry.add(DEPRECATED_DIRECTIVE_DEFINITION);
1253+
}
1254+
if (typeRegistry.getDirectiveDefinition(SPECIFIED_BY_DIRECTIVE_DEFINITION.getName()).isEmpty()) {
1255+
typeRegistry.add(SPECIFIED_BY_DIRECTIVE_DEFINITION);
1256+
}
12541257
}
12551258

12561259
private @NotNull Optional<OperationTypeDefinition> getOperationNamed(String name, Map<String, OperationTypeDefinition> operationTypeDefs) {

0 commit comments

Comments
 (0)