10000 Use objects instead of closures for type mappers by ahejlsberg · Pull Request #36576 · microsoft/TypeScript · GitHub
[go: up one dir, main page]
Skip to content

Use objects instead of closures for type mappers #36576

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

Merged
merged 11 commits into from
Mar 11, 2020
Merged

Use objects instead of closures for type mappers #36576

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
63338f9
Use objects instead of closures for type mappers
ahejlsberg Feb 2, 2020
979bc6a
Flatten combined type mappers
ahejlsberg Feb 2, 2020
82cd7a1
Merge branch 'master' into typeMappersAsObjects
ahejlsberg Mar 5, 2020
8e6a2b1
Single point of creation for type mappers
ahejlsberg Mar 5, 2020
c7d3806
More optimizations
ahejlsberg Mar 5, 2020
163ba2f
Fix lint error
ahejlsberg Mar 5, 2020
61f0c7a
Fewer symbol instantiations / discard type mapper after instantiation
ahejlsberg Mar 5, 2020
50de2db
More optimizations
ahejlsberg Mar 6, 2020
ce9ddf3
Simplify mapper layout and cache in composite mappers
ahejlsberg Mar 8, 2020
30e7a18
Removing cache as it doesn't seem to matter much
ahejlsberg Mar 8, 2020
1cb54e1
Get rid of identityMapper
ahejlsberg Mar 10, 2020
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
Prev Previous commit
Get rid of identityMapper
  • Loading branch information
@ahejlsberg
ahejlsberg committed Mar 10, 2020
commit 1cb54e1836f2438f4c84e4afcbdf25b3fd2b4ac3
12 changes: 5 additions & 7 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,6 @@ namespace ts {
const keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
const numberOrBigIntType = getUnionType([numberType, bigintType]);

const identityMapper: TypeMapper = makeUnaryTypeMapper(anyType, anyType);
const restrictiveMapper: TypeMapper = makeFunctionTypeMapper(t => t.flags & TypeFlags.TypeParameter ? getRestrictiveTypeParameter(<TypeParameter>t) : t);
const permissiveMapper: TypeMapper = makeFunctionTypeMapper(t => t.flags & TypeFlags.TypeParameter ? wildcardType : t);

Expand Down Expand Up @@ -9043,14 +9042,13 @@ namespace ts {
}

function resolveObjectTypeMembers(type: ObjectType, source: InterfaceTypeWithDeclaredMembers, typeParameters: readonly TypeParameter[], typeArguments: readonly Type[]) {
let mapper: TypeMapper;
let mapper: TypeMapper | undefined;
let members: SymbolTable;
let callSignatures: readonly Signature[];
let constructSignatures: readonly Signature[] | undefined;
let stringIndexInfo: IndexInfo | undefined;
let numberIndexInfo: IndexInfo | undefined;
if (rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
mapper = identityMapper;
members = source.symbol ? getMembersOfSymbol(source.symbol) : createSymbolTable(source.declaredProperties);
callSignatures = source.declaredCallSignatures;
constructSignatures = source.declaredConstructSignatures;
Expand Down Expand Up @@ -9709,7 +9707,7 @@ namespace ts {
function getTemplateTypeFromMappedType(type: MappedType) {
return type.templateType ||
(type.templateType = type.declaration.type ?
instantiateType(addOptionality(getTypeFromTypeNode(type.declaration.type), !!(getMappedTypeModifiers(type) & MappedTypeModifiers.IncludeOptional)), type.mapper || identityMapper) :
instantiateType(addOptionality(getTypeFromTypeNode(type.declaration.type), !!(getMappedTypeModifiers(type) & MappedTypeModifiers.IncludeOptional)), type.mapper) :
errorType);
}

Expand All @@ -9729,7 +9727,7 @@ namespace ts {
// If the constraint declaration is a 'keyof T' node, the modifiers type is T. We check
// AST nodes here because, when T is a non-generic type, the logic below eagerly resolves
// 'keyof T' to a literal union type and we can't recover T from that type.
type.modifiersType = instantiateType(getTypeFromTypeNode((<TypeOperatorNode>getConstraintDeclarationForMappedType(type)).type), type.mapper || identityMapper);
type.modifiersType = instantiateType(getTypeFromTypeNode((<TypeOperatorNode>getConstraintDeclarationForMappedType(type)).type), type.mapper);
}
else {
// Otherwise, get the declared constraint type, and if the constraint type is a type parameter,
Expand All @@ -9738,7 +9736,7 @@ namespace ts {
const declaredType = <MappedType>getTypeFromMappedTypeNode(type.declaration);
const constraint = getConstraintTypeFromMappedType(declaredType);
const extendedConstraint = constraint && constraint.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>constraint) : constraint;
type.modifiersType = extendedConstraint && extendedConstraint.flags & TypeFlags.Index ? instantiateType((<IndexType>extendedConstraint).type, type.mapper || identityMapper) : unknownType;
type.modifiersType = extendedConstraint && extendedConstraint.flags & TypeFlags.Index ? instantiateType((<IndexType>extendedConstraint).type, type.mapper) : unknownType;
}
}
return type.modifiersType;
Expand Down Expand Up @@ -13899,7 +13897,7 @@ namespace ts {
function instantiateType(type: Type, mapper: TypeMapper | undefined): Type;
function instantiateType(type: Type | undefined, mapper: TypeMapper | undefined): Type | undefined;
function instantiateType(type: Type | undefined, mapper: TypeMapper | undefined): Type | undefined {
if (!type || !mapper || mapper === identityMapper) {
if (!type || !mapper) {
return type;
}
if (instantiationDepth === 50 || instantiationCount >= 5000000) {
Expand Down
0