microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-15 22:15:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Use isWithinSpreadAssignment flag + objectsWithinSpread cache instead of ancestor traversal

Browse Source
This commit is contained in:
Mateusz Burzyński
2022-07-21 20:20:09 +02:00
parent 015a8965cf
commit be387e3bbf
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/compiler/checker.ts
View File

@@ -1005,6 +1005,9 @@ namespace ts {
let lastFlowNode: FlowNode | undefined;
let lastFlowNodeReachable: boolean;
let flowTypeCache: Type[] | undefined;
let isWithinSpreadAssignment = false;
const objectsWithinSpread = new WeakSet<Node>();
const emptyStringType = getStringLiteralType("");
const zeroType = getNumberLiteralType(0);
@@ -28032,7 +28035,10 @@ namespace ts {
hasComputedNumberProperty = false;
hasComputedSymbolProperty = false;
}
const isAlreadyWithinSpread = isWithinSpreadAssignment;
isWithinSpreadAssignment = true;
const type = getReducedType(checkExpression(memberDecl.expression));
isWithinSpreadAssignment = isAlreadyWithinSpread;
if (isValidSpreadType(type)) {
const mergedType = tryMergeUnionOfObjectTypeAndEmptyObject(type, inConstContext);
if (allPropertiesTable) {
@@ -28082,31 +28088,23 @@ namespace ts {
propertiesArray.push(member);
}
if (isWithinSpreadAssignment) {
objectsWithinSpread.add(node);
}
// If object literal is contextually typed by the implied type of a binding pattern, augment the result
// type with those properties for which the binding pattern specifies a default value.
// If the object literal is spread into another object literal, skip this step and let the top-level object
// literal handle it instead.
if (contextualTypeHasPattern) {
const rootPatternParent = findAncestor(contextualType.pattern!.parent, n =>
n.kind === SyntaxKind.VariableDeclaration ||
n.kind === SyntaxKind.BinaryExpression ||
n.kind === SyntaxKind.Parameter
);
const spreadOrOutsideRootObject = findAncestor(node, n =>
n === rootPatternParent ||
n.kind === SyntaxKind.SpreadAssignment
)!;
if (spreadOrOutsideRootObject.kind !== SyntaxKind.SpreadAssignment) {
for (const prop of getPropertiesOfType(contextualType)) {
if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
if (!(prop.flags & SymbolFlags.Optional)) {
error(prop.valueDeclaration || (prop as TransientSymbol).bindingElement,
Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
}
propertiesTable.set(prop.escapedName, prop);
propertiesArray.push(prop);
if (contextualTypeHasPattern && !objectsWithinSpread.has(node)) {
for (const prop of getPropertiesOfType(contextualType)) {
if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
if (!(prop.flags & SymbolFlags.Optional)) {
error(prop.valueDeclaration || (prop as TransientSymbol).bindingElement,
Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
}
propertiesTable.set(prop.escapedName, prop);
propertiesArray.push(prop);
}
}
}