Skip to content

Fix 35842 #35895

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

Closed
wants to merge 1 commit into from
Closed

Fix 35842 #35895

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
11 changes: 9 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19744,8 +19744,15 @@ namespace ts {
// operator is !== and the type of value is undefined.
const effectiveTrue = operator === SyntaxKind.EqualsEqualsToken || operator === SyntaxKind.EqualsEqualsEqualsToken ? assumeTrue : !assumeTrue;
const doubleEquals = operator === SyntaxKind.EqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsToken;
const valueNonNullish = !(getTypeFacts(getTypeOfExpression(value)) & (doubleEquals ? TypeFacts.EQUndefinedOrNull : TypeFacts.EQUndefined));
return effectiveTrue === valueNonNullish ? getTypeWithFacts(type, TypeFacts.NEUndefinedOrNull) : type;
const expectedNullishFacts = (doubleEquals ? TypeFacts.EQUndefinedOrNull : TypeFacts.EQUndefined);
const valueFacts = getTypeFacts(getTypeOfExpression(value));
if (effectiveTrue) {
return (valueFacts & expectedNullishFacts) ? type : getTypeWithFacts(type, TypeFacts.NEUndefinedOrNull);
}
if ((valueFacts & expectedNullishFacts) && (valueFacts & ~(doubleEquals ? (TypeFacts.UndefinedFacts | TypeFacts.NullFacts) : TypeFacts.UndefinedFacts)) === 0) {
return getTypeWithFacts(type, TypeFacts.NEUndefinedOrNull);
}
return type;
}

function narrowTypeByEquality(type: Type, operator: SyntaxKind, value: Expression, assumeTrue: boolean): Type {
Expand Down
68 changes: 67 additions & 1 deletion tests/baselines/reference/controlFlowOptionalChain.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,21 @@ tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(471,13): error T
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(474,13): error TS2532: Object is possibly 'undefined'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(488,13): error TS2532: Object is possibly 'undefined'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(491,13): error TS2532: Object is possibly 'undefined'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(539,9): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(541,5): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(548,5): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(553,9): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(555,5): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.
tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(560,9): error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
Type 'undefined' is not assignable to type 'SomeObject'.


==== tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts (53 errors) ====
==== tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts (59 errors) ====
// assignments in shortcutting chain
declare const o: undefined | {
[key: string]: any;
Expand Down Expand Up @@ -687,4 +699,58 @@ tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(491,13): error T
}
return f.geometry.coordinates;
}

// Simplified repro from #35842

interface SomeObject {
someProperty: unknown;
}

declare let lastSomeProperty: unknown;

function someFunction(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== lastSomeProperty) {
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}

function someFunction2(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== undefined) {
return someOptionalObject; // no error
}
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}

function someFunction3(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === lastSomeProperty) {
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}

function someFunction4(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === undefined) {
return someOptionalObject; // error
~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2322: Type 'SomeObject | undefined' is not assignable to type 'SomeObject'.
!!! error TS2322: Type 'undefined' is not assignable to type 'SomeObject'.
}
return someOptionalObject; // no error
}

60 changes: 60 additions & 0 deletions tests/baselines/reference/controlFlowOptionalChain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,42 @@ function extractCoordinates(f: Feature): number[] {
}
return f.geometry.coordinates;
}

// Simplified repro from #35842

interface SomeObject {
someProperty: unknown;
}

declare let lastSomeProperty: unknown;

function someFunction(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}

function someFunction2(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== undefined) {
return someOptionalObject; // no error
}
return someOptionalObject; // error
}

function someFunction3(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}

function someFunction4(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === undefined) {
return someOptionalObject; // error
}
return someOptionalObject; // no error
}


//// [controlFlowOptionalChain.js]
Expand Down Expand Up @@ -982,3 +1018,27 @@ function extractCoordinates(f) {
}
return f.geometry.coordinates;
}
function someFunction(someOptionalObject) {
if ((someOptionalObject === null || someOptionalObject === void 0 ? void 0 : someOptionalObject.someProperty) !== lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}
function someFunction2(someOptionalObject) {
if ((someOptionalObject === null || someOptionalObject === void 0 ? void 0 : someOptionalObject.someProperty) !== undefined) {
return someOptionalObject; // no error
}
return someOptionalObject; // error
}
function someFunction3(someOptionalObject) {
if ((someOptionalObject === null || someOptionalObject === void 0 ? void 0 : someOptionalObject.someProperty) === lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}
function someFunction4(someOptionalObject) {
if ((someOptionalObject === null || someOptionalObject === void 0 ? void 0 : someOptionalObject.someProperty) === undefined) {
return someOptionalObject; // error
}
return someOptionalObject; // no error
}
88 changes: 88 additions & 0 deletions tests/baselines/reference/controlFlowOptionalChain.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1663,3 +1663,91 @@ function extractCoordinates(f: Feature): number[] {
>coordinates : Symbol(coordinates, Decl(controlFlowOptionalChain.ts, 515, 17))
}

// Simplified repro from #35842

interface SomeObject {
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))

someProperty: unknown;
>someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
}

declare let lastSomeProperty: unknown;
>lastSomeProperty : Symbol(lastSomeProperty, Decl(controlFlowOptionalChain.ts, 534, 11))

function someFunction(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction : Symbol(someFunction, Decl(controlFlowOptionalChain.ts, 534, 38))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 536, 22))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))

if (someOptionalObject?.someProperty !== lastSomeProperty) {
>someOptionalObject?.someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 536, 22))
>someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>lastSomeProperty : Symbol(lastSomeProperty, Decl(controlFlowOptionalChain.ts, 534, 11))

return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 536, 22))
}
return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 536, 22))
}

function someFunction2(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction2 : Symbol(someFunction2, Decl(controlFlowOptionalChain.ts, 541, 1))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 543, 23))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))

if (someOptionalObject?.someProperty !== undefined) {
>someOptionalObject?.someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 543, 23))
>someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>undefined : Symbol(undefined)

return someOptionalObject; // no error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 543, 23))
}
return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 543, 23))
}

function someFunction3(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction3 : Symbol(someFunction3, Decl(controlFlowOptionalChain.ts, 548, 1))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 550, 23))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))

if (someOptionalObject?.someProperty === lastSomeProperty) {
>someOptionalObject?.someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 550, 23))
>someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>lastSomeProperty : Symbol(lastSomeProperty, Decl(controlFlowOptionalChain.ts, 534, 11))

return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 550, 23))
}
return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 550, 23))
}

function someFunction4(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction4 : Symbol(someFunction4, Decl(controlFlowOptionalChain.ts, 555, 1))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 557, 23))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))
>SomeObject : Symbol(SomeObject, Decl(controlFlowOptionalChain.ts, 526, 1))

if (someOptionalObject?.someProperty === undefined) {
>someOptionalObject?.someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 557, 23))
>someProperty : Symbol(SomeObject.someProperty, Decl(controlFlowOptionalChain.ts, 530, 22))
>undefined : Symbol(undefined)

return someOptionalObject; // error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 557, 23))
}
return someOptionalObject; // no error
>someOptionalObject : Symbol(someOptionalObject, Decl(controlFlowOptionalChain.ts, 557, 23))
}

82 changes: 82 additions & 0 deletions tests/baselines/reference/controlFlowOptionalChain.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,3 +1886,85 @@ function extractCoordinates(f: Feature): number[] {
>coordinates : number[]
}

// Simplified repro from #35842

interface SomeObject {
someProperty: unknown;
>someProperty : unknown
}

declare let lastSomeProperty: unknown;
>lastSomeProperty : unknown

function someFunction(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction : (someOptionalObject: SomeObject | undefined) => SomeObject
>someOptionalObject : SomeObject | undefined

if (someOptionalObject?.someProperty !== lastSomeProperty) {
>someOptionalObject?.someProperty !== lastSomeProperty : boolean
>someOptionalObject?.someProperty : unknown
>someOptionalObject : SomeObject | undefined
>someProperty : unknown
>lastSomeProperty : unknown

return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}
return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}

function someFunction2(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction2 : (someOptionalObject: SomeObject | undefined) => SomeObject
>someOptionalObject : SomeObject | undefined

if (someOptionalObject?.someProperty !== undefined) {
>someOptionalObject?.someProperty !== undefined : boolean
>someOptionalObject?.someProperty : unknown
>someOptionalObject : SomeObject | undefined
>someProperty : unknown
>undefined : undefined

return someOptionalObject; // no error
>someOptionalObject : SomeObject
}
return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}

function someFunction3(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction3 : (someOptionalObject: SomeObject | undefined) => SomeObject
>someOptionalObject : SomeObject | undefined

if (someOptionalObject?.someProperty === lastSomeProperty) {
>someOptionalObject?.someProperty === lastSomeProperty : boolean
>someOptionalObject?.someProperty : unknown
>someOptionalObject : SomeObject | undefined
>someProperty : unknown
>lastSomeProperty : unknown

return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}
return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}

function someFunction4(someOptionalObject: SomeObject | undefined): SomeObject {
>someFunction4 : (someOptionalObject: SomeObject | undefined) => SomeObject
>someOptionalObject : SomeObject | undefined

if (someOptionalObject?.someProperty === undefined) {
>someOptionalObject?.someProperty === undefined : boolean
>someOptionalObject?.someProperty : unknown
>someOptionalObject : SomeObject | undefined
>someProperty : unknown
>undefined : undefined

return someOptionalObject; // error
>someOptionalObject : SomeObject | undefined
}
return someOptionalObject; // no error
>someOptionalObject : SomeObject
}

36 changes: 36 additions & 0 deletions tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,3 +528,39 @@ function extractCoordinates(f: Feature): number[] {
}
return f.geometry.coordinates;
}

// Simplified repro from #35842

interface SomeObject {
someProperty: unknown;
}

declare let lastSomeProperty: unknown;

function someFunction(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}

function someFunction2(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty !== undefined) {
return someOptionalObject; // no error
}
return someOptionalObject; // error
}

function someFunction3(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === lastSomeProperty) {
return someOptionalObject; // error
}
return someOptionalObject; // error
}

function someFunction4(someOptionalObject: SomeObject | undefined): SomeObject {
if (someOptionalObject?.someProperty === undefined) {
return someOptionalObject; // error
}
return someOptionalObject; // no error
}