Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 13:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(website): duplicate method in docs when interface merging (#10435)

Browse Source
This commit is contained in:
Qjuh
2024-08-19 15:26:08 +02:00
committed by GitHub
parent bb71dc825e
commit 8fb400827f
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/api-extractor/src/generators/ApiModelGenerator.ts
View File

@@ -1788,7 +1788,8 @@ export class ApiModelGenerator {
{ {
kind: type?.includes("'") ? ExcerptTokenKind.Content : ExcerptTokenKind.Reference, kind: type?.includes("'") ? ExcerptTokenKind.Content : ExcerptTokenKind.Reference,
text: fixPrimitiveTypes(type ?? 'unknown', symbol), text: fixPrimitiveTypes(type ?? 'unknown', symbol),
canonicalReference: type?.includes("'") canonicalReference:
type?.includes("'") || !astEntity
? undefined ? undefined
: DeclarationReference.package(pkg) : DeclarationReference.package(pkg)
.addNavigationStep( .addNavigationStep(
@@ -1796,8 +1797,9 @@ export class ApiModelGenerator {
DeclarationReference.parseComponent(type ?? 'unknown'), DeclarationReference.parseComponent(type ?? 'unknown'),
) )
.withMeaning( .withMeaning(
(lookup[astSymbol?.astDeclarations.at(-1)?.declaration.kind ?? ts.SyntaxKind.ClassDeclaration] ?? (lookup[
'class') as Meaning, astSymbol?.astDeclarations.at(-1)?.declaration.kind ?? ts.SyntaxKind.ClassDeclaration
] ?? 'class') as Meaning,
) )
.toString(), .toString(),
}, },
@@ -1867,7 +1869,7 @@ export class ApiModelGenerator {
: `${method.access ? `${method.access} ` : ''}${method.scope === 'static' ? 'static ' : ''}${method.name}(` : `${method.access ? `${method.access} ` : ''}${method.scope === 'static' ? 'static ' : ''}${method.name}(`
}${ }${
method.params?.length method.params?.length
? `${method.params[0]!.name}${method.params[0]!.nullable || method.params[0]!.optional ? '?' : ''}` ? `${method.params[0]!.name}${method.params[0]!.nullable || method.params[0]!.optional ? '?' : ''}: `
: '): ' : '): '
}`, }`,
}); });

2
packages/scripts/src/generateSplitDocumentation.ts
View File

@@ -99,7 +99,7 @@ export function resolveMembers<WantedItem extends ApiItem>(
.getMergedSiblings() .getMergedSiblings()
.filter((sibling) => sibling.containerKey !== parent.containerKey) .filter((sibling) => sibling.containerKey !== parent.containerKey)
.flatMap((sibling) => (sibling as ApiItemContainerMixin).findMembersWithInheritance().items) .flatMap((sibling) => (sibling as ApiItemContainerMixin).findMembersWithInheritance().items)
.filter((item) => predicate(item) && !seenItems.has(item.containerKey)) .filter((item) => predicate(item) && !seenItems.has(item.displayName))
.map((item) => ({ .map((item) => ({
item: item as WantedItem, item: item as WantedItem,
inherited: item.parent ? (item.parent as ApiItemContainerMixin) : undefined, inherited: item.parent ? (item.parent as ApiItemContainerMixin) : undefined,