microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 15:25:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Refactor get(Regular|Widened)TypeOfObjectLiteral.

Browse Source 
Now more code is shared.
This commit is contained in:
Nathan Shively-Sanders 2016-05-16 10:43:26 -07:00
parent e579c09c2c
commit 91fb1ac980
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/compiler/checker.ts
View File

@ -6834,45 +6834,42 @@ namespace ts {
return symbol;
}
function updateTypeOfMembers(type: Type, update: (propertyType: Type) => Type) {
const members: SymbolTable = {};
for (const property of getPropertiesOfObjectType(type)) {
const original = getTypeOfSymbol(property);
const updated = update(original);
members[property.name] = updated === original ? property : createTransientSymbol(property, updated);
};
return members;
}
function getRegularTypeOfObjectLiteral(type: Type): Type {
if (type.flags & TypeFlags.FreshObjectLiteral) {
let regularType = (<FreshObjectLiteralType>type).regularType;
if (!regularType) {
regularType = <ResolvedType>createType((<ResolvedType>type).flags & ~TypeFlags.FreshObjectLiteral);
regularType.symbol = (<ResolvedType>type).symbol;
const members: SymbolTable = {};
const properties: Symbol[] = [];
for (let p of (<ResolvedType>type).properties) {
const propType = getTypeOfSymbol(p);
if (propType.flags & TypeFlags.FreshObjectLiteral) {
p = createTransientSymbol(p, getRegularTypeOfObjectLiteral(propType));
}
members[p.name] = p;
properties.push(p);
};
regularType.properties = properties;
regularType.members = members;
regularType.callSignatures = (<ResolvedType>type).callSignatures;
regularType.constructSignatures = (<ResolvedType>type).constructSignatures;
regularType.stringIndexInfo = (<ResolvedType>type).stringIndexInfo;
regularType.numberIndexInfo = (<ResolvedType>type).numberIndexInfo;
(<FreshObjectLiteralType>type).regularType = regularType;
}
if (!(type.flags & TypeFlags.FreshObjectLiteral)) {
return type;
}
const regularType = (<FreshObjectLiteralType>type).regularType;
if (regularType) {
return regularType;
}
return type;
const resolved = <ResolvedType>type;
const members = updateTypeOfMembers(type, prop => prop.flags & TypeFlags.FreshObjectLiteral ? getRegularTypeOfObjectLiteral(prop) : prop);
const regularNew = createAnonymousType(resolved.symbol,
members,
resolved.callSignatures,
resolved.constructSignatures,
resolved.stringIndexInfo,
resolved.numberIndexInfo);
regularNew.flags = resolved.flags & ~TypeFlags.FreshObjectLiteral;
(<FreshObjectLiteralType>type).regularType = regularNew;
return regularNew;
}
function getWidenedTypeOfObjectLiteral(type: Type): Type {
const properties = getPropertiesOfObjectType(type);
const members: SymbolTable = {};
forEach(properties, p => {
const propType = getTypeOfSymbol(p);
const widenedType = getWidenedType(propType);
if (propType !== widenedType) {
p = createTransientSymbol(p, widenedType);
}
members[p.name] = p;
const members = updateTypeOfMembers(type, prop => {
const widened = getWidenedType(prop);
return prop === widened ? prop : widened;
});
const stringIndexInfo = getIndexInfoOfType(type, IndexKind.String);
const numberIndexInfo = getIndexInfoOfType(type, IndexKind.Number);