Skip to content

Commit e2dec84

Browse files
Fix missing schema's astNode when schema was defined inside extension (#1698)
1 parent c680b6c commit e2dec84

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/utilities/__tests__/extendSchema-test.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,14 +1165,15 @@ describe('extendSchema', () => {
11651165
});
11661166
expect(schema.getQueryType()).to.equal(undefined);
11671167

1168-
const ast = parse(`
1168+
const extensionSDL = dedent`
11691169
schema @foo {
11701170
query: Foo
1171-
}
1172-
`);
1173-
schema = extendSchema(schema, ast);
1171+
}`;
1172+
schema = extendSchema(schema, parse(extensionSDL));
1173+
11741174
const queryType = schema.getQueryType();
11751175
expect(queryType).to.include({ name: 'Foo' });
1176+
expect(print(schema.astNode)).to.equal(extensionSDL);
11761177
});
11771178

11781179
it('adds new root types via schema extension', () => {

src/utilities/extendSchema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export function extendSchema(
206206

207207
types: objectValues(typeMap),
208208
directives: getMergedDirectives(),
209-
astNode: schemaConfig.astNode,
209+
astNode: schemaDef || schemaConfig.astNode,
210210
extensionASTNodes: schemaConfig.extensionASTNodes.concat(schemaExts),
211211
allowedLegacyNames,
212212
});

0 commit comments

Comments
 (0)