Skip to content

Simplify buildASTSchema implementation #1625

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

Merged
IvanGoncharov merged 1 commit into from
Dec 23, 2018
Merged

Simplify buildASTSchema implementation #1625

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/utilities/buildASTSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import invariant from '../jsutils/invariant';
import keyMap from '../jsutils/keyMap';
import keyValMap from '../jsutils/keyValMap';
import objectValues from '../jsutils/objectValues';
import type { ObjMap } from '../jsutils/ObjMap';
import { valueFromAST } from './valueFromAST';
import { assertValidSDL } from '../validation/validate';
Expand Down Expand Up @@ -128,18 +129,14 @@ export function buildASTSchema(
}

let schemaDef: ?SchemaDefinitionNode;

const typeDefs: Array<TypeDefinitionNode> = [];
const nodeMap: ObjMap<TypeDefinitionNode> = Object.create(null);
const directiveDefs: Array<DirectiveDefinitionNode> = [];
for (let i = 0; i < documentAST.definitions.length; i++) {
const def = documentAST.definitions[i];

for (const def of documentAST.definitions) {
if (def.kind === Kind.SCHEMA_DEFINITION) {
schemaDef = def;
} else if (isTypeDefinitionNode(def)) {
const typeName = def.name.value;
typeDefs.push(def);
nodeMap[typeName] = def;
nodeMap[def.name.value] = def;
} else if (def.kind === Kind.DIRECTIVE_DEFINITION) {
directiveDefs.push(def);
}
Expand Down Expand Up @@ -191,7 +188,7 @@ export function buildASTSchema(
subscription: operationTypes.subscription
? (definitionBuilder.buildType(operationTypes.subscription): any)
: null,
types: typeDefs.map(node => definitionBuilder.buildType(node)),
types: objectValues(nodeMap).map(node => definitionBuilder.buildType(node)),
directives,
astNode: schemaDef,
assumeValid: options && options.assumeValid,
Expand Down
3 changes: 1 addition & 2 deletions src/utilities/extendSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ export function extendSchema(
// Schema extensions are collected which may add additional operation types.
const schemaExtensions: Array<SchemaExtensionNode> = [];

for (let i = 0; i < documentAST.definitions.length; i++) {
const def = documentAST.definitions[i];
for (const def of documentAST.definitions) {
if (def.kind === Kind.SCHEMA_DEFINITION) {
schemaDef = def;
} else if (def.kind === Kind.SCHEMA_EXTENSION) {
Expand Down