Fix arrow expressions in conditional expressions, take N+1 #49531

jakebailey · 2022-06-13T23:59:46Z

This is a revert of PR #48940 with #48788 applied.

I previously described #48788 as "permissive"; this is accurate in the sense that all of the existing TS code that we found in the wild is parsed correctly without a change in meaning. However, this does not compromise on the ideal that if it's legal JS, then we should parse it as such; the effect of this PR should be to get everything working as expected.

I recommend ignoring the first commit for sake of viewing the diff, as it's just setting up the tests in such a way to make sure we can view the JS and TS code side by side with the output.

If it's legal JS, we want to parse it as such. This means that in cases where the code is legal JS, we should see that:

The input JS should match the output JS.
The output of the TS file (containing the same code) should match the output of the JS file.

If it's a syntax error in JS, then we are free to interpret it how we need, i.e. to support TS features. Many of the tests are not legal JS.

weswigham · 2022-06-14T21:27:34Z

@typescript-bot test this
@typescript-bot user test this inline
@typescript-bot perf test this faster
@typescript-bot pack this

typescript-bot · 2022-06-14T21:27:37Z

Heya @weswigham, I've started to run the extended test suite on this PR at 7ac56c3. You can monitor the build here.

typescript-bot · 2022-06-14T21:27:37Z

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

typescript-bot · 2022-06-14T21:27:37Z

Heya @weswigham, I've started to run the perf test suite on this PR at 7ac56c3. You can monitor the build here.

Update: The results are in!

typescript-bot · 2022-06-14T21:27:37Z

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

Update: The results are in!

typescript-bot · 2022-06-14T21:27:37Z

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

Update: The results are in!

typescript-bot · 2022-06-14T21:47:47Z

@weswigham
Great news! no new errors were found between main..refs/pull/49531/merge

typescript-bot · 2022-06-14T21:48:25Z

Heya @weswigham, I've run the RWC suite on this PR - assuming you're on the TS core team, you can view the resulting diff here.

typescript-bot · 2022-06-14T21:50:55Z

Hey @weswigham, 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/128080/artifacts?artifactName=tgz&fileId=30E2A902FA82282BB3FD9B24C7DF2067682BAAD64F3A0C9DB1F3B30652CB932302&fileName=/typescript-4.8.0-insiders.20220614.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/pr-build@4.8.0-pr-49531-22".;

typescript-bot · 2022-06-14T22:21:07Z

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

Here they are:

Comparison Report - main..49531

_Metric	_main	₄₉₅₃₁	_Delta	_Best	_Worst
_{Angular - node (v14.15.1, x64)}
_{Memory used}	_{333,876k (± 0.01%)}	_{333,860k (± 0.01%)}	_{-16k (- 0.00%)}	_333,787k	_333,923k
_{Parse Time}	_{2.08s (± 0.68%)}	_{2.08s (± 0.76%)}	_{-0.00s (- 0.19%)}	_2.05s	_2.12s
_{Bind Time}	_{0.89s (± 0.50%)}	_{0.88s (± 0.51%)}	_{-0.01s (- 1.12%)}	_0.87s	_0.89s
_{Check Time}	_{5.74s (± 0.62%)}	_{5.76s (± 0.51%)}	_{+0.02s (+ 0.30%)}	_5.71s	_5.82s
_{Emit Time}	_{6.41s (± 0.65%)}	_{6.39s (± 0.59%)}	_{-0.01s (- 0.20%)}	_6.31s	_6.47s
_{Total Time}	_{15.12s (± 0.44%)}	_{15.11s (± 0.37%)}	_{-0.01s (- 0.05%)}	_14.97s	_15.26s
_{Compiler-Unions - node (v14.15.1, x64)}
_{Memory used}	_{192,598k (± 0.02%)}	_{192,861k (± 0.41%)}	_{+262k (+ 0.14%)}	_191,635k	_195,949k
_{Parse Time}	_{0.85s (± 0.53%)}	_{0.86s (± 0.69%)}	_{+0.01s (+ 0.94%)}	_0.85s	_0.87s
_{Bind Time}	_{0.58s (± 0.82%)}	_{0.58s (± 0.85%)}	_{+0.00s (+ 0.34%)}	_0.58s	_0.60s
_{Check Time}	_{7.68s (± 0.63%)}	_{7.63s (± 0.66%)}	_{-0.05s (- 0.60%)}	_7.55s	_7.74s
_{Emit Time}	_{2.53s (± 0.79%)}	_{2.52s (± 1.20%)}	_{-0.01s (- 0.28%)}	_2.49s	_2.63s
_{Total Time}	_{11.63s (± 0.46%)}	_{11.59s (± 0.64%)}	_{-0.04s (- 0.38%)}	_11.48s	_11.81s
_{Monaco - node (v14.15.1, x64)}
_{Memory used}	_{325,586k (± 0.01%)}	_{325,600k (± 0.01%)}	_{+14k (+ 0.00%)}	_325,559k	_325,653k
_{Parse Time}	_{1.57s (± 0.56%)}	_{1.59s (± 0.70%)}	_{+0.02s (+ 1.34%)}	_1.57s	_1.62s
_{Bind Time}	_{0.78s (± 0.61%)}	_{0.79s (± 0.47%)}	_{+0.01s (+ 1.53%)}	_0.79s	_0.80s
_{Check Time}	_{5.66s (± 0.38%)}	_{5.70s (± 0.43%)}	_{+0.04s (+ 0.69%)}	_5.65s	_5.75s
_{Emit Time}	_{3.37s (± 0.65%)}	_{3.35s (± 0.69%)}	_{-0.02s (- 0.53%)}	_3.30s	_3.40s
_{Total Time}	_{11.39s (± 0.31%)}	_{11.44s (± 0.38%)}	_{+0.05s (+ 0.47%)}	_11.34s	_11.55s
_{TFS - node (v14.15.1, x64)}
_{Memory used}	_{288,720k (± 0.01%)}	_{288,739k (± 0.00%)}	_{+19k (+ 0.01%)}	_288,706k	_288,763k
_{Parse Time}	_{1.33s (± 0.75%)}	_{1.35s (± 1.08%)}	_{+0.02s (+ 1.20%)}	_1.32s	_1.38s
_{Bind Time}	_{0.76s (± 0.92%)}	_{0.75s (± 0.64%)}	_{-0.01s (- 1.58%)}	_0.74s	_0.76s
_{Check Time}	_{5.32s (± 0.56%)}	_{5.32s (± 0.54%)}	_{+0.01s (+ 0.11%)}	_5.26s	_5.39s
_{Emit Time}	_{3.49s (± 1.18%)}	_{3.61s (± 1.72%)}	_{+0.11s (+ 3.26%)}	_3.46s	_3.69s
_{Total Time}	_{10.90s (± 0.52%)}	_{11.02s (± 0.68%)}	_{+0.12s (+ 1.11%)}	_10.80s	_11.14s
_{material-ui - node (v14.15.1, x64)}
_{Memory used}	_{446,412k (± 0.01%)}	_{446,303k (± 0.06%)}	_{-109k (- 0.02%)}	_445,263k	_446,447k
_{Parse Time}	_{1.90s (± 0.36%)}	_{1.89s (± 0.47%)}	_{-0.01s (- 0.47%)}	_1.87s	_1.91s
_{Bind Time}	_{0.73s (± 1.20%)}	_{0.73s (± 0.64%)}	_{-0.00s (- 0.41%)}	_0.72s	_0.74s
_{Check Time}	_{13.20s (± 0.80%)}	_{13.06s (± 0.42%)}	_{-0.13s (- 1.01%)}	_12.93s	_13.22s
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_{0.00s ( NaN%)}	_0.00s	_0.00s
_{Total Time}	_{15.83s (± 0.70%)}	_{15.68s (± 0.31%)}	_{-0.15s (- 0.94%)}	_15.57s	_15.82s
_{xstate - node (v14.15.1, x64)}
_{Memory used}	_{537,430k (± 0.00%)}	_{537,498k (± 0.00%)}	_{+67k (+ 0.01%)}	_537,436k	_537,547k
_{Parse Time}	_{2.61s (± 0.95%)}	_{2.60s (± 0.59%)}	_{-0.01s (- 0.54%)}	_2.57s	_2.64s
_{Bind Time}	_{1.15s (± 0.83%)}	_{1.15s (± 1.33%)}	_{+0.00s (+ 0.09%)}	_1.12s	_1.19s
_{Check Time}	_{1.54s (± 0.69%)}	_{1.54s (± 0.58%)}	_{-0.00s (- 0.07%)}	_1.52s	_1.55s
_{Emit Time}	_{0.07s (± 4.92%)}	_{0.07s (± 4.13%)}	_{-0.00s (- 2.70%)}	_0.07s	_0.08s
_{Total Time}	_{5.36s (± 0.48%)}	_{5.35s (± 0.34%)}	_{-0.01s (- 0.19%)}	_5.32s	_5.40s

System

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

Hosts

node (v14.15.1, x64)

Scenarios

Angular - node (v14.15.1, x64)
Compiler-Unions - node (v14.15.1, x64)
Monaco - node (v14.15.1, x64)
TFS - node (v14.15.1, x64)
material-ui - node (v14.15.1, x64)
xstate - node (v14.15.1, x64)

_Benchmark	_Name	_Iterations
_Current	₄₉₅₃₁	₁₀
_Baseline	_main	₁₀

Developer Information:

Download Benchmark

jakebailey · 2022-06-17T18:18:38Z

@typescript-bot run dt

typescript-bot · 2022-06-17T18:18:41Z

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

src/compiler/parser.ts

DanielRosenwasser · 2022-06-17T22:58:02Z

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

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the extended test suite on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the perf test suite on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

Update: The results are in!

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the diff-based user code test suite on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the tarball bundle task on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the abridged perf test suite on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

typescript-bot · 2022-06-17T22:58:05Z

Heya @DanielRosenwasser, I'm starting to run the parallelized Definitely Typed test suite on this PR at 8675dc1. Hold tight - I'll update this comment with the log link once the build has been queued.

DanielRosenwasser · 2022-06-17T23:02:56Z

src/compiler/parser.ts

                    colonToken = parseExpectedToken(SyntaxKind.ColonToken),
                    nodeIsPresent(colonToken)
-                        ? parseAssignmentExpressionOrHigher()
+                        ? parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction)


We had a discussion over at #49531 (comment) about whether or we should have consistency between the true/false branches, or whether backwards compatibility should win and we propagate outer context for the false case.

In other words, should the following continue to parse?

a ? b : (c): Type => c

While we can propagate the flag here, having the two branches differ is confusing, and could make naive refactorings fail. I have a soft vote for disallowing in conditional types, but explicitly document it.

What do you think @ahejlsberg @sandersn?

I am pro-backwards-compatibility; this was an oversight in that I had it this way in a previous change, but while working on one of the newer examples from the wild, I switched it back until I found the "real" fix as the token === ":" check in the arrow function parsing function.

The relevant test case is e76fe4c (#49531), which I fixed in 8675dc1 (#49531) before I had a test case.

DanielRosenwasser · 2022-06-17T23:12:33Z

tests/baselines/reference/parserArrowFunctionExpression10.js

@@ -1,8 +0,0 @@
-//// [parserArrowFunctionExpression10.ts]


Ugh, this is a rename, not a deletion.

Yeah, that's why I wanted to have my first commit be only test changes, so the following commits were clear as to what changed.

typescript-bot · 2022-06-17T23:14:21Z

Heya @DanielRosenwasser, I've run the RWC suite on this PR - assuming you're on the TS core team, you can view the resulting diff here.

DanielRosenwasser · 2022-06-17T23:16:53Z

tests/baselines/reference/parserArrowFunctionExpression14(target=es3).errors.txt

+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/fileJs.js (7 errors) ====
+    a() ? (b: number, c?: string): void => d() : e; // Not legal JS; "Unexpected token ':'" at first colon


Is this comment supposed to reflect an example runtime's error?

Yes, that's the parser error I get from node or a browser. I can drop these if they are confusing, I only had them in there to convince myself and reviewers that in every case, the only ones with TS-y meanings were ones that were not valid JavaScript.

typescript-bot · 2022-06-17T23:21:37Z

Hey @DanielRosenwasser, 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/128426/artifacts?artifactName=tgz&fileId=639B538382E62B1E7A355CC96EA3165EB6F315ACCD9A790BD57A920EF3564C7302&fileName=/typescript-4.8.0-insiders.20220617.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/pr-build@4.8.0-pr-49531-35".;

jakebailey · 2022-06-17T23:34:21Z

RWC and DT look good, perf is fine as well. Going to merge this to get this in for the beta.

typescript-bot · 2022-06-17T23:36:54Z

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

Here they are:

Comparison Report - main..49531

_Metric	_main	₄₉₅₃₁	_Delta	_Best	_Worst
_{Angular - node (v10.16.3, x64)}
_{Memory used}	_{359,549k (± 0.02%)}	_{359,519k (± 0.02%)}	_{-30k (- 0.01%)}	_359,357k	_359,626k
_{Parse Time}	_{2.12s (± 0.69%)}	_{2.11s (± 0.74%)}	_{-0.01s (- 0.33%)}	_2.08s	_2.14s
_{Bind Time}	_{0.91s (± 0.91%)}	_{0.90s (± 1.00%)}	_{-0.01s (- 1.21%)}	_0.88s	_0.91s
_{Check Time}	_{5.98s (± 0.55%)}	_{5.95s (± 0.32%)}	_{-0.04s (- 0.60%)}	_5.91s	_6.00s
_{Emit Time}	_{6.17s (± 0.78%)}	_{6.12s (± 0.88%)}	_{-0.05s (- 0.83%)}	_6.03s	_6.26s
_{Total Time}	_{15.17s (± 0.51%)}	_{15.06s (± 0.40%)}	_{-0.11s (- 0.71%)}	_14.93s	_15.24s
_{Compiler-Unions - node (v10.16.3, x64)}
_{Memory used}	_{206,438k (± 0.05%)}	_{206,414k (± 0.03%)}	_{-24k (- 0.01%)}	_206,297k	_206,577k
_{Parse Time}	_{0.84s (± 0.90%)}	_{0.84s (± 0.62%)}	_{-0.01s (- 0.59%)}	_0.83s	_0.85s
_{Bind Time}	_{0.53s (± 1.87%)}	_{0.52s (± 0.69%)}	_{-0.00s (- 0.76%)}	_0.52s	_0.53s
_{Check Time}	_{8.15s (± 0.63%)}	_{8.11s (± 0.58%)}	_{-0.04s (- 0.50%)}	_7.97s	_8.19s
_{Emit Time}	_{2.52s (± 0.86%)}	_{2.51s (± 1.00%)}	_{-0.01s (- 0.52%)}	_2.46s	_2.59s
_{Total Time}	_{12.04s (± 0.53%)}	_{11.98s (± 0.38%)}	_{-0.06s (- 0.47%)}	_11.90s	_12.09s
_{Monaco - node (v10.16.3, x64)}
_{Memory used}	_{343,816k (± 0.01%)}	_{343,860k (± 0.01%)}	_{+44k (+ 0.01%)}	_343,788k	_343,937k
_{Parse Time}	_{1.60s (± 0.51%)}	_{1.59s (± 0.51%)}	_{-0.01s (- 0.62%)}	_1.58s	_1.62s
_{Bind Time}	_{0.77s (± 0.52%)}	_{0.78s (± 1.07%)}	_{+0.00s (+ 0.52%)}	_0.76s	_0.79s
_{Check Time}	_{5.99s (± 0.24%)}	_{5.96s (± 0.73%)}	_{-0.03s (- 0.53%)}	_5.82s	_6.04s
_{Emit Time}	_{3.27s (± 0.87%)}	_{3.26s (± 0.65%)}	_{-0.00s (- 0.09%)}	_3.23s	_3.33s
_{Total Time}	_{11.63s (± 0.38%)}	_{11.59s (± 0.48%)}	_{-0.04s (- 0.32%)}	_11.45s	_11.74s
_{TFS - node (v10.16.3, x64)}
_{Memory used}	_{305,139k (± 0.02%)}	_{305,147k (± 0.02%)}	_{+8k (+ 0.00%)}	_304,975k	_305,309k
_{Parse Time}	_{1.30s (± 0.57%)}	_{1.29s (± 0.50%)}	_{-0.01s (- 0.92%)}	_1.28s	_1.30s
_{Bind Time}	_{0.73s (± 0.79%)}	_{0.73s (± 0.68%)}	_{-0.00s (- 0.55%)}	_0.72s	_0.74s
_{Check Time}	_{5.42s (± 0.62%)}	_{5.39s (± 0.81%)}	_{-0.03s (- 0.46%)}	_5.31s	_5.52s
_{Emit Time}	_{3.41s (± 1.01%)}	_{3.43s (± 1.02%)}	_{+0.02s (+ 0.62%)}	_3.35s	_3.53s
_{Total Time}	_{10.85s (± 0.56%)}	_{10.83s (± 0.71%)}	_{-0.02s (- 0.19%)}	_10.71s	_11.08s
_{material-ui - node (v10.16.3, x64)}
_{Memory used}	_{469,116k (± 0.02%)}	_{469,081k (± 0.01%)}	_{-36k (- 0.01%)}	_468,980k	_469,228k
_{Parse Time}	_{1.85s (± 0.65%)}	_{1.85s (± 0.83%)}	_{-0.00s (- 0.11%)}	_1.82s	_1.89s
_{Bind Time}	_{0.70s (± 0.97%)}	_{0.69s (± 1.80%)}	_{-0.01s (- 1.56%)}	_0.67s	_0.72s
_{Check Time}	_{14.61s (± 0.86%)}	_{14.55s (± 0.80%)}	_{-0.06s (- 0.38%)}	_14.31s	_14.82s
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_{0.00s ( NaN%)}	_0.00s	_0.00s
_{Total Time}	_{17.17s (± 0.76%)}	_{17.10s (± 0.72%)}	_{-0.07s (- 0.41%)}	_16.84s	_17.38s
_{xstate - node (v10.16.3, x64)}
_{Memory used}	_{580,948k (± 1.25%)}	_{577,722k (± 0.01%)}	_{-3,226k (- 0.56%)}	_577,530k	_577,855k
_{Parse Time}	_{2.63s (± 0.28%)}	_{2.62s (± 0.42%)}	_{-0.01s (- 0.34%)}	_2.59s	_2.64s
_{Bind Time}	_{1.04s (± 0.91%)}	_{1.04s (± 0.55%)}	_{-0.00s (- 0.38%)}	_1.03s	_1.05s
_{Check Time}	_{1.55s (± 0.69%)}	_{1.53s (± 0.54%)}	_{-0.01s (- 0.90%)}	_1.52s	_1.56s
_{Emit Time}	_{0.07s (± 0.00%)}	_{0.07s (± 0.00%)}	_{0.00s ( 0.00%)}	_0.07s	_0.07s
_{Total Time}	_{5.29s (± 0.40%)}	_{5.27s (± 0.20%)}	_{-0.02s (- 0.38%)}	_5.25s	_5.30s
_{Angular - node (v12.1.0, x64)}
_{Memory used}	_{337,212k (± 0.02%)}	_{337,203k (± 0.01%)}	_{-8k (- 0.00%)}	_337,168k	_337,266k
_{Parse Time}	_{2.11s (± 0.61%)}	_{2.10s (± 0.76%)}	_{-0.00s (- 0.14%)}	_2.07s	_2.14s
_{Bind Time}	_{0.86s (± 0.65%)}	_{0.86s (± 1.12%)}	_{+0.00s (+ 0.35%)}	_0.85s	_0.89s
_{Check Time}	_{5.77s (± 0.77%)}	_{5.75s (± 0.28%)}	_{-0.02s (- 0.33%)}	_5.72s	_5.79s
_{Emit Time}	_{6.36s (± 0.61%)}	_{6.36s (± 0.56%)}	_{-0.01s (- 0.13%)}	_6.28s	_6.44s
_{Total Time}	_{15.10s (± 0.52%)}	_{15.06s (± 0.34%)}	_{-0.03s (- 0.21%)}	_14.98s	_15.20s
_{Compiler-Unions - node (v12.1.0, x64)}
_{Memory used}	_{194,131k (± 0.03%)}	_{193,920k (± 0.15%)}	_{-211k (- 0.11%)}	_193,193k	_194,352k
_{Parse Time}	_{0.83s (± 1.08%)}	_{0.84s (± 1.26%)}	_{+0.01s (+ 1.33%)}	_0.82s	_0.86s
_{Bind Time}	_{0.55s (± 1.12%)}	_{0.55s (± 1.10%)}	_{-0.01s (- 1.09%)}	_0.53s	_0.56s
_{Check Time}	_{7.66s (± 0.48%)}	_{7.55s (± 0.52%)}	_{-0.11s (- 1.40%)}	_7.48s	_7.66s
_{Emit Time}	_{2.52s (± 0.84%)}	_{2.52s (± 0.96%)}	_{+0.00s (+ 0.08%)}	_2.47s	_2.57s
_{Total Time}	_{11.55s (± 0.34%)}	_{11.45s (± 0.38%)}	_{-0.10s (- 0.88%)}	_11.36s	_11.55s
_{Monaco - node (v12.1.0, x64)}
_{Memory used}	_{326,891k (± 0.02%)}	_{326,816k (± 0.02%)}	_{-76k (- 0.02%)}	_326,714k	_326,969k
_{Parse Time}	_{1.58s (± 0.80%)}	_{1.58s (± 1.03%)}	_{+0.01s (+ 0.63%)}	_1.55s	_1.62s
_{Bind Time}	_{0.76s (± 0.99%)}	_{0.76s (± 0.45%)}	_{-0.01s (- 0.92%)}	_0.75s	_0.76s
_{Check Time}	_{5.81s (± 0.29%)}	_{5.77s (± 0.35%)}	_{-0.04s (- 0.72%)}	_5.73s	_5.81s
_{Emit Time}	_{3.34s (± 0.92%)}	_{3.29s (± 0.91%)}	_{-0.04s (- 1.32%)}	_3.24s	_3.38s
_{Total Time}	_{11.48s (± 0.31%)}	_{11.40s (± 0.32%)}	_{-0.08s (- 0.71%)}	_11.34s	_11.51s
_{TFS - node (v12.1.0, x64)}
_{Memory used}	_{289,726k (± 0.02%)}	_{289,777k (± 0.03%)}	_{+51k (+ 0.02%)}	_289,618k	_289,994k
_{Parse Time}	_{1.31s (± 0.45%)}	_{1.31s (± 0.81%)}	_{0.00s ( 0.00%)}	_1.29s	_1.34s
_{Bind Time}	_{0.77s (± 1.17%)}	_{0.73s (± 1.50%)}	_{🟩-0.04s (- 4.84%)}	_0.72s	_0.77s
_{Check Time}	_{5.34s (± 0.59%)}	_{5.34s (± 0.48%)}	_{+0.00s (+ 0.04%)}	_5.30s	_5.42s
_{Emit Time}	_{3.51s (± 1.05%)}	_{3.51s (± 1.28%)}	_{-0.00s (- 0.03%)}	_3.45s	_3.63s
_{Total Time}	_{10.92s (± 0.49%)}	_{10.89s (± 0.46%)}	_{-0.03s (- 0.29%)}	_10.80s	_10.98s
_{material-ui - node (v12.1.0, x64)}
_{Memory used}	_{448,056k (± 0.06%)}	_{448,026k (± 0.07%)}	_{-30k (- 0.01%)}	_446,881k	_448,349k
_{Parse Time}	_{1.86s (± 0.56%)}	_{1.84s (± 0.41%)}	_{-0.01s (- 0.75%)}	_1.83s	_1.86s
_{Bind Time}	_{0.68s (± 0.73%)}	_{0.68s (± 1.07%)}	_{-0.00s (- 0.44%)}	_0.67s	_0.70s
_{Check Time}	_{13.09s (± 0.95%)}	_{13.06s (± 1.01%)}	_{-0.03s (- 0.21%)}	_12.77s	_13.40s
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_{0.00s ( NaN%)}	_0.00s	_0.00s
_{Total Time}	_{15.63s (± 0.82%)}	_{15.59s (± 0.83%)}	_{-0.04s (- 0.25%)}	_15.29s	_15.91s
_{xstate - node (v12.1.0, x64)}
_{Memory used}	_{543,243k (± 0.02%)}	_{546,509k (± 1.30%)}	_{+3,266k (+ 0.60%)}	_543,100k	_575,246k
_{Parse Time}	_{2.58s (± 0.58%)}	_{2.57s (± 0.61%)}	_{-0.02s (- 0.58%)}	_2.55s	_2.62s
_{Bind Time}	_{1.03s (± 1.16%)}	_{1.04s (± 0.62%)}	_{+0.00s (+ 0.48%)}	_1.02s	_1.05s
_{Check Time}	_{1.50s (± 0.64%)}	_{1.48s (± 0.59%)}	_{-0.02s (- 1.00%)}	_1.46s	_1.50s
_{Emit Time}	_{0.07s (± 0.00%)}	_{0.07s (± 0.00%)}	_{0.00s ( 0.00%)}	_0.07s	_0.07s
_{Total Time}	_{5.19s (± 0.42%)}	_{5.16s (± 0.32%)}	_{-0.03s (- 0.58%)}	_5.13s	_5.19s
_{Angular - node (v14.15.1, x64)}
_{Memory used}	_{335,253k (± 0.01%)}	_{335,310k (± 0.01%)}	_{+57k (+ 0.02%)}	_335,270k	_335,340k
_{Parse Time}	_{2.08s (± 0.68%)}	_{2.08s (± 0.36%)}	_{+0.00s (+ 0.24%)}	_2.07s	_2.10s
_{Bind Time}	_{0.91s (± 1.02%)}	_{0.91s (± 0.66%)}	_{-0.00s (- 0.33%)}	_0.89s	_0.92s
_{Check Time}	_{5.77s (± 0.52%)}	_{5.73s (± 0.61%)}	_{-0.04s (- 0.76%)}	_5.65s	_5.80s
_{Emit Time}	_{6.47s (± 0.71%)}	_{6.40s (± 0.82%)}	_{-0.07s (- 1.11%)}	_6.33s	_6.58s
_{Total Time}	_{15.23s (± 0.49%)}	_{15.12s (± 0.51%)}	_{-0.11s (- 0.75%)}	_14.97s	_15.29s
_{Compiler-Unions - node (v14.15.1, x64)}
_{Memory used}	_{192,642k (± 0.01%)}	_{192,555k (± 0.11%)}	_{-88k (- 0.05%)}	_191,682k	_192,688k
_{Parse Time}	_{0.84s (± 0.53%)}	_{0.85s (± 0.96%)}	_{+0.01s (+ 0.95%)}	_0.84s	_0.87s
_{Bind Time}	_{0.58s (± 0.95%)}	_{0.57s (± 1.04%)}	_{-0.01s (- 1.20%)}	_0.56s	_0.59s
_{Check Time}	_{7.70s (± 0.49%)}	_{7.66s (± 0.72%)}	_{-0.04s (- 0.58%)}	_7.57s	_7.82s
_{Emit Time}	_{2.53s (± 0.77%)}	_{2.56s (± 1.36%)}	_{+0.03s (+ 1.23%)}	_2.50s	_2.66s
_{Total Time}	_{11.66s (± 0.40%)}	_{11.64s (± 0.61%)}	_{-0.02s (- 0.13%)}	_11.53s	_11.84s
_{Monaco - node (v14.15.1, x64)}
_{Memory used}	_{325,597k (± 0.01%)}	_{325,605k (± 0.00%)}	_{+8k (+ 0.00%)}	_325,580k	_325,646k
_{Parse Time}	_{1.58s (± 0.42%)}	_{1.57s (± 0.57%)}	_{-0.00s (- 0.19%)}	_1.56s	_1.59s
_{Bind Time}	_{0.79s (± 0.59%)}	_{0.80s (± 1.03%)}	_{+0.01s (+ 0.89%)}	_0.78s	_0.82s
_{Check Time}	_{5.68s (± 0.37%)}	_{5.69s (± 0.58%)}	_{+0.01s (+ 0.16%)}	_5.63s	_5.78s
_{Emit Time}	_{3.40s (± 1.04%)}	_{3.35s (± 0.54%)}	_{-0.05s (- 1.50%)}	_3.31s	_3.40s
_{Total Time}	_{11.45s (± 0.45%)}	_{11.41s (± 0.45%)}	_{-0.04s (- 0.36%)}	_11.34s	_11.57s
_{TFS - node (v14.15.1, x64)}
_{Memory used}	_{288,764k (± 0.01%)}	_{288,730k (± 0.01%)}	_{-34k (- 0.01%)}	_288,632k	_288,796k
_{Parse Time}	_{1.33s (± 1.54%)}	_{1.32s (± 1.15%)}	_{-0.00s (- 0.38%)}	_1.30s	_1.36s
_{Bind Time}	_{0.76s (± 0.96%)}	_{0.75s (± 1.06%)}	_{-0.01s (- 0.79%)}	_0.73s	_0.77s
_{Check Time}	_{5.33s (± 0.25%)}	_{5.32s (± 0.83%)}	_{-0.00s (- 0.08%)}	_5.25s	_5.41s
_{Emit Time}	_{3.64s (± 1.99%)}	_{3.60s (± 2.39%)}	_{-0.03s (- 0.91%)}	_3.41s	_3.73s
_{Total Time}	_{11.05s (± 0.65%)}	_{11.00s (± 1.08%)}	_{-0.05s (- 0.48%)}	_10.76s	_11.19s
_{material-ui - node (v14.15.1, x64)}
_{Memory used}	_{446,374k (± 0.00%)}	_{446,384k (± 0.00%)}	_{+10k (+ 0.00%)}	_446,350k	_446,428k
_{Parse Time}	_{1.90s (± 0.56%)}	_{1.89s (± 0.70%)}	_{-0.01s (- 0.58%)}	_1.87s	_1.93s
_{Bind Time}	_{0.73s (± 1.64%)}	_{0.72s (± 1.38%)}	_{-0.01s (- 1.50%)}	_0.70s	_0.74s
_{Check Time}	_{13.22s (± 0.40%)}	_{13.18s (± 0.76%)}	_{-0.04s (- 0.32%)}	_12.92s	_13.37s
_{Emit Time}	_{0.00s (± 0.00%)}	_{0.00s (± 0.00%)}	_{0.00s ( NaN%)}	_0.00s	_0.00s
_{Total Time}	_{15.86s (± 0.31%)}	_{15.79s (± 0.63%)}	_{-0.06s (- 0.40%)}	_15.53s	_15.98s
_{xstate - node (v14.15.1, x64)}
_{Memory used}	_{540,944k (± 0.00%)}	_{540,997k (± 0.01%)}	_{+53k (+ 0.01%)}	_540,931k	_541,062k
_{Parse Time}	_{2.61s (± 0.36%)}	_{2.63s (± 0.70%)}	_{+0.01s (+ 0.50%)}	_2.59s	_2.69s
_{Bind Time}	_{1.19s (± 1.31%)}	_{1.17s (± 1.30%)}	_{-0.02s (- 1.68%)}	_1.15s	_1.22s
_{Check Time}	_{1.54s (± 0.38%)}	_{1.53s (± 0.62%)}	_{-0.01s (- 0.58%)}	_1.52s	_1.55s
_{Emit Time}	_{0.07s (± 0.00%)}	_{0.07s (± 4.66%)}	_{+0.00s (+ 4.29%)}	_0.07s	_0.08s
_{Total Time}	_{5.42s (± 0.34%)}	_{5.40s (± 0.53%)}	_{-0.01s (- 0.20%)}	_5.36s	_5.46s

System

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

Hosts

node (v10.16.3, x64)
node (v12.1.0, x64)
node (v14.15.1, x64)

Scenarios

Angular - node (v10.16.3, x64)
Angular - node (v12.1.0, x64)
Angular - node (v14.15.1, x64)
Compiler-Unions - node (v10.16.3, x64)
Compiler-Unions - node (v12.1.0, x64)
Compiler-Unions - node (v14.15.1, x64)
Monaco - node (v10.16.3, x64)
Monaco - node (v12.1.0, x64)
Monaco - node (v14.15.1, x64)
TFS - node (v10.16.3, x64)
TFS - node (v12.1.0, x64)
TFS - node (v14.15.1, x64)
material-ui - node (v10.16.3, x64)
material-ui - node (v12.1.0, x64)
material-ui - node (v14.15.1, x64)
xstate - node (v10.16.3, x64)
xstate - node (v12.1.0, x64)
xstate - node (v14.15.1, x64)

_Benchmark	_Name	_Iterations
_Current	₄₉₅₃₁	₁₀
_Baseline	_main	₁₀

Developer Information:

Download Benchmark

jakebailey added 2 commits June 13, 2022 16:36

Rewrite tests to check both TS/JS, and arrow/no arrow emit

4aaf1db

Fix arrow functions in conditional expressions

7ac56c3

typescript-bot assigned jakebailey Jun 13, 2022

typescript-bot added the Author: Team label Jun 13, 2022

typescript-bot assigned ahejlsberg Jun 13, 2022

typescript-bot added the For Milestone Bug PRs that fix a bug with a specific milestone label Jun 13, 2022

jakebailey changed the title ~~Rewrite tests to check both TS/JS, and arrow/no arrow emit~~ Fix arrow expressions in conditional expressions, take N+1 Jun 14, 2022

This comment was marked as outdated.

Sign in to view

This comment was marked as resolved.

Sign in to view

jakebailey requested review from amcasey and sandersn June 17, 2022 17:09

DanielRosenwasser mentioned this pull request Jun 17, 2022

Design Meeting Notes, 6/17/2022 #49595

Closed

DanielRosenwasser reviewed Jun 17, 2022

View reviewed changes

src/compiler/parser.ts Outdated Show resolved Hide resolved

DanielRosenwasser reviewed Jun 17, 2022

View reviewed changes

src/compiler/parser.ts Outdated Show resolved Hide resolved

jakebailey added 3 commits June 17, 2022 15:29

Merge branch 'main' into arrow-function-cond-expression

2b01a96

Flip flag to be allowReturnTypeInArrowFunction

22c476c

Inherit allowReturnTypeInArrowFunction in parseConditionalExpressionRest

8675dc1

DanielRosenwasser reviewed Jun 17, 2022

View reviewed changes

Add case from daniel

e76fe4c

DanielRosenwasser reviewed Jun 17, 2022

View reviewed changes

DanielRosenwasser approved these changes Jun 17, 2022

View reviewed changes

jakebailey merged commit d7e58c8 into microsoft:main Jun 17, 2022

jakebailey deleted the arrow-function-cond-expression branch June 17, 2022 23:34

IWANABETHATGUY mentioned this pull request Jul 8, 2022

Improve Conformance for Arrow Functions in Conditional Expressions rome/tools#2844

Closed



		==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/fileJs.js (7 errors) ====
		a() ? (b: number, c?: string): void => d() : e; // Not legal JS; "Unexpected token ':'" at first colon

Fix arrow expressions in conditional expressions, take N+1 #49531

Fix arrow expressions in conditional expressions, take N+1 #49531

Conversation

jakebailey commented Jun 13, 2022

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

weswigham commented Jun 14, 2022

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022

typescript-bot commented Jun 14, 2022

typescript-bot commented Jun 14, 2022 • edited Loading

typescript-bot commented Jun 14, 2022

jakebailey commented Jun 17, 2022

typescript-bot commented Jun 17, 2022 • edited Loading

DanielRosenwasser commented Jun 17, 2022

typescript-bot commented Jun 17, 2022

typescript-bot commented Jun 17, 2022 • edited Loading

typescript-bot commented Jun 17, 2022

typescript-bot commented Jun 17, 2022

typescript-bot commented Jun 17, 2022

typescript-bot commented Jun 17, 2022

DanielRosenwasser Jun 17, 2022 • edited Loading

Choose a reason for hiding this comment

jakebailey Jun 17, 2022

Choose a reason for hiding this comment

jakebailey Jun 17, 2022

Choose a reason for hiding this comment

DanielRosenwasser Jun 17, 2022

Choose a reason for hiding this comment

jakebailey Jun 17, 2022

Choose a reason for hiding this comment

typescript-bot commented Jun 17, 2022

DanielRosenwasser Jun 17, 2022 • edited Loading

Choose a reason for hiding this comment

jakebailey Jun 17, 2022 • edited Loading

Choose a reason for hiding this comment

typescript-bot commented Jun 17, 2022 • edited Loading

jakebailey commented Jun 17, 2022

typescript-bot commented Jun 17, 2022

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 14, 2022 •

edited

Loading

typescript-bot commented Jun 17, 2022 •

edited

Loading

typescript-bot commented Jun 17, 2022 •

edited

Loading

DanielRosenwasser Jun 17, 2022 •

edited

Loading

DanielRosenwasser Jun 17, 2022 •

edited

Loading

jakebailey Jun 17, 2022 •

edited

Loading

typescript-bot commented Jun 17, 2022 •

edited

Loading