Skip to content

GraphQLSchema: Remove unneeded recursion during type collection #2083

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
merged 1 commit into from
Aug 12, 2019
Merged

GraphQLSchema: Remove unneeded recursion during type collection #2083

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
32 changes: 16 additions & 16 deletions src/type/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
isInterfaceType,
isUnionType,
isInputObjectType,
isWrappingType,
getNamedType,
} from './definition';

/**
Expand Down Expand Up @@ -324,39 +324,39 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
if (!type) {
return map;
}
if (isWrappingType(type)) {
return typeMapReducer(map, type.ofType);
}
if (map[type.name]) {
if (map[type.name] !== type) {

const namedType = getNamedType(type);
const seenType = map[namedType.name];
if (seenType) {
if (seenType !== namedType) {
throw new Error(
`Schema must contain uniquely named types but contains multiple types named "${type.name}".`,
`Schema must contain uniquely named types but contains multiple types named "${namedType.name}".`,
);
}
return map;
}
map[type.name] = type;
map[namedType.name] = namedType;

let reducedMap = map;

if (isUnionType(type)) {
reducedMap = type.getTypes().reduce(typeMapReducer, reducedMap);
if (isUnionType(namedType)) {
reducedMap = namedType.getTypes().reduce(typeMapReducer, reducedMap);
}

if (isObjectType(type)) {
reducedMap = type.getInterfaces().reduce(typeMapReducer, reducedMap);
if (isObjectType(namedType)) {
reducedMap = namedType.getInterfaces().reduce(typeMapReducer, reducedMap);
}

if (isObjectType(type) || isInterfaceType(type)) {
for (const field of objectValues(type.getFields())) {
if (isObjectType(namedType) || isInterfaceType(namedType)) {
for (const field of objectValues(namedType.getFields())) {
const fieldArgTypes = field.args.map(arg => arg.type);
reducedMap = fieldArgTypes.reduce(typeMapReducer, reducedMap);
reducedMap = typeMapReducer(reducedMap, field.type);
}
}

if (isInputObjectType(type)) {
for (const field of objectValues(type.getFields())) {
if (isInputObjectType(namedType)) {
for (const field of objectValues(namedType.getFields())) {
reducedMap = typeMapReducer(reducedMap, field.type);
}
}
Expand Down