Discriminate contextual types using shorthand properties #55151

Andarist · 2023-07-25T16:43:11Z

It's a bug that I noticed when working on #55144

typescript-bot · 2023-07-25T16:43:17Z

This PR doesn't have any linked issues. Please open an issue that references this PR. From there we can discuss and prioritise.

gabritto · 2023-08-14T22:36:48Z

@typescript-bot test this
@typescript-bot run DT
@typescript-bot user test this
@typescript-bot test top100
@typescript-bot perf test this

typescript-bot · 2023-08-14T22:36:50Z

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

Update: The results are in!

typescript-bot · 2023-08-14T22:36:50Z

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

Update: The results are in!

typescript-bot · 2023-08-14T22:36:50Z

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

Update: The results are in!

typescript-bot · 2023-08-14T22:36:50Z

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

Update: The results are in!

typescript-bot · 2023-08-14T23:02:14Z

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

There were infrastructure failures potentially unrelated to your change:

1 instance of "Unknown failure"
1 instance of "Package install failed"

Otherwise...

Something interesting changed - please have a look.

Details

rxjs-src

/mnt/ts_downloads/rxjs-src/build.sh

[NEW] error TS2428: All declarations of 'WeakMap' must have identical type parameters.
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-55151/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
[MISSING] error TS2428: All declarations of 'WeakMap' must have identical type parameters.
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-main/lib/lib.es2015.symbol.wellknown.d.ts(140,11)

typescript-bot · 2023-08-14T23:07:01Z

@gabritto
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 (v16.17.1, x64)}
_{Memory used}	_{300,337k (± 0.01%)}	_{300,325k (± 0.01%)}	_~	_300,295k	_300,363k	_{p=0.422 n=6}
_{Parse Time}	_{3.03s (± 0.00%)}	_{3.02s (± 0.49%)}	_{-0.01s (- 0.39%)}	_2.99s	_3.03s	_{p=0.027 n=6}
_{Bind Time}	_{0.93s (± 0.00%)}	_{0.93s (± 0.00%)}	_~	_0.93s	_0.93s	_{p=1.000 n=6}
_{Check Time}	_{9.47s (± 0.20%)}	_{9.47s (± 0.30%)}	_~	_9.43s	_9.51s	_{p=0.935 n=6}
_{Emit Time}	_{7.61s (± 0.16%)}	_{7.63s (± 0.36%)}	_~	_7.59s	_7.67s	_{p=0.164 n=6}
_{Total Time}	_{21.05s (± 0.08%)}	_{21.06s (± 0.27%)}	_~	_20.98s	_21.14s	_{p=0.872 n=6}
_{Compiler-Unions - node (v16.17.1, x64)}
_{Memory used}	_{193,798k (± 0.01%)}	_{193,814k (± 0.01%)}	_~	_193,789k	_193,830k	_{p=0.148 n=6}
_{Parse Time}	_{1.57s (± 1.25%)}	_{1.57s (± 1.05%)}	_~	_1.55s	_1.58s	_{p=0.476 n=6}
_{Bind Time}	_{0.79s (± 0.00%)}	_{0.79s (± 0.00%)}	_~	_0.79s	_0.79s	_{p=1.000 n=6}
_{Check Time}	_{9.89s (± 0.16%)}	_{9.88s (± 0.46%)}	_~	_9.82s	_9.94s	_{p=0.514 n=6}
_{Emit Time}	_{2.73s (± 0.19%)}	_{2.74s (± 0.30%)}	_{+0.01s (+ 0.43%)}	_2.74s	_2.76s	_{p=0.019 n=6}
_{Total Time}	_{14.99s (± 0.11%)}	_{14.98s (± 0.42%)}	_~	_14.90s	_15.07s	_{p=0.686 n=6}
_{Monaco - node (v16.17.1, x64)}
_{Memory used}	_{347,044k (± 0.00%)}	_{347,055k (± 0.00%)}	_~	_347,036k	_347,082k	_{p=0.198 n=6}
_{Parse Time}	_{2.69s (± 0.30%)}	_{2.69s (± 0.49%)}	_~	_2.68s	_2.71s	_{p=0.865 n=6}
_{Bind Time}	_{0.99s (± 0.00%)}	_{0.99s (± 0.00%)}	_~	_0.99s	_0.99s	_{p=1.000 n=6}
_{Check Time}	_{7.92s (± 0.31%)}	_{7.90s (± 0.15%)}	_~	_7.88s	_7.91s	_{p=0.318 n=6}
_{Emit Time}	_{4.26s (± 0.69%)}	_{4.27s (± 0.27%)}	_~	_4.26s	_4.29s	_{p=0.324 n=6}
_{Total Time}	_{15.86s (± 0.17%)}	_{15.85s (± 0.17%)}	_~	_15.82s	_15.90s	_{p=0.568 n=6}
_{TFS - node (v16.17.1, x64)}
_{Memory used}	_{301,125k (± 0.01%)}	_{301,127k (± 0.00%)}	_~	_301,112k	_301,143k	_{p=0.872 n=6}
_{Parse Time}	_{2.17s (± 0.45%)}	_{2.17s (± 0.45%)}	_~	_2.16s	_2.18s	_{p=1.000 n=6}
_{Bind Time}	_{1.11s (± 0.57%)}	_{1.11s (± 0.49%)}	_~	_1.11s	_1.12s	_{p=0.201 n=6}
_{Check Time}	_{7.21s (± 0.38%)}	_{7.23s (± 0.27%)}	_~	_7.20s	_7.25s	_{p=0.418 n=6}
_{Emit Time}	_{3.97s (± 0.74%)}	_{3.97s (± 0.44%)}	_~	_3.95s	_4.00s	_{p=0.512 n=6}
_{Total Time}	_{14.47s (± 0.28%)}	_{14.48s (± 0.16%)}	_~	_14.45s	_14.52s	_{p=0.572 n=6}
_{material-ui - node (v16.17.1, x64)}
_{Memory used}	_{479,381k (± 0.01%)}	_{479,398k (± 0.01%)}	_~	_479,342k	_479,462k	_{p=0.810 n=6}
_{Parse Time}	_{3.15s (± 0.13%)}	_{3.15s (± 0.33%)}	_~	_3.14s	_3.17s	_{p=0.924 n=6}
_{Bind Time}	_{0.91s (± 0.00%)}	_{0.91s (± 0.00%)}	_~	_0.91s	_0.91s	_{p=1.000 n=6}
_{Check Time}	_{17.92s (± 0.22%)}	_{17.88s (± 0.40%)}	_~	_17.80s	_18.01s	_{p=0.149 n=6}
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_~	_0.00s	_0.00s	_{p=1.000 n=6}
_{Total Time}	_{21.98s (± 0.19%)}	_{21.95s (± 0.32%)}	_~	_21.85s	_22.07s	_{p=0.228 n=6}
_{xstate - node (v16.17.1, x64)}
_{Memory used}	_{542,753k (± 0.00%)}	_{542,752k (± 0.01%)}	_~	_542,712k	_542,808k	_{p=0.936 n=6}
_{Parse Time}	_{3.70s (± 0.14%)}	_{3.70s (± 0.32%)}	_~	_3.68s	_3.71s	_{p=0.542 n=6}
_{Bind Time}	_{1.38s (± 4.67%)}	_{1.42s (± 4.45%)}	_~	_1.34s	_1.47s	_{p=0.432 n=6}
_{Check Time}	_{3.27s (± 2.79%)}	_{3.21s (± 2.15%)}	_~	_3.15s	_3.30s	_{p=0.126 n=6}
_{Emit Time}	_{0.08s (± 4.99%)}	_{0.08s (± 0.00%)}	_~	_0.08s	_0.08s	_{p=0.405 n=6}
_{Total Time}	_{8.45s (± 0.45%)}	_{8.42s (± 0.12%)}	_~	_8.40s	_8.43s	_{p=0.258 n=6}

System info unknown

Hosts

node (v16.17.1, x64)

Scenarios

Angular - node (v16.17.1, x64)
Compiler-Unions - node (v16.17.1, x64)
Monaco - node (v16.17.1, x64)
TFS - node (v16.17.1, x64)
material-ui - node (v16.17.1, x64)
xstate - node (v16.17.1, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

tsserver

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Compiler-UnionsTSServer - node (v16.17.1, x64)}
_{Req 1 - updateOpen}	_{2,490ms (± 0.09%)}	_{2,493ms (± 0.21%)}	_~	_2,486ms	_2,498ms	_{p=0.371 n=6}
_{Req 2 - geterr}	_{5,922ms (± 0.21%)}	_{5,933ms (± 0.30%)}	_~	_5,915ms	_5,956ms	_{p=0.173 n=6}
_{Req 3 - references}	_{342ms (± 0.39%)}	_{342ms (± 0.22%)}	_~	_341ms	_343ms	_{p=0.548 n=6}
_{Req 4 - navto}	_{278ms (± 1.01%)}	_{277ms (± 0.82%)}	_~	_275ms	_281ms	_{p=0.870 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}	_{86ms (± 6.93%)}	_{79ms (± 3.71%)}	_{🟩-7ms (- 8.11%)}	_76ms	_82ms	_{p=0.016 n=6}
_{CompilerTSServer - node (v16.17.1, x64)}
_{Req 1 - updateOpen}	_{2,595ms (± 0.67%)}	_{2,598ms (± 0.89%)}	_~	_2,581ms	_2,634ms	_{p=0.873 n=6}
_{Req 2 - geterr}	_{4,712ms (± 0.26%)}	_{4,715ms (± 0.24%)}	_~	_4,701ms	_4,733ms	_{p=0.810 n=6}
_{Req 3 - references}	_{350ms (± 0.26%)}	_{350ms (± 0.28%)}	_~	_348ms	_351ms	_{p=0.931 n=6}
_{Req 4 - navto}	_{269ms (± 0.28%)}	_{269ms (± 0.31%)}	_~	_267ms	_269ms	_{p=0.209 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}	_{78ms (± 0.66%)}	_{78ms (± 3.02%)}	_~	_73ms	_79ms	_{p=0.931 n=6}
_{xstateTSServer - node (v16.17.1, x64)}
_{Req 1 - updateOpen}	_{2,718ms (± 0.28%)}	_{2,709ms (± 0.29%)}	_~	_2,699ms	_2,718ms	_{p=0.090 n=6}
_{Req 2 - geterr}	_{1,936ms (± 1.70%)}	_{1,955ms (± 0.38%)}	_~	_1,943ms	_1,964ms	_{p=0.199 n=6}
_{Req 3 - references}	_{137ms (± 6.24%)}	_{126ms (± 8.66%)}	_~	_113ms	_142ms	_{p=0.077 n=6}
_{Req 4 - navto}	_{353ms (± 0.35%)}	_{352ms (± 0.12%)}	_~	_351ms	_352ms	_{p=0.218 n=6}
_{Req 5 - completionInfo count}	_{2,071 (± 0.00%)}	_{2,071 (± 0.00%)}	_~	_2,071	_2,071	_{p=1.000 n=6}
_{Req 5 - completionInfo}	_{323ms (± 2.48%)}	_{321ms (± 2.47%)}	_~	_311ms	_328ms	_{p=0.466 n=6}

System info unknown

Hosts

node (v16.17.1, x64)

Scenarios

CompilerTSServer - node (v16.17.1, x64)
Compiler-UnionsTSServer - node (v16.17.1, x64)
xstateTSServer - node (v16.17.1, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Startup

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{tsc-startup - node (v16.17.1, x64)}
_{Execution time}	_{155.53ms (± 0.15%)}	_{155.42ms (± 0.20%)}	_{-0.11ms (- 0.07%)}	_154.14ms	_161.29ms	_{p=0.000 n=600}
_{tsserver-startup - node (v16.17.1, x64)}
_{Execution time}	_{230.83ms (± 0.13%)}	_{230.64ms (± 0.12%)}	_{-0.19ms (- 0.08%)}	_229.50ms	_234.25ms	_{p=0.000 n=600}
_{tsserverlibrary-startup - node (v16.17.1, x64)}
_{Execution time}	_{234.61ms (± 0.15%)}	_{236.00ms (± 0.13%)}	_{+1.38ms (+ 0.59%)}	_234.95ms	_241.52ms	_{p=0.000 n=600}
_{typescript-startup - node (v16.17.1, x64)}
_{Execution time}	_{235.86ms (± 0.16%)}	_{235.70ms (± 0.14%)}	_{-0.15ms (- 0.07%)}	_234.31ms	_241.00ms	_{p=0.000 n=600}

System info unknown

Hosts

node (v16.17.1, x64)

Scenarios

tsc-startup - node (v16.17.1, x64)
tsserver-startup - node (v16.17.1, x64)
tsserverlibrary-startup - node (v16.17.1, x64)
typescript-startup - node (v16.17.1, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Developer Information:

Download Benchmarks

typescript-bot · 2023-08-15T00:08:05Z

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

Everything looks good!

typescript-bot · 2023-08-15T00:53:13Z

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

…5151)

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

Discriminate contextual types using shorthand properties

5dbbb6c

Andarist force-pushed the fix/shorthand-contextual-discrimination branch from f2d3e2c to 5dbbb6c Compare July 25, 2023 17:07

sandersn requested review from gabritto and iisaduan August 4, 2023 23:32

sandersn assigned gabritto Aug 4, 2023

gabritto approved these changes Aug 14, 2023

View reviewed changes

This comment was marked as duplicate.

Sign in to view

gabritto merged commit 8863e2f into microsoft:main Aug 15, 2023

snovader pushed a commit to EG-A-S/TypeScript that referenced this pull request Sep 23, 2023

Discriminate contextual types using shorthand properties (microsoft#5…

736a7b6

…5151)

Andarist deleted the fix/shorthand-contextual-discrimination branch February 1, 2025 09:39

microsoft locked as resolved and limited conversation to collaborators Oct 16, 2025

Discriminate contextual types using shorthand properties #55151

Discriminate contextual types using shorthand properties #55151

Uh oh!

Conversation

Andarist commented Jul 25, 2023

Uh oh!

typescript-bot commented Jul 25, 2023

Uh oh!

This comment was marked as duplicate.

gabritto commented Aug 14, 2023

Uh oh!

typescript-bot commented Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Aug 14, 2023

rxjs-src

/mnt/ts_downloads/rxjs-src/build.sh

Uh oh!

typescript-bot commented Aug 14, 2023

Compiler

tsserver

Startup

Uh oh!

typescript-bot commented Aug 15, 2023

Uh oh!

typescript-bot commented Aug 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

typescript-bot commented Aug 14, 2023 •

edited

Loading

typescript-bot commented Aug 14, 2023 •

edited

Loading

typescript-bot commented Aug 14, 2023 •

edited

Loading

typescript-bot commented Aug 14, 2023 •

edited

Loading