Skip to content

Commit 1bfa115

Browse files
authored
chore(ensureValidRuntimeType): remove special v16 error message (#4183)
1 parent 6c56e05 commit 1bfa115

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

src/execution/__tests__/abstract-test.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -633,15 +633,7 @@ describe('Execute: Handles execution of abstract types', () => {
633633
// @ts-expect-error
634634
assertInterfaceType(schema.getType('Pet')).resolveType = () => [];
635635
expectError({ forTypeName: undefined }).toEqual(
636-
'Abstract type "Pet" must resolve to an Object type at runtime for field "Query.pet" with value { __typename: undefined }, received "[]".',
637-
);
638-
639-
// FIXME: workaround since we can't inject resolveType into SDL
640-
// @ts-expect-error
641-
assertInterfaceType(schema.getType('Pet')).resolveType = () =>
642-
schema.getType('Cat');
643-
expectError({ forTypeName: undefined }).toEqual(
644-
'Support for returning GraphQLObjectType from resolveType was removed in [email protected] please return type name instead.',
636+
'Abstract type "Pet" must resolve to an Object type at runtime for field "Query.pet" with value { __typename: undefined }, received "[]", which is not a valid Object type name.',
645637
);
646638
});
647639
});

src/execution/execute.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,18 +1588,12 @@ function ensureValidRuntimeType(
15881588
);
15891589
}
15901590

1591-
// releases before 16.0.0 supported returning `GraphQLObjectType` from `resolveType`
1592-
// TODO: remove in 17.0.0 release
1593-
if (isObjectType(runtimeTypeName)) {
1594-
throw new GraphQLError(
1595-
'Support for returning GraphQLObjectType from resolveType was removed in [email protected] please return type name instead.',
1596-
);
1597-
}
1598-
15991591
if (typeof runtimeTypeName !== 'string') {
16001592
throw new GraphQLError(
16011593
`Abstract type "${returnType}" must resolve to an Object type at runtime for field "${info.parentType}.${info.fieldName}" with ` +
1602-
`value ${inspect(result)}, received "${inspect(runtimeTypeName)}".`,
1594+
`value ${inspect(result)}, received "${inspect(
1595+
runtimeTypeName,
1596+
)}", which is not a valid Object type name.`,
16031597
);
16041598
}
16051599

0 commit comments

Comments
 (0)