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

Handle huge unions better in createUnionOrIntersectionProperty #30411

Merged
merged 5 commits into from
Mar 22, 2019
Merged

Handle huge unions better in createUnionOrIntersectionProperty #30411

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed8ceba
Handle huge unions better in createUnionOrIntersectionProperty
weswigham Mar 14, 2019
528e863
Mimic first-in-wins behavior of pushIfUnique to retain order
weswigham Mar 14, 2019
eb21c09
!props -> props.length === 0 (why dont we warn on that ffs)
weswigham Mar 14, 2019
44e0aa0
Merge branch 'master' into handle-huge-unions-efficiently-in-props
weswigham Mar 18, 2019
92234c0
Avoid collection into an array if there are no properties
weswigham Mar 18, 2019
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
10 changes: 7 additions & 3 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7772,7 +7772,7 @@ namespace ts {
}

function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: __String): Symbol | undefined {
let props: Symbol[] | undefined;
const propSet = createMap<Symbol>();
let indexTypes: Type[] | undefined;
const isUnion = containingType.flags & TypeFlags.Union;
const excludeModifiers = isUnion ? ModifierFlags.NonPublicAccessibilityModifier : 0;
Expand All @@ -7787,7 +7787,10 @@ namespace ts {
const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0;
if (prop && !(modifiers & excludeModifiers)) {
commonFlags &= prop.flags;
props = appendIfUnique(props, prop);
const id = "" + getSymbolId(prop);
if (!propSet.has(id)) {
propSet.set(id, prop);
}
checkFlags |= (isReadonlySymbol(prop) ? CheckFlags.Readonly : 0) |
(!(modifiers & ModifierFlags.NonPublicAccessibilityModifier) ? CheckFlags.ContainsPublic : 0) |
(modifiers & ModifierFlags.Protected ? CheckFlags.ContainsProtected : 0) |
Expand All @@ -7809,9 +7812,10 @@ namespace ts {
}
}
}
if (!props) {
if (!propSet.size) {
weswigham marked this conversation as resolved.
Show resolved Hide resolved
weswigham marked this conversation as resolved.
Show resolved Hide resolved
return undefined;
}
const props = arrayFrom(propSet.values());
if (props.length === 1 && !(checkFlags & CheckFlags.Partial) && !indexTypes) {
return props[0];
}
Expand Down