Fixed an issue in boolean comparison narrowing when the reference is an optional chain #56504

Andarist · 2023-11-22T08:23:14Z

…an optional chain

Andarist · 2023-11-22T08:29:18Z

src/compiler/checker.ts

@@ -27929,10 +27929,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                    if (isMatchingConstructorReference(right)) {
                        return narrowTypeByConstructor(type, operator, left, assumeTrue);
                    }
-                    if (isBooleanLiteral(right)) {
+                    if (isBooleanLiteral(right) && !isAccessExpression(left)) {


It turns out that the original type can be reassigned based on optionalChainContainsReference. That messed up the else branch because narrowTypeByBooleanComparison was operating on the wrong type.

I've also tried keeping originalType around and pass that to narrowTypeByBooleanComparison. That fixed the reported issue~ related to the wrong type in the else branch but it broke the same type within the if block. This happened because originally the intention was for that reassigned type to be returned through the return at the bottom of this function but I changed it to return originalType through narrowTypeByBooleanComparison.

So all in all, this seems like the simplest fix and reflects the intention the best. The motivation behind the original change was to improve non-access expression narrowing. Access expressions are already handled by discrimination-based narrowing etc.

Even though it worked previously (as far as I know) for non-optional chain access expressions, this helps them avoid some redundant work too.

This seems fine as a quick fix for now, though I suspect that we could try and do better later.

Then again, not sure what "better" even means; an expression like (options?.a === false || options.b is not the same as (!options?.a || options.b) so realistically I don't think there's any extra info gained here.

jakebailey · 2023-11-22T08:47:19Z

@typescript-bot test top200
@typescript-bot user test this
@typescript-bot run dt

@typescript-bot perf test this
@typescript-bot pack this

typescript-bot · 2023-11-22T08:47:23Z

Heya @jakebailey, I've started to run the parallelized Definitely Typed test suite on this PR at b549581. You can monitor the build here.

Update: The results are in!

typescript-bot · 2023-11-22T08:47:23Z

Heya @jakebailey, I've started to run the tarball bundle task on this PR at b549581. You can monitor the build here.

typescript-bot · 2023-11-22T08:47:23Z

Heya @jakebailey, I've started to run the diff-based user code test suite on this PR at b549581. You can monitor the build here.

Update: The results are in!

typescript-bot · 2023-11-22T08:47:23Z

Heya @jakebailey, I've started to run the diff-based top-repos suite on this PR at b549581. You can monitor the build here.

Update: The results are in!

typescript-bot · 2023-11-22T08:47:23Z

Heya @jakebailey, I've started to run the regular perf test suite on this PR at b549581. You can monitor the build here.

Update: The results are in!

typescript-bot · 2023-11-22T08:49:25Z

Hey @jakebailey, I've packed this into an installable tgz. You can install it for testing by referencing it in your package.json like so:

{
    "devDependencies": {
        "typescript": "https://typescript.visualstudio.com/cf7ac146-d525-443c-b23c-0d58337efebc/_apis/build/builds/158776/artifacts?artifactName=tgz&fileId=0354B9F2A4021077377EA088E6459FA61983E3E2334251E88120F6D99779965F02&fileName=/typescript-5.4.0-insiders.20231122.tgz"
    }
}

and then running npm install.

There is also a playground for this build and an npm module you can use via "typescript": "npm:@typescript-deploys/[email protected]".;

typescript-bot · 2023-11-22T09:05:07Z

@jakebailey Here are the results of running the user test suite comparing main and refs/pull/56504/merge:

There were infrastructure failures potentially unrelated to your change:

2 instances of "Package install failed"

Otherwise...

Something interesting changed - please have a look.

Details

puppeteer

packages/browsers/test/src/tsconfig.json

[MISSING] error TS2307: Cannot find module '@pptr/testserver' or its corresponding type declarations.
- packages/browsers/test/src/utils.ts#L23 in packages/browsers/test/src/tsconfig.json

typescript-bot · 2023-11-22T09:07:16Z

@jakebailey
The results of the perf run you requested are in!

Here they are:

Compiler

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Angular - node (v18.15.0, x64)}
_{Memory used}	_{295,190k (± 0.00%)}	_{295,192k (± 0.01%)}	_~	_295,147k	_295,236k	_{p=0.810 n=6}
_{Parse Time}	_{2.64s (± 0.15%)}	_{2.64s (± 0.24%)}	_~	_2.63s	_2.65s	_{p=0.673 n=6}
_{Bind Time}	_{0.83s (± 0.62%)}	_{0.82s (± 0.50%)}	_~	_0.82s	_0.83s	_{p=0.112 n=6}
_{Check Time}	_{8.04s (± 0.33%)}	_{8.04s (± 0.17%)}	_~	_8.02s	_8.06s	_{p=0.868 n=6}
_{Emit Time}	_{7.10s (± 0.37%)}	_{7.08s (± 0.34%)}	_~	_7.04s	_7.11s	_{p=0.506 n=6}
_{Total Time}	_{18.60s (± 0.10%)}	_{18.59s (± 0.21%)}	_~	_18.52s	_18.63s	_{p=0.686 n=6}
_{Compiler-Unions - node (v18.15.0, x64)}
_{Memory used}	_{192,612k (± 1.55%)}	_{192,091k (± 1.25%)}	_~	_190,683k	_196,534k	_{p=0.936 n=6}
_{Parse Time}	_{1.35s (± 1.37%)}	_{1.35s (± 1.01%)}	_~	_1.34s	_1.38s	_{p=0.932 n=6}
_{Bind Time}	_{0.72s (± 0.00%)}	_{0.72s (± 0.00%)}	_~	_0.72s	_0.72s	_{p=1.000 n=6}
_{Check Time}	_{9.18s (± 0.38%)}	_{9.18s (± 0.19%)}	_~	_9.16s	_9.20s	_{p=0.807 n=6}
_{Emit Time}	_{2.61s (± 0.62%)}	_{2.62s (± 0.78%)}	_~	_2.59s	_2.64s	_{p=0.685 n=6}
_{Total Time}	_{13.86s (± 0.30%)}	_{13.88s (± 0.23%)}	_~	_13.82s	_13.91s	_{p=0.746 n=6}
_{Monaco - node (v18.15.0, x64)}
_{Memory used}	_{347,365k (± 0.01%)}	_{347,358k (± 0.00%)}	_~	_347,344k	_347,385k	_{p=0.575 n=6}
_{Parse Time}	_{2.46s (± 0.54%)}	_{2.47s (± 0.43%)}	_~	_2.45s	_2.48s	_{p=0.737 n=6}
_{Bind Time}	_{0.92s (± 0.59%)}	_{0.93s (± 0.44%)}	_~	_0.92s	_0.93s	_{p=0.282 n=6}
_{Check Time}	_{6.90s (± 0.57%)}	_{6.89s (± 0.38%)}	_~	_6.87s	_6.94s	_{p=1.000 n=6}
_{Emit Time}	_{4.05s (± 0.41%)}	_{4.05s (± 0.34%)}	_~	_4.03s	_4.07s	_{p=0.868 n=6}
_{Total Time}	_{14.34s (± 0.33%)}	_{14.33s (± 0.19%)}	_~	_14.29s	_14.37s	_{p=0.807 n=6}
_{TFS - node (v18.15.0, x64)}
_{Memory used}	_{302,623k (± 0.01%)}	_{302,615k (± 0.01%)}	_~	_302,584k	_302,638k	_{p=0.748 n=6}
_{Parse Time}	_{1.99s (± 0.61%)}	_{2.00s (± 0.61%)}	_~	_1.98s	_2.01s	_{p=0.219 n=6}
_{Bind Time}	_{1.00s (± 1.17%)}	_{1.01s (± 0.97%)}	_~	_1.00s	_1.02s	_{p=0.314 n=6}
_{Check Time}	_{6.25s (± 0.16%)}	_{6.24s (± 0.31%)}	_~	_6.21s	_6.26s	_{p=0.192 n=6}
_{Emit Time}	_{3.58s (± 0.38%)}	_{3.58s (± 0.65%)}	_~	_3.55s	_3.61s	_{p=1.000 n=6}
_{Total Time}	_{12.83s (± 0.21%)}	_{12.82s (± 0.15%)}	_~	_12.80s	_12.85s	_{p=0.870 n=6}
_{material-ui - node (v18.15.0, x64)}
_{Memory used}	_{470,611k (± 0.02%)}	_{470,577k (± 0.02%)}	_~	_470,521k	_470,711k	_{p=0.471 n=6}
_{Parse Time}	_{2.56s (± 0.64%)}	_{2.57s (± 0.45%)}	_~	_2.56s	_2.59s	_{p=0.510 n=6}
_{Bind Time}	_{1.00s (± 1.65%)}	_{0.98s (± 1.23%)}	_~	_0.97s	_1.00s	_{p=0.285 n=6}
_{Check Time}	_{16.75s (± 0.64%)}	_{16.78s (± 0.33%)}	_~	_16.69s	_16.84s	_{p=0.419 n=6}
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_~	_0.00s	_0.00s	_{p=1.000 n=6}
_{Total Time}	_{20.31s (± 0.60%)}	_{20.33s (± 0.26%)}	_~	_20.26s	_20.40s	_{p=0.423 n=6}
_{xstate - node (v18.15.0, x64)}
_{Memory used}	_{512,004k (± 0.02%)}	_{512,003k (± 0.01%)}	_~	_511,941k	_512,098k	_{p=0.873 n=6}
_{Parse Time}	_{3.27s (± 0.25%)}	_{3.28s (± 0.27%)}	_~	_3.27s	_3.29s	_{p=0.270 n=6}
_{Bind Time}	_{1.54s (± 0.27%)}	_{1.54s (± 0.35%)}	_~	_1.54s	_1.55s	_{p=0.054 n=6}
_{Check Time}	_{2.81s (± 0.59%)}	_{2.80s (± 0.94%)}	_~	_2.78s	_2.85s	_{p=0.418 n=6}
_{Emit Time}	_{0.08s (± 0.00%)}	_{0.08s (± 4.99%)}	_~	_0.08s	_0.09s	_{p=0.405 n=6}
_{Total Time}	_{7.70s (± 0.18%)}	_{7.70s (± 0.37%)}	_~	_7.67s	_7.75s	_{p=0.628 n=6}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

Angular - node (v18.15.0, x64)
Compiler-Unions - node (v18.15.0, x64)
Monaco - node (v18.15.0, x64)
TFS - node (v18.15.0, x64)
material-ui - node (v18.15.0, x64)
xstate - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

tsserver

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Compiler-UnionsTSServer - node (v18.15.0, x64)}
_{Req 1 - updateOpen}	_{2,374ms (± 0.61%)}	_{2,365ms (± 0.68%)}	_~	_2,342ms	_2,383ms	_{p=0.575 n=6}
_{Req 2 - geterr}	_{5,350ms (± 1.27%)}	_{5,367ms (± 1.63%)}	_~	_5,303ms	_5,481ms	_{p=0.936 n=6}
_{Req 3 - references}	_{327ms (± 1.36%)}	_{327ms (± 1.09%)}	_~	_323ms	_333ms	_{p=1.000 n=6}
_{Req 4 - navto}	_{279ms (± 1.01%)}	_{278ms (± 1.14%)}	_~	_273ms	_280ms	_{p=1.000 n=6}
_{Req 5 - completionInfo count}	_{1,356 (± 0.00%)}	_{1,356 (± 0.00%)}	_~	_1,356	_1,356	_{p=1.000 n=6}
_{Req 5 - completionInfo}	_{81ms (± 3.58%)}	_{84ms (± 5.48%)}	_~	_80ms	_90ms	_{p=0.286 n=6}
_{CompilerTSServer - node (v18.15.0, x64)}
_{Req 1 - updateOpen}	_{2,471ms (± 1.01%)}	_{2,493ms (± 0.83%)}	_~	_2,462ms	_2,514ms	_{p=0.128 n=6}
_{Req 2 - geterr}	_{4,132ms (± 0.97%)}	_{4,090ms (± 1.88%)}	_~	_4,014ms	_4,168ms	_{p=0.873 n=6}
_{Req 3 - references}	_{336ms (± 1.31%)}	_{339ms (± 1.57%)}	_~	_334ms	_345ms	_{p=0.565 n=6}
_{Req 4 - navto}	_{282ms (± 0.29%)}	_{283ms (± 0.47%)}	_~	_281ms	_284ms	_{p=0.584 n=6}
_{Req 5 - completionInfo count}	_{1,518 (± 0.00%)}	_{1,518 (± 0.00%)}	_~	_1,518	_1,518	_{p=1.000 n=6}
_{Req 5 - completionInfo}	_{80ms (± 6.12%)}	_{85ms (± 7.58%)}	_~	_78ms	_91ms	_{p=0.058 n=6}
_{xstateTSServer - node (v18.15.0, x64)}
_{Req 1 - updateOpen}	_{2,594ms (± 0.50%)}	_{2,599ms (± 0.49%)}	_~	_2,579ms	_2,616ms	_{p=0.470 n=6}
_{Req 2 - geterr}	_{1,659ms (± 1.66%)}	_{1,661ms (± 1.67%)}	_~	_1,625ms	_1,695ms	_{p=0.810 n=6}
_{Req 3 - references}	_{113ms (± 9.54%)}	_{113ms (±10.38%)}	_~	_101ms	_124ms	_{p=0.467 n=6}
_{Req 4 - navto}	_{365ms (± 0.57%)}	_{365ms (± 0.62%)}	_~	_363ms	_369ms	_{p=0.807 n=6}
_{Req 5 - completionInfo count}	_{2,073 (± 0.00%)}	_{2,073 (± 0.00%)}	_~	_2,073	_2,073	_{p=1.000 n=6}
_{Req 5 - completionInfo}	_{311ms (± 1.96%)}	_{310ms (± 1.76%)}	_~	_302ms	_316ms	_{p=0.747 n=6}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

CompilerTSServer - node (v18.15.0, x64)
Compiler-UnionsTSServer - node (v18.15.0, x64)
xstateTSServer - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Startup

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{tsc-startup - node (v18.15.0, x64)}
_{Execution time}	_{152.47ms (± 0.21%)}	_{152.27ms (± 0.20%)}	_{-0.21ms (- 0.13%)}	_151.22ms	_155.84ms	_{p=0.000 n=600}
_{tsserver-startup - node (v18.15.0, x64)}
_{Execution time}	_{227.91ms (± 0.16%)}	_{227.64ms (± 0.15%)}	_{-0.26ms (- 0.11%)}	_226.15ms	_232.48ms	_{p=0.000 n=600}
_{tsserverlibrary-startup - node (v18.15.0, x64)}
_{Execution time}	_{229.30ms (± 0.21%)}	_{229.35ms (± 0.17%)}	_{+0.05ms (+ 0.02%)}	_227.80ms	_232.08ms	_{p=0.021 n=600}
_{typescript-startup - node (v18.15.0, x64)}
_{Execution time}	_{229.07ms (± 0.18%)}	_{229.25ms (± 0.19%)}	_{+0.17ms (+ 0.08%)}	_227.79ms	_235.58ms	_{p=0.000 n=600}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

tsc-startup - node (v18.15.0, x64)
tsserver-startup - node (v18.15.0, x64)
tsserverlibrary-startup - node (v18.15.0, x64)
typescript-startup - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Developer Information:

Download Benchmarks

typescript-bot · 2023-11-22T09:38:23Z

Hey @jakebailey, the results of running the DT tests are ready.
Everything looks the same!
You can check the log here.

typescript-bot · 2023-11-22T10:29:43Z

@jakebailey Here are the results of running the top-repos suite comparing main and refs/pull/56504/merge:

Everything looks good!

jakebailey · 2023-11-22T18:18:20Z

src/compiler/checker.ts

@@ -27929,10 +27929,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                    if (isMatchingConstructorReference(right)) {
                        return narrowTypeByConstructor(type, operator, left, assumeTrue);
                    }
-                    if (isBooleanLiteral(right)) {
+                    if (isBooleanLiteral(right) && !isAccessExpression(left)) {


This seems fine as a quick fix for now, though I suspect that we could try and do better later.

jakebailey · 2023-11-22T18:22:36Z

@typescript-bot cherry-pick this to release-5.3

typescript-bot · 2023-11-22T18:22:43Z

Heya @jakebailey, I've started to cherry-pick this into release-5.3 for you. Here's the link to my best guess at the log.

typescript-bot · 2023-11-22T18:24:59Z

Hey @jakebailey, I was unable to cherry-pick this PR.

Check the logs at: https://github.com/microsoft/TypeScript/actions/runs/6961303591

jakebailey · 2023-11-22T18:54:04Z

@typescript-bot cherry-pick this to release-5.3

typescript-bot · 2023-11-22T18:54:10Z

Heya @jakebailey, I've started to cherry-pick this into release-5.3 for you. Here's the link to my best guess at the log.

typescript-bot · 2023-11-22T18:55:23Z

Hey @jakebailey, I was unable to cherry-pick this PR.

Check the logs at: https://github.com/microsoft/TypeScript/actions/runs/6961580628

jakebailey · 2023-11-22T18:57:30Z

@typescript-bot cherry-pick this to release-5.3

typescript-bot · 2023-11-22T18:57:36Z

Heya @jakebailey, I've started to cherry-pick this into release-5.3 for you. Here's the link to my best guess at the log.

typescript-bot · 2023-11-22T18:59:41Z

Hey @jakebailey, I've created #56512 for you.

DanielRosenwasser · 2023-11-22T19:09:05Z

Is using isAccessExpression just intended to not check more deeply on the expression?

DanielRosenwasser · 2023-11-22T19:10:19Z

Never mind, I think I understand now.

jakebailey · 2023-11-22T19:13:33Z

Is using isAccessExpression just intended to not check more deeply on the expression?

If you write an expression like options?.a === false || options.b or options?.a === undefined || options.b, it's not the same as like !options?.a || options.b; specifically, it doesn't provide any information about whether the equality was done on options or options.a, so we can't know if options was undefined or not for the following expression. Kinda makes sense; we're allowing a narrowing based on a specific falsy value.

It's possible that this could work with just ==, though, but I think the big hammer is okay.

…to release-5.3 (microsoft#56512) Co-authored-by: Mateusz Burzyński <[email protected]>

Fixed an issue in boolean comparison narrowing when the reference is …

2be581e

…an optional chain

typescript-bot added the For Uncommitted Bug PR for untriaged, rejected, closed or missing bug label Nov 22, 2023

Andarist commented Nov 22, 2023

View reviewed changes

add an extra test case

b549581

add another extra test case

c2b785e

jakebailey approved these changes Nov 22, 2023

View reviewed changes

jakebailey added this to the TypeScript 5.3.3 milestone Nov 22, 2023

typescript-bot added For Milestone Bug PRs that fix a bug with a specific milestone and removed For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels Nov 22, 2023

typescript-bot mentioned this pull request Nov 22, 2023

🤖 Pick PR #56504 (Fixed an issue in boolean compariso...) into release-5.3 #56512

Merged

jakebailey merged commit d4fbc9b into microsoft:main Nov 22, 2023
19 checks passed

dsherret pushed a commit to denoland/TypeScript that referenced this pull request Dec 6, 2023

🤖 Pick PR microsoft#56504 (Fixed an issue in boolean compariso...) in…

f3808c4

…to release-5.3 (microsoft#56512) Co-authored-by: Mateusz Burzyński <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed an issue in boolean comparison narrowing when the reference is an optional chain #56504

Fixed an issue in boolean comparison narrowing when the reference is an optional chain #56504

Andarist commented Nov 22, 2023

Andarist Nov 22, 2023

jakebailey Nov 22, 2023

jakebailey Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023

puppeteer

packages/browsers/test/src/tsconfig.json

typescript-bot commented Nov 22, 2023

Compiler

tsserver

Startup

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

DanielRosenwasser commented Nov 22, 2023 •

edited

Loading

DanielRosenwasser commented Nov 22, 2023

jakebailey commented Nov 22, 2023

Fixed an issue in boolean comparison narrowing when the reference is an optional chain #56504

Fixed an issue in boolean comparison narrowing when the reference is an optional chain #56504

Conversation

Andarist commented Nov 22, 2023

Andarist Nov 22, 2023

Choose a reason for hiding this comment

jakebailey Nov 22, 2023

Choose a reason for hiding this comment

jakebailey Nov 22, 2023

Choose a reason for hiding this comment

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023 • edited Loading

typescript-bot commented Nov 22, 2023

puppeteer

packages/browsers/test/src/tsconfig.json

typescript-bot commented Nov 22, 2023

Compiler

tsserver

Startup

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey Nov 22, 2023

Choose a reason for hiding this comment

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

typescript-bot commented Nov 22, 2023

DanielRosenwasser commented Nov 22, 2023 • edited Loading

DanielRosenwasser commented Nov 22, 2023

jakebailey commented Nov 22, 2023

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

typescript-bot commented Nov 22, 2023 •

edited

Loading

DanielRosenwasser commented Nov 22, 2023 •

edited

Loading