Skip to content

feat(packages/graphql): resolve field output type by name #3932

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

Open
NicolasGn wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −12
Open

feat(packages/graphql): resolve field output type by name #3932

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
3 changes: 2 additions & 1 deletion packages/graphql/lib/interfaces/return-type-func.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export type GqlTypeReference<T = any> =
| GraphQLScalarType
| Function
| object
| symbol;
| symbol
| string;
export type ReturnTypeFuncValue = GqlTypeReference | [GqlTypeReference];
export type ReturnTypeFunc<T extends ReturnTypeFuncValue = any> = (
returns?: void,
Expand Down
30 changes: 19 additions & 11 deletions packages/graphql/lib/schema-builder/storages/type-definitions.storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { UnionDefinition } from '../factories/union-definition.factory';
export type GqlInputTypeKey = Function | object;
export type GqlInputType = InputTypeDefinition | EnumDefinition;

export type GqlOutputTypeKey = Function | object | symbol;
export type GqlOutputTypeKey = Function | object | symbol | string;
export type GqlOutputType =
| InterfaceTypeDefinition
| ObjectTypeDefinition
Expand All @@ -38,13 +38,15 @@ export class TypeDefinitionsStorage {
Function,
InputTypeDefinition
>();
private readonly outputTypesByName = new Map<string, GqlOutputType>();
private inputTypeDefinitionsLinks?: Map<GqlInputTypeKey, GqlInputType>;
private outputTypeDefinitionsLinks?: Map<GqlOutputTypeKey, GqlOutputType>;

addEnums(enumDefs: EnumDefinition[]) {
enumDefs.forEach((item) =>
this.enumTypeDefinitions.set(item.enumRef, item),
);
enumDefs.forEach((item) => {
this.enumTypeDefinitions.set(item.enumRef, item);
this.outputTypesByName.set(item.type.name, item);
});
}

getEnumByObject(obj: object): EnumDefinition {
Expand All @@ -56,7 +58,10 @@ export class TypeDefinitionsStorage {
}

addUnions(unionDefs: UnionDefinition[]) {
unionDefs.forEach((item) => this.unionTypeDefinitions.set(item.id, item));
unionDefs.forEach((item) => {
this.unionTypeDefinitions.set(item.id, item);
this.outputTypesByName.set(item.type.name, item);
});
}

getUnionBySymbol(key: symbol): UnionDefinition {
Expand All @@ -68,9 +73,10 @@ export class TypeDefinitionsStorage {
}

addInterfaces(interfaceDefs: InterfaceTypeDefinition[]) {
interfaceDefs.forEach((item) =>
this.interfaceTypeDefinitions.set(item.target, item),
);
interfaceDefs.forEach((item) => {
this.interfaceTypeDefinitions.set(item.target, item);
this.outputTypesByName.set(item.type.name, item);
});
}

getInterfaceByTarget(type: Function): InterfaceTypeDefinition {
Expand All @@ -96,9 +102,10 @@ export class TypeDefinitionsStorage {
}

addObjectTypes(objectDefs: ObjectTypeDefinition[]) {
objectDefs.forEach((item) =>
this.objectTypeDefinitions.set(item.target, item),
);
objectDefs.forEach((item) => {
this.objectTypeDefinitions.set(item.target, item);
this.outputTypesByName.set(item.type.name, item);
});
}

getObjectTypeByTarget(type: Function): ObjectTypeDefinition {
Expand Down Expand Up @@ -142,6 +149,7 @@ export class TypeDefinitionsStorage {
...this.interfaceTypeDefinitions.entries(),
...this.enumTypeDefinitions.entries(),
...this.unionTypeDefinitions.entries(),
...this.outputTypesByName.entries(),
]);
}
const definition = this.outputTypeDefinitionsLinks.get(key);
Expand Down