From 780f915f2738fb63d62bb47e62b8554ef96c4450 Mon Sep 17 00:00:00 2001 From: Qjuh <76154676+Qjuh@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:03:40 +0100 Subject: [PATCH 1/3] fix(website): add type to variables --- apps/website/src/components/UnionMember.tsx | 4 ++-- .../scripts/src/generateSplitDocumentation.ts | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/website/src/components/UnionMember.tsx b/apps/website/src/components/UnionMember.tsx index ce30e01ff6cc..ea94c2fea483 100644 --- a/apps/website/src/components/UnionMember.tsx +++ b/apps/website/src/components/UnionMember.tsx @@ -3,9 +3,9 @@ import { ExcerptNode } from './ExcerptNode'; export async function UnionMember({ node, version }: { readonly node: any; readonly version: string }) { return (
-

Union Members

+ {node.length > 1 ?

Union Members

: ''} - +
diff --git a/packages/scripts/src/generateSplitDocumentation.ts b/packages/scripts/src/generateSplitDocumentation.ts index 7f76fd92e491..703d24116edd 100644 --- a/packages/scripts/src/generateSplitDocumentation.ts +++ b/packages/scripts/src/generateSplitDocumentation.ts @@ -903,13 +903,13 @@ function itemInterface(item: ApiInterface) { }; } -function itemUnion(item: ApiTypeAlias) { +function itemUnion(item: Excerpt) { const union: ExcerptToken[][] = []; let currentUnionMember: ExcerptToken[] = []; let depth = 0; - for (const token of item.typeExcerpt.spannedTokens) { + for (const token of item.spannedTokens) { if (token.text.includes('?')) { - return [item.typeExcerpt.spannedTokens]; + return [item.spannedTokens]; } depth += token.text.split('<').length - token.text.split('>').length; @@ -948,7 +948,7 @@ function itemTypeAlias(item: ApiTypeAlias) { return { ...itemInfo(item), typeParameters: itemTypeParameters(item), - unionMembers: itemUnion(item).map((member) => + unionMembers: itemUnion(item.typeExcerpt).map((member) => itemExcerptText( new Excerpt(member, { startIndex: 0, endIndex: member.length }), item.getAssociatedPackage()!, @@ -961,6 +961,13 @@ function itemTypeAlias(item: ApiTypeAlias) { function itemVariable(item: ApiVariable) { return { ...itemInfo(item), + unionMembers: itemUnion(item.variableTypeExcerpt).map((member) => + itemExcerptText( + new Excerpt(member, { startIndex: 0, endIndex: member.length }), + item.getAssociatedPackage()!, + item.getHierarchy().find(ApiTypeParameterListMixin.isBaseClassOf), + ), + ), }; } From 563a75d35496e0e0d0fdd887a783cb54117c8b39 Mon Sep 17 00:00:00 2001 From: Qjuh <76154676+Qjuh@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:10:46 +0100 Subject: [PATCH 2/3] chore: apply suggestion --- apps/website/src/components/UnionMember.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/src/components/UnionMember.tsx b/apps/website/src/components/UnionMember.tsx index ea94c2fea483..6a5c3f30a6c5 100644 --- a/apps/website/src/components/UnionMember.tsx +++ b/apps/website/src/components/UnionMember.tsx @@ -3,7 +3,7 @@ import { ExcerptNode } from './ExcerptNode'; export async function UnionMember({ node, version }: { readonly node: any; readonly version: string }) { return (
- {node.length > 1 ?

Union Members

: ''} + {node.length > 1 ?

Union Members

: null} From 832a3c56689f0683bef3edca44cd8d4a1dbc5fa2 Mon Sep 17 00:00:00 2001 From: Qjuh <76154676+Qjuh@users.noreply.github.com> Date: Thu, 10 Apr 2025 22:32:02 +0200 Subject: [PATCH 3/3] chore: lint --- apps/website/src/components/UnionMember.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/src/components/UnionMember.tsx b/apps/website/src/components/UnionMember.tsx index 6a5c3f30a6c5..161af976c21c 100644 --- a/apps/website/src/components/UnionMember.tsx +++ b/apps/website/src/components/UnionMember.tsx @@ -5,7 +5,7 @@ export async function UnionMember({ node, version }: { readonly node: any; reado
{node.length > 1 ?

Union Members

: null} - +