Skip to content

Commit 96d44b8

Browse files
authored
chore: improve update-fixtures script (#429)
1 parent ff242c4 commit 96d44b8

21 files changed

+134
-83
lines changed

.github/workflows/NodeCI.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@v4
5454
- uses: pnpm/action-setup@v2
55-
- name: Use Node.js ${{ matrix.node-version }}
55+
- name: Use Node.js
5656
uses: actions/setup-node@v4
57-
with:
58-
node-version: ${{ matrix.node-version }}
5957
- name: Install Svelte v4
6058
run: |+
6159
pnpm install -D svelte@4
@@ -153,17 +151,12 @@ jobs:
153151
- uses: actions/setup-node@v4
154152
with:
155153
node-version: 18
156-
- name: Install Svelte v4
157-
run: |+
158-
pnpm install -D svelte@4
159-
rm -rf node_modules
160154
- name: Install Packages
161155
run: pnpm install
162156
- name: Update fixtures
163157
run: pnpm run update-fixtures
164158
- name: Check changes
165159
run: |
166-
git checkout package.json && \
167160
git add --all && \
168161
git diff-index --cached HEAD --stat --exit-code
169162
test-and-coverage:

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"release": "changeset publish",
4242
"test": "pnpm run mocha \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
4343
"ts": "node -r esbuild-register",
44-
"update-fixtures": "pnpm run ts ./tools/update-fixtures.ts",
44+
"update-fixtures": "pnpm i -D svelte@4 && pnpm run run-update-fixtures && git checkout package.json && pnpm i && pnpm run run-update-fixtures",
45+
"run-update-fixtures": "pnpm run ts ./tools/update-fixtures.ts",
4546
"version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
4647
},
4748
"peerDependencies": {

tests/fixtures/parser/ast/$$slots-scope-output-svelte5.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
"identifier": {
1010
"type": "Identifier",
1111
"name": "$$slots",
12-
"range": [5, 12],
12+
"range": [
13+
5,
14+
12
15+
],
1316
"loc": {
1417
"start": {
1518
"line": 1,
@@ -64,4 +67,4 @@
6467
"references": []
6568
}
6669
]
67-
}
70+
}

tests/fixtures/parser/ast/docs/template-syntax/02-attributes-and-props/10-scope-output-svelte5.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
"identifier": {
1616
"type": "Identifier",
1717
"name": "$$props",
18-
"range": [12, 19],
18+
"range": [
19+
12,
20+
19
21+
],
1922
"loc": {
2023
"start": {
2124
"line": 1,
@@ -64,4 +67,4 @@
6467
"references": []
6568
}
6669
]
67-
}
70+
}

tests/fixtures/parser/ast/docs/template-syntax/02-attributes-and-props/11-scope-output-svelte5.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
"identifier": {
2222
"type": "Identifier",
2323
"name": "$$restProps",
24-
"range": [11, 22],
24+
"range": [
25+
11,
26+
22
27+
],
2528
"loc": {
2629
"start": {
2730
"line": 1,
@@ -64,4 +67,4 @@
6467
"references": []
6568
}
6669
]
67-
}
70+
}

tests/fixtures/parser/ast/docs/template-syntax/13-slot/02-$$slots/01-scope-output-svelte5.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
"identifier": {
1010
"type": "Identifier",
1111
"name": "$$slots",
12-
"range": [61, 68],
12+
"range": [
13+
61,
14+
68
15+
],
1316
"loc": {
1417
"start": {
1518
"line": 4,
@@ -64,4 +67,4 @@
6467
"references": []
6568
}
6669
]
67-
}
70+
}

tests/fixtures/parser/ast/svelte5/ts-$effect01-prefer-const-result.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"line": 3,
66
"column": 7
77
}
8-
]
8+
]

tests/fixtures/parser/ast/svelte5/ts-$effect01-scope-output.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959
"type": "Identifier",
6060
"name": "$derived",
6161
"range": [
62-
62,
63-
70
62+
60,
63+
68
6464
],
6565
"loc": {
6666
"start": {
6767
"line": 3,
68-
"column": 18
68+
"column": 16
6969
},
7070
"end": {
7171
"line": 3,
72-
"column": 26
72+
"column": 24
7373
}
7474
}
7575
},
@@ -89,8 +89,8 @@
8989
"type": "Identifier",
9090
"name": "$effect",
9191
"range": [
92-
86,
93-
93
92+
84,
93+
91
9494
],
9595
"loc": {
9696
"start": {

tests/fixtures/parser/ast/svelte5/ts-$effect01-type-output.svelte

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
let count = $state(0); // count: number, $state(0): 0
33
let doubled = $derived(count * 2); // doubled: number, $derived(count * 2): number
44
5-
$effect(() => {
6-
// $effect(() => { // runs when the component is mounted, and again // whenever `count` or `doubled` change, // after the DOM has been updated console.log({ count, doubled }); return () => { // if a callback is provided, it will run // a) immediately before the effect re-runs // b) when the component is destroyed console.log("cleanup"); }; }): void
5+
$effect(() => { // $effect(() => { // runs when the component is mounted, and again // whenever `count` or `doubled` change, // after the DOM has been updated console.log({ count, doubled }); return () => { // if a callback is provided, it will run // a) immediately before the effect re-runs // b) when the component is destroyed console.log("cleanup"); }; }): void
76
// runs when the component is mounted, and again
87
// whenever `count` or `doubled` change,
98
// after the DOM has been updated
@@ -18,11 +17,8 @@
1817
});
1918
</script>
2019

21-
<button on:click="{() => count++}">
22-
<!-- count: number -->
23-
{doubled}
24-
<!-- doubled: number -->
20+
<button on:click="{() => count++}"> <!-- count: number -->
21+
{doubled} <!-- doubled: number -->
2522
</button>
2623

27-
<p>{count} doubled is {doubled}</p>
28-
<!-- count: number, doubled: number -->
24+
<p>{count} doubled is {doubled}</p> <!-- count: number, doubled: number -->

tests/fixtures/parser/ast/svelte5/ts-$effectpre01-type-output.svelte

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
let count = $state(0); // count: number, $state(0): 0
33
const doubled = $derived(count * 2); // doubled: number, $derived(count * 2): number
44
5-
$effect(() => {
6-
// $effect(() => { // runs when the component is mounted, and again // whenever `count` or `doubled` change, // after the DOM has been updated console.log({ count, doubled }); return () => { // if a callback is provided, it will run // a) immediately before the effect re-runs // b) when the component is destroyed console.log("cleanup"); }; }): void
5+
$effect(() => { // $effect(() => { // runs when the component is mounted, and again // whenever `count` or `doubled` change, // after the DOM has been updated console.log({ count, doubled }); return () => { // if a callback is provided, it will run // a) immediately before the effect re-runs // b) when the component is destroyed console.log("cleanup"); }; }): void
76
// runs when the component is mounted, and again
87
// whenever `count` or `doubled` change,
98
// after the DOM has been updated
@@ -18,11 +17,8 @@
1817
});
1918
</script>
2019

21-
<button on:click="{() => count++}">
22-
<!-- count: number -->
23-
{doubled}
24-
<!-- doubled: number -->
20+
<button on:click="{() => count++}"> <!-- count: number -->
21+
{doubled} <!-- doubled: number -->
2522
</button>
2623

27-
<p>{count} doubled is {doubled}</p>
28-
<!-- count: number, doubled: number -->
24+
<p>{count} doubled is {doubled}</p> <!-- count: number, doubled: number -->

tests/fixtures/parser/ast/svelte5/ts-$props01-prefer-const-result.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
"line": 8,
2424
"column": 21
2525
}
26-
]
26+
]
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
2-
interface MyProps {
3-
// MyProps: MyProps
2+
interface MyProps { // MyProps: MyProps
43
a: number; // a: number
54
b: string; // b: string
65
c: boolean; // c: boolean
@@ -9,11 +8,7 @@
98
let { a, b, c, ...everythingElse } = $props<MyProps>(); // a: number, a: number, b: string, b: string, c: boolean, c: boolean, everythingElse: { d: number; }, $props<MyProps>(): MyProps
109
</script>
1110

12-
{a}
13-
<!-- a: number -->
14-
{b}
15-
<!-- b: Promise<{ x: number; }> -->
16-
{c}
17-
<!-- c: Promise<{ x: number; }> -->
18-
{everythingElse}
19-
<!-- everythingElse: { d: number; } -->
11+
{a} <!-- a: number -->
12+
{b} <!-- b: Promise<{ x: number; }> -->
13+
{c} <!-- c: Promise<{ x: number; }> -->
14+
{everythingElse} <!-- everythingElse: { d: number; } -->

tests/fixtures/parser/ast/svelte5/ts-$state01-scope-output.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@
7979
"references": []
8080
},
8181
{
82-
"name": "$props",
82+
"name": "$effect",
8383
"identifiers": [],
8484
"defs": [],
8585
"references": []
8686
},
8787
{
88-
"name": "$effect",
88+
"name": "$props",
8989
"identifiers": [],
9090
"defs": [],
9191
"references": []

tests/fixtures/parser/ast/ts-$$props01-scope-output-svelte5.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
"references": []
8080
},
8181
{
82-
"name": "$props",
82+
"name": "$effect",
8383
"identifiers": [],
8484
"defs": [],
8585
"references": []
8686
},
8787
{
88-
"name": "$effect",
88+
"name": "$props",
8989
"identifiers": [],
9090
"defs": [],
9191
"references": []
9292
}
9393
]
94-
}
94+
}

tests/fixtures/parser/ast/ts-$$slots01-scope-output-svelte5.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@
5555
"references": []
5656
},
5757
{
58-
"name": "$props",
58+
"name": "$effect",
5959
"identifiers": [],
6060
"defs": [],
6161
"references": []
6262
},
6363
{
64-
"name": "$effect",
64+
"name": "$props",
6565
"identifiers": [],
6666
"defs": [],
6767
"references": []
6868
}
6969
]
70-
}
70+
}

tests/fixtures/parser/ast/ts-$$slots02-no-slot-scope-output-svelte5.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@
5555
"references": []
5656
},
5757
{
58-
"name": "$props",
58+
"name": "$effect",
5959
"identifiers": [],
6060
"defs": [],
6161
"references": []
6262
},
6363
{
64-
"name": "$effect",
64+
"name": "$props",
6565
"identifiers": [],
6666
"defs": [],
6767
"references": []
6868
}
6969
]
70-
}
70+
}

tests/fixtures/parser/ast/ts-$$slots03-named-scope-output-svelte5.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@
5555
"references": []
5656
},
5757
{
58-
"name": "$props",
58+
"name": "$effect",
5959
"identifiers": [],
6060
"defs": [],
6161
"references": []
6262
},
6363
{
64-
"name": "$effect",
64+
"name": "$props",
6565
"identifiers": [],
6666
"defs": [],
6767
"references": []
6868
}
6969
]
70-
}
70+
}

tests/fixtures/parser/ast/ts-$$slots04-named-scope-output-svelte5.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@
5555
"references": []
5656
},
5757
{
58-
"name": "$props",
58+
"name": "$effect",
5959
"identifiers": [],
6060
"defs": [],
6161
"references": []
6262
},
6363
{
64-
"name": "$effect",
64+
"name": "$props",
6565
"identifiers": [],
6666
"defs": [],
6767
"references": []
6868
}
6969
]
70-
}
70+
}

tests/fixtures/parser/ast/tutorial/optional-slots03-scope-output-svelte5.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
"identifier": {
1010
"type": "Identifier",
1111
"name": "$$slots",
12-
"range": [758, 765],
12+
"range": [
13+
758,
14+
765
15+
],
1316
"loc": {
1417
"start": {
1518
"line": 53,
@@ -29,7 +32,10 @@
2932
"identifier": {
3033
"type": "Identifier",
3134
"name": "$$slots",
32-
"range": [872, 879],
35+
"range": [
36+
872,
37+
879
38+
],
3339
"loc": {
3440
"start": {
3541
"line": 58,
@@ -84,4 +90,4 @@
8490
"references": []
8591
}
8692
]
87-
}
93+
}

0 commit comments

Comments
 (0)