TypeScript fix(53589): Allow newlines before extend in conditional types

Fixes #53589

Currently, when attempting to parse a conditional type we check that there is no newline before the extends keyword. This was added as a fix for #21637 where the object key with name extends was incorrectly being considered part of a conditional type. While this fixed the initial problem, the check was too broad as there are other contexts where a newline before the extends would be valid. In order to allow these cases, I updated the check to instead see if the extends is followed by : or ?: in which case it is part of an object type (or at least can't be a conditional type).

Jun 17 '23 19:06 nlipiarski

@microsoft-github-policy-service agree

Jun 17 '23 19:06 nlipiarski

@typescript-bot test this @typescript-bot test top100 @typescript-bot user test this @typescript-bot user test tsserver @typescript-bot test tsserver top100 @typescript-bot run dt @typescript-bot perf test this faster @typescript-bot pack this

Jun 20 '23 17:06 jakebailey

Heya @jakebailey, I've started to run the extended test suite on this PR at 3145ef49f3ec4ee8e701df53cb1bca5cb4946cd3. You can monitor the build here.

Jun 20 '23 17:06 typescript-bot

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

Jun 20 '23 17:06 typescript-bot

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

Update: The results are in!

Jun 20 '23 17:06 typescript-bot

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

Update: The results are in!

Jun 20 '23 17:06 typescript-bot

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

Jun 20 '23 17:06 typescript-bot

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

Update: The results are in!

Jun 20 '23 17:06 typescript-bot

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

Update: The results are in!

Jun 20 '23 17:06 typescript-bot

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

Update: The results are in!

Jun 20 '23 17:06 typescript-bot

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/155547/artifacts?artifactName=tgz&fileId=C4871A23F8C5B1777273557904DC4E8D3B2183F6DC3103D870718FA379B05AFC02&fileName=/typescript-5.2.0-insiders.20230620.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]".;

Jun 20 '23 17:06 typescript-bot

@jakebailey Here are the results of running the user test suite comparing main and refs/pull/54688/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-54688/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.symbol.wellknown.d.ts(140,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.collection.d.ts(63,11)
- /home/vsts/work/1/s/typescript-54688/lib/lib.es2015.iterable.d.ts(162,11)
- /home/vsts/work/1/s/typescript-54688/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)

Jun 20 '23 17:06 typescript-bot

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

Everything looks good!

Jun 20 '23 17:06 typescript-bot

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

Here they are:

Comparison Report - main..54688

_Metric	_main	₅₄₆₈₈	_Delta	_Best	_Worst	_p-value
_{Angular - node (v16.17.1, x64)}
_{Memory used}	_{365,523k (± 0.01%)}	_{365,560k (± 0.02%)}	_~	_365,500k	_365,650k	_{p=0.471 n=6}
_{Parse Time}	_{3.56s (± 0.81%)}	_{3.58s (± 0.25%)}	_~	_3.57s	_3.59s	_{p=0.119 n=6}
_{Bind Time}	_{1.18s (± 0.69%)}	_{1.18s (± 0.35%)}	_~	_1.17s	_1.18s	_{p=0.584 n=6}
_{Check Time}	_{9.67s (± 0.34%)}	_{9.62s (± 0.22%)}	_{-0.05s (- 0.53%)}	_9.59s	_9.65s	_{p=0.015 n=6}
_{Emit Time}	_{7.92s (± 0.61%)}	_{7.90s (± 0.58%)}	_~	_7.84s	_7.96s	_{p=0.574 n=6}
_{Total Time}	_{22.33s (± 0.39%)}	_{22.27s (± 0.20%)}	_~	_22.23s	_22.32s	_{p=0.198 n=6}
_{Compiler-Unions - node (v16.17.1, x64)}
_{Memory used}	_{193,082k (± 0.66%)}	_{192,606k (± 0.02%)}	_~	_192,554k	_192,668k	_{p=0.471 n=6}
_{Parse Time}	_{1.60s (± 1.16%)}	_{1.61s (± 0.47%)}	_~	_1.60s	_1.62s	_{p=0.195 n=6}
_{Bind Time}	_{0.83s (± 0.91%)}	_{0.83s (± 0.99%)}	_~	_0.82s	_0.84s	_{p=0.729 n=6}
_{Check Time}	_{10.22s (± 0.85%)}	_{10.22s (± 0.86%)}	_~	_10.13s	_10.36s	_{p=1.000 n=6}
_{Emit Time}	_{3.01s (± 0.57%)}	_{3.01s (± 1.18%)}	_~	_2.95s	_3.04s	_{p=1.000 n=6}
_{Total Time}	_{15.66s (± 0.53%)}	_{15.67s (± 0.72%)}	_~	_15.57s	_15.84s	_{p=0.688 n=6}
_{Monaco - node (v16.17.1, x64)}
_{Memory used}	_{345,899k (± 0.00%)}	_{345,886k (± 0.00%)}	_~	_345,871k	_345,905k	_{p=0.228 n=6}
_{Parse Time}	_{2.74s (± 0.44%)}	_{2.74s (± 1.03%)}	_~	_2.71s	_2.78s	_{p=0.870 n=6}
_{Bind Time}	_{1.08s (± 1.01%)}	_{1.08s (± 0.48%)}	_~	_1.08s	_1.09s	_{p=0.784 n=6}
_{Check Time}	_{7.88s (± 0.29%)}	_{7.87s (± 0.56%)}	_~	_7.80s	_7.92s	_{p=0.810 n=6}
_{Emit Time}	_{4.47s (± 0.56%)}	_{4.44s (± 1.15%)}	_~	_4.38s	_4.51s	_{p=0.378 n=6}
_{Total Time}	_{16.16s (± 0.22%)}	_{16.13s (± 0.64%)}	_~	_16.01s	_16.26s	_{p=0.688 n=6}
_{TFS - node (v16.17.1, x64)}
_{Memory used}	_{300,004k (± 0.00%)}	_{300,008k (± 0.00%)}	_~	_299,991k	_300,018k	_{p=0.518 n=6}
_{Parse Time}	_{2.17s (± 0.56%)}	_{2.18s (± 1.19%)}	_~	_2.15s	_2.22s	_{p=0.463 n=6}
_{Bind Time}	_{1.24s (± 0.94%)}	_{1.25s (± 0.84%)}	_~	_1.23s	_1.26s	_{p=0.406 n=6}
_{Check Time}	_{7.33s (± 0.45%)}	_{7.29s (± 0.43%)}	_{-0.05s (- 0.64%)}	_7.25s	_7.34s	_{p=0.036 n=6}
_{Emit Time}	_{4.31s (± 0.79%)}	_{4.34s (± 0.57%)}	_~	_4.31s	_4.38s	_{p=0.125 n=6}
_{Total Time}	_{15.05s (± 0.43%)}	_{15.05s (± 0.37%)}	_~	_14.96s	_15.11s	_{p=1.000 n=6}
_{material-ui - node (v16.17.1, x64)}
_{Memory used}	_{480,323k (± 0.01%)}	_{480,358k (± 0.02%)}	_~	_480,255k	_480,463k	_{p=0.471 n=6}
_{Parse Time}	_{3.26s (± 0.55%)}	_{3.27s (± 0.58%)}	_~	_3.25s	_3.30s	_{p=0.511 n=6}
_{Bind Time}	_{0.94s (± 0.86%)}	_{0.94s (± 0.43%)}	_~	_0.94s	_0.95s	_{p=0.584 n=6}
_{Check Time}	_{17.98s (± 0.58%)}	_{17.93s (± 0.62%)}	_~	_17.77s	_18.04s	_{p=0.936 n=6}
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_~	_0.00s	_0.00s	_{p=1.000 n=6}
_{Total Time}	_{22.19s (± 0.47%)}	_{22.14s (± 0.53%)}	_~	_21.98s	_22.25s	_{p=0.936 n=6}
_{xstate - node (v16.17.1, x64)}
_{Memory used}	_{560,629k (± 0.02%)}	_{560,643k (± 0.01%)}	_~	_560,574k	_560,753k	_{p=0.689 n=6}
_{Parse Time}	_{3.99s (± 0.52%)}	_{4.03s (± 0.34%)}	_{+0.04s (+ 0.96%)}	_4.02s	_4.05s	_{p=0.007 n=6}
_{Bind Time}	_{1.75s (± 0.93%)}	_{1.73s (± 0.30%)}	_{-0.02s (- 1.15%)}	_1.72s	_1.73s	_{p=0.021 n=6}
_{Check Time}	_{3.05s (± 0.40%)}	_{3.05s (± 0.51%)}	_~	_3.04s	_3.07s	_{p=0.796 n=6}
_{Emit Time}	_{0.09s (± 0.00%)}	_{0.09s (± 0.00%)}	_~	_0.09s	_0.09s	_{p=1.000 n=6}
_{Total Time}	_{8.88s (± 0.17%)}	_{8.90s (± 0.33%)}	_~	_8.87s	_8.95s	_{p=0.226 n=6}

System

_{Machine Name}	_ts-ci-ubuntu
_Platform	_{linux 5.4.0-148-generic}
_Architecture	_x64
_{Available Memory}	_{16 GB}
_{Available Memory}	_{15 GB}
_CPUs	_{4 × Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz}

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	₅₄₆₈₈	₆
_Baseline	_main	₆

Developer Information:

Download Benchmark

Jun 20 '23 18:06 typescript-bot

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

Jun 20 '23 19:06 typescript-bot

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

Everything looks good!

Jun 20 '23 20:06 typescript-bot