Skip to content

Commit d3fd6c3

Browse files
authored
Merge pull request graphql#994 from APIs-guru/cleanupBuildAstSchema
remove dead code from buildASTSchema
2 parents 0eb070f + d9178f4 commit d3fd6c3

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

src/utilities/buildASTSchema.js

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -316,26 +316,16 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
316316
}
317317

318318
function typeDefNamed(typeName: string): GraphQLNamedType {
319-
if (innerTypeMap[typeName]) {
320-
return innerTypeMap[typeName];
321-
}
322-
323-
if (!nodeMap[typeName]) {
324-
throw new Error(`Type "${typeName}" not found in document.`);
325-
}
326-
327-
const innerTypeDef = makeSchemaDef(nodeMap[typeName]);
328-
if (!innerTypeDef) {
329-
throw new Error(`Nothing constructed for "${typeName}".`);
319+
if (!innerTypeMap[typeName]) {
320+
if (!nodeMap[typeName]) {
321+
throw new Error(`Type "${typeName}" not found in document.`);
322+
}
323+
innerTypeMap[typeName] = makeSchemaDef(nodeMap[typeName]);
330324
}
331-
innerTypeMap[typeName] = innerTypeDef;
332-
return innerTypeDef;
325+
return innerTypeMap[typeName];
333326
}
334327

335328
function makeSchemaDef(def) {
336-
if (!def) {
337-
throw new Error('def must be defined');
338-
}
339329
switch (def.kind) {
340330
case Kind.OBJECT_TYPE_DEFINITION:
341331
return makeTypeDef(def);
@@ -403,9 +393,8 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
403393
}
404394

405395
function makeInterfaceDef(def: InterfaceTypeDefinitionNode) {
406-
const typeName = def.name.value;
407396
return new GraphQLInterfaceType({
408-
name: typeName,
397+
name: def.name.value,
409398
description: getDescription(def),
410399
fields: () => makeFieldDefMap(def),
411400
astNode: def,
@@ -414,7 +403,7 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
414403
}
415404

416405
function makeEnumDef(def: EnumTypeDefinitionNode) {
417-
const enumType = new GraphQLEnumType({
406+
return new GraphQLEnumType({
418407
name: def.name.value,
419408
description: getDescription(def),
420409
values: keyValMap(
@@ -428,8 +417,6 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
428417
),
429418
astNode: def,
430419
});
431-
432-
return enumType;
433420
}
434421

435422
function makeUnionDef(def: UnionTypeDefinitionNode) {

0 commit comments

Comments
 (0)