Skip to content

Commit

Permalink
fix(route): Conditionally prefix package names (#9975)
Browse files Browse the repository at this point in the history
fix(route): conditionally prefix package names
  • Loading branch information
Jiralite committed Nov 17, 2023
1 parent 55be1c9 commit 5da5be2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions apps/website/src/app/api/dynamic-open-graph.png/route.tsx
Expand Up @@ -3,6 +3,7 @@
import type { ApiItemKind } from '@discordjs/api-extractor-model';
import { ImageResponse } from '@vercel/og';
import type { NextRequest } from 'next/server';
import { resolvePackageName } from '~/util/resolvePackageName';

export const runtime = 'edge';

Expand Down Expand Up @@ -87,7 +88,7 @@ export async function GET(request: NextRequest) {
const hasMethods = searchParams.has('methods');
const hasProps = searchParams.has('props');
const hasMembers = searchParams.has('members');
const pkg = hasPkg ? searchParams.get('pkg') : '';
const pkg = hasPkg ? resolvePackageName(searchParams.get('pkg')!) : '';
const kind = hasKind ? searchParams.get('kind')! : 'Method';
const name = hasName ? searchParams.get('name')!.slice(0, 100) : 'My default name which is super long to overflow';
const methods = hasMethods ? searchParams.get('methods') : '';
Expand All @@ -103,7 +104,7 @@ export async function GET(request: NextRequest) {
tw="flex flex-row bg-[#181818] h-full w-full p-24"
>
<div tw="flex flex-col mx-auto h-full text-white">
<div tw="flex flex-row text-4xl text-gray-400">@discordjs/{pkg}</div>
<div tw="flex flex-row text-4xl text-gray-400">{pkg}</div>
<div tw="flex flex-col justify-between h-full w-full pt-14">
<div tw="flex flex-row items-center max-w-full">
<span tw="mr-6">{resolveIcon(kind as keyof typeof ApiItemKind)}</span>
Expand Down
5 changes: 3 additions & 2 deletions apps/website/src/util/model.ts
Expand Up @@ -6,9 +6,10 @@ import type {
Excerpt,
} from '@discordjs/api-extractor-model';
import type { DocSection } from '@microsoft/tsdoc';
import { resolvePackageName } from './resolvePackageName';

export const findMemberByKey = (model: ApiModel, packageName: string, containerKey: string) => {
const pkg = model.tryGetPackageByName(packageName === 'discord.js' ? packageName : `@discordjs/${packageName}`)!;
const pkg = model.tryGetPackageByName(resolvePackageName(packageName))!;
return (pkg.members[0] as ApiEntryPoint).tryGetMemberByKey(containerKey);
};

Expand All @@ -17,7 +18,7 @@ export const findMember = (model: ApiModel, packageName: string, memberName: str
return undefined;
}

const pkg = model.tryGetPackageByName(packageName === 'discord.js' ? packageName : `@discordjs/${packageName}`)!;
const pkg = model.tryGetPackageByName(resolvePackageName(packageName))!;
return pkg.entryPoints[0]?.findMembersByName(memberName)[0];
};

Expand Down
3 changes: 3 additions & 0 deletions apps/website/src/util/resolvePackageName.ts
@@ -0,0 +1,3 @@
export function resolvePackageName(packageName: string) {
return packageName === 'discord.js' ? packageName : `@discordjs/${packageName}`;
}

1 comment on commit 5da5be2

@vercel
Copy link

@vercel vercel bot commented on 5da5be2 Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.