Skip to content
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

Jump to bottom

Declare non-const enums if preserveConstEnums is true #46626

Closed
wants to merge 5 commits into from
Closed

Declare non-const enums if preserveConstEnums is true #46626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9405a03
Declare non-const enums if isolatedModules is true
jablko Nov 1, 2021
42d1408
Move from emitter -> transformer
jablko Nov 4, 2021
b4dc52b
Broaden from isolatedModules -> preserveConstEnums
jablko Nov 4, 2021
04f4bc4
Inline plain enums from referenced projects
jablko Mar 2, 2022
ee3537f
Ignore ambient const enums
jablko Mar 2, 2022
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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41629,7 +41629,7 @@ namespace ts {
if (symbol && (symbol.flags & SymbolFlags.EnumMember)) {
// inline property\index accesses only for const enums
const member = symbol.valueDeclaration as EnumMember;
if (isEnumConst(member.parent)) {
if (isEnumConst(member.parent) || host.getProjectReferenceRedirect(getSourceFileOfNode(member).originalFileName)) {
return getEnumMemberValue(member);
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/compiler/transformers/declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,6 +1577,10 @@ namespace ts {
mask ^= ModifierFlags.Ambient;
additions = ModifierFlags.None;
}
// Transform non-ambient const enums -> ambient non-const enums if preserveConstEnums is true
if (!(node.flags & NodeFlags.Ambient) && isEnumDeclaration(node) && shouldPreserveConstEnums(options)) {
mask ^= ModifierFlags.Const;
}
return maskModifierFlags(node, mask, additions);
}

Expand Down