Skip to content

Improve indexed access relation check for nested indexed accesses on the source side #60678

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

Open
Andarist wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Improve indexed access relation check for nested indexed accesses on the source side #60678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce56eb6
Improve relationship check between indexed access types
Andarist Dec 4, 2024
96bcac2
use a better type breakdown
Andarist Dec 4, 2024
e7ffdfd
add test
Andarist Dec 4, 2024
f969bcf
add nested test case
Andarist Dec 5, 2024
22a9d53
add extra assignment tests
Andarist Dec 5, 2024
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
15 changes: 13 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23085,17 +23085,28 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
else if (targetFlags & TypeFlags.IndexedAccess) {
if (sourceFlags & TypeFlags.IndexedAccess) {
const objectType = (source as IndexedAccessType).objectType;
const indexType = (source as IndexedAccessType).indexType;
// Relate components directly before falling back to constraint relationships
// A type S[K] is related to a type T[J] if S is related to T and K is related to J.
if (result = isRelatedTo((source as IndexedAccessType).objectType, (target as IndexedAccessType).objectType, RecursionFlags.Both, reportErrors)) {
result &= isRelatedTo((source as IndexedAccessType).indexType, (target as IndexedAccessType).indexType, RecursionFlags.Both, reportErrors);
if (result = isRelatedTo(objectType, (target as IndexedAccessType).objectType, RecursionFlags.Both, reportErrors)) {
result &= isRelatedTo(indexType, (target as IndexedAccessType).indexType, RecursionFlags.Both, reportErrors);
}
if (result) {
return result;
}
if (reportErrors) {
originalErrorInfo = errorInfo;
}
if (objectType.flags & TypeFlags.IndexedAccess && !isGenericIndexType(indexType)) {
const type = getIndexedAccessTypeOrUndefined(getReducedApparentType(objectType), indexType);
if (type && type !== source && (result = isRelatedTo(type, target, RecursionFlags.Both, reportErrors))) {
return result;
}
if (reportErrors) {
originalErrorInfo = errorInfo;
}
}
}
// A type S is related to a type T[K] if S is related to C, where C is the base
// constraint of T[K] for writing.
Expand Down
98 changes: 98 additions & 0 deletions tests/baselines/reference/mappedTypeGenericIndexedAccess2.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
//// [tests/cases/compiler/mappedTypeGenericIndexedAccess2.ts] ////

=== mappedTypeGenericIndexedAccess2.ts ===
// https://github.com/microsoft/TypeScript/issues/60675

type EventPayloads = {
>EventPayloads : Symbol(EventPayloads, Decl(mappedTypeGenericIndexedAccess2.ts, 0, 0))

completeSprint: {
>completeSprint : Symbol(completeSprint, Decl(mappedTypeGenericIndexedAccess2.ts, 2, 22))

automationId: string;
>automationId : Symbol(automationId, Decl(mappedTypeGenericIndexedAccess2.ts, 3, 19))

spaceId: string;
>spaceId : Symbol(spaceId, Decl(mappedTypeGenericIndexedAccess2.ts, 4, 25))

};
sendMessage: {
>sendMessage : Symbol(sendMessage, Decl(mappedTypeGenericIndexedAccess2.ts, 6, 4))

message: string;
>message : Symbol(message, Decl(mappedTypeGenericIndexedAccess2.ts, 7, 16))

};
};

type CompletedEvent<T extends keyof EventPayloads> = {
>CompletedEvent : Symbol(CompletedEvent, Decl(mappedTypeGenericIndexedAccess2.ts, 10, 2))
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 12, 20))
>EventPayloads : Symbol(EventPayloads, Decl(mappedTypeGenericIndexedAccess2.ts, 0, 0))

[E in T]: {
>E : Symbol(E, Decl(mappedTypeGenericIndexedAccess2.ts, 13, 3))
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 12, 20))

type: E;
>type : Symbol(type, Decl(mappedTypeGenericIndexedAccess2.ts, 13, 13))
>E : Symbol(E, Decl(mappedTypeGenericIndexedAccess2.ts, 13, 3))

payload: EventPayloads[E];
>payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>EventPayloads : Symbol(EventPayloads, Decl(mappedTypeGenericIndexedAccess2.ts, 0, 0))
>E : Symbol(E, Decl(mappedTypeGenericIndexedAccess2.ts, 13, 3))

appName: string;
>appName : Symbol(appName, Decl(mappedTypeGenericIndexedAccess2.ts, 15, 30))

};
}[T];
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 12, 20))

function overwriteAppName<T extends keyof EventPayloads>(
>overwriteAppName : Symbol(overwriteAppName, Decl(mappedTypeGenericIndexedAccess2.ts, 18, 5))
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 26))
>EventPayloads : Symbol(EventPayloads, Decl(mappedTypeGenericIndexedAccess2.ts, 0, 0))

scheduled: CompletedEvent<T>,
>scheduled : Symbol(scheduled, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 57))
>CompletedEvent : Symbol(CompletedEvent, Decl(mappedTypeGenericIndexedAccess2.ts, 10, 2))
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 26))

): CompletedEvent<T> {
>CompletedEvent : Symbol(CompletedEvent, Decl(mappedTypeGenericIndexedAccess2.ts, 10, 2))
>T : Symbol(T, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 26))

const { appName, ...rest } = scheduled;
>appName : Symbol(appName, Decl(mappedTypeGenericIndexedAccess2.ts, 23, 9))
>rest : Symbol(rest, Decl(mappedTypeGenericIndexedAccess2.ts, 23, 18))
>scheduled : Symbol(scheduled, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 57))

scheduled.payload = rest.payload // ok
>scheduled.payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>scheduled : Symbol(scheduled, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 57))
>payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>rest.payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>rest : Symbol(rest, Decl(mappedTypeGenericIndexedAccess2.ts, 23, 18))
>payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))

rest.payload = scheduled.payload // ok
>rest.payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>rest : Symbol(rest, Decl(mappedTypeGenericIndexedAccess2.ts, 23, 18))
>payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>scheduled.payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))
>scheduled : Symbol(scheduled, Decl(mappedTypeGenericIndexedAccess2.ts, 20, 57))
>payload : Symbol(payload, Decl(mappedTypeGenericIndexedAccess2.ts, 14, 12))

// ok
return {
...rest,
>rest : Symbol(rest, Decl(mappedTypeGenericIndexedAccess2.ts, 23, 18))

appName: "test",
>appName : Symbol(appName, Decl(mappedTypeGenericIndexedAccess2.ts, 30, 12))

};
}

120 changes: 120 additions & 0 deletions tests/baselines/reference/mappedTypeGenericIndexedAccess2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
//// [tests/cases/compiler/mappedTypeGenericIndexedAccess2.ts] ////

=== mappedTypeGenericIndexedAccess2.ts ===
// https://github.com/microsoft/TypeScript/issues/60675

type EventPayloads = {
>EventPayloads : EventPayloads
> : ^^^^^^^^^^^^^

completeSprint: {
>completeSprint : { automationId: string; spaceId: string; }
> : ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^ ^^^

automationId: string;
>automationId : string
> : ^^^^^^

spaceId: string;
>spaceId : string
> : ^^^^^^

};
sendMessage: {
>sendMessage : { message: string; }
> : ^^^^^^^^^^^ ^^^

message: string;
>message : string
> : ^^^^^^

};
};

type CompletedEvent<T extends keyof EventPayloads> = {
>CompletedEvent : CompletedEvent<T>
> : ^^^^^^^^^^^^^^^^^

[E in T]: {
type: E;
>type : E
> : ^

payload: EventPayloads[E];
>payload : EventPayloads[E]
> : ^^^^^^^^^^^^^^^^

appName: string;
>appName : string
> : ^^^^^^

};
}[T];

function overwriteAppName<T extends keyof EventPayloads>(
>overwriteAppName : <T extends keyof EventPayloads>(scheduled: CompletedEvent<T>) => CompletedEvent<T>
> : ^ ^^^^^^^^^ ^^ ^^ ^^^^^

scheduled: CompletedEvent<T>,
>scheduled : CompletedEvent<T>
> : ^^^^^^^^^^^^^^^^^

): CompletedEvent<T> {
const { appName, ...rest } = scheduled;
>appName : string
> : ^^^^^^
>rest : Omit<CompletedEvent<T>, "appName">
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>scheduled : CompletedEvent<T>
> : ^^^^^^^^^^^^^^^^^

scheduled.payload = rest.payload // ok
>scheduled.payload = rest.payload : CompletedEvent<T>["payload"]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>scheduled.payload : EventPayloads[T]
> : ^^^^^^^^^^^^^^^^
>scheduled : CompletedEvent<T>
> : ^^^^^^^^^^^^^^^^^
>payload : EventPayloads[T]
> : ^^^^^^^^^^^^^^^^
>rest.payload : CompletedEvent<T>["payload"]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>rest : Omit<CompletedEvent<T>, "appName">
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>payload : CompletedEvent<T>["payload"]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

rest.payload = scheduled.payload // ok
>rest.payload = scheduled.payload : EventPayloads[T]
> : ^^^^^^^^^^^^^^^^
>rest.payload : CompletedEvent<T>["payload"]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>rest : Omit<CompletedEvent<T>, "appName">
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>payload : CompletedEvent<T>["payload"]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>scheduled.payload : EventPayloads[T]
> : ^^^^^^^^^^^^^^^^
>scheduled : CompletedEvent<T>
> : ^^^^^^^^^^^^^^^^^
>payload : EventPayloads[T]
> : ^^^^^^^^^^^^^^^^

// ok
return {
>{ ...rest, appName: "test", } : Omit<CompletedEvent<T>, "appName"> & { appName: string; }
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

...rest,
>rest : Omit<CompletedEvent<T>, "appName">
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

appName: "test",
>appName : string
> : ^^^^^^
>"test" : "test"
> : ^^^^^^

};
}

Loading
Loading