Skip to content

Commit

Permalink
fix(website): search index generation (#9980)
Browse files Browse the repository at this point in the history
* types: fix links in @deprecated tags

* Merge branch 'main' into fix/deprecated-links-d.ts

* fix: searchIndices

* refactor: apply review suggestions
  • Loading branch information
Qjuh committed Nov 18, 2023
1 parent ae58053 commit 5a71570
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 27 deletions.
7 changes: 2 additions & 5 deletions apps/website/src/util/addPackageToModel.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { ApiPackage } from '@discordjs/api-extractor-model';
import type { ApiModel } from '@discordjs/api-extractor-model';
import { type ApiModel, ApiPackage } from '@discordjs/api-extractor-model';

export const addPackageToModel = (model: ApiModel, data: any) => {
const apiPackage = ApiPackage.loadFromJson(data);

model.addMember(apiPackage);
model.addMember(ApiPackage.loadFromJson(data));
return model;
};
32 changes: 10 additions & 22 deletions packages/scripts/src/generateIndex.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { stat, mkdir, writeFile } from 'node:fs/promises';
import { join } from 'node:path';
import { cwd } from 'node:process';
import type { ApiPackage } from '@discordjs/api-extractor-model';
import { ApiItem, ApiModel, ApiDeclaredItem, ApiItemContainerMixin, ApiItemKind } from '@discordjs/api-extractor-model';
import {
type ApiItem,
ApiPackage,
ApiModel,
ApiDeclaredItem,
ApiItemContainerMixin,
ApiItemKind,
} from '@discordjs/api-extractor-model';
import { generatePath } from '@discordjs/api-extractor-utils';
import { DocNodeKind, TSDocConfiguration } from '@microsoft/tsdoc';
import { DocNodeKind } from '@microsoft/tsdoc';
import type { DocLinkTag, DocCodeSpan, DocNode, DocParagraph, DocPlainText } from '@microsoft/tsdoc';
import { TSDocConfigFile } from '@microsoft/tsdoc-config';
import { request } from 'undici';

export interface MemberJSON {
Expand All @@ -33,24 +38,7 @@ export const PACKAGES = [
let idx = 0;

export function addPackageToModel(model: ApiModel, data: any) {
let apiPackage: ApiPackage;
if (data.metadata) {
const tsdocConfiguration = new TSDocConfiguration();
const tsdocConfigFile = TSDocConfigFile.loadFromObject(data.metadata.tsdocConfig);
tsdocConfigFile.configureParser(tsdocConfiguration);

apiPackage = ApiItem.deserialize(data, {
apiJsonFilename: '',
toolPackage: data.metadata.toolPackage,
toolVersion: data.metadata.toolVersion,
versionToDeserialize: data.metadata.schemaVersion,
tsdocConfiguration,
}) as ApiPackage;
} else {
apiPackage = ApiItem.deserializeDocgen(data, 'discord.js') as ApiPackage;
}

model.addMember(apiPackage);
model.addMember(ApiPackage.loadFromJson(data));
return model;
}

Expand Down

1 comment on commit 5a71570

@vercel
Copy link

@vercel vercel bot commented on 5a71570 Nov 18, 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.