Skip to content

Add an extra test case for mapped type relationships #53232

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 4 commits into from
Mar 14, 2023
Merged

Add an extra test case for mapped type relationships #53232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4cffbe
Add an extra test case for mapped type relationships
Andarist Mar 13, 2023
1bd20ed
Address nits from the review
Andarist Mar 14, 2023
95b3080
Merge remote-tracking branch 'origin/main' into test/extra-for-mapped…
Andarist Mar 14, 2023
6275221
Merge remote-tracking branch 'origin/main' into test/extra-for-mapped…
Andarist Mar 14, 2023
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
19 changes: 18 additions & 1 deletion tests/baselines/reference/mappedTypeRelationships.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,4 +372,21 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
function f<T extends { x: {} }>(): Partial<T> {
return undefined! as T;
}


// #32365
interface SettingsTypes {
audio: {
volume: string;
};
video: {
resolution: string;
};
}
interface Settings<Params extends { [K in keyof Params]?: string }> {
config: Params;
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;
37 changes: 36 additions & 1 deletion tests/baselines/reference/mappedTypeRelationships.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,24 @@ function f90<T extends { x: number }>() {
function f<T extends { x: {} }>(): Partial<T> {
return undefined! as T;
}


// #32365
interface SettingsTypes {
audio: {
volume: string;
};
video: {
resolution: string;
};
}
interface Settings<Params extends { [K in keyof Params]?: string }> {
config: Params;
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;

//// [mappedTypeRelationships.js]
function f1(x, k) {
Expand Down Expand Up @@ -418,3 +435,21 @@ declare function f90<T extends {
declare function f<T extends {
x: {};
}>(): Partial<T>;
interface SettingsTypes {
audio: {
volume: string;
};
video: {
resolution: string;
};
}
interface Settings<Params extends {
[K in keyof Params]?: string;
}> {
config: Params;
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;
55 changes: 55 additions & 0 deletions tests/baselines/reference/mappedTypeRelationships.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,3 +836,58 @@ function f<T extends { x: {} }>(): Partial<T> {
>T : Symbol(T, Decl(mappedTypeRelationships.ts, 188, 11))
}

// #32365
interface SettingsTypes {
>SettingsTypes : Symbol(SettingsTypes, Decl(mappedTypeRelationships.ts, 190, 1))

audio: {
>audio : Symbol(SettingsTypes.audio, Decl(mappedTypeRelationships.ts, 193, 25))

volume: string;
>volume : Symbol(volume, Decl(mappedTypeRelationships.ts, 194, 10))

};
video: {
>video : Symbol(SettingsTypes.video, Decl(mappedTypeRelationships.ts, 196, 4))

resolution: string;
>resolution : Symbol(resolution, Decl(mappedTypeRelationships.ts, 197, 10))

};
}
interface Settings<Params extends { [K in keyof Params]?: string }> {
>Settings : Symbol(Settings, Decl(mappedTypeRelationships.ts, 200, 1))
>Params : Symbol(Params, Decl(mappedTypeRelationships.ts, 201, 19))
>K : Symbol(K, Decl(mappedTypeRelationships.ts, 201, 37))
>Params : Symbol(Params, Decl(mappedTypeRelationships.ts, 201, 19))

config: Params;
>config : Symbol(Settings.config, Decl(mappedTypeRelationships.ts, 201, 69))
>Params : Symbol(Params, Decl(mappedTypeRelationships.ts, 201, 19))
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
>ConcreteSettingsResult1 : Symbol(ConcreteSettingsResult1, Decl(mappedTypeRelationships.ts, 203, 1))
>Settings : Symbol(Settings, Decl(mappedTypeRelationships.ts, 200, 1))
>SettingsTypes : Symbol(SettingsTypes, Decl(mappedTypeRelationships.ts, 190, 1))

type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
>ConcreteSettingsResult2 : Symbol(ConcreteSettingsResult2, Decl(mappedTypeRelationships.ts, 204, 64))
>Settings : Symbol(Settings, Decl(mappedTypeRelationships.ts, 200, 1))
>SettingsTypes : Symbol(SettingsTypes, Decl(mappedTypeRelationships.ts, 190, 1))

type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
>GenericSettingsAccess : Symbol(GenericSettingsAccess, Decl(mappedTypeRelationships.ts, 205, 74))
>T : Symbol(T, Decl(mappedTypeRelationships.ts, 206, 27))
>SettingsTypes : Symbol(SettingsTypes, Decl(mappedTypeRelationships.ts, 190, 1))
>Settings : Symbol(Settings, Decl(mappedTypeRelationships.ts, 200, 1))
>SettingsTypes : Symbol(SettingsTypes, Decl(mappedTypeRelationships.ts, 190, 1))
>T : Symbol(T, Decl(mappedTypeRelationships.ts, 206, 27))

type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
>GenericSettingsResult1 : Symbol(GenericSettingsResult1, Decl(mappedTypeRelationships.ts, 206, 87))
>GenericSettingsAccess : Symbol(GenericSettingsAccess, Decl(mappedTypeRelationships.ts, 205, 74))

type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;
>GenericSettingsResult2 : Symbol(GenericSettingsResult2, Decl(mappedTypeRelationships.ts, 207, 61))
>GenericSettingsAccess : Symbol(GenericSettingsAccess, Decl(mappedTypeRelationships.ts, 205, 74))

36 changes: 36 additions & 0 deletions tests/baselines/reference/mappedTypeRelationships.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,3 +678,39 @@ function f<T extends { x: {} }>(): Partial<T> {
>undefined : undefined
}

// #32365
interface SettingsTypes {
audio: {
>audio : { volume: string; }

volume: string;
>volume : string

};
video: {
>video : { resolution: string; }

resolution: string;
>resolution : string

};
}
interface Settings<Params extends { [K in keyof Params]?: string }> {
config: Params;
>config : Params
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
>ConcreteSettingsResult1 : Settings<{ volume: string; }>

type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
>ConcreteSettingsResult2 : Settings<{ volume: string; } | { resolution: string; }>

type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
>GenericSettingsAccess : GenericSettingsAccess<T>

type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
>GenericSettingsResult1 : Settings<{ volume: string; }>

type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;
>GenericSettingsResult2 : Settings<{ volume: string; } | { resolution: string; }>

18 changes: 18 additions & 0 deletions tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,21 @@ function f90<T extends { x: number }>() {
function f<T extends { x: {} }>(): Partial<T> {
return undefined! as T;
}

// #32365
interface SettingsTypes {
audio: {
volume: string;
};
video: {
resolution: string;
};
}
interface Settings<Params extends { [K in keyof Params]?: string }> {
config: Params;
}
type ConcreteSettingsResult1 = Settings<SettingsTypes["audio"]>;
type ConcreteSettingsResult2 = Settings<SettingsTypes["audio" | "video"]>;
type GenericSettingsAccess<T extends keyof SettingsTypes> = Settings<SettingsTypes[T]>;
type GenericSettingsResult1 = GenericSettingsAccess<"audio">;
type GenericSettingsResult2 = GenericSettingsAccess<"audio" | "video">;