microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-09 20:51:43 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove Rest<T, K> and use Pick<T, Exclude<keyof T, K>> instead

Browse Source
This commit is contained in:
Anders Hejlsberg 2018-11-02 06:40:26 -07:00
parent f55805955d
commit 9fd7d0a5f4
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/checker.ts
View File

@ -517,7 +517,8 @@ namespace ts {
let deferredGlobalTemplateStringsArrayType: ObjectType;
let deferredGlobalImportMetaType: ObjectType;
let deferredGlobalExtractSymbol: Symbol;
let deferredGlobalRestSymbol: Symbol;
let deferredGlobalExcludeSymbol: Symbol;
let deferredGlobalPickSymbol: Symbol;
const allPotentiallyUnusedIdentifiers = createMap<PotentiallyUnusedIdentifier[]>(); // key is file name
@ -4602,10 +4603,16 @@ namespace ts {
}
const omitKeyType = getUnionType(map(properties, getLiteralTypeFromPropertyName));
if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
const restTypeAlias = getGlobalRestSymbol();
return !restTypeAlias ? errorType :
omitKeyType.flags & TypeFlags.Never ? source :
getTypeAliasInstantiation(restTypeAlias, [source, omitKeyType]);
if (omitKeyType.flags & TypeFlags.Never) {
return source;
}
const pickTypeAlias = getGlobalPickSymbol();
const excludeTypeAlias = getGlobalExcludeSymbol();
if (!pickTypeAlias || !excludeTypeAlias) {
return errorType;
}
const pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
}
const members = createSymbolTable();
for (const prop of getPropertiesOfType(source)) {
@ -8640,8 +8647,12 @@ namespace ts {
return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract" as __String, SymbolFlags.TypeAlias, Diagnostics.Cannot_find_global_type_0)!); // TODO: GH#18217
}
function getGlobalRestSymbol(): Symbol {
return deferredGlobalRestSymbol || (deferredGlobalRestSymbol = getGlobalSymbol("Rest" as __String, SymbolFlags.TypeAlias, Diagnostics.Cannot_find_global_type_0)!); // TODO: GH#18217
function getGlobalExcludeSymbol(): Symbol {
return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude" as __String, SymbolFlags.TypeAlias, Diagnostics.Cannot_find_global_type_0)!); // TODO: GH#18217
}
function getGlobalPickSymbol(): Symbol {
return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick" as __String, SymbolFlags.TypeAlias, Diagnostics.Cannot_find_global_type_0)!); // TODO: GH#18217
}
/**
@ -9227,9 +9238,8 @@ namespace ts {
}
function getLiteralTypeFromPropertyName(name: PropertyName) {
return isComputedPropertyName(name) ? checkComputedPropertyName(name) :
isIdentifier(name) ? getLiteralType(unescapeLeadingUnderscores(name.escapedText)) :
checkExpression(name);
return isIdentifier(name) ? getLiteralType(unescapeLeadingUnderscores(name.escapedText)) :
getRegularTypeOfLiteralType(isComputedPropertyName(name) ? checkComputedPropertyName(name) : checkExpression(name));
}
function getLiteralTypeFromProperty(prop: Symbol, include: TypeFlags) {

5
src/lib/es5.d.ts vendored
View File

@ -1438,11 +1438,6 @@ type Extract<T, U> = T extends U ? T : never;
*/
type NonNullable<T> = T extends null | undefined ? never : T;
/**
* From T, pick all properties except those in the union K
*/
type Rest<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
/**
* Obtain the parameters of a function type in a tuple
*/