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

Union multiple spread index signatures

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2016-09-27 11:05:12 -07:00
parent d6e414ce5b
commit 429b0d95ca
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiler/checker.ts
View File

@@ -2321,6 +2321,8 @@ namespace ts {
printFollowingPunctuation = true;
}
}
// TODO: Only print if this is directly on the type -- not on the subtype somewhere.
// (This is not crucial, though, since the extra info *might* be nice.)
const resolved = resolveStructuredTypeMembers(type);
writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
@@ -4291,6 +4293,11 @@ namespace ts {
getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
}
function unionIndexInfos(info1: IndexInfo, info2: IndexInfo): IndexInfo {
return !info1 ? info2 : !info2 ? info1 : createIndexInfo(
getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
}
function resolveIntersectionTypeMembers(type: IntersectionType) {
// The members and properties collections are empty for intersection types. To get all properties of an
// intersection type use getPropertiesOfType (only the language service uses this).
@@ -4315,8 +4322,8 @@ namespace ts {
for (let i = type.types.length - 1; i > -1; i--) {
const t = type.types[i];
if (!t.isDeclaredProperty) {
stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
stringIndexInfo = unionIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
numberIndexInfo = unionIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
}
}
setObjectTypeMembers(type, emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
@@ -16839,7 +16846,9 @@ namespace ts {
// perform property check if property or indexer is declared in 'type'
// this allows to rule out cases when both property and indexer are inherited from the base class
let errorNode: Node;
if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName ||
prop.parent === containingType.symbol ||
containingType.flags & TypeFlags.Spread) {
errorNode = prop.valueDeclaration;
}
else if (indexDeclaration) {