Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue in printSchemaWithDirectives #1528

Merged
merged 1 commit into from May 25, 2020
Merged

Fix issue in printSchemaWithDirectives #1528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/utils/src/print-schema-with-directives.ts
View file
Open in desktop
Expand Up @@ -89,14 +89,19 @@ function correctType<TMap extends { [key: string]: GraphQLNamedType }, TName ext
const originalAstNode = type?.astNode;
if (originalAstNode) {
(fixedAstNode.directives as DirectiveNode[]) = originalAstNode?.directives as DirectiveNode[];
if ('fields' in fixedAstNode && 'fields' in originalAstNode) {
if (fixedAstNode && 'fields' in fixedAstNode && originalAstNode && 'fields' in originalAstNode) {
for (const fieldDefinitionNode of fixedAstNode.fields) {
const originalFieldDefinitionNode = (originalAstNode.fields as (
| InputValueDefinitionNode
| FieldDefinitionNode
)[]).find(field => field.name.value === fieldDefinitionNode.name.value);
(fieldDefinitionNode.directives as DirectiveNode[]) = originalFieldDefinitionNode?.directives as DirectiveNode[];
if ('arguments' in fieldDefinitionNode && 'arguments' in originalFieldDefinitionNode) {
if (
fieldDefinitionNode &&
'arguments' in fieldDefinitionNode &&
originalFieldDefinitionNode &&
'arguments' in originalFieldDefinitionNode
) {
for (const argument of fieldDefinitionNode.arguments) {
const originalArgumentNode = (originalFieldDefinitionNode as FieldDefinitionNode).arguments?.find(
arg => arg.name.value === argument.name.value
Expand All @@ -105,7 +110,7 @@ function correctType<TMap extends { [key: string]: GraphQLNamedType }, TName ext
}
}
}
} else if ('values' in fixedAstNode && 'values' in originalAstNode) {
} else if (fixedAstNode && 'values' in fixedAstNode && originalAstNode && 'values' in originalAstNode) {
for (const valueDefinitionNode of fixedAstNode.values) {
const originalValueDefinitionNode = (originalAstNode.values as EnumValueDefinitionNode[]).find(
valueNode => valueNode.name.value === valueDefinitionNode.name.value
Expand Down