Skip to content
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

Revise behavior of mapped types with any/keyof any constraints #61224

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revise behavior of mapped types with any/keyof any constraints #61224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14127,7 +14127,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
cb(getLiteralTypeFromProperty(prop, include));
}
if (type.flags & TypeFlags.Any) {
cb(stringType);
forEachType(stringsOnly ? stringType : stringNumberSymbolType, cb);
}
else {
for (const info of getIndexInfosOfType(type)) {
Expand Down Expand Up @@ -14166,7 +14166,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {

function addMemberForKeyType(keyType: Type) {
const propNameType = nameType ? instantiateType(nameType, appendTypeMapping(type.mapper, typeParameter, keyType)) : keyType;
forEachType(propNameType, t => addMemberForKeyTypeWorker(keyType, t));
forEachType(keyType.flags & TypeFlags.Any ? stringNumberSymbolType : propNameType, t => addMemberForKeyTypeWorker(keyType, t));
}

function addMemberForKeyTypeWorker(keyType: Type, propNameType: Type) {
Expand Down Expand Up @@ -14201,10 +14201,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
members.set(propName, prop);
}
}
else if (isValidIndexKeyType(propNameType) || propNameType.flags & (TypeFlags.Any | TypeFlags.Enum)) {
const indexKeyType = propNameType.flags & (TypeFlags.Any | TypeFlags.String) ? stringType :
propNameType.flags & (TypeFlags.Number | TypeFlags.Enum) ? numberType :
propNameType;
else if (isValidIndexKeyType(propNameType) || propNameType.flags & TypeFlags.Enum) {
const indexKeyType = propNameType.flags & (TypeFlags.Number | TypeFlags.Enum) ? numberType : propNameType;
const propType = instantiateType(templateType, appendTypeMapping(type.mapper, typeParameter, keyType));
const modifiersIndexInfo = getApplicableIndexInfo(modifiersType, propNameType);
const isReadonly = !!(templateModifiers & MappedTypeModifiers.IncludeReadonly ||
Expand Down
6 changes: 6 additions & 0 deletions tests/baselines/reference/mappedTypeWithAny.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,10 @@ mappedTypeWithAny.ts(53,5): error TS2322: Type 'string[]' is not assignable to t
type Evolver<T extends Evolvable<any> = any> = {
[key in keyof Partial<T>]: never;
};

// https://github.com/microsoft/TypeScript/issues/61203
type Obj61203 = { [k in keyof any]: number };
declare const obj61203: Obj61203;
declare const key61203: keyof Obj61203;
obj61203[key61203]; // ok

12 changes: 12 additions & 0 deletions tests/baselines/reference/mappedTypeWithAny.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ type Evolvable<E extends Evolver> = {
type Evolver<T extends Evolvable<any> = any> = {
[key in keyof Partial<T>]: never;
};

// https://github.com/microsoft/TypeScript/issues/61203
type Obj61203 = { [k in keyof any]: number };
declare const obj61203: Obj61203;
declare const key61203: keyof Obj61203;
obj61203[key61203]; // ok


//// [mappedTypeWithAny.js]
Expand All @@ -79,6 +85,7 @@ function bar(arrayish, objectish, indirectArrayish) {
}
var abc = stringifyArray(void 0);
var def = stringifyPair(void 0);
obj61203[key61203]; // ok


//// [mappedTypeWithAny.d.ts]
Expand Down Expand Up @@ -128,3 +135,8 @@ type Evolvable<E extends Evolver> = {
type Evolver<T extends Evolvable<any> = any> = {
[key in keyof Partial<T>]: never;
};
type Obj61203 = {
[k in keyof any]: number;
};
declare const obj61203: Obj61203;
declare const key61203: keyof Obj61203;
17 changes: 17 additions & 0 deletions tests/baselines/reference/mappedTypeWithAny.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,20 @@ type Evolver<T extends Evolvable<any> = any> = {

};

// https://github.com/microsoft/TypeScript/issues/61203
type Obj61203 = { [k in keyof any]: number };
>Obj61203 : Symbol(Obj61203, Decl(mappedTypeWithAny.ts, 61, 2))
>k : Symbol(k, Decl(mappedTypeWithAny.ts, 64, 19))

declare const obj61203: Obj61203;
>obj61203 : Symbol(obj61203, Decl(mappedTypeWithAny.ts, 65, 13))
>Obj61203 : Symbol(Obj61203, Decl(mappedTypeWithAny.ts, 61, 2))

declare const key61203: keyof Obj61203;
>key61203 : Symbol(key61203, Decl(mappedTypeWithAny.ts, 66, 13))
>Obj61203 : Symbol(Obj61203, Decl(mappedTypeWithAny.ts, 61, 2))

obj61203[key61203]; // ok
>obj61203 : Symbol(obj61203, Decl(mappedTypeWithAny.ts, 65, 13))
>key61203 : Symbol(key61203, Decl(mappedTypeWithAny.ts, 66, 13))

25 changes: 23 additions & 2 deletions tests/baselines/reference/mappedTypeWithAny.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ declare let x2: { [P in string]: Item };
> : ^^^^^^^^^^^^^^^^^^^^^^

declare let x3: { [P in keyof any]: Item };
>x3 : { [x: string]: Item; }
> : ^^^^^^^^^^^^^^^^^^^^^^
>x3 : { [x: string]: Item; [x: number]: Item; [x: symbol]: Item; }
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

declare let x4: ItemMap<any>;
>x4 : ItemMap<any>
Expand Down Expand Up @@ -197,3 +197,24 @@ type Evolver<T extends Evolvable<any> = any> = {
[key in keyof Partial<T>]: never;
};

// https://github.com/microsoft/TypeScript/issues/61203
type Obj61203 = { [k in keyof any]: number };
>Obj61203 : Obj61203
> : ^^^^^^^^

declare const obj61203: Obj61203;
>obj61203 : Obj61203
> : ^^^^^^^^

declare const key61203: keyof Obj61203;
>key61203 : string | number | symbol
> : ^^^^^^^^^^^^^^^^^^^^^^^^

obj61203[key61203]; // ok
>obj61203[key61203] : number
> : ^^^^^^
>obj61203 : Obj61203
> : ^^^^^^^^
>key61203 : string | number | symbol
> : ^^^^^^^^^^^^^^^^^^^^^^^^

6 changes: 6 additions & 0 deletions tests/cases/conformance/types/mapped/mappedTypeWithAny.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,9 @@ type Evolvable<E extends Evolver> = {
type Evolver<T extends Evolvable<any> = any> = {
[key in keyof Partial<T>]: never;
};

// https://github.com/microsoft/TypeScript/issues/61203
type Obj61203 = { [k in keyof any]: number };
declare const obj61203: Obj61203;
declare const key61203: keyof Obj61203;
obj61203[key61203]; // ok