fix(59011): TypeScript generates invalid types if @import tags are spread over multiple lines #59026

a-tarasyuk · 2024-06-25T21:26:42Z

…sterisks from the identifier range

DanielRosenwasser · 2024-06-26T17:40:20Z

typescript-bot · 2024-06-26T17:40:23Z

Starting jobs; this comment will be updated as builds start and complete.

Command	Status	Results
`perf test this faster`	✅ Started	👀 Results

DanielRosenwasser · 2024-06-26T17:46:18Z

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

typescript-bot · 2024-06-26T17:46:21Z

Starting jobs; this comment will be updated as builds start and complete.

Command	Status	Results
`cherry-pick this to release-5.5`	✅ Started	✅ Results

typescript-bot · 2024-06-26T17:48:45Z

Hey, @DanielRosenwasser! I've created #59039 for you.

src/compiler/parser.ts

typescript-bot · 2024-06-26T18:16:01Z

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

Here they are:

tsc

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Compiler-Unions - node (v18.15.0, x64)}
_Errors	₃₀	₃₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_62,153	_62,153	_~	_~	_~	_{p=1.000 n=6}
_Types	_50,242	_50,242	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{192,843k (± 0.75%)}	_{192,665k (± 0.59%)}	_~	_192,116k	_194,973k	_{p=0.810 n=6}
_{Parse Time}	_{1.31s (± 0.94%)}	_{1.30s (± 0.90%)}	_~	_1.29s	_1.32s	_{p=0.677 n=6}
_{Bind Time}	_0.71s	_0.71s	_~	_~	_~	_{p=1.000 n=6}
_{Check Time}	_{9.42s (± 0.30%)}	_{9.45s (± 0.34%)}	_~	_9.39s	_9.48s	_{p=0.143 n=6}
_{Emit Time}	_{2.74s (± 0.58%)}	_{2.75s (± 0.96%)}	_~	_2.72s	_2.79s	_{p=0.683 n=6}
_{Total Time}	_{14.17s (± 0.25%)}	_{14.21s (± 0.22%)}	_~	_14.16s	_14.25s	_{p=0.196 n=6}
_{angular-1 - node (v18.15.0, x64)}
_Errors	₅	₅	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_944,114	_944,114	_~	_~	_~	_{p=1.000 n=6}
_Types	_407,050	_407,050	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{1,218,346k (± 0.00%)}	_{1,218,369k (± 0.00%)}	_~	_1,218,323k	_1,218,420k	_{p=0.471 n=6}
_{Parse Time}	_{6.65s (± 0.78%)}	_{6.68s (± 1.01%)}	_~	_6.58s	_6.78s	_{p=0.228 n=6}
_{Bind Time}	_{1.86s (± 0.68%)}	_{1.86s (± 0.56%)}	_~	_1.84s	_1.87s	_{p=0.456 n=6}
_{Check Time}	_{30.61s (± 0.54%)}	_{30.57s (± 0.31%)}	_~	_30.41s	_30.70s	_{p=0.748 n=6}
_{Emit Time}	_{13.56s (± 0.39%)}	_{13.57s (± 0.42%)}	_~	_13.48s	_13.65s	_{p=0.872 n=6}
_{Total Time}	_{52.69s (± 0.30%)}	_{52.68s (± 0.22%)}	_~	_52.51s	_52.82s	_{p=1.000 n=6}
_{mui-docs - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_2,132,286	_2,132,286	_~	_~	_~	_{p=1.000 n=6}
_Types	_926,125	_926,125	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{2,114,502k (± 0.00%)}	_{2,114,589k (± 0.01%)}	_~	_2,114,441k	_2,114,826k	_{p=0.230 n=6}
_{Parse Time}	_{6.64s (± 0.20%)}	_{6.67s (± 0.19%)}	_{+0.03s (+ 0.43%)}	_6.66s	_6.69s	_{p=0.009 n=6}
_{Bind Time}	_{2.33s (± 0.27%)}	_{2.32s (± 0.90%)}	_~	_2.29s	_2.34s	_{p=0.615 n=6}
_{Check Time}	_{70.94s (± 0.47%)}	_{70.73s (± 0.38%)}	_~	_70.42s	_71.06s	_{p=0.471 n=6}
_{Emit Time}	_{0.14s (± 6.19%)}	_{0.14s (± 3.77%)}	_~	_0.13s	_0.14s	_{p=0.533 n=6}
_{Total Time}	_{80.05s (± 0.40%)}	_{79.85s (± 0.35%)}	_~	_79.53s	_80.19s	_{p=0.575 n=6}
_{self-build-src - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,231,463	_1,231,478	_{+15 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_Types	_261,178	_261,180	_{+2 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_{Memory used}	_{2,347,325k (± 0.05%)}	_{2,346,961k (± 0.03%)}	_~	_2,346,396k	_2,347,866k	_{p=0.575 n=6}
_{Parse Time}	_{5.04s (± 0.99%)}	_{5.05s (± 0.58%)}	_~	_5.01s	_5.09s	_{p=0.575 n=6}
_{Bind Time}	_{1.92s (± 0.77%)}	_{1.93s (± 0.84%)}	_~	_1.91s	_1.95s	_{p=0.144 n=6}
_{Check Time}	_{34.14s (± 0.28%)}	_{34.18s (± 0.32%)}	_~	_34.06s	_34.37s	_{p=0.575 n=6}
_{Emit Time}	_{2.73s (± 3.16%)}	_{2.81s (± 4.38%)}	_~	_2.65s	_3.03s	_{p=0.377 n=6}
_{Total Time}	_{43.85s (± 0.33%)}	_{43.99s (± 0.27%)}	_~	_43.85s	_44.19s	_{p=0.128 n=6}
_{self-build-src-public-api - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,231,463	_1,231,478	_{+15 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_Types	_261,178	_261,180	_{+2 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_{Memory used}	_{2,424,574k (± 0.03%)}	_{2,425,120k (± 0.02%)}	_~	_2,424,561k	_2,425,852k	_{p=0.093 n=6}
_{Parse Time}	_{7.73s (± 0.81%)}	_{7.73s (± 1.01%)}	_~	_7.63s	_7.85s	_{p=0.810 n=6}
_{Bind Time}	_{2.53s (± 0.90%)}	_{2.52s (± 0.54%)}	_~	_2.49s	_2.53s	_{p=0.286 n=6}
_{Check Time}	_{50.06s (± 0.27%)}	_{50.15s (± 0.19%)}	_~	_50.00s	_50.25s	_{p=0.199 n=6}
_{Emit Time}	_{3.96s (± 1.88%)}	_{3.88s (± 1.88%)}	_~	_3.81s	_4.02s	_{p=0.109 n=6}
_{Total Time}	_{64.28s (± 0.33%)}	_{64.29s (± 0.26%)}	_~	_64.10s	_64.53s	_{p=0.936 n=6}
_{self-compiler - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_258,577	_258,581	_{+4 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_Types	_104,827	_104,829	_{+2 (+ 0.00%)}	_~	_~	_{p=0.001 n=6}
_{Memory used}	_{428,200k (± 0.00%)}	_{428,193k (± 0.01%)}	_~	_428,149k	_428,231k	_{p=0.810 n=6}
_{Parse Time}	_{3.31s (± 0.30%)}	_{3.33s (± 0.86%)}	_~	_3.29s	_3.37s	_{p=0.303 n=6}
_{Bind Time}	_{1.32s (± 1.94%)}	_{1.30s (± 0.80%)}	_~	_1.28s	_1.31s	_{p=0.167 n=6}
_{Check Time}	_{17.79s (± 0.28%)}	_{17.78s (± 0.39%)}	_~	_17.70s	_17.85s	_{p=0.746 n=6}
_{Emit Time}	_{1.37s (± 1.27%)}	_{1.37s (± 1.51%)}	_~	_1.33s	_1.39s	_{p=0.934 n=6}
_{Total Time}	_{23.80s (± 0.32%)}	_{23.77s (± 0.39%)}	_~	_23.63s	_23.86s	_{p=0.629 n=6}
_{ts-pre-modules - node (v18.15.0, x64)}
_Errors	₃₅	₃₅	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_224,565	_224,565	_~	_~	_~	_{p=1.000 n=6}
_Types	_93,734	_93,734	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{369,507k (± 0.04%)}	_{369,482k (± 0.02%)}	_~	_369,355k	_369,577k	_{p=0.936 n=6}
_{Parse Time}	_{2.77s (± 1.20%)}	_{2.78s (± 0.87%)}	_~	_2.76s	_2.82s	_{p=0.683 n=6}
_{Bind Time}	_{1.60s (± 1.40%)}	_{1.58s (± 0.48%)}	_~	_1.57s	_1.59s	_{p=0.161 n=6}
_{Check Time}	_{15.45s (± 0.16%)}	_{15.49s (± 0.48%)}	_~	_15.37s	_15.58s	_{p=0.170 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{19.82s (± 0.24%)}	_{19.86s (± 0.27%)}	_~	_19.78s	_19.92s	_{p=0.470 n=6}
_{vscode - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_2,878,484	_2,878,484	_~	_~	_~	_{p=1.000 n=6}
_Types	_975,142	_975,142	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{3,041,926k (± 0.00%)}	_{3,041,943k (± 0.00%)}	_~	_3,041,917k	_3,041,980k	_{p=0.630 n=6}
_{Parse Time}	_{13.54s (± 0.15%)}	_{13.51s (± 0.42%)}	_~	_13.42s	_13.59s	_{p=0.327 n=6}
_{Bind Time}	_{4.19s (± 0.47%)}	_{4.19s (± 0.41%)}	_~	_4.17s	_4.21s	_{p=0.806 n=6}
_{Check Time}	_{73.51s (± 0.17%)}	_{73.31s (± 0.43%)}	_~	_73.02s	_73.90s	_{p=0.066 n=6}
_{Emit Time}	_{23.99s (± 0.77%)}	_{23.92s (± 0.34%)}	_~	_23.84s	_24.02s	_{p=0.748 n=6}
_{Total Time}	_{115.22s (± 0.24%)}	_{114.93s (± 0.34%)}	_{-0.29s (- 0.25%)}	_114.65s	_115.71s	_{p=0.045 n=6}
_{webpack - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_267,117	_267,117	_~	_~	_~	_{p=1.000 n=6}
_Types	_108,775	_108,775	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{411,613k (± 0.02%)}	_{411,575k (± 0.02%)}	_~	_411,504k	_411,700k	_{p=0.378 n=6}
_{Parse Time}	_{4.71s (± 0.35%)}	_{4.73s (± 0.43%)}	_~	_4.70s	_4.76s	_{p=0.089 n=6}
_{Bind Time}	_{2.07s (± 0.95%)}	_{2.07s (± 1.45%)}	_~	_2.02s	_2.10s	_{p=0.805 n=6}
_{Check Time}	_{20.78s (± 0.33%)}	_{20.81s (± 0.38%)}	_~	_20.72s	_20.93s	_{p=0.688 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{27.56s (± 0.32%)}	_{27.62s (± 0.30%)}	_~	_27.51s	_27.72s	_{p=0.378 n=6}
_{xstate-main - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_525,251	_525,251	_~	_~	_~	_{p=1.000 n=6}
_Types	_178,574	_178,574	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{462,767k (± 0.07%)}	_{462,993k (± 0.06%)}	_~	_462,466k	_463,311k	_{p=0.128 n=6}
_{Parse Time}	_{3.17s (± 0.78%)}	_{3.16s (± 0.52%)}	_~	_3.14s	_3.19s	_{p=0.514 n=6}
_{Bind Time}	_{1.16s (± 0.44%)}	_{1.17s (± 0.70%)}	_~	_1.16s	_1.18s	_{p=0.523 n=6}
_{Check Time}	_{17.90s (± 0.43%)}	_{17.91s (± 0.38%)}	_~	_17.83s	_18.00s	_{p=1.000 n=6}
_{Emit Time}	_{0.00s (±244.70%)}	_0.00s	_~	_~	_~	_{p=0.405 n=6}
_{Total Time}	_{22.24s (± 0.35%)}	_{22.24s (± 0.30%)}	_~	_22.16s	_22.33s	_{p=0.936 n=6}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

Compiler-Unions - node (v18.15.0, x64)
angular-1 - node (v18.15.0, x64)
mui-docs - node (v18.15.0, x64)
self-build-src - node (v18.15.0, x64)
self-build-src-public-api - node (v18.15.0, x64)
self-compiler - node (v18.15.0, x64)
ts-pre-modules - node (v18.15.0, x64)
vscode - node (v18.15.0, x64)
webpack - node (v18.15.0, x64)
xstate-main - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Developer Information:

Download Benchmarks

tests/cases/conformance/jsdoc/importTag18.ts

tests/baselines/reference/importTag7.types

src/compiler/scanner.ts

DanielRosenwasser · 2024-06-26T23:06:14Z

I think we will schedule this for a follow-up patch. I want to get 5.5.3 out today.

sandersn · 2024-06-27T15:30:55Z

I think this is good enough to merge once @a-tarasyuk has a chance to confirm that the scanner changes are infeasible (or, if they're feasible, to make the changes). Can you check whether adjusting fullStartPos after * does actually cause * appears after names?

a-tarasyuk · 2024-07-01T21:41:16Z

Modifying fullStartPos in the scanner might lead to a * being added after the name or \n* being included in the node range.

/*HIGHLIGHTS*/<|[|{| kind: "reference" |}foo|]: string;
//  *   |>

The first issue can be fixed by adjusting fullStartPos for identifiers. However, the second case won't stop at the ; token because \n* is considered a valid leading asterisk within the node range...

sandersn

Given the complexity of a better fix, let's take this with the idea of improving the scanner's ability to skip * in the future.

(Based on discussion between me and @jakebailey .)

@a-tarasyuk would you mind bringing this branch up to date with main?

…ix/59011

fix(59011): use token start instead of full start to remove leading a…

937f0cb

…sterisks from the identifier range

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

DanielRosenwasser approved these changes Jun 26, 2024

View reviewed changes

typescript-bot mentioned this pull request Jun 26, 2024

🤖 Pick PR #59026 (fix(59011): TypeScript generates in...) into release-5.5 #59039

Open

jakebailey reviewed Jun 26, 2024

View reviewed changes

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

sandersn requested changes Jun 26, 2024

View reviewed changes

tests/cases/conformance/jsdoc/importTag18.ts Show resolved Hide resolved

tests/baselines/reference/importTag7.types Show resolved Hide resolved

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

add more tests

fc9ec9e

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 Jun 26, 2024

add tests

f9e9a44

use token flag to handle preceding jsdoc leading asterisks

85f588e

connorjclark mentioned this pull request Jul 1, 2024

deps: upgrade typescript to 5.5.3 GoogleChrome/lighthouse#16091

Merged

sandersn approved these changes Jul 9, 2024

View reviewed changes

a-tarasyuk added 2 commits July 10, 2024 01:03

Merge branch 'main' of https://github.com/microsoft/TypeScript into f…

231f39c

…ix/59011

Merge branch 'main' of https://github.com/microsoft/TypeScript into f…

d3c50a2

…ix/59011

sandersn merged commit e450c46 into microsoft:main Jul 10, 2024
29 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(59011): TypeScript generates invalid types if @import tags are spread over multiple lines #59026

fix(59011): TypeScript generates invalid types if @import tags are spread over multiple lines #59026

a-tarasyuk commented Jun 25, 2024

DanielRosenwasser commented Jun 26, 2024

typescript-bot commented Jun 26, 2024 •

edited

Loading

DanielRosenwasser commented Jun 26, 2024

typescript-bot commented Jun 26, 2024 •

edited

Loading

typescript-bot commented Jun 26, 2024

typescript-bot commented Jun 26, 2024

tsc

DanielRosenwasser commented Jun 26, 2024

sandersn commented Jun 27, 2024

a-tarasyuk commented Jul 1, 2024

sandersn left a comment

fix(59011): TypeScript generates invalid types if @import tags are spread over multiple lines #59026

fix(59011): TypeScript generates invalid types if @import tags are spread over multiple lines #59026

Conversation

a-tarasyuk commented Jun 25, 2024

DanielRosenwasser commented Jun 26, 2024

typescript-bot commented Jun 26, 2024 • edited Loading

DanielRosenwasser commented Jun 26, 2024

typescript-bot commented Jun 26, 2024 • edited Loading

typescript-bot commented Jun 26, 2024

typescript-bot commented Jun 26, 2024

tsc

DanielRosenwasser commented Jun 26, 2024

sandersn commented Jun 27, 2024

a-tarasyuk commented Jul 1, 2024

sandersn left a comment

Choose a reason for hiding this comment

typescript-bot commented Jun 26, 2024 •

edited

Loading

typescript-bot commented Jun 26, 2024 •

edited

Loading