Skip to content

Avoid silentNeverType leaking into generator types inferred based on inner generic calls at yields #62283

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+382 −15
Open

Avoid silentNeverType leaking into generator types inferred based on inner generic calls at yields #62283

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
9 changes: 1 addition & 8 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
};

var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
var silentNeverIterationTypes = createIterationTypes(silentNeverType, silentNeverType, silentNeverType);

var asyncIterationTypesResolver: IterationTypesResolver = {
iterableCacheKey: "iterationTypesOfAsyncIterable",
Expand Down Expand Up @@ -39208,7 +39207,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const nextTypes: Type[] = [];
const isAsync = (getFunctionFlags(func) & FunctionFlags.Async) !== 0;
forEachYieldExpression(func.body as Block, yieldExpression => {
const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode && checkMode & ~CheckMode.SkipGenericFunctions) : undefinedWideningType;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is exactly what the cousin (checkAndAggregateReturnExpressionTypes) of this function (checkAndAggregateYieldOperandTypes) does

pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
let nextType: Type | undefined;
if (yieldExpression.asteriskToken) {
Expand All @@ -39228,9 +39227,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function getYieldedTypeOfYieldExpression(node: YieldExpression, expressionType: Type, sentType: Type, isAsync: boolean): Type | undefined {
if (expressionType === silentNeverType) {
return silentNeverType;
}
const errorNode = node.expression || node;
// A `yield*` expression effectively yields everything that its operand yields
const yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? IterationUse.AsyncYieldStar : IterationUse.YieldStar, expressionType, sentType, errorNode) : expressionType;
Expand Down Expand Up @@ -45741,9 +45737,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
* the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
*/
function getIterationTypesOfIterable(type: Type, use: IterationUse, errorNode: Node | undefined) {
if (type === silentNeverType) {
return silentNeverIterationTypes;
}
if (isTypeAny(type)) {
return anyIterationTypes;
}
Expand Down
69 changes: 68 additions & 1 deletion tests/baselines/reference/genericCallAtYieldExpressionInGenericCall1.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
The types returned by 'next(...)' are incompatible between these types.
Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
Type 'number' is not assignable to type 'never'.
genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
The types returned by 'next(...)' are incompatible between these types.
Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
Type 'number' is not assignable to type 'never'.


==== genericCallAtYieldExpressionInGenericCall1.ts (1 errors) ====
==== genericCallAtYieldExpressionInGenericCall1.ts (3 errors) ====
declare const inner: {
<A>(value: A): {
(): A;
Expand Down Expand Up @@ -31,4 +45,57 @@ genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type '() =>
~~~~~~~~~~~~~
!!! error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
});

declare const inner3: {
<A>(value: A): {
(): A;
[Symbol.iterator](): {
next(...args: ReadonlyArray<any>): IteratorResult<number, A>;
};
};
};

declare function outer2<A, Y>(body: (value: A) => Generator<Y, any, any>): Y;

// number
const result1 = outer2(function* <T>(value: T) {
yield* inner3(value);
});

// number
const result2 = outer2(function* <T>(value: T) {
const x = inner3(value);
yield* x;
});

declare function outer3<A>(
body: (value: A) => Generator<never, unknown, unknown>,
): void;

// error
outer3(function* <T>(value: T) {
~~~~~~~~
!!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
!!! error TS2345: Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
!!! error TS2345: The types returned by 'next(...)' are incompatible between these types.
!!! error TS2345: Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
!!! error TS2345: Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
!!! error TS2345: Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
!!! error TS2345: Type 'number' is not assignable to type 'never'.
yield* inner3(value);
});

// error
outer3(function* <T>(value: T) {
~~~~~~~~
!!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
!!! error TS2345: Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
!!! error TS2345: The types returned by 'next(...)' are incompatible between these types.
!!! error TS2345: Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
!!! error TS2345: Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
!!! error TS2345: Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
!!! error TS2345: Type 'number' is not assignable to type 'never'.
const x = inner3(value);
yield* x;
});

113 changes: 113 additions & 0 deletions tests/baselines/reference/genericCallAtYieldExpressionInGenericCall1.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,116 @@ outer(function* <T>(value: T) {

});

declare const inner3: {
>inner3 : Symbol(inner3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 28, 13))

<A>(value: A): {
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 29, 3))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 29, 6))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 29, 3))

(): A;
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 29, 3))

[Symbol.iterator](): {
>[Symbol.iterator] : Symbol([Symbol.iterator], Decl(genericCallAtYieldExpressionInGenericCall1.ts, 30, 10))
>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --))
>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))

next(...args: ReadonlyArray<any>): IteratorResult<number, A>;
>next : Symbol(next, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 31, 26))
>args : Symbol(args, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 32, 11))
>ReadonlyArray : Symbol(ReadonlyArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2016.array.include.d.ts, --, --) ... and 3 more)
>IteratorResult : Symbol(IteratorResult, Decl(lib.es2015.iterable.d.ts, --, --))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 29, 3))

};
};
};

declare function outer2<A, Y>(body: (value: A) => Generator<Y, any, any>): Y;
>outer2 : Symbol(outer2, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 35, 2))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 24))
>Y : Symbol(Y, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 26))
>body : Symbol(body, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 30))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 37))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 24))
>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))
>Y : Symbol(Y, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 26))
>Y : Symbol(Y, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 37, 26))

// number
const result1 = outer2(function* <T>(value: T) {
>result1 : Symbol(result1, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 40, 5))
>outer2 : Symbol(outer2, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 35, 2))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 40, 34))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 40, 37))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 40, 34))

yield* inner3(value);
>inner3 : Symbol(inner3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 28, 13))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 40, 37))

});

// number
const result2 = outer2(function* <T>(value: T) {
>result2 : Symbol(result2, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 45, 5))
>outer2 : Symbol(outer2, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 35, 2))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 45, 34))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 45, 37))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 45, 34))

const x = inner3(value);
>x : Symbol(x, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 46, 7))
>inner3 : Symbol(inner3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 28, 13))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 45, 37))

yield* x;
>x : Symbol(x, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 46, 7))

});

declare function outer3<A>(
>outer3 : Symbol(outer3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 48, 3))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 50, 24))

body: (value: A) => Generator<never, unknown, unknown>,
>body : Symbol(body, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 50, 27))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 51, 9))
>A : Symbol(A, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 50, 24))
>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))

): void;

// error
outer3(function* <T>(value: T) {
>outer3 : Symbol(outer3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 48, 3))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 55, 18))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 55, 21))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 55, 18))

yield* inner3(value);
>inner3 : Symbol(inner3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 28, 13))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 55, 21))

});

// error
outer3(function* <T>(value: T) {
>outer3 : Symbol(outer3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 48, 3))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 60, 18))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 60, 21))
>T : Symbol(T, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 60, 18))

const x = inner3(value);
>x : Symbol(x, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 61, 7))
>inner3 : Symbol(inner3, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 28, 13))
>value : Symbol(value, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 60, 21))

yield* x;
>x : Symbol(x, Decl(genericCallAtYieldExpressionInGenericCall1.ts, 61, 7))

});

Loading
Loading