Skip to content

Instantiate anonymous types less #7138

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

Closed
wants to merge 8 commits into from
Closed

Instantiate anonymous types less #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c0b0ef
Strawman: instantiate anonymous types less
sandersn Feb 18, 2016
7a48fb2
Add test with lots of generic static methods
sandersn Feb 18, 2016
2fecf2b
Instantiate more this-class types
sandersn Feb 18, 2016
f6cadc9
Instantiate all interfaces that are mapped.
sandersn Feb 18, 2016
5774f14
Instantiate generic type aliases
sandersn Feb 18, 2016
b138d4a
PR comments
sandersn Feb 26, 2016
f7c4b3a
Improve type-parameter-in-scope check
sandersn Mar 1, 2016
a5a4b59
Add complex out-of-memory test based on bluebird.d.ts
sandersn Mar 1, 2016
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
98 changes: 80 additions & 18 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ namespace ts {
const anySignature = createSignature(undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);


const identityMapper: TypeMapper = <TypeMapper>((t: TypeParameter) => <Type>t);
identityMapper.mapsType = t => false;

const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);

const globals: SymbolTable = {};
Expand Down Expand Up @@ -4954,54 +4958,66 @@ namespace ts {
}

function createUnaryTypeMapper(source: Type, target: Type): TypeMapper {
return t => t === source ? target : t;
const mapper = <TypeMapper>(t => t === source ? target : t);
mapper.mapsType = t => t === source;
return mapper;
}

function createBinaryTypeMapper(source1: Type, target1: Type, source2: Type, target2: Type): TypeMapper {
return t => t === source1 ? target1 : t === source2 ? target2 : t;
const mapper = <TypeMapper>(t => t === source1 ? target1 : t === source2 ? target2 : t);
mapper.mapsType = t => t === source1 || t === source2;
return mapper;
}

function createTypeMapper(sources: Type[], targets: Type[]): TypeMapper {
switch (sources.length) {
case 1: return createUnaryTypeMapper(sources[0], targets[0]);
case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
}
return t => {
const mapper = <TypeMapper>(t => {
for (let i = 0; i < sources.length; i++) {
if (t === sources[i]) {
return targets[i];
}
}
return t;
};
});
mapper.mapsType = t => forEach(sources, source => t === source);
return mapper;
}

function createUnaryTypeEraser(source: Type): TypeMapper {
return t => t === source ? anyType : t;
const eraser = <TypeMapper>(t => t === source ? <Type>anyType : <Type>t);
eraser.mapsType = t => t === source;
return eraser;
}

function createBinaryTypeEraser(source1: Type, source2: Type): TypeMapper {
return t => t === source1 || t === source2 ? anyType : t;
const eraser = <TypeMapper>(t => t === source1 || t === source2 ? <Type>anyType : <Type>t);
eraser.mapsType = t => t === source1 || t === source2;
return eraser;
}

function createTypeEraser(sources: Type[]): TypeMapper {
switch (sources.length) {
case 1: return createUnaryTypeEraser(sources[0]);
case 2: return createBinaryTypeEraser(sources[0], sources[1]);
}
return t => {
const mapper = <TypeMapper>(t => {
for (const source of sources) {
if (t === source) {
return anyType;
return <Type>anyType;
}
}
return t;
};
return <Type>t;
});
mapper.mapsType = t => forEach(sources, source => t === source);
return mapper;
}

function getInferenceMapper(context: InferenceContext): TypeMapper {
if (!context.mapper) {
const mapper: TypeMapper = t => {
const mapper = <TypeMapper>(t => {
const typeParameters = context.typeParameters;
for (let i = 0; i < typeParameters.length; i++) {
if (t === typeParameters[i]) {
Expand All @@ -5010,19 +5026,18 @@ namespace ts {
}
}
return t;
};
});
mapper.context = context;
mapper.mapsType = t => forEach(context.typeParameters, param => t === param);
context.mapper = mapper;
}
return context.mapper;
}

function identityMapper(type: Type): Type {
return type;
}

function combineTypeMappers(mapper1: TypeMapper, mapper2: TypeMapper): TypeMapper {
return t => instantiateType(mapper1(t), mapper2);
const mapper = <TypeMapper>(t => instantiateType(mapper1(t), mapper2));
mapper.mapsType = t => mapper1.mapsType(t) || mapper2.mapsType(t);
return mapper;
}

function cloneTypeParameter(typeParameter: TypeParameter): TypeParameter {
Expand Down Expand Up @@ -5123,7 +5138,9 @@ namespace ts {
return mapper(<TypeParameter>type);
}
if (type.flags & TypeFlags.Anonymous) {
return type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) ?
return type.symbol &&
type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
hasTypeParametersInScope(<AnonymousType>type, mapper) ?
instantiateAnonymousType(<AnonymousType>type, mapper) : type;
}
if (type.flags & TypeFlags.Reference) {
Expand All @@ -5142,6 +5159,51 @@ namespace ts {
return type;
}

function hasTypeParametersInScope(type: AnonymousType, mapper: TypeMapper) {
for (const original of type.symbol.declarations) {
let node: Node = original;
while (node !== undefined) {
switch (node.kind) {
case SyntaxKind.FunctionType:
case SyntaxKind.ConstructorType:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.MethodDeclaration:
case SyntaxKind.MethodSignature:
case SyntaxKind.Constructor:
case SyntaxKind.CallSignature:
case SyntaxKind.ConstructSignature:
case SyntaxKind.IndexSignature:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
case SyntaxKind.FunctionExpression:
case SyntaxKind.ArrowFunction:
case SyntaxKind.JSDocFunctionType:
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
case SyntaxKind.TypeAliasDeclaration:
case SyntaxKind.InterfaceDeclaration:
const decl = <SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration>node;
const typeParameters = map(decl.typeParameters, parameter => {
const t = <TypeParameter>getTypeOfNode(parameter);
return type.mapper ? type.mapper(t) : t;
});
if (forEach(typeParameters, mapper.mapsType)) {
return true;
}
if (isClassLike(node) || node.kind === SyntaxKind.InterfaceDeclaration) {
const classLikeType = <InterfaceType>getTypeOfNode(node);
if (mapper.mapsType(classLikeType.thisType)) {
return true;
}
break;
}
}
node = node.parent;
}
}
return false;
}

function instantiateIndexInfo(info: IndexInfo, mapper: TypeMapper): IndexInfo {
return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
}
Expand Down
1 change: 1 addition & 0 deletions src/compiler/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,6 +2282,7 @@ namespace ts {
/* @internal */
export interface TypeMapper {
(t: TypeParameter): Type;
mapsType(t: Type): boolean; // whether this mapper maps the type
instantiations?: Type[]; // Cache of instantiations created using this type mapper.
context?: InferenceContext; // The inference context this mapper was created from.
// Only inference mappers have this set (in createInferenceMapper).
Expand Down
Loading