chore: improve update-fixtures script

.github/workflows/NodeCI.yml

@@ -52,10 +52,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v2
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js
         uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
       - name: Install Svelte v4
         run: |+
           pnpm install -D svelte@4
@@ -153,17 +151,12 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Install Svelte v4
-        run: |+
-          pnpm install -D svelte@4
-          rm -rf node_modules
       - name: Install Packages
         run: pnpm install
       - name: Update fixtures
         run: pnpm run update-fixtures
       - name: Check changes
         run: |
-          git checkout package.json && \
           git add --all && \
           git diff-index --cached HEAD --stat --exit-code
   test-and-coverage:

package.json

@@ -41,7 +41,8 @@
     "release": "changeset publish",
     "test": "pnpm run mocha \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
     "ts": "node -r esbuild-register",
-    "update-fixtures": "pnpm run ts ./tools/update-fixtures.ts",
+    "update-fixtures": "pnpm i -D svelte@4 && pnpm run run-update-fixtures && git checkout package.json && pnpm i && pnpm run run-update-fixtures",
+    "run-update-fixtures": "pnpm run ts ./tools/update-fixtures.ts",
     "version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
   },
   "peerDependencies": {

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

@@ -9,7 +9,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$slots",
-            "range": [5, 12],
+            "range": [
+              5,
+              12
+            ],
             "loc": {
               "start": {
                 "line": 1,
@@ -64,4 +67,4 @@
       "references": []
     }
   ]
-}
+}

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

@@ -15,7 +15,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$props",
-            "range": [12, 19],
+            "range": [
+              12,
+              19
+            ],
             "loc": {
               "start": {
                 "line": 1,
@@ -64,4 +67,4 @@
       "references": []
     }
   ]
-}
+}

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

@@ -21,7 +21,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$restProps",
-            "range": [11, 22],
+            "range": [
+              11,
+              22
+            ],
             "loc": {
               "start": {
                 "line": 1,
@@ -64,4 +67,4 @@
       "references": []
     }
   ]
-}
+}

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

@@ -9,7 +9,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$slots",
-            "range": [61, 68],
+            "range": [
+              61,
+              68
+            ],
             "loc": {
               "start": {
                 "line": 4,
@@ -64,4 +67,4 @@
       "references": []
     }
   ]
-}
+}

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

@@ -5,4 +5,4 @@
     "line": 3,
     "column": 7
   }
-]
+]

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

@@ -59,17 +59,17 @@
             "type": "Identifier",
             "name": "$derived",
             "range": [
-              62,
-              70
+              60,
+              68
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 18
+                "column": 16
               },
               "end": {
                 "line": 3,
-                "column": 26
+                "column": 24
               }
             }
           },
@@ -89,8 +89,8 @@
             "type": "Identifier",
             "name": "$effect",
             "range": [
-              86,
-              93
+              84,
+              91
             ],
             "loc": {
               "start": {

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

@@ -2,8 +2,7 @@
   let count = $state(0); // count: number, $state(0): 0
   let doubled = $derived(count * 2); // doubled: number, $derived(count * 2): number
 
-  $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
+  $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
     // runs when the component is mounted, and again
     // whenever `count` or `doubled` change,
     // after the DOM has been updated
@@ -18,11 +17,8 @@
   });
 </script>
 
-<button on:click="{() => count++}">
-  <!-- count: number -->
-  {doubled}
-  <!-- doubled: number -->
+<button on:click="{() => count++}"> <!-- count: number -->
+  {doubled} <!-- doubled: number -->
 </button>
 
-<p>{count} doubled is {doubled}</p>
-<!-- count: number, doubled: number -->
+<p>{count} doubled is {doubled}</p> <!-- count: number, doubled: number -->

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

@@ -2,8 +2,7 @@
   let count = $state(0); // count: number, $state(0): 0
   const doubled = $derived(count * 2); // doubled: number, $derived(count * 2): number
 
-  $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
+  $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
     // runs when the component is mounted, and again
     // whenever `count` or `doubled` change,
     // after the DOM has been updated
@@ -18,11 +17,8 @@
   });
 </script>
 
-<button on:click="{() => count++}">
-  <!-- count: number -->
-  {doubled}
-  <!-- doubled: number -->
+<button on:click="{() => count++}"> <!-- count: number -->
+  {doubled} <!-- doubled: number -->
 </button>
 
-<p>{count} doubled is {doubled}</p>
-<!-- count: number, doubled: number -->
+<p>{count} doubled is {doubled}</p> <!-- count: number, doubled: number -->

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

@@ -23,4 +23,4 @@
     "line": 8,
     "column": 21
   }
-]
+]

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

@@ -1,6 +1,5 @@
 <script lang="ts">
-  interface MyProps {
-    // MyProps: MyProps
+  interface MyProps { // MyProps: MyProps
     a: number; // a: number
     b: string; // b: string
     c: boolean; // c: boolean
@@ -9,11 +8,7 @@
   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
 </script>
 
-{a}
-<!-- a: number -->
-{b}
-<!-- b: Promise<{ x: number; }> -->
-{c}
-<!-- c: Promise<{ x: number; }> -->
-{everythingElse}
-<!-- everythingElse: { d: number; } -->
+{a} <!-- a: number -->
+{b} <!-- b: Promise<{ x: number; }> -->
+{c} <!-- c: Promise<{ x: number; }> -->
+{everythingElse} <!-- everythingElse: { d: number; } -->

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

@@ -79,13 +79,13 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []

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

@@ -79,16 +79,16 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []
     }
   ]
-}
+}

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

@@ -55,16 +55,16 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []
     }
   ]
-}
+}

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

@@ -55,16 +55,16 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []
     }
   ]
-}
+}

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

@@ -55,16 +55,16 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []
     }
   ]
-}
+}

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

@@ -55,16 +55,16 @@
       "references": []
     },
     {
-      "name": "$props",
+      "name": "$effect",
       "identifiers": [],
       "defs": [],
       "references": []
     },
     {
-      "name": "$effect",
+      "name": "$props",
       "identifiers": [],
       "defs": [],
       "references": []
     }
   ]
-}
+}

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

@@ -9,7 +9,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$slots",
-            "range": [758, 765],
+            "range": [
+              758,
+              765
+            ],
             "loc": {
               "start": {
                 "line": 53,
@@ -29,7 +32,10 @@
           "identifier": {
             "type": "Identifier",
             "name": "$$slots",
-            "range": [872, 879],
+            "range": [
+              872,
+              879
+            ],
             "loc": {
               "start": {
                 "line": 58,
@@ -84,4 +90,4 @@
       "references": []
     }
   ]
-}
+}