Skip to content

perf: avoid garbage colection in token type utils #18

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

Merged
merged 4 commits into from
Sep 26, 2025
Merged

perf: avoid garbage colection in token type utils #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
474a27f
perf: avoid garbage colection in token type utils
43081j Sep 17, 2025
15c7a74
chore: add changeset
43081j Sep 17, 2025
e95896f
Merge branch 'main' into garbage-man
benmccann Sep 24, 2025
2c51818
Update .changeset/nine-carrots-share.md
dummdidumm Sep 26, 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
5 changes: 5 additions & 0 deletions .changeset/nine-carrots-share.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/acorn-typescript': patch
---

perf: avoid garbage collection in token type utilities.
50 changes: 29 additions & 21 deletions src/tokenType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ function kwLike(_name, options: any = {}) {
}

const acornTypeScriptMap = new WeakMap();
const keywordTypeValues = Object.values(keywordTypes);

export function generateAcornTypeScript(_acorn: any): AcornTypeScript {
const acorn = _acorn.Parser.acorn || _acorn;
let acornTypeScript = acornTypeScriptMap.get(acorn);
if (!acornTypeScript) {
const tsKwTokenType = generateTsKwTokenType();
const tsKwTokenTypeValues = Object.values(tsKwTokenType);
const tsTokenType = generateTsTokenType();
const tsTokenContext = generateTsTokenContext();
const tsKeywordsRegExp = new RegExp(`^(?:${Object.keys(tsKwTokenType).join('|')})$`);
Expand All @@ -43,39 +45,45 @@ export function generateAcornTypeScript(_acorn: any): AcornTypeScript {
};

function tokenIsLiteralPropertyName(token: TokenType): boolean {
return [
...[tokTypes.name, tokTypes.string, tokTypes.num],
...Object.values(keywordTypes),
...Object.values(tsKwTokenType)
].includes(token);
return (
token === tokTypes.name ||
token === tokTypes.string ||
token === tokTypes.num ||
keywordTypeValues.includes(token) ||
tsKwTokenTypeValues.includes(token)
);
}

function tokenIsKeywordOrIdentifier(token: TokenType): boolean {
return [
...[tokTypes.name],
...Object.values(keywordTypes),
...Object.values(tsKwTokenType)
].includes(token);
return (
token === tokTypes.name ||
keywordTypeValues.includes(token) ||
tsKwTokenTypeValues.includes(token)
);
}

function tokenIsIdentifier(token: TokenType): boolean {
return [...Object.values(tsKwTokenType), tokTypes.name].includes(token);
return token === tokTypes.name || tsKwTokenTypeValues.includes(token);
}

function tokenIsTSDeclarationStart(token: TokenType): boolean {
return [
tsKwTokenType.abstract,
tsKwTokenType.declare,
tsKwTokenType.enum,
tsKwTokenType.module,
tsKwTokenType.namespace,
tsKwTokenType.interface,
tsKwTokenType.type
].includes(token);
return (
token === tsKwTokenType.abstract ||
token === tsKwTokenType.declare ||
token === tsKwTokenType.enum ||
token === tsKwTokenType.module ||
token === tsKwTokenType.namespace ||
token === tsKwTokenType.interface ||
token === tsKwTokenType.type
);
}

function tokenIsTSTypeOperator(token: TokenType): boolean {
return [tsKwTokenType.keyof, tsKwTokenType.readonly, tsKwTokenType.unique].includes(token);
return (
token === tsKwTokenType.keyof ||
token === tsKwTokenType.readonly ||
token === tsKwTokenType.unique
);
}

function tokenIsTemplate(token: TokenType): boolean {
Expand Down