Skip to content

Fix invalid TypeScript syntax for array of union #1263

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix invalid TypeScript syntax for array of union #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca633ab
Fix invalid TypeScript syntax for array of union
michaelcamper Apr 10, 2025
66c3cb2
add missing tests
michaelcamper Apr 10, 2025
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
2 changes: 1 addition & 1 deletion integration-tests/lts/dbschema/default.esdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ module default {
property c -> bool;
}
type Z {
link xy -> W | X | Y;
multi link xy -> W | X | Y;
}

# Unicode handling
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/lts/interfaces.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export interface test_Profile extends BaseObject {
c?: string | null;
}
interface test_Z extends BaseObject {
xy?: W | X | Y | null;
xy?: (W | X | Y)[];
}
interface test_User extends BaseObject {
username: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/generate/src/edgeql-js/generateInterfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ export const generateInterfaces = (params: GenerateInterfacesParams) => {
Boolean(targetType.union_of?.length);

if (isUnion) {
return targetType.union_of
return `(${targetType.union_of
.map(({ id }) => types.get(id))
.map((member) => getTypeName(member.name))
.join(" | ");
.join(" | ")})`;
} else if (isLink) {
return getTypeName(targetType.name);
} else {
Expand Down
Loading