8000 Fixed a crash related to variadic tuple elements with intersections containing `InstantiableNonPrimitive` by Andarist · Pull Request #63128 · microsoft/TypeScript · GitHub
[go: up one dir, main page]

Skip to content
Open
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
< 8000 div data-view-component="true" class="js-unified-diff-view-box tmp-pt-3 border rounded-1 pb-1 color-border-accent-emphasis">
Diff view
6 changes: 5 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17965,7 +17965,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (type.flags & TypeFlags.Any) {
addElement(type, ElementFlags.Rest, target.labeledElementDeclarations?.[i]);
}
else if (type.flags & TypeFlags.InstantiableNonPrimitive || isGenericMappedType(type)) {
else if (someContainedType(type, t => !!(t.flags & TypeFlags.InstantiableNonPrimitive) || isGenericMappedType(type))) {
// Generic variadic elements stay as they are.
addElement(type, ElementFlags.Variadic, target.labeledElementDeclarations?.[i]);
}
Expand Down Expand Up @@ -28515,6 +28515,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return type.flags & TypeFlags.Union ? every((type as UnionType).types, f) : f(type);
}

function someContainedType(type: Type, f: (t: Type) => boolean): boolean {
return type.flags & TypeFlags.UnionOrIntersection ? some((type as UnionOrIntersectionType).types, f) : f(type);
}

function everyContainedType(type: Type, f: (t: Type) => boolean): boolean {
return type.flags & TypeFlags.UnionOrIntersection ? every((type as UnionOrIntersectionType).types, f) : f(type);
}
Expand Down
10 changes: 10 additions & 0 deletions tests/baselines/reference/recursiveConditionalCrash5.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
recursiveConditionalCrash5.ts(3,60): error TS2589: Type instantiation is excessively deep and possibly infinite.


==== recursiveConditionalCrash5.ts (1 errors) ====
// https://github.com/microsoft/TypeScript/issues/63040

type StringTreeArrayAsTuple<T> = (T extends [...infer R] ? [...StringTreeArrayAsTuple<R>] : never) & boolean;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2589: Type instantiation is excessively deep and possibly infinite.

13 changes: 13 additions & 0 deletions tests/baselines/reference/recursiveConditionalCrash5.symbols
D19F
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//// [tests/cases/compiler/recursiveConditionalCrash5.ts] ////

=== recursiveConditionalCrash5.ts ===
// https://github.com/microsoft/TypeScript/issues/63040

type StringTreeArrayAsTuple<T> = (T extends [...infer R] ? [...StringTreeArrayAsTuple<R>] : never) & boolean;
>StringTreeArrayAsTuple : Symbol(StringTreeArrayAsTuple, Decl(recursiveConditionalCrash5.ts, 0, 0))
>T : Symbol(T, Decl(recursiveConditionalCrash5.ts, 2, 28))
>T : Symbol(T, Decl(recursiveConditionalCrash5.ts, 2, 28))
>R : Symbol(R, Decl(recursiveConditionalCrash5.ts, 2, 53))
>StringTreeArrayAsTuple : Symbol(StringTreeArrayAsTuple, Decl(recursiveConditionalCrash5.ts, 0, 0))
>R : Symbol(R, Decl(recursiveConditionalCrash5.ts, 2, 53))

9 changes: 9 additions & 0 deletions tests/baselines/reference/recursiveConditionalCrash5.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//// [tests/cases/compiler/recursiveConditionalCrash5.ts] ////

=== recursiveConditionalCrash5.ts ===
// https://github.com/microsoft/TypeScript/issues/63040

type StringTreeArrayAsTuple<T> = (T extends [...infer R] ? [...StringTreeArrayAsTuple<R>] : never) & boolean;
>StringTreeArrayAsTuple : StringTreeArrayAsTuple<T>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^

6 changes: 6 additions & 0 deletions tests/cases/compiler/recursiveConditionalCrash5.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @strict: true
// @noEmit: true

// https://github.com/microsoft/TypeScript/issues/63040

type StringTreeArrayAsTuple<T> = (T extends [...infer R] ? [...StringTreeArrayAsTuple<R>] : never) & boolean;
0