Skip to content

Commit be4f2d9

Browse files
committed
Accept new baselines
1 parent c94d28d commit be4f2d9

File tree

4 files changed

+405
-378
lines changed

4 files changed

+405
-378
lines changed

tests/baselines/reference/conditionalTypes1.errors.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(159,5): error TS2
6464
tests/cases/conformance/types/conditional/conditionalTypes1.ts(160,5): error TS2322: Type 'T' is not assignable to type 'ZeroOf<T>'.
6565
Type 'string | number' is not assignable to type 'ZeroOf<T>'.
6666
Type 'string' is not assignable to type 'ZeroOf<T>'.
67-
tests/cases/conformance/types/conditional/conditionalTypes1.ts(254,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'z' must be of type 'T1', but here has type 'Foo<T & U>'.
68-
tests/cases/conformance/types/conditional/conditionalTypes1.ts(279,43): error TS2322: Type 'T95<U>' is not assignable to type 'T94<U>'.
67+
tests/cases/conformance/types/conditional/conditionalTypes1.ts(255,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'z' must be of type 'T1', but here has type 'Foo<T & U>'.
68+
tests/cases/conformance/types/conditional/conditionalTypes1.ts(280,43): error TS2322: Type 'T95<U>' is not assignable to type 'T94<U>'.
6969
Type 'boolean' is not assignable to type 'true'.
7070

7171

@@ -321,6 +321,7 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(279,43): error TS
321321
type T35<T extends { a: string, b: number }> = T[];
322322
type T36<T> = T extends { a: string } ? T extends { b: number } ? T35<T> : never : never;
323323
type T37<T> = T extends { b: number } ? T extends { a: string } ? T35<T> : never : never;
324+
type T38<T> = [T] extends [{ a: string }] ? [T] extends [{ b: number }] ? T35<T> : never : never;
324325

325326
type Extends<T, U> = T extends U ? true : false;
326327
type If<C extends boolean, T, F> = C extends true ? T : F;

tests/baselines/reference/conditionalTypes1.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ function f21<T extends number | string>(x: T, y: ZeroOf<T>) {
164164
type T35<T extends { a: string, b: number }> = T[];
165165
type T36<T> = T extends { a: string } ? T extends { b: number } ? T35<T> : never : never;
166166
type T37<T> = T extends { b: number } ? T extends { a: string } ? T35<T> : never : never;
167+
type T38<T> = [T] extends [{ a: string }] ? [T] extends [{ b: number }] ? T35<T> : never : never;
167168

168169
type Extends<T, U> = T extends U ? true : false;
169170
type If<C extends boolean, T, F> = C extends true ? T : F;
@@ -546,6 +547,11 @@ declare type T37<T> = T extends {
546547
} ? T extends {
547548
a: string;
548549
} ? T35<T> : never : never;
550+
declare type T38<T> = [T] extends [{
551+
a: string;
552+
}] ? [T] extends [{
553+
b: number;
554+
}] ? T35<T> : never : never;
549555
declare type Extends<T, U> = T extends U ? true : false;
550556
declare type If<C extends boolean, T, F> = C extends true ? T : F;
551557
declare type Not<C extends boolean> = If<C, false, true>;

0 commit comments

Comments
 (0)