Skip to content

Add extra test cases for indexed access on generic mapped type #53112

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 1 commit into from
Mar 6, 2023
Merged

Add extra test cases for indexed access on generic mapped type #53112

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
51 changes: 50 additions & 1 deletion tests/baselines/reference/correlatedUnions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,38 @@ const getStringAndNumberFromOriginalAndMapped = <
nestedKey: N
): [Original[K][N], MappedFromOriginal[K][N]] => {
return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];
};
};

// repro from #31675
interface Config {
string: string;
number: number;
}

function getConfigOrDefault<T extends keyof Config>(
userConfig: Partial<Config>,
key: T,
defaultValue: Config[T]
): Config[T] {
const userValue = userConfig[key];
const assertedCheck = userValue ? userValue! : defaultValue;
return assertedCheck;
}

// repro from #47523

type Foo1 = {
x: number;
y: string;
};

function getValueConcrete<K extends keyof Foo1>(
o: Partial<Foo1>,
k: K
): Foo1[K] | undefined {
return o[k];
}


//// [correlatedUnions.js]
"use strict";
Expand Down Expand Up @@ -392,6 +423,14 @@ var BAR_LOOKUP = makeCompleteLookupMapping(ALL_BARS, 'name');
var getStringAndNumberFromOriginalAndMapped = function (original, mappedFromOriginal, key, nestedKey) {
return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];
};
function getConfigOrDefault(userConfig, key, defaultValue) {
var userValue = userConfig[key];
var assertedCheck = userValue ? userValue : defaultValue;
return assertedCheck;
}
function getValueConcrete(o, k) {
return o[k];
}


//// [correlatedUnions.d.ts]
Expand Down Expand Up @@ -562,3 +601,13 @@ type SameKeys<T> = {
};
type MappedFromOriginal = SameKeys<Original>;
declare const getStringAndNumberFromOriginalAndMapped: <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], SameKeys<Original>[K][N]];
interface Config {
string: string;
number: number;
}
declare function getConfigOrDefault<T extends keyof Config>(userConfig: Partial<Config>, key: T, defaultValue: Config[T]): Config[T];
type Foo1 = {
x: number;
y: string;
};
declare function getValueConcrete<K extends keyof Foo1>(o: Partial<Foo1>, k: K): Foo1[K] | undefined;
86 changes: 86 additions & 0 deletions tests/baselines/reference/correlatedUnions.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,3 +928,89 @@ const getStringAndNumberFromOriginalAndMapped = <
>nestedKey : Symbol(nestedKey, Decl(correlatedUnions.ts, 265, 9))

};

// repro from #31675
interface Config {
>Config : Symbol(Config, Decl(correlatedUnions.ts, 269, 2))

string: string;
>string : Symbol(Config.string, Decl(correlatedUnions.ts, 272, 18))

number: number;
>number : Symbol(Config.number, Decl(correlatedUnions.ts, 273, 17))
}

function getConfigOrDefault<T extends keyof Config>(
>getConfigOrDefault : Symbol(getConfigOrDefault, Decl(correlatedUnions.ts, 275, 1))
>T : Symbol(T, Decl(correlatedUnions.ts, 277, 28))
>Config : Symbol(Config, Decl(correlatedUnions.ts, 269, 2))

userConfig: Partial<Config>,
>userConfig : Symbol(userConfig, Decl(correlatedUnions.ts, 277, 52))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Config : Symbol(Config, Decl(correlatedUnions.ts, 269, 2))

key: T,
>key : Symbol(key, Decl(correlatedUnions.ts, 278, 30))
>T : Symbol(T, Decl(correlatedUnions.ts, 277, 28))

defaultValue: Config[T]
>defaultValue : Symbol(defaultValue, Decl(correlatedUnions.ts, 279, 9))
>Config : Symbol(Config, Decl(correlatedUnions.ts, 269, 2))
>T : Symbol(T, Decl(correlatedUnions.ts, 277, 28))

): Config[T] {
>Config : Symbol(Config, Decl(correlatedUnions.ts, 269, 2))
>T : Symbol(T, Decl(correlatedUnions.ts, 277, 28))

const userValue = userConfig[key];
>userValue : Symbol(userValue, Decl(correlatedUnions.ts, 282, 7))
>userConfig : Symbol(userConfig, Decl(correlatedUnions.ts, 277, 52))
>key : Symbol(key, Decl(correlatedUnions.ts, 278, 30))

const assertedCheck = userValue ? userValue! : defaultValue;
>assertedCheck : Symbol(assertedCheck, Decl(correlatedUnions.ts, 283, 7))
>userValue : Symbol(userValue, Decl(correlatedUnions.ts, 282, 7))
>userValue : Symbol(userValue, Decl(correlatedUnions.ts, 282, 7))
>defaultValue : Symbol(defaultValue, Decl(correlatedUnions.ts, 279, 9))

return assertedCheck;
>assertedCheck : Symbol(assertedCheck, Decl(correlatedUnions.ts, 283, 7))
}

// repro from #47523

type Foo1 = {
>Foo1 : Symbol(Foo1, Decl(correlatedUnions.ts, 285, 1))

x: number;
>x : Symbol(x, Decl(correlatedUnions.ts, 289, 13))

y: string;
>y : Symbol(y, Decl(correlatedUnions.ts, 290, 12))

};

function getValueConcrete<K extends keyof Foo1>(
>getValueConcrete : Symbol(getValueConcrete, Decl(correlatedUnions.ts, 292, 2))
>K : Symbol(K, Decl(correlatedUnions.ts, 294, 26))
>Foo1 : Symbol(Foo1, Decl(correlatedUnions.ts, 285, 1))

o: Partial<Foo1>,
>o : Symbol(o, Decl(correlatedUnions.ts, 294, 48))
>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
>Foo1 : Symbol(Foo1, Decl(correlatedUnions.ts, 285, 1))

k: K
>k : Symbol(k, Decl(correlatedUnions.ts, 295, 19))
>K : Symbol(K, Decl(correlatedUnions.ts, 294, 26))

): Foo1[K] | undefined {
>Foo1 : Symbol(Foo1, Decl(correlatedUnions.ts, 285, 1))
>K : Symbol(K, Decl(correlatedUnions.ts, 294, 26))

return o[k];
>o : Symbol(o, Decl(correlatedUnions.ts, 294, 48))
>k : Symbol(k, Decl(correlatedUnions.ts, 295, 19))
}

70 changes: 70 additions & 0 deletions tests/baselines/reference/correlatedUnions.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,3 +828,73 @@ const getStringAndNumberFromOriginalAndMapped = <
>nestedKey : N

};

// repro from #31675
interface Config {
string: string;
>string : string

number: number;
>number : number
}

function getConfigOrDefault<T extends keyof Config>(
>getConfigOrDefault : <T extends keyof Config>(userConfig: Partial<Config>, key: T, defaultValue: Config[T]) => Config[T]

userConfig: Partial<Config>,
>userConfig : Partial<Config>

key: T,
>key : T

defaultValue: Config[T]
>defaultValue : Config[T]

): Config[T] {
const userValue = userConfig[key];
>userValue : Partial<Config>[T]
>userConfig[key] : Partial<Config>[T]
>userConfig : Partial<Config>
>key : T

const assertedCheck = userValue ? userValue! : defaultValue;
>assertedCheck : Config[T]
>userValue ? userValue! : defaultValue : Config[T]
>userValue : Partial<Config>[T]
>userValue! : NonNullable<Partial<Config>[T]>
>userValue : NonNullable<Partial<Config>[T]>
>defaultValue : Config[T]

return assertedCheck;
>assertedCheck : Config[T]
}

// repro from #47523

type Foo1 = {
>Foo1 : { x: number; y: string; }

x: number;
>x : number

y: string;
>y : string

};

function getValueConcrete<K extends keyof Foo1>(
>getValueConcrete : <K extends keyof Foo1>(o: Partial<Foo1>, k: K) => Foo1[K] | undefined

o: Partial<Foo1>,
>o : Partial<Foo1>

k: K
>k : K

): Foo1[K] | undefined {
return o[k];
>o[k] : Partial<Foo1>[K]
>o : Partial<Foo1>
>k : K
}

32 changes: 31 additions & 1 deletion tests/cases/compiler/correlatedUnions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,34 @@ const getStringAndNumberFromOriginalAndMapped = <
nestedKey: N
): [Original[K][N], MappedFromOriginal[K][N]] => {
return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];
};
};

// repro from #31675
interface Config {
string: string;
number: number;
}

function getConfigOrDefault<T extends keyof Config>(
userConfig: Partial<Config>,
key: T,
defaultValue: Config[T]
): Config[T] {
const userValue = userConfig[key];
const assertedCheck = userValue ? userValue! : defaultValue;
return assertedCheck;
}

// repro from #47523

type Foo1 = {
x: number;
y: string;
};

function getValueConcrete<K extends keyof Foo1>(
o: Partial<Foo1>,
k: K
): Foo1[K] | undefined {
return o[k];
}