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.

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

Predefined conditional types #21847

Merged
merged 3 commits into from
Feb 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions src/lib/es5.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1338,6 +1338,31 @@ type Record<K extends string, T> = {
[P in K]: T;
};

/**
* Exclude from T those types that are assignable to U
*/
type Exclude<T, U> = T extends U ? never : T;

/**
* Extract from T those types that are assignable to U
*/
type Extract<T, U> = T extends U ? T : never;

/**
* Exclude null and undefined from T
*/
type NonNullable<T> = T extends null | undefined ? never : T;

/**
* Obtain the return type of a function type
*/
type ReturnType<T extends (...args: any[]) => any> = T extends (...args: any[]) => infer R ? R : any;

/**
* Obtain the return type of a constructor function type
*/
type InstanceType<T extends new (...args: any[]) => any> = T extends new (...args: any[]) => infer R ? R : any;

/**
* Marker for contextual 'this' type
*/
Expand Down
90 changes: 43 additions & 47 deletions tests/baselines/reference/conditionalTypes1.errors.txt

Large diffs are not rendered by default.

59 changes: 26 additions & 33 deletions tests/baselines/reference/conditionalTypes1.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
//// [conditionalTypes1.ts]
type Diff<T, U> = T extends U ? never : T;
type Filter<T, U> = T extends U ? T : never;
type NonNullable<T> = Diff<T, null | undefined>;
type T00 = Exclude<"a" | "b" | "c" | "d", "a" | "c" | "f">; // "b" | "d"
type T01 = Extract<"a" | "b" | "c" | "d", "a" | "c" | "f">; // "a" | "c"

type T00 = Diff<"a" | "b" | "c" | "d", "a" | "c" | "f">; // "b" | "d"
type T01 = Filter<"a" | "b" | "c" | "d", "a" | "c" | "f">; // "a" | "c"

type T02 = Diff<string | number | (() => void), Function>; // string | number
type T03 = Filter<string | number | (() => void), Function>; // () => void
type T02 = Exclude<string | number | (() => void), Function>; // string | number
type T03 = Extract<string | number | (() => void), Function>; // () => void

type T04 = NonNullable<string | number | undefined>; // string | number
type T05 = NonNullable<(() => string) | string[] | null | undefined>; // (() => string) | string[]
Expand All @@ -31,23 +27,23 @@ function f3<T>(x: Partial<T>[keyof T], y: NonNullable<Partial<T>[keyof T]>) {

type Options = { k: "a", a: number } | { k: "b", b: string } | { k: "c", c: boolean };

type T10 = Diff<Options, { k: "a" | "b" }>; // { k: "c", c: boolean }
type T11 = Filter<Options, { k: "a" | "b" }>; // { k: "a", a: number } | { k: "b", b: string }
type T10 = Exclude<Options, { k: "a" | "b" }>; // { k: "c", c: boolean }
type T11 = Extract<Options, { k: "a" | "b" }>; // { k: "a", a: number } | { k: "b", b: string }

type T12 = Diff<Options, { k: "a" } | { k: "b" }>; // { k: "c", c: boolean }
type T13 = Filter<Options, { k: "a" } | { k: "b" }>; // { k: "a", a: number } | { k: "b", b: string }
type T12 = Exclude<Options, { k: "a" } | { k: "b" }>; // { k: "c", c: boolean }
type T13 = Extract<Options, { k: "a" } | { k: "b" }>; // { k: "a", a: number } | { k: "b", b: string }

type T14 = Diff<Options, { q: "a" }>; // Options
type T15 = Filter<Options, { q: "a" }>; // never
type T14 = Exclude<Options, { q: "a" }>; // Options
type T15 = Extract<Options, { q: "a" }>; // never

declare function f4<T extends Options, K extends string>(p: K): Filter<T, { k: K }>;
declare function f4<T extends Options, K extends string>(p: K): Extract<T, { k: K }>;
let x0 = f4("a"); // { k: "a", a: number }

type OptionsOfKind<K extends Options["k"]> = Filter<Options, { k: K }>;
type OptionsOfKind<K extends Options["k"]> = Extract<Options, { k: K }>;

type T16 = OptionsOfKind<"a" | "b">; // { k: "a", a: number } | { k: "b", b: string }

type Select<T, K extends keyof T, V extends T[K]> = Filter<T, { [P in K]: V }>;
type Select<T, K extends keyof T, V extends T[K]> = Extract<T, { [P in K]: V }>;

type T17 = Select<Options, "k", "a" | "b">; // // { k: "a", a: number } | { k: "b", b: string }

Expand Down Expand Up @@ -332,13 +328,10 @@ function f33() {


//// [conditionalTypes1.d.ts]
declare type Diff<T, U> = T extends U ? never : T;
declare type Filter<T, U> = T extends U ? T : never;
declare type NonNullable<T> = Diff<T, null | undefined>;
declare type T00 = Diff<"a" | "b" | "c" | "d", "a" | "c" | "f">;
declare type T01 = Filter<"a" | "b" | "c" | "d", "a" | "c" | "f">;
declare type T02 = Diff<string | number | (() => void), Function>;
declare type T03 = Filter<string | number | (() => void), Function>;
declare type T00 = Exclude<"a" | "b" | "c" | "d", "a" | "c" | "f">;
declare type T01 = Extract<"a" | "b" | "c" | "d", "a" | "c" | "f">;
declare type T02 = Exclude<string | number | (() => void), Function>;
declare type T03 = Extract<string | number | (() => void), Function>;
declare type T04 = NonNullable<string | number | undefined>;
declare type T05 = NonNullable<(() => string) | string[] | null | undefined>;
declare function f1<T>(x: T, y: NonNullable<T>): void;
Expand All @@ -354,40 +347,40 @@ declare type Options = {
k: "c";
c: boolean;
};
declare type T10 = Diff<Options, {
declare type T10 = Exclude<Options, {
k: "a" | "b";
}>;
declare type T11 = Filter<Options, {
declare type T11 = Extract<Options, {
k: "a" | "b";
}>;
declare type T12 = Diff<Options, {
declare type T12 = Exclude<Options, {
k: "a";
} | {
k: "b";
}>;
declare type T13 = Filter<Options, {
declare type T13 = Extract<Options, {
k: "a";
} | {
k: "b";
}>;
declare type T14 = Diff<Options, {
declare type T14 = Exclude<Options, {
q: "a";
}>;
declare type T15 = Filter<Options, {
declare type T15 = Extract<Options, {
q: "a";
}>;
declare function f4<T extends Options, K extends string>(p: K): Filter<T, {
declare function f4<T extends Options, K extends string>(p: K): Extract<T, {
k: K;
}>;
declare let x0: {
k: "a";
a: number;
};
declare type OptionsOfKind<K extends Options["k"]> = Filter<Options, {
declare type OptionsOfKind<K extends Options["k"]> = Extract<Options, {
k: K;
}>;
declare type T16 = OptionsOfKind<"a" | "b">;
declare type Select<T, K extends keyof T, V extends T[K]> = Filter<T, {
declare type Select<T, K extends keyof T, V extends T[K]> = Extract<T, {
[P in K]: V;
}>;
declare type T17 = Select<Options, "k", "a" | "b">;
Expand Down
Loading