From dafc1768249bb94cbd47600b53a259919567a7fa Mon Sep 17 00:00:00 2001
From: baseballyama <xydybaseball@gmail.com>
Date: Mon, 22 Apr 2024 06:42:04 +0900
Subject: [PATCH] update

---
 explorer-v2/src/lib/MonacoEditor.svelte       |    7 +-
 explorer-v2/src/routes/+layout.svelte         |    2 +-
 package.json                                  |    2 +-
 src/parser/converts/attr.ts                   |    2 +-
 src/parser/converts/element.ts                |    2 +-
 src/parser/typescript/analyze/index.ts        |    2 +-
 .../docs/runes/08-$props-ts-input.svelte      |    4 +-
 .../08-$props-ts-no-unused-vars-result.json   |    8 +-
 .../docs/runes/08-$props-ts-output.json       |  502 +++--
 .../08-$props-ts-prefer-const-result.json     |    8 +-
 .../docs/runes/08-$props-ts-scope-output.json | 1192 ++++++-----
 .../snippets/10-typing-snippets-input.svelte  |    6 +-
 .../snippets/10-typing-snippets-output.json   |  706 +++---
 .../10-typing-snippets-scope-output.json      | 1630 +++++++-------
 .../10-typing-snippets-type-output.svelte     |   12 +-
 .../snippets/11-typing-snippets-input.svelte  |    4 +-
 .../snippets/11-typing-snippets-output.json   |  722 +++----
 .../11-typing-snippets-scope-output.json      | 1780 ++++++++--------
 .../11-typing-snippets-type-output.svelte     |   10 +-
 .../svelte5/generics01-snippets-input.svelte  |    4 +-
 .../svelte5/generics01-snippets-output.json   | 1214 ++++++-----
 .../generics01-snippets-scope-output.json     | 1886 ++++++++---------
 .../generics01-snippets-type-output.svelte    |   10 +-
 .../ast/svelte5/ts-$props01-input.svelte      |    2 +-
 .../ast/svelte5/ts-$props01-output.json       |  168 +-
 .../ast/svelte5/ts-$props01-scope-output.json |  520 +++--
 .../svelte5/ts-$props01-type-output.svelte    |    2 +-
 .../ast/svelte5/ts-event03-input.svelte       |    4 +-
 .../parser/ast/svelte5/ts-event03-output.json |  902 ++++----
 .../ast/svelte5/ts-event03-scope-output.json  |  628 +++---
 .../ast/svelte5/ts-event03-type-output.svelte |    6 +-
 31 files changed, 5906 insertions(+), 6041 deletions(-)

diff --git a/explorer-v2/src/lib/MonacoEditor.svelte b/explorer-v2/src/lib/MonacoEditor.svelte
index 11a1121a..1b9edf52 100644
--- a/explorer-v2/src/lib/MonacoEditor.svelte
+++ b/explorer-v2/src/lib/MonacoEditor.svelte
@@ -238,10 +238,13 @@
 
 {#await loading}
 	{#if started}
-		<div class="eslint-editor-monaco-root eslint-editor-monaco-root--wait" in:loadingTypewriter />
+		<div
+			class="eslint-editor-monaco-root eslint-editor-monaco-root--wait"
+			in:loadingTypewriter
+		></div>
 	{/if}
 {:then}
-	<div bind:this={rootElement} class="eslint-editor-monaco-root" />
+	<div bind:this={rootElement} class="eslint-editor-monaco-root"></div>
 {/await}
 
 <style>
diff --git a/explorer-v2/src/routes/+layout.svelte b/explorer-v2/src/routes/+layout.svelte
index ef6e418d..0bea75d0 100644
--- a/explorer-v2/src/routes/+layout.svelte
+++ b/explorer-v2/src/routes/+layout.svelte
@@ -14,7 +14,7 @@
 		position: relative;
 		height: calc(100vh - 64px);
 	}
-	.main > * {
+	.main > :global(*) {
 		position: relative;
 		width: 100%;
 		height: 100%;
diff --git a/package.json b/package.json
index 5b27b804..d98e1eb4 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "prettier-plugin-svelte": "^3.2.2",
     "rimraf": "^5.0.5",
     "semver": "^7.6.0",
-    "svelte": "^5.0.0-next.94",
+    "svelte": "^5.0.0-next.110",
     "svelte2tsx": "^0.7.6",
     "typescript": "~5.4.4",
     "typescript-eslint-parser-for-extra-files": "^0.6.0"
diff --git a/src/parser/converts/attr.ts b/src/parser/converts/attr.ts
index cb03c7d0..2f1d4c60 100644
--- a/src/parser/converts/attr.ts
+++ b/src/parser/converts/attr.ts
@@ -106,7 +106,7 @@ export function* convertAttributes(
     if (attr.type === "Ref") {
       throw new ParseError("Ref are not supported.", attr.start, ctx);
     }
-    if ((attr as any).type === "Style") {
+    if (attr.type === "Style") {
       throw new ParseError(
         `Svelte v3.46.0 is no longer supported. Please use Svelte>=v3.46.1.`,
         attr.start,
diff --git a/src/parser/converts/element.ts b/src/parser/converts/element.ts
index 4a87bc69..c89170ea 100644
--- a/src/parser/converts/element.ts
+++ b/src/parser/converts/element.ts
@@ -211,7 +211,7 @@ export function* convertChildren(
       continue;
     }
 
-    throw new Error(`Unknown type:${(child as any).type}`);
+    throw new Error(`Unknown type:${child.type}`);
   }
 }
 
diff --git a/src/parser/typescript/analyze/index.ts b/src/parser/typescript/analyze/index.ts
index c2f332ec..f18ddb6c 100644
--- a/src/parser/typescript/analyze/index.ts
+++ b/src/parser/typescript/analyze/index.ts
@@ -354,7 +354,7 @@ function analyzeRuneVariables(
       }
       // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2655
       case "$props": {
-        appendDeclareFunctionVirtualScripts(globalName, ["<T>(): T"]);
+        appendDeclareFunctionVirtualScripts(globalName, ["(): any"]);
         break;
       }
       // See https://github.com/sveltejs/svelte/blob/dfc55c18f010f620b966e13eb0ad1f9791b5798f/packages/svelte/types/index.d.ts#L2666
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-input.svelte b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-input.svelte
index 9fa47908..6368015c 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-input.svelte
@@ -1,4 +1,4 @@
 <script lang="ts">
-    type MyProps = {}
-    let { a, b, c, ...everythingElse } = $props<MyProps>();
+  type MyProps = {};
+  let { a, b, c, ...everythingElse }: MyProps = $props();
 </script>
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-no-unused-vars-result.json b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-no-unused-vars-result.json
index 70377cef..fb21723e 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-no-unused-vars-result.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-no-unused-vars-result.json
@@ -3,24 +3,24 @@
     "ruleId": "no-unused-vars",
     "code": "a",
     "line": 3,
-    "column": 11
+    "column": 9
   },
   {
     "ruleId": "no-unused-vars",
     "code": "b",
     "line": 3,
-    "column": 14
+    "column": 12
   },
   {
     "ruleId": "no-unused-vars",
     "code": "c",
     "line": 3,
-    "column": 17
+    "column": 15
   },
   {
     "ruleId": "no-unused-vars",
     "code": "everythingElse",
     "line": 3,
-    "column": 23
+    "column": 21
   }
 ]
\ No newline at end of file
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-output.json
index 9ce52f34..d2f3206c 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-output.json
@@ -104,17 +104,17 @@
             "type": "Identifier",
             "name": "MyProps",
             "range": [
-              28,
-              35
+              26,
+              33
             ],
             "loc": {
               "start": {
                 "line": 2,
-                "column": 9
+                "column": 7
               },
               "end": {
                 "line": 2,
-                "column": 16
+                "column": 14
               }
             }
           },
@@ -122,32 +122,32 @@
             "type": "TSTypeLiteral",
             "members": [],
             "range": [
-              38,
-              40
+              36,
+              38
             ],
             "loc": {
               "start": {
                 "line": 2,
-                "column": 19
+                "column": 17
               },
               "end": {
                 "line": 2,
-                "column": 21
+                "column": 19
               }
             }
           },
           "range": [
-            23,
-            40
+            21,
+            39
           ],
           "loc": {
             "start": {
               "line": 2,
-              "column": 4
+              "column": 2
             },
             "end": {
               "line": 2,
-              "column": 21
+              "column": 20
             }
           }
         },
@@ -168,17 +168,17 @@
                       "type": "Identifier",
                       "name": "a",
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
@@ -188,32 +188,32 @@
                       "type": "Identifier",
                       "name": "a",
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
                     "range": [
-                      51,
-                      52
+                      48,
+                      49
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 10
+                        "column": 8
                       },
                       "end": {
                         "line": 3,
-                        "column": 11
+                        "column": 9
                       }
                     }
                   },
@@ -225,17 +225,17 @@
                       "type": "Identifier",
                       "name": "b",
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
@@ -245,32 +245,32 @@
                       "type": "Identifier",
                       "name": "b",
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
                     "range": [
-                      54,
-                      55
+                      51,
+                      52
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 13
+                        "column": 11
                       },
                       "end": {
                         "line": 3,
-                        "column": 14
+                        "column": 12
                       }
                     }
                   },
@@ -282,17 +282,17 @@
                       "type": "Identifier",
                       "name": "c",
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
@@ -302,32 +302,32 @@
                       "type": "Identifier",
                       "name": "c",
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
                     "range": [
-                      57,
-                      58
+                      54,
+                      55
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 16
+                        "column": 14
                       },
                       "end": {
                         "line": 3,
-                        "column": 17
+                        "column": 15
                       }
                     }
                   },
@@ -337,49 +337,101 @@
                       "type": "Identifier",
                       "name": "everythingElse",
                       "range": [
-                        63,
-                        77
+                        60,
+                        74
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 22
+                          "column": 20
                         },
                         "end": {
                           "line": 3,
-                          "column": 36
+                          "column": 34
                         }
                       }
                     },
                     "optional": false,
                     "range": [
-                      60,
-                      77
+                      57,
+                      74
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 19
+                        "column": 17
                       },
                       "end": {
                         "line": 3,
-                        "column": 36
+                        "column": 34
                       }
                     }
                   }
                 ],
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeReference",
+                    "typeName": {
+                      "type": "Identifier",
+                      "name": "MyProps",
+                      "range": [
+                        78,
+                        85
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      78,
+                      85
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 38
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 45
+                      }
+                    }
+                  },
+                  "range": [
+                    76,
+                    85
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 36
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 45
+                    }
+                  }
+                },
                 "range": [
-                  49,
-                  79
+                  46,
+                  85
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 6
                   },
                   "end": {
                     "line": 3,
-                    "column": 38
+                    "column": 45
                   }
                 }
               },
@@ -389,119 +441,65 @@
                 "callee": {
                   "type": "Identifier",
                   "name": "$props",
-                  "range": [
-                    82,
-                    88
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 3,
-                      "column": 41
-                    },
-                    "end": {
-                      "line": 3,
-                      "column": 47
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeReference",
-                      "typeName": {
-                        "type": "Identifier",
-                        "name": "MyProps",
-                        "range": [
-                          89,
-                          96
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 48
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 55
-                          }
-                        }
-                      },
-                      "range": [
-                        89,
-                        96
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 3,
-                          "column": 48
-                        },
-                        "end": {
-                          "line": 3,
-                          "column": 55
-                        }
-                      }
-                    }
-                  ],
                   "range": [
                     88,
-                    97
+                    94
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 47
+                      "column": 48
                     },
                     "end": {
                       "line": 3,
-                      "column": 56
+                      "column": 54
                     }
                   }
                 },
+                "optional": false,
                 "range": [
-                  82,
-                  99
+                  88,
+                  96
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 41
+                    "column": 48
                   },
                   "end": {
                     "line": 3,
-                    "column": 58
+                    "column": 56
                   }
                 }
               },
               "range": [
-                49,
-                99
+                46,
+                96
               ],
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 8
+                  "column": 6
                 },
                 "end": {
                   "line": 3,
-                  "column": 58
+                  "column": 56
                 }
               }
             }
           ],
           "range": [
-            45,
-            100
+            42,
+            97
           ],
           "loc": {
             "start": {
               "line": 3,
-              "column": 4
+              "column": 2
             },
             "end": {
               "line": 3,
-              "column": 59
+              "column": 57
             }
           }
         }
@@ -509,8 +507,8 @@
       "endTag": {
         "type": "SvelteEndTag",
         "range": [
-          101,
-          110
+          98,
+          107
         ],
         "loc": {
           "start": {
@@ -525,7 +523,7 @@
       },
       "range": [
         0,
-        110
+        107
       ],
       "loc": {
         "start": {
@@ -690,17 +688,17 @@
       "type": "Identifier",
       "value": "type",
       "range": [
-        23,
-        27
+        21,
+        25
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 4
+          "column": 2
         },
         "end": {
           "line": 2,
-          "column": 8
+          "column": 6
         }
       }
     },
@@ -708,13 +706,31 @@
       "type": "Identifier",
       "value": "MyProps",
       "range": [
-        28,
+        26,
+        33
+      ],
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 7
+        },
+        "end": {
+          "line": 2,
+          "column": 14
+        }
+      }
+    },
+    {
+      "type": "Punctuator",
+      "value": "=",
+      "range": [
+        34,
         35
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 9
+          "column": 15
         },
         "end": {
           "line": 2,
@@ -724,7 +740,7 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
+      "value": "{",
       "range": [
         36,
         37
@@ -742,37 +758,37 @@
     },
     {
       "type": "Punctuator",
-      "value": "{",
+      "value": "}",
       "range": [
-        38,
-        39
+        37,
+        38
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 19
+          "column": 18
         },
         "end": {
           "line": 2,
-          "column": 20
+          "column": 19
         }
       }
     },
     {
       "type": "Punctuator",
-      "value": "}",
+      "value": ";",
       "range": [
-        39,
-        40
+        38,
+        39
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 20
+          "column": 19
         },
         "end": {
           "line": 2,
-          "column": 21
+          "column": 20
         }
       }
     },
@@ -780,17 +796,17 @@
       "type": "Keyword",
       "value": "let",
       "range": [
-        45,
-        48
+        42,
+        45
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 4
+          "column": 2
         },
         "end": {
           "line": 3,
-          "column": 7
+          "column": 5
         }
       }
     },
@@ -798,17 +814,17 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        49,
-        50
+        46,
+        47
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 8
+          "column": 6
         },
         "end": {
           "line": 3,
-          "column": 9
+          "column": 7
         }
       }
     },
@@ -816,17 +832,17 @@
       "type": "Identifier",
       "value": "a",
       "range": [
-        51,
-        52
+        48,
+        49
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 10
+          "column": 8
         },
         "end": {
           "line": 3,
-          "column": 11
+          "column": 9
         }
       }
     },
@@ -834,17 +850,17 @@
       "type": "Punctuator",
       "value": ",",
       "range": [
-        52,
-        53
+        49,
+        50
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 11
+          "column": 9
         },
         "end": {
           "line": 3,
-          "column": 12
+          "column": 10
         }
       }
     },
@@ -852,17 +868,17 @@
       "type": "Identifier",
       "value": "b",
       "range": [
-        54,
-        55
+        51,
+        52
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 13
+          "column": 11
         },
         "end": {
           "line": 3,
-          "column": 14
+          "column": 12
         }
       }
     },
@@ -870,17 +886,17 @@
       "type": "Punctuator",
       "value": ",",
       "range": [
-        55,
-        56
+        52,
+        53
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 14
+          "column": 12
         },
         "end": {
           "line": 3,
-          "column": 15
+          "column": 13
         }
       }
     },
@@ -888,17 +904,17 @@
       "type": "Identifier",
       "value": "c",
       "range": [
-        57,
-        58
+        54,
+        55
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 16
+          "column": 14
         },
         "end": {
           "line": 3,
-          "column": 17
+          "column": 15
         }
       }
     },
@@ -906,17 +922,17 @@
       "type": "Punctuator",
       "value": ",",
       "range": [
-        58,
-        59
+        55,
+        56
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 17
+          "column": 15
         },
         "end": {
           "line": 3,
-          "column": 18
+          "column": 16
         }
       }
     },
@@ -924,17 +940,17 @@
       "type": "Punctuator",
       "value": "...",
       "range": [
-        60,
-        63
+        57,
+        60
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 19
+          "column": 17
         },
         "end": {
           "line": 3,
-          "column": 22
+          "column": 20
         }
       }
     },
@@ -942,17 +958,17 @@
       "type": "Identifier",
       "value": "everythingElse",
       "range": [
-        63,
-        77
+        60,
+        74
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 22
+          "column": 20
         },
         "end": {
           "line": 3,
-          "column": 36
+          "column": 34
         }
       }
     },
@@ -960,80 +976,80 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        78,
-        79
+        75,
+        76
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 37
+          "column": 35
         },
         "end": {
           "line": 3,
-          "column": 38
+          "column": 36
         }
       }
     },
     {
       "type": "Punctuator",
-      "value": "=",
+      "value": ":",
       "range": [
-        80,
-        81
+        76,
+        77
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 39
+          "column": 36
         },
         "end": {
           "line": 3,
-          "column": 40
+          "column": 37
         }
       }
     },
     {
       "type": "Identifier",
-      "value": "$props",
+      "value": "MyProps",
       "range": [
-        82,
-        88
+        78,
+        85
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 41
+          "column": 38
         },
         "end": {
           "line": 3,
-          "column": 47
+          "column": 45
         }
       }
     },
     {
       "type": "Punctuator",
-      "value": "<",
+      "value": "=",
       "range": [
-        88,
-        89
+        86,
+        87
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 47
+          "column": 46
         },
         "end": {
           "line": 3,
-          "column": 48
+          "column": 47
         }
       }
     },
     {
       "type": "Identifier",
-      "value": "MyProps",
+      "value": "$props",
       "range": [
-        89,
-        96
+        88,
+        94
       ],
       "loc": {
         "start": {
@@ -1042,25 +1058,7 @@
         },
         "end": {
           "line": 3,
-          "column": 55
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": ">",
-      "range": [
-        96,
-        97
-      ],
-      "loc": {
-        "start": {
-          "line": 3,
-          "column": 55
-        },
-        "end": {
-          "line": 3,
-          "column": 56
+          "column": 54
         }
       }
     },
@@ -1068,17 +1066,17 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        97,
-        98
+        94,
+        95
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 56
+          "column": 54
         },
         "end": {
           "line": 3,
-          "column": 57
+          "column": 55
         }
       }
     },
@@ -1086,17 +1084,17 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        98,
-        99
+        95,
+        96
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 57
+          "column": 55
         },
         "end": {
           "line": 3,
-          "column": 58
+          "column": 56
         }
       }
     },
@@ -1104,17 +1102,17 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        99,
-        100
+        96,
+        97
       ],
       "loc": {
         "start": {
           "line": 3,
-          "column": 58
+          "column": 56
         },
         "end": {
           "line": 3,
-          "column": 59
+          "column": 57
         }
       }
     },
@@ -1122,8 +1120,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        101,
-        102
+        98,
+        99
       ],
       "loc": {
         "start": {
@@ -1140,8 +1138,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        102,
-        103
+        99,
+        100
       ],
       "loc": {
         "start": {
@@ -1158,8 +1156,8 @@
       "type": "HTMLIdentifier",
       "value": "script",
       "range": [
-        103,
-        109
+        100,
+        106
       ],
       "loc": {
         "start": {
@@ -1176,8 +1174,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        109,
-        110
+        106,
+        107
       ],
       "loc": {
         "start": {
@@ -1193,7 +1191,7 @@
   ],
   "range": [
     0,
-    111
+    108
   ],
   "loc": {
     "start": {
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-prefer-const-result.json b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-prefer-const-result.json
index 368783a9..49af005f 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-prefer-const-result.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-prefer-const-result.json
@@ -3,24 +3,24 @@
     "ruleId": "prefer-const",
     "code": "a",
     "line": 3,
-    "column": 11
+    "column": 9
   },
   {
     "ruleId": "prefer-const",
     "code": "b",
     "line": 3,
-    "column": 14
+    "column": 12
   },
   {
     "ruleId": "prefer-const",
     "code": "c",
     "line": 3,
-    "column": 17
+    "column": 15
   },
   {
     "ruleId": "prefer-const",
     "code": "everythingElse",
     "line": 3,
-    "column": 23
+    "column": 21
   }
 ]
\ No newline at end of file
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-scope-output.json
index 56e7dcd3..464a2b2e 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/08-$props-ts-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              82,
-              88
+              88,
+              94
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 41
+                "column": 48
               },
               "end": {
                 "line": 3,
-                "column": 47
+                "column": 54
               }
             }
           },
@@ -92,17 +92,17 @@
               "type": "Identifier",
               "name": "MyProps",
               "range": [
-                28,
-                35
+                26,
+                33
               ],
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 9
+                  "column": 7
                 },
                 "end": {
                   "line": 2,
-                  "column": 16
+                  "column": 14
                 }
               }
             }
@@ -114,17 +114,17 @@
                 "type": "Identifier",
                 "name": "MyProps",
                 "range": [
-                  28,
-                  35
+                  26,
+                  33
                 ],
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 9
+                    "column": 7
                   },
                   "end": {
                     "line": 2,
-                    "column": 16
+                    "column": 14
                   }
                 }
               },
@@ -134,17 +134,17 @@
                   "type": "Identifier",
                   "name": "MyProps",
                   "range": [
-                    28,
-                    35
+                    26,
+                    33
                   ],
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 9
+                      "column": 7
                     },
                     "end": {
                       "line": 2,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -152,32 +152,32 @@
                   "type": "TSTypeLiteral",
                   "members": [],
                   "range": [
-                    38,
-                    40
+                    36,
+                    38
                   ],
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 19
+                      "column": 17
                     },
                     "end": {
                       "line": 2,
-                      "column": 21
+                      "column": 19
                     }
                   }
                 },
                 "range": [
-                  23,
-                  40
+                  21,
+                  39
                 ],
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 4
+                    "column": 2
                   },
                   "end": {
                     "line": 2,
-                    "column": 21
+                    "column": 20
                   }
                 }
               }
@@ -189,17 +189,17 @@
                 "type": "Identifier",
                 "name": "MyProps",
                 "range": [
-                  89,
-                  96
+                  78,
+                  85
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 48
+                    "column": 38
                   },
                   "end": {
                     "line": 3,
-                    "column": 55
+                    "column": 45
                   }
                 }
               },
@@ -209,17 +209,17 @@
                 "type": "Identifier",
                 "name": "MyProps",
                 "range": [
-                  28,
-                  35
+                  26,
+                  33
                 ],
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 9
+                    "column": 7
                   },
                   "end": {
                     "line": 2,
-                    "column": 16
+                    "column": 14
                   }
                 }
               }
@@ -233,17 +233,17 @@
               "type": "Identifier",
               "name": "a",
               "range": [
-                51,
-                52
+                48,
+                49
               ],
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 10
+                  "column": 8
                 },
                 "end": {
                   "line": 3,
-                  "column": 11
+                  "column": 9
                 }
               }
             }
@@ -255,17 +255,17 @@
                 "type": "Identifier",
                 "name": "a",
                 "range": [
-                  51,
-                  52
+                  48,
+                  49
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 10
+                    "column": 8
                   },
                   "end": {
                     "line": 3,
-                    "column": 11
+                    "column": 9
                   }
                 }
               },
@@ -282,17 +282,17 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
@@ -302,32 +302,32 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
@@ -339,17 +339,17 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
@@ -359,32 +359,32 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
@@ -396,17 +396,17 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
@@ -416,32 +416,32 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
@@ -451,49 +451,101 @@
                         "type": "Identifier",
                         "name": "everythingElse",
                         "range": [
-                          63,
-                          77
+                          60,
+                          74
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 22
+                            "column": 20
                           },
                           "end": {
                             "line": 3,
-                            "column": 36
+                            "column": 34
                           }
                         }
                       },
                       "optional": false,
                       "range": [
-                        60,
-                        77
+                        57,
+                        74
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 19
+                          "column": 17
                         },
                         "end": {
                           "line": 3,
-                          "column": 36
+                          "column": 34
                         }
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          78,
+                          85
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        78,
+                        85
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      76,
+                      85
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
-                    49,
-                    79
+                    46,
+                    85
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 8
+                      "column": 6
                     },
                     "end": {
                       "line": 3,
-                      "column": 38
+                      "column": 45
                     }
                   }
                 },
@@ -503,103 +555,49 @@
                   "callee": {
                     "type": "Identifier",
                     "name": "$props",
-                    "range": [
-                      82,
-                      88
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 41
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 47
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            89,
-                            96
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 3,
-                              "column": 48
-                            },
-                            "end": {
-                              "line": 3,
-                              "column": 55
-                            }
-                          }
-                        },
-                        "range": [
-                          89,
-                          96
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 48
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 55
-                          }
-                        }
-                      }
-                    ],
                     "range": [
                       88,
-                      97
+                      94
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 47
+                        "column": 48
                       },
                       "end": {
                         "line": 3,
-                        "column": 56
+                        "column": 54
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    82,
-                    99
+                    88,
+                    96
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 41
+                      "column": 48
                     },
                     "end": {
                       "line": 3,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
                 "range": [
-                  49,
-                  99
+                  46,
+                  96
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 6
                   },
                   "end": {
                     "line": 3,
-                    "column": 58
+                    "column": 56
                   }
                 }
               }
@@ -611,17 +609,17 @@
                 "type": "Identifier",
                 "name": "a",
                 "range": [
-                  51,
-                  52
+                  48,
+                  49
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 10
+                    "column": 8
                   },
                   "end": {
                     "line": 3,
-                    "column": 11
+                    "column": 9
                   }
                 }
               },
@@ -631,17 +629,17 @@
                 "type": "Identifier",
                 "name": "a",
                 "range": [
-                  51,
-                  52
+                  48,
+                  49
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 10
+                    "column": 8
                   },
                   "end": {
                     "line": 3,
-                    "column": 11
+                    "column": 9
                   }
                 }
               }
@@ -655,17 +653,17 @@
               "type": "Identifier",
               "name": "b",
               "range": [
-                54,
-                55
+                51,
+                52
               ],
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 13
+                  "column": 11
                 },
                 "end": {
                   "line": 3,
-                  "column": 14
+                  "column": 12
                 }
               }
             }
@@ -677,17 +675,17 @@
                 "type": "Identifier",
                 "name": "b",
                 "range": [
-                  54,
-                  55
+                  51,
+                  52
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 13
+                    "column": 11
                   },
                   "end": {
                     "line": 3,
-                    "column": 14
+                    "column": 12
                   }
                 }
               },
@@ -704,17 +702,17 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
@@ -724,32 +722,32 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
@@ -761,17 +759,17 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
@@ -781,32 +779,32 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
@@ -818,17 +816,17 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
@@ -838,32 +836,32 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
@@ -873,49 +871,101 @@
                         "type": "Identifier",
                         "name": "everythingElse",
                         "range": [
-                          63,
-                          77
+                          60,
+                          74
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 22
+                            "column": 20
                           },
                           "end": {
                             "line": 3,
-                            "column": 36
+                            "column": 34
                           }
                         }
                       },
                       "optional": false,
                       "range": [
-                        60,
-                        77
+                        57,
+                        74
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 19
+                          "column": 17
                         },
                         "end": {
                           "line": 3,
-                          "column": 36
+                          "column": 34
                         }
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          78,
+                          85
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        78,
+                        85
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      76,
+                      85
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
-                    49,
-                    79
+                    46,
+                    85
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 8
+                      "column": 6
                     },
                     "end": {
                       "line": 3,
-                      "column": 38
+                      "column": 45
                     }
                   }
                 },
@@ -925,103 +975,49 @@
                   "callee": {
                     "type": "Identifier",
                     "name": "$props",
-                    "range": [
-                      82,
-                      88
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 41
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 47
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            89,
-                            96
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 3,
-                              "column": 48
-                            },
-                            "end": {
-                              "line": 3,
-                              "column": 55
-                            }
-                          }
-                        },
-                        "range": [
-                          89,
-                          96
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 48
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 55
-                          }
-                        }
-                      }
-                    ],
                     "range": [
                       88,
-                      97
+                      94
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 47
+                        "column": 48
                       },
                       "end": {
                         "line": 3,
-                        "column": 56
+                        "column": 54
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    82,
-                    99
+                    88,
+                    96
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 41
+                      "column": 48
                     },
                     "end": {
                       "line": 3,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
                 "range": [
-                  49,
-                  99
+                  46,
+                  96
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 6
                   },
                   "end": {
                     "line": 3,
-                    "column": 58
+                    "column": 56
                   }
                 }
               }
@@ -1033,17 +1029,17 @@
                 "type": "Identifier",
                 "name": "b",
                 "range": [
-                  54,
-                  55
+                  51,
+                  52
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 13
+                    "column": 11
                   },
                   "end": {
                     "line": 3,
-                    "column": 14
+                    "column": 12
                   }
                 }
               },
@@ -1053,17 +1049,17 @@
                 "type": "Identifier",
                 "name": "b",
                 "range": [
-                  54,
-                  55
+                  51,
+                  52
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 13
+                    "column": 11
                   },
                   "end": {
                     "line": 3,
-                    "column": 14
+                    "column": 12
                   }
                 }
               }
@@ -1077,17 +1073,17 @@
               "type": "Identifier",
               "name": "c",
               "range": [
-                57,
-                58
+                54,
+                55
               ],
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 16
+                  "column": 14
                 },
                 "end": {
                   "line": 3,
-                  "column": 17
+                  "column": 15
                 }
               }
             }
@@ -1099,17 +1095,17 @@
                 "type": "Identifier",
                 "name": "c",
                 "range": [
-                  57,
-                  58
+                  54,
+                  55
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 16
+                    "column": 14
                   },
                   "end": {
                     "line": 3,
-                    "column": 17
+                    "column": 15
                   }
                 }
               },
@@ -1126,17 +1122,17 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
@@ -1146,32 +1142,32 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
@@ -1183,17 +1179,17 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
@@ -1203,32 +1199,32 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
@@ -1240,17 +1236,17 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
@@ -1260,32 +1256,32 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
@@ -1295,49 +1291,101 @@
                         "type": "Identifier",
                         "name": "everythingElse",
                         "range": [
-                          63,
-                          77
+                          60,
+                          74
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 22
+                            "column": 20
                           },
                           "end": {
                             "line": 3,
-                            "column": 36
+                            "column": 34
                           }
                         }
                       },
                       "optional": false,
                       "range": [
-                        60,
-                        77
+                        57,
+                        74
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 19
+                          "column": 17
                         },
                         "end": {
                           "line": 3,
-                          "column": 36
+                          "column": 34
                         }
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          78,
+                          85
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        78,
+                        85
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      76,
+                      85
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
-                    49,
-                    79
+                    46,
+                    85
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 8
+                      "column": 6
                     },
                     "end": {
                       "line": 3,
-                      "column": 38
+                      "column": 45
                     }
                   }
                 },
@@ -1347,103 +1395,49 @@
                   "callee": {
                     "type": "Identifier",
                     "name": "$props",
-                    "range": [
-                      82,
-                      88
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 41
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 47
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            89,
-                            96
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 3,
-                              "column": 48
-                            },
-                            "end": {
-                              "line": 3,
-                              "column": 55
-                            }
-                          }
-                        },
-                        "range": [
-                          89,
-                          96
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 48
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 55
-                          }
-                        }
-                      }
-                    ],
                     "range": [
                       88,
-                      97
+                      94
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 47
+                        "column": 48
                       },
                       "end": {
                         "line": 3,
-                        "column": 56
+                        "column": 54
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    82,
-                    99
+                    88,
+                    96
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 41
+                      "column": 48
                     },
                     "end": {
                       "line": 3,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
                 "range": [
-                  49,
-                  99
+                  46,
+                  96
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 6
                   },
                   "end": {
                     "line": 3,
-                    "column": 58
+                    "column": 56
                   }
                 }
               }
@@ -1455,17 +1449,17 @@
                 "type": "Identifier",
                 "name": "c",
                 "range": [
-                  57,
-                  58
+                  54,
+                  55
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 16
+                    "column": 14
                   },
                   "end": {
                     "line": 3,
-                    "column": 17
+                    "column": 15
                   }
                 }
               },
@@ -1475,17 +1469,17 @@
                 "type": "Identifier",
                 "name": "c",
                 "range": [
-                  57,
-                  58
+                  54,
+                  55
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 16
+                    "column": 14
                   },
                   "end": {
                     "line": 3,
-                    "column": 17
+                    "column": 15
                   }
                 }
               }
@@ -1499,17 +1493,17 @@
               "type": "Identifier",
               "name": "everythingElse",
               "range": [
-                63,
-                77
+                60,
+                74
               ],
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 22
+                  "column": 20
                 },
                 "end": {
                   "line": 3,
-                  "column": 36
+                  "column": 34
                 }
               }
             }
@@ -1521,17 +1515,17 @@
                 "type": "Identifier",
                 "name": "everythingElse",
                 "range": [
-                  63,
-                  77
+                  60,
+                  74
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 22
+                    "column": 20
                   },
                   "end": {
                     "line": 3,
-                    "column": 36
+                    "column": 34
                   }
                 }
               },
@@ -1548,17 +1542,17 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
@@ -1568,32 +1562,32 @@
                         "type": "Identifier",
                         "name": "a",
                         "range": [
-                          51,
-                          52
+                          48,
+                          49
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 10
+                            "column": 8
                           },
                           "end": {
                             "line": 3,
-                            "column": 11
+                            "column": 9
                           }
                         }
                       },
                       "range": [
-                        51,
-                        52
+                        48,
+                        49
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 10
+                          "column": 8
                         },
                         "end": {
                           "line": 3,
-                          "column": 11
+                          "column": 9
                         }
                       }
                     },
@@ -1605,17 +1599,17 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
@@ -1625,32 +1619,32 @@
                         "type": "Identifier",
                         "name": "b",
                         "range": [
-                          54,
-                          55
+                          51,
+                          52
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 13
+                            "column": 11
                           },
                           "end": {
                             "line": 3,
-                            "column": 14
+                            "column": 12
                           }
                         }
                       },
                       "range": [
-                        54,
-                        55
+                        51,
+                        52
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 13
+                          "column": 11
                         },
                         "end": {
                           "line": 3,
-                          "column": 14
+                          "column": 12
                         }
                       }
                     },
@@ -1662,17 +1656,17 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
@@ -1682,32 +1676,32 @@
                         "type": "Identifier",
                         "name": "c",
                         "range": [
-                          57,
-                          58
+                          54,
+                          55
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 16
+                            "column": 14
                           },
                           "end": {
                             "line": 3,
-                            "column": 17
+                            "column": 15
                           }
                         }
                       },
                       "range": [
-                        57,
-                        58
+                        54,
+                        55
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 16
+                          "column": 14
                         },
                         "end": {
                           "line": 3,
-                          "column": 17
+                          "column": 15
                         }
                       }
                     },
@@ -1717,49 +1711,101 @@
                         "type": "Identifier",
                         "name": "everythingElse",
                         "range": [
-                          63,
-                          77
+                          60,
+                          74
                         ],
                         "loc": {
                           "start": {
                             "line": 3,
-                            "column": 22
+                            "column": 20
                           },
                           "end": {
                             "line": 3,
-                            "column": 36
+                            "column": 34
                           }
                         }
                       },
                       "optional": false,
                       "range": [
-                        60,
-                        77
+                        57,
+                        74
                       ],
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 19
+                          "column": 17
                         },
                         "end": {
                           "line": 3,
-                          "column": 36
+                          "column": 34
                         }
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          78,
+                          85
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        78,
+                        85
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      76,
+                      85
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
-                    49,
-                    79
+                    46,
+                    85
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 8
+                      "column": 6
                     },
                     "end": {
                       "line": 3,
-                      "column": 38
+                      "column": 45
                     }
                   }
                 },
@@ -1769,103 +1815,49 @@
                   "callee": {
                     "type": "Identifier",
                     "name": "$props",
-                    "range": [
-                      82,
-                      88
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 41
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 47
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            89,
-                            96
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 3,
-                              "column": 48
-                            },
-                            "end": {
-                              "line": 3,
-                              "column": 55
-                            }
-                          }
-                        },
-                        "range": [
-                          89,
-                          96
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 48
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 55
-                          }
-                        }
-                      }
-                    ],
                     "range": [
                       88,
-                      97
+                      94
                     ],
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 47
+                        "column": 48
                       },
                       "end": {
                         "line": 3,
-                        "column": 56
+                        "column": 54
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    82,
-                    99
+                    88,
+                    96
                   ],
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 41
+                      "column": 48
                     },
                     "end": {
                       "line": 3,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
                 "range": [
-                  49,
-                  99
+                  46,
+                  96
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 6
                   },
                   "end": {
                     "line": 3,
-                    "column": 58
+                    "column": 56
                   }
                 }
               }
@@ -1877,17 +1869,17 @@
                 "type": "Identifier",
                 "name": "everythingElse",
                 "range": [
-                  63,
-                  77
+                  60,
+                  74
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 22
+                    "column": 20
                   },
                   "end": {
                     "line": 3,
-                    "column": 36
+                    "column": 34
                   }
                 }
               },
@@ -1897,17 +1889,17 @@
                 "type": "Identifier",
                 "name": "everythingElse",
                 "range": [
-                  63,
-                  77
+                  60,
+                  74
                 ],
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 22
+                    "column": 20
                   },
                   "end": {
                     "line": 3,
-                    "column": 36
+                    "column": 34
                   }
                 }
               }
@@ -1921,17 +1913,17 @@
             "type": "Identifier",
             "name": "a",
             "range": [
-              51,
-              52
+              48,
+              49
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 10
+                "column": 8
               },
               "end": {
                 "line": 3,
-                "column": 11
+                "column": 9
               }
             }
           },
@@ -1941,17 +1933,17 @@
             "type": "Identifier",
             "name": "a",
             "range": [
-              51,
-              52
+              48,
+              49
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 10
+                "column": 8
               },
               "end": {
                 "line": 3,
-                "column": 11
+                "column": 9
               }
             }
           }
@@ -1961,17 +1953,17 @@
             "type": "Identifier",
             "name": "b",
             "range": [
-              54,
-              55
+              51,
+              52
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 13
+                "column": 11
               },
               "end": {
                 "line": 3,
-                "column": 14
+                "column": 12
               }
             }
           },
@@ -1981,17 +1973,17 @@
             "type": "Identifier",
             "name": "b",
             "range": [
-              54,
-              55
+              51,
+              52
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 13
+                "column": 11
               },
               "end": {
                 "line": 3,
-                "column": 14
+                "column": 12
               }
             }
           }
@@ -2001,17 +1993,17 @@
             "type": "Identifier",
             "name": "c",
             "range": [
-              57,
-              58
+              54,
+              55
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 16
+                "column": 14
               },
               "end": {
                 "line": 3,
-                "column": 17
+                "column": 15
               }
             }
           },
@@ -2021,17 +2013,17 @@
             "type": "Identifier",
             "name": "c",
             "range": [
-              57,
-              58
+              54,
+              55
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 16
+                "column": 14
               },
               "end": {
                 "line": 3,
-                "column": 17
+                "column": 15
               }
             }
           }
@@ -2041,17 +2033,17 @@
             "type": "Identifier",
             "name": "everythingElse",
             "range": [
-              63,
-              77
+              60,
+              74
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 22
+                "column": 20
               },
               "end": {
                 "line": 3,
-                "column": 36
+                "column": 34
               }
             }
           },
@@ -2061,17 +2053,17 @@
             "type": "Identifier",
             "name": "everythingElse",
             "range": [
-              63,
-              77
+              60,
+              74
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 22
+                "column": 20
               },
               "end": {
                 "line": 3,
-                "column": 36
+                "column": 34
               }
             }
           }
@@ -2081,17 +2073,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              82,
-              88
+              88,
+              94
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 41
+                "column": 48
               },
               "end": {
                 "line": 3,
-                "column": 47
+                "column": 54
               }
             }
           },
@@ -2104,17 +2096,17 @@
             "type": "Identifier",
             "name": "MyProps",
             "range": [
-              89,
-              96
+              78,
+              85
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 48
+                "column": 38
               },
               "end": {
                 "line": 3,
-                "column": 55
+                "column": 45
               }
             }
           },
@@ -2124,17 +2116,17 @@
             "type": "Identifier",
             "name": "MyProps",
             "range": [
-              28,
-              35
+              26,
+              33
             ],
             "loc": {
               "start": {
                 "line": 2,
-                "column": 9
+                "column": 7
               },
               "end": {
                 "line": 2,
-                "column": 16
+                "column": 14
               }
             }
           }
@@ -2147,17 +2139,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              82,
-              88
+              88,
+              94
             ],
             "loc": {
               "start": {
                 "line": 3,
-                "column": 41
+                "column": 48
               },
               "end": {
                 "line": 3,
-                "column": 47
+                "column": 54
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-input.svelte b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-input.svelte
index 878ee2c0..50de525b 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-input.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
 
-	let { data, children, row } = $props<{
+	let { data, children, row }: {
 		data: any[];
 		children: Snippet;
 		row: Snippet<[any]>;
-	}>();
+	} = $props();
 </script>
 
 <table>
@@ -19,4 +19,4 @@
 			<tr>{@render row(d)}</tr>
 		{/each}
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-output.json b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-output.json
index 0249095d..e34e2b34 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-output.json
@@ -372,94 +372,41 @@
                     }
                   }
                 ],
-                "range": [
-                  65,
-                  88
-                ],
-                "loc": {
-                  "start": {
-                    "line": 4,
-                    "column": 5
-                  },
-                  "end": {
-                    "line": 4,
-                    "column": 28
-                  }
-                }
-              },
-              "init": {
-                "type": "CallExpression",
-                "arguments": [],
-                "callee": {
-                  "type": "Identifier",
-                  "name": "$props",
-                  "range": [
-                    91,
-                    97
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 31
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 37
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeLiteral",
-                      "members": [
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "data",
-                            "range": [
-                              102,
-                              106
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 5,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 5,
-                                "column": 6
-                              }
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeLiteral",
+                    "members": [
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "data",
+                          "range": [
+                            94,
+                            98
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 6
                             }
-                          },
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSArrayType",
-                              "elementType": {
-                                "type": "TSAnyKeyword",
-                                "range": [
-                                  108,
-                                  111
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 5,
-                                    "column": 8
-                                  },
-                                  "end": {
-                                    "line": 5,
-                                    "column": 11
-                                  }
-                                }
-                              },
+                            "type": "TSArrayType",
+                            "elementType": {
+                              "type": "TSAnyKeyword",
                               "range": [
-                                108,
-                                113
+                                100,
+                                103
                               ],
                               "loc": {
                                 "start": {
@@ -468,18 +415,18 @@
                                 },
                                 "end": {
                                   "line": 5,
-                                  "column": 13
+                                  "column": 11
                                 }
                               }
                             },
                             "range": [
-                              106,
-                              113
+                              100,
+                              105
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 6
+                                "column": 8
                               },
                               "end": {
                                 "line": 5,
@@ -488,66 +435,66 @@
                             }
                           },
                           "range": [
-                            102,
-                            114
+                            98,
+                            105
                           ],
                           "loc": {
                             "start": {
                               "line": 5,
-                              "column": 2
+                              "column": 6
                             },
                             "end": {
                               "line": 5,
-                              "column": 14
+                              "column": 13
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "children",
-                            "range": [
-                              117,
-                              125
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 6,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 6,
-                                "column": 10
-                              }
-                            }
+                        "range": [
+                          94,
+                          106
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 5,
+                            "column": 14
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "children",
+                          "range": [
+                            109,
+                            117
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 6,
+                              "column": 10
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  127,
-                                  134
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 6,
-                                    "column": 12
-                                  },
-                                  "end": {
-                                    "line": 6,
-                                    "column": 19
-                                  }
-                                }
-                              },
+                            "type": "TSTypeReference",
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                127,
-                                134
+                                119,
+                                126
                               ],
                               "loc": {
                                 "start": {
@@ -561,13 +508,13 @@
                               }
                             },
                             "range": [
-                              125,
-                              134
+                              119,
+                              126
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 10
+                                "column": 12
                               },
                               "end": {
                                 "line": 6,
@@ -577,120 +524,120 @@
                           },
                           "range": [
                             117,
-                            135
+                            126
                           ],
                           "loc": {
                             "start": {
                               "line": 6,
-                              "column": 2
+                              "column": 10
                             },
                             "end": {
                               "line": 6,
-                              "column": 20
+                              "column": 19
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "row",
-                            "range": [
-                              138,
-                              141
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 7,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 7,
-                                "column": 5
-                              }
-                            }
+                        "range": [
+                          109,
+                          127
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 6,
+                            "column": 20
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "row",
+                          "range": [
+                            130,
+                            133
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 5
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeArguments": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "TSTupleType",
-                                    "elementTypes": [
-                                      {
-                                        "type": "TSAnyKeyword",
-                                        "range": [
-                                          152,
-                                          155
-                                        ],
-                                        "loc": {
-                                          "start": {
-                                            "line": 7,
-                                            "column": 16
-                                          },
-                                          "end": {
-                                            "line": 7,
-                                            "column": 19
-                                          }
+                            "type": "TSTypeReference",
+                            "typeArguments": {
+                              "type": "TSTypeParameterInstantiation",
+                              "params": [
+                                {
+                                  "type": "TSTupleType",
+                                  "elementTypes": [
+                                    {
+                                      "type": "TSAnyKeyword",
+                                      "range": [
+                                        144,
+                                        147
+                                      ],
+                                      "loc": {
+                                        "start": {
+                                          "line": 7,
+                                          "column": 16
+                                        },
+                                        "end": {
+                                          "line": 7,
+                                          "column": 19
                                         }
                                       }
-                                    ],
-                                    "range": [
-                                      151,
-                                      156
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 7,
-                                        "column": 15
-                                      },
-                                      "end": {
-                                        "line": 7,
-                                        "column": 20
-                                      }
                                     }
-                                  }
-                                ],
-                                "range": [
-                                  150,
-                                  157
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 7,
-                                    "column": 14
-                                  },
-                                  "end": {
-                                    "line": 7,
-                                    "column": 21
+                                  ],
+                                  "range": [
+                                    143,
+                                    148
+                                  ],
+                                  "loc": {
+                                    "start": {
+                                      "line": 7,
+                                      "column": 15
+                                    },
+                                    "end": {
+                                      "line": 7,
+                                      "column": 20
+                                    }
                                   }
                                 }
-                              },
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  143,
-                                  150
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 7,
-                                    "column": 7
-                                  },
-                                  "end": {
-                                    "line": 7,
-                                    "column": 14
-                                  }
+                              ],
+                              "range": [
+                                142,
+                                149
+                              ],
+                              "loc": {
+                                "start": {
+                                  "line": 7,
+                                  "column": 14
+                                },
+                                "end": {
+                                  "line": 7,
+                                  "column": 21
                                 }
-                              },
+                              }
+                            },
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                143,
-                                157
+                                135,
+                                142
                               ],
                               "loc": {
                                 "start": {
@@ -699,18 +646,18 @@
                                 },
                                 "end": {
                                   "line": 7,
-                                  "column": 21
+                                  "column": 14
                                 }
                               }
                             },
                             "range": [
-                              141,
-                              157
+                              135,
+                              149
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 5
+                                "column": 7
                               },
                               "end": {
                                 "line": 7,
@@ -719,64 +666,115 @@
                             }
                           },
                           "range": [
-                            138,
-                            158
+                            133,
+                            149
                           ],
                           "loc": {
                             "start": {
                               "line": 7,
-                              "column": 2
+                              "column": 5
                             },
                             "end": {
                               "line": 7,
-                              "column": 22
+                              "column": 21
                             }
                           }
-                        }
-                      ],
-                      "range": [
-                        98,
-                        161
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 4,
-                          "column": 38
                         },
-                        "end": {
-                          "line": 8,
-                          "column": 2
+                        "range": [
+                          130,
+                          150
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 2
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 22
+                          }
                         }
                       }
+                    ],
+                    "range": [
+                      90,
+                      153
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 2
+                      }
                     }
-                  ],
+                  },
                   "range": [
-                    97,
-                    162
+                    88,
+                    153
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 37
+                      "column": 28
                     },
                     "end": {
                       "line": 8,
-                      "column": 3
+                      "column": 2
                     }
                   }
                 },
                 "range": [
-                  91,
-                  164
+                  65,
+                  153
                 ],
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 31
+                    "column": 5
                   },
                   "end": {
+                    "line": 8,
+                    "column": 2
+                  }
+                }
+              },
+              "init": {
+                "type": "CallExpression",
+                "arguments": [],
+                "callee": {
+                  "type": "Identifier",
+                  "name": "$props",
+                  "range": [
+                    156,
+                    162
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 11
+                    }
+                  }
+                },
+                "optional": false,
+                "range": [
+                  156,
+                  164
+                ],
+                "loc": {
+                  "start": {
                     "line": 8,
                     "column": 5
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 13
                   }
                 }
               },
@@ -791,7 +789,7 @@
                 },
                 "end": {
                   "line": 8,
-                  "column": 5
+                  "column": 13
                 }
               }
             }
@@ -807,7 +805,7 @@
             },
             "end": {
               "line": 8,
-              "column": 6
+              "column": 14
             }
           }
         }
@@ -2020,55 +2018,19 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
-      "range": [
-        89,
-        90
-      ],
-      "loc": {
-        "start": {
-          "line": 4,
-          "column": 29
-        },
-        "end": {
-          "line": 4,
-          "column": 30
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "$props",
-      "range": [
-        91,
-        97
-      ],
-      "loc": {
-        "start": {
-          "line": 4,
-          "column": 31
-        },
-        "end": {
-          "line": 4,
-          "column": 37
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "<",
+      "value": ":",
       "range": [
-        97,
-        98
+        88,
+        89
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 37
+          "column": 28
         },
         "end": {
           "line": 4,
-          "column": 38
+          "column": 29
         }
       }
     },
@@ -2076,17 +2038,17 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        98,
-        99
+        90,
+        91
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 38
+          "column": 30
         },
         "end": {
           "line": 4,
-          "column": 39
+          "column": 31
         }
       }
     },
@@ -2094,8 +2056,8 @@
       "type": "Identifier",
       "value": "data",
       "range": [
-        102,
-        106
+        94,
+        98
       ],
       "loc": {
         "start": {
@@ -2112,8 +2074,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        106,
-        107
+        98,
+        99
       ],
       "loc": {
         "start": {
@@ -2130,8 +2092,8 @@
       "type": "Identifier",
       "value": "any",
       "range": [
-        108,
-        111
+        100,
+        103
       ],
       "loc": {
         "start": {
@@ -2148,8 +2110,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        111,
-        112
+        103,
+        104
       ],
       "loc": {
         "start": {
@@ -2166,8 +2128,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        112,
-        113
+        104,
+        105
       ],
       "loc": {
         "start": {
@@ -2184,8 +2146,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        113,
-        114
+        105,
+        106
       ],
       "loc": {
         "start": {
@@ -2202,8 +2164,8 @@
       "type": "Identifier",
       "value": "children",
       "range": [
-        117,
-        125
+        109,
+        117
       ],
       "loc": {
         "start": {
@@ -2220,8 +2182,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        125,
-        126
+        117,
+        118
       ],
       "loc": {
         "start": {
@@ -2238,8 +2200,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        127,
-        134
+        119,
+        126
       ],
       "loc": {
         "start": {
@@ -2256,8 +2218,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        134,
-        135
+        126,
+        127
       ],
       "loc": {
         "start": {
@@ -2274,8 +2236,8 @@
       "type": "Identifier",
       "value": "row",
       "range": [
-        138,
-        141
+        130,
+        133
       ],
       "loc": {
         "start": {
@@ -2292,8 +2254,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        141,
-        142
+        133,
+        134
       ],
       "loc": {
         "start": {
@@ -2310,8 +2272,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        143,
-        150
+        135,
+        142
       ],
       "loc": {
         "start": {
@@ -2328,8 +2290,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        150,
-        151
+        142,
+        143
       ],
       "loc": {
         "start": {
@@ -2346,8 +2308,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        151,
-        152
+        143,
+        144
       ],
       "loc": {
         "start": {
@@ -2364,8 +2326,8 @@
       "type": "Identifier",
       "value": "any",
       "range": [
-        152,
-        155
+        144,
+        147
       ],
       "loc": {
         "start": {
@@ -2382,8 +2344,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        155,
-        156
+        147,
+        148
       ],
       "loc": {
         "start": {
@@ -2400,8 +2362,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        156,
-        157
+        148,
+        149
       ],
       "loc": {
         "start": {
@@ -2418,8 +2380,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        157,
-        158
+        149,
+        150
       ],
       "loc": {
         "start": {
@@ -2436,8 +2398,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        160,
-        161
+        152,
+        153
       ],
       "loc": {
         "start": {
@@ -2452,19 +2414,37 @@
     },
     {
       "type": "Punctuator",
-      "value": ">",
+      "value": "=",
+      "range": [
+        154,
+        155
+      ],
+      "loc": {
+        "start": {
+          "line": 8,
+          "column": 3
+        },
+        "end": {
+          "line": 8,
+          "column": 4
+        }
+      }
+    },
+    {
+      "type": "Identifier",
+      "value": "$props",
       "range": [
-        161,
+        156,
         162
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 2
+          "column": 5
         },
         "end": {
           "line": 8,
-          "column": 3
+          "column": 11
         }
       }
     },
@@ -2478,11 +2458,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 3
+          "column": 11
         },
         "end": {
           "line": 8,
-          "column": 4
+          "column": 12
         }
       }
     },
@@ -2496,11 +2476,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 4
+          "column": 12
         },
         "end": {
           "line": 8,
-          "column": 5
+          "column": 13
         }
       }
     },
@@ -2514,11 +2494,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 5
+          "column": 13
         },
         "end": {
           "line": 8,
-          "column": 6
+          "column": 14
         }
       }
     },
@@ -3893,7 +3873,7 @@
   ],
   "range": [
     0,
-    348
+    349
   ],
   "loc": {
     "start": {
@@ -3901,8 +3881,8 @@
       "column": 0
     },
     "end": {
-      "line": 22,
-      "column": 8
+      "line": 23,
+      "column": 0
     }
   }
 }
\ No newline at end of file
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-scope-output.json
index c7026978..fba3285e 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              91,
-              97
+              156,
+              162
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
@@ -190,8 +190,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  127,
-                  134
+                  119,
+                  126
                 ],
                 "loc": {
                   "start": {
@@ -230,8 +230,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  143,
-                  150
+                  135,
+                  142
                 ],
                 "loc": {
                   "start": {
@@ -487,94 +487,41 @@
                       }
                     }
                   ],
-                  "range": [
-                    65,
-                    88
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      91,
-                      97
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                102,
-                                106
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              94,
+                              98
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSAnyKeyword",
-                                  "range": [
-                                    108,
-                                    111
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 5,
-                                      "column": 8
-                                    },
-                                    "end": {
-                                      "line": 5,
-                                      "column": 11
-                                    }
-                                  }
-                                },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSAnyKeyword",
                                 "range": [
-                                  108,
-                                  113
+                                  100,
+                                  103
                                 ],
                                 "loc": {
                                   "start": {
@@ -583,18 +530,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 13
+                                    "column": 11
                                   }
                                 }
                               },
                               "range": [
-                                106,
-                                113
+                                100,
+                                105
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -603,66 +550,66 @@
                               }
                             },
                             "range": [
-                              102,
-                              114
+                              98,
+                              105
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 14
+                                "column": 13
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                117,
-                                125
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            94,
+                            106
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 14
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              109,
+                              117
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    127,
-                                    134
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  127,
-                                  134
+                                  119,
+                                  126
                                 ],
                                 "loc": {
                                   "start": {
@@ -676,13 +623,13 @@
                                 }
                               },
                               "range": [
-                                125,
-                                134
+                                119,
+                                126
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -692,120 +639,120 @@
                             },
                             "range": [
                               117,
-                              135
+                              126
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                138,
-                                141
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            109,
+                            127
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              130,
+                              133
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSAnyKeyword",
-                                          "range": [
-                                            152,
-                                            155
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 7,
-                                              "column": 16
-                                            },
-                                            "end": {
-                                              "line": 7,
-                                              "column": 19
-                                            }
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSAnyKeyword",
+                                        "range": [
+                                          144,
+                                          147
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 19
                                           }
                                         }
-                                      ],
-                                      "range": [
-                                        151,
-                                        156
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
-                                        },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 20
-                                        }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 21
+                                    ],
+                                    "range": [
+                                      143,
+                                      148
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 20
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    143,
-                                    150
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  142,
+                                  149
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 21
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  143,
-                                  157
+                                  135,
+                                  142
                                 ],
                                 "loc": {
                                   "start": {
@@ -814,18 +761,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 21
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                141,
-                                157
+                                135,
+                                149
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -834,64 +781,115 @@
                               }
                             },
                             "range": [
-                              138,
-                              158
+                              133,
+                              149
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 22
+                                "column": 21
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          98,
-                          161
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            130,
+                            150
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 22
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        90,
+                        153
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      97,
-                      162
+                      88,
+                      153
                     ],
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    91,
-                    164
+                    65,
+                    153
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 8,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      156,
+                      162
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    156,
+                    164
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 8,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 13
                     }
                   }
                 },
@@ -906,7 +904,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -1215,94 +1213,41 @@
                       }
                     }
                   ],
-                  "range": [
-                    65,
-                    88
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      91,
-                      97
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                102,
-                                106
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              94,
+                              98
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSAnyKeyword",
-                                  "range": [
-                                    108,
-                                    111
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 5,
-                                      "column": 8
-                                    },
-                                    "end": {
-                                      "line": 5,
-                                      "column": 11
-                                    }
-                                  }
-                                },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSAnyKeyword",
                                 "range": [
-                                  108,
-                                  113
+                                  100,
+                                  103
                                 ],
                                 "loc": {
                                   "start": {
@@ -1311,18 +1256,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 13
+                                    "column": 11
                                   }
                                 }
                               },
                               "range": [
-                                106,
-                                113
+                                100,
+                                105
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -1331,66 +1276,66 @@
                               }
                             },
                             "range": [
-                              102,
-                              114
+                              98,
+                              105
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 14
+                                "column": 13
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                117,
-                                125
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            94,
+                            106
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 14
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              109,
+                              117
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    127,
-                                    134
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  127,
-                                  134
+                                  119,
+                                  126
                                 ],
                                 "loc": {
                                   "start": {
@@ -1404,13 +1349,13 @@
                                 }
                               },
                               "range": [
-                                125,
-                                134
+                                119,
+                                126
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -1420,120 +1365,120 @@
                             },
                             "range": [
                               117,
-                              135
+                              126
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                138,
-                                141
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            109,
+                            127
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              130,
+                              133
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSAnyKeyword",
-                                          "range": [
-                                            152,
-                                            155
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 7,
-                                              "column": 16
-                                            },
-                                            "end": {
-                                              "line": 7,
-                                              "column": 19
-                                            }
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSAnyKeyword",
+                                        "range": [
+                                          144,
+                                          147
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 19
                                           }
                                         }
-                                      ],
-                                      "range": [
-                                        151,
-                                        156
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
-                                        },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 20
-                                        }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 21
+                                    ],
+                                    "range": [
+                                      143,
+                                      148
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 20
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    143,
-                                    150
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  142,
+                                  149
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 21
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  143,
-                                  157
+                                  135,
+                                  142
                                 ],
                                 "loc": {
                                   "start": {
@@ -1542,18 +1487,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 21
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                141,
-                                157
+                                135,
+                                149
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -1562,64 +1507,115 @@
                               }
                             },
                             "range": [
-                              138,
-                              158
+                              133,
+                              149
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 22
+                                "column": 21
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          98,
-                          161
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            130,
+                            150
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 22
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        90,
+                        153
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
+                    },
+                    "range": [
+                      88,
+                      153
                     ],
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 2
+                      }
+                    }
+                  },
+                  "range": [
+                    65,
+                    153
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
                     "range": [
-                      97,
+                      156,
                       162
                     ],
                     "loc": {
                       "start": {
-                        "line": 4,
-                        "column": 37
+                        "line": 8,
+                        "column": 5
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 11
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    91,
+                    156,
                     164
                   ],
                   "loc": {
                     "start": {
-                      "line": 4,
-                      "column": 31
+                      "line": 8,
+                      "column": 5
                     },
                     "end": {
                       "line": 8,
-                      "column": 5
+                      "column": 13
                     }
                   }
                 },
@@ -1634,7 +1630,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -1983,94 +1979,41 @@
                       }
                     }
                   ],
-                  "range": [
-                    65,
-                    88
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      91,
-                      97
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                102,
-                                106
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              94,
+                              98
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSAnyKeyword",
-                                  "range": [
-                                    108,
-                                    111
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 5,
-                                      "column": 8
-                                    },
-                                    "end": {
-                                      "line": 5,
-                                      "column": 11
-                                    }
-                                  }
-                                },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSAnyKeyword",
                                 "range": [
-                                  108,
-                                  113
+                                  100,
+                                  103
                                 ],
                                 "loc": {
                                   "start": {
@@ -2079,18 +2022,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 13
+                                    "column": 11
                                   }
                                 }
                               },
                               "range": [
-                                106,
-                                113
+                                100,
+                                105
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -2099,66 +2042,66 @@
                               }
                             },
                             "range": [
-                              102,
-                              114
+                              98,
+                              105
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 14
+                                "column": 13
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                117,
-                                125
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            94,
+                            106
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 14
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              109,
+                              117
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    127,
-                                    134
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  127,
-                                  134
+                                  119,
+                                  126
                                 ],
                                 "loc": {
                                   "start": {
@@ -2172,13 +2115,13 @@
                                 }
                               },
                               "range": [
-                                125,
-                                134
+                                119,
+                                126
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -2188,120 +2131,120 @@
                             },
                             "range": [
                               117,
-                              135
+                              126
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                138,
-                                141
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            109,
+                            127
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              130,
+                              133
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSAnyKeyword",
-                                          "range": [
-                                            152,
-                                            155
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 7,
-                                              "column": 16
-                                            },
-                                            "end": {
-                                              "line": 7,
-                                              "column": 19
-                                            }
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSAnyKeyword",
+                                        "range": [
+                                          144,
+                                          147
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 19
                                           }
                                         }
-                                      ],
-                                      "range": [
-                                        151,
-                                        156
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
-                                        },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 20
-                                        }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 21
+                                    ],
+                                    "range": [
+                                      143,
+                                      148
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 20
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    143,
-                                    150
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  142,
+                                  149
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 21
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  143,
-                                  157
+                                  135,
+                                  142
                                 ],
                                 "loc": {
                                   "start": {
@@ -2310,18 +2253,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 21
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                141,
-                                157
+                                135,
+                                149
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -2330,64 +2273,115 @@
                               }
                             },
                             "range": [
-                              138,
-                              158
+                              133,
+                              149
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 22
+                                "column": 21
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          98,
-                          161
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            130,
+                            150
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 22
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        90,
+                        153
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      97,
-                      162
+                      88,
+                      153
                     ],
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    91,
-                    164
+                    65,
+                    153
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 8,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      156,
+                      162
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    156,
+                    164
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 8,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 13
                     }
                   }
                 },
@@ -2402,7 +2396,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -2618,17 +2612,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              91,
-              97
+              156,
+              162
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
@@ -2641,8 +2635,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              127,
-              134
+              119,
+              126
             ],
             "loc": {
               "start": {
@@ -2681,8 +2675,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              143,
-              150
+              135,
+              142
             ],
             "loc": {
               "start": {
@@ -3317,17 +3311,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              91,
-              97
+              156,
+              162
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-type-output.svelte b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-type-output.svelte
index d7a1f1de..2349866e 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-type-output.svelte
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/10-typing-snippets-type-output.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte'; // Snippet: Snippet<T>, Snippet: Snippet<T>
 
-	let { data, children, row } = $props<{ // data: any[], data: any[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: any) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: any) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, $props<{ data: any[]; children: Snippet; row: Snippet<[any]>; }>(): { data: any[]; children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }; row: (this: void, args_0: any) => unique symbol & { ...; }; }
-		data: any[];
-		children: Snippet;
-		row: Snippet<[any]>;
-	}>();
+	let { data, children, row }: { // data: any[], data: any[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: any) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: any) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		data: any[]; // data: any[]
+		children: Snippet; // Snippet: Snippet<T>, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		row: Snippet<[any]>; // Snippet: Snippet<T>, row: (this: void, args_0: any) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+	} = $props(); // $props(): any
 </script>
 
 <table>
@@ -19,4 +19,4 @@
 			<tr>{@render row(d)}</tr> <!-- row(d): unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; } -->
 		{/each}
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-input.svelte b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-input.svelte
index 209a7dee..bf1ebe3c 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-input.svelte
@@ -1,11 +1,11 @@
 <script lang="ts" generics="T">
 	import type { Snippet } from 'svelte';
 
-	let { data, children, row } = $props<{
+	let { data, children, row }: {
 		data: T[];
 		children: Snippet;
 		row: Snippet<[T]>;
-	}>();
+	} = $props();
 </script>
 
 <table>
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-output.json b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-output.json
index 275ab745..d7f0e50e 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-output.json
@@ -447,97 +447,44 @@
                     }
                   }
                 ],
-                "range": [
-                  78,
-                  101
-                ],
-                "loc": {
-                  "start": {
-                    "line": 4,
-                    "column": 5
-                  },
-                  "end": {
-                    "line": 4,
-                    "column": 28
-                  }
-                }
-              },
-              "init": {
-                "type": "CallExpression",
-                "arguments": [],
-                "callee": {
-                  "type": "Identifier",
-                  "name": "$props",
-                  "range": [
-                    104,
-                    110
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 31
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 37
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeLiteral",
-                      "members": [
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "data",
-                            "range": [
-                              115,
-                              119
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 5,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 5,
-                                "column": 6
-                              }
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeLiteral",
+                    "members": [
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "data",
+                          "range": [
+                            107,
+                            111
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 6
                             }
-                          },
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSArrayType",
-                              "elementType": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "T",
-                                  "range": [
-                                    121,
-                                    122
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 5,
-                                      "column": 8
-                                    },
-                                    "end": {
-                                      "line": 5,
-                                      "column": 9
-                                    }
-                                  }
-                                },
+                            "type": "TSArrayType",
+                            "elementType": {
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "T",
                                 "range": [
-                                  121,
-                                  122
+                                  113,
+                                  114
                                 ],
                                 "loc": {
                                   "start": {
@@ -551,8 +498,8 @@
                                 }
                               },
                               "range": [
-                                121,
-                                124
+                                113,
+                                114
                               ],
                               "loc": {
                                 "start": {
@@ -561,18 +508,18 @@
                                 },
                                 "end": {
                                   "line": 5,
-                                  "column": 11
+                                  "column": 9
                                 }
                               }
                             },
                             "range": [
-                              119,
-                              124
+                              113,
+                              116
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 6
+                                "column": 8
                               },
                               "end": {
                                 "line": 5,
@@ -581,66 +528,66 @@
                             }
                           },
                           "range": [
-                            115,
-                            125
+                            111,
+                            116
                           ],
                           "loc": {
                             "start": {
                               "line": 5,
-                              "column": 2
+                              "column": 6
                             },
                             "end": {
                               "line": 5,
-                              "column": 12
+                              "column": 11
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "children",
-                            "range": [
-                              128,
-                              136
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 6,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 6,
-                                "column": 10
-                              }
-                            }
+                        "range": [
+                          107,
+                          117
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 5,
+                            "column": 12
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "children",
+                          "range": [
+                            120,
+                            128
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 6,
+                              "column": 10
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  138,
-                                  145
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 6,
-                                    "column": 12
-                                  },
-                                  "end": {
-                                    "line": 6,
-                                    "column": 19
-                                  }
-                                }
-                              },
+                            "type": "TSTypeReference",
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                138,
-                                145
+                                130,
+                                137
                               ],
                               "loc": {
                                 "start": {
@@ -654,13 +601,13 @@
                               }
                             },
                             "range": [
-                              136,
-                              145
+                              130,
+                              137
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 10
+                                "column": 12
                               },
                               "end": {
                                 "line": 6,
@@ -670,73 +617,73 @@
                           },
                           "range": [
                             128,
-                            146
+                            137
                           ],
                           "loc": {
                             "start": {
                               "line": 6,
-                              "column": 2
+                              "column": 10
                             },
                             "end": {
                               "line": 6,
-                              "column": 20
+                              "column": 19
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "row",
-                            "range": [
-                              149,
-                              152
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 7,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 7,
-                                "column": 5
-                              }
-                            }
+                        "range": [
+                          120,
+                          138
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 6,
+                            "column": 20
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "row",
+                          "range": [
+                            141,
+                            144
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 5
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeArguments": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "TSTupleType",
-                                    "elementTypes": [
-                                      {
-                                        "type": "TSTypeReference",
-                                        "typeName": {
-                                          "type": "Identifier",
-                                          "name": "T",
-                                          "range": [
-                                            163,
-                                            164
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 7,
-                                              "column": 16
-                                            },
-                                            "end": {
-                                              "line": 7,
-                                              "column": 17
-                                            }
-                                          }
-                                        },
+                            "type": "TSTypeReference",
+                            "typeArguments": {
+                              "type": "TSTypeParameterInstantiation",
+                              "params": [
+                                {
+                                  "type": "TSTupleType",
+                                  "elementTypes": [
+                                    {
+                                      "type": "TSTypeReference",
+                                      "typeName": {
+                                        "type": "Identifier",
+                                        "name": "T",
                                         "range": [
-                                          163,
-                                          164
+                                          155,
+                                          156
                                         ],
                                         "loc": {
                                           "start": {
@@ -748,60 +695,60 @@
                                             "column": 17
                                           }
                                         }
-                                      }
-                                    ],
-                                    "range": [
-                                      162,
-                                      165
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 7,
-                                        "column": 15
                                       },
-                                      "end": {
-                                        "line": 7,
-                                        "column": 18
+                                      "range": [
+                                        155,
+                                        156
+                                      ],
+                                      "loc": {
+                                        "start": {
+                                          "line": 7,
+                                          "column": 16
+                                        },
+                                        "end": {
+                                          "line": 7,
+                                          "column": 17
+                                        }
                                       }
                                     }
-                                  }
-                                ],
-                                "range": [
-                                  161,
-                                  166
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 7,
-                                    "column": 14
-                                  },
-                                  "end": {
-                                    "line": 7,
-                                    "column": 19
+                                  ],
+                                  "range": [
+                                    154,
+                                    157
+                                  ],
+                                  "loc": {
+                                    "start": {
+                                      "line": 7,
+                                      "column": 15
+                                    },
+                                    "end": {
+                                      "line": 7,
+                                      "column": 18
+                                    }
                                   }
                                 }
-                              },
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  154,
-                                  161
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 7,
-                                    "column": 7
-                                  },
-                                  "end": {
-                                    "line": 7,
-                                    "column": 14
-                                  }
+                              ],
+                              "range": [
+                                153,
+                                158
+                              ],
+                              "loc": {
+                                "start": {
+                                  "line": 7,
+                                  "column": 14
+                                },
+                                "end": {
+                                  "line": 7,
+                                  "column": 19
                                 }
-                              },
+                              }
+                            },
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                154,
-                                166
+                                146,
+                                153
                               ],
                               "loc": {
                                 "start": {
@@ -810,18 +757,18 @@
                                 },
                                 "end": {
                                   "line": 7,
-                                  "column": 19
+                                  "column": 14
                                 }
                               }
                             },
                             "range": [
-                              152,
-                              166
+                              146,
+                              158
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 5
+                                "column": 7
                               },
                               "end": {
                                 "line": 7,
@@ -830,64 +777,115 @@
                             }
                           },
                           "range": [
-                            149,
-                            167
+                            144,
+                            158
                           ],
                           "loc": {
                             "start": {
                               "line": 7,
-                              "column": 2
+                              "column": 5
                             },
                             "end": {
                               "line": 7,
-                              "column": 20
+                              "column": 19
                             }
                           }
-                        }
-                      ],
-                      "range": [
-                        111,
-                        170
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 4,
-                          "column": 38
                         },
-                        "end": {
-                          "line": 8,
-                          "column": 2
+                        "range": [
+                          141,
+                          159
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 2
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 20
+                          }
                         }
                       }
+                    ],
+                    "range": [
+                      103,
+                      162
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 2
+                      }
                     }
-                  ],
+                  },
                   "range": [
-                    110,
-                    171
+                    101,
+                    162
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 37
+                      "column": 28
                     },
                     "end": {
                       "line": 8,
-                      "column": 3
+                      "column": 2
                     }
                   }
                 },
                 "range": [
-                  104,
-                  173
+                  78,
+                  162
                 ],
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 31
+                    "column": 5
                   },
                   "end": {
+                    "line": 8,
+                    "column": 2
+                  }
+                }
+              },
+              "init": {
+                "type": "CallExpression",
+                "arguments": [],
+                "callee": {
+                  "type": "Identifier",
+                  "name": "$props",
+                  "range": [
+                    165,
+                    171
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 11
+                    }
+                  }
+                },
+                "optional": false,
+                "range": [
+                  165,
+                  173
+                ],
+                "loc": {
+                  "start": {
                     "line": 8,
                     "column": 5
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 13
                   }
                 }
               },
@@ -902,7 +900,7 @@
                 },
                 "end": {
                   "line": 8,
-                  "column": 5
+                  "column": 13
                 }
               }
             }
@@ -918,7 +916,7 @@
             },
             "end": {
               "line": 8,
-              "column": 6
+              "column": 14
             }
           }
         }
@@ -2221,55 +2219,19 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
-      "range": [
-        102,
-        103
-      ],
-      "loc": {
-        "start": {
-          "line": 4,
-          "column": 29
-        },
-        "end": {
-          "line": 4,
-          "column": 30
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "$props",
-      "range": [
-        104,
-        110
-      ],
-      "loc": {
-        "start": {
-          "line": 4,
-          "column": 31
-        },
-        "end": {
-          "line": 4,
-          "column": 37
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "<",
+      "value": ":",
       "range": [
-        110,
-        111
+        101,
+        102
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 37
+          "column": 28
         },
         "end": {
           "line": 4,
-          "column": 38
+          "column": 29
         }
       }
     },
@@ -2277,17 +2239,17 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        111,
-        112
+        103,
+        104
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 38
+          "column": 30
         },
         "end": {
           "line": 4,
-          "column": 39
+          "column": 31
         }
       }
     },
@@ -2295,8 +2257,8 @@
       "type": "Identifier",
       "value": "data",
       "range": [
-        115,
-        119
+        107,
+        111
       ],
       "loc": {
         "start": {
@@ -2313,8 +2275,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        119,
-        120
+        111,
+        112
       ],
       "loc": {
         "start": {
@@ -2331,8 +2293,8 @@
       "type": "Identifier",
       "value": "T",
       "range": [
-        121,
-        122
+        113,
+        114
       ],
       "loc": {
         "start": {
@@ -2349,8 +2311,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        122,
-        123
+        114,
+        115
       ],
       "loc": {
         "start": {
@@ -2367,8 +2329,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        123,
-        124
+        115,
+        116
       ],
       "loc": {
         "start": {
@@ -2385,8 +2347,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        124,
-        125
+        116,
+        117
       ],
       "loc": {
         "start": {
@@ -2403,8 +2365,8 @@
       "type": "Identifier",
       "value": "children",
       "range": [
-        128,
-        136
+        120,
+        128
       ],
       "loc": {
         "start": {
@@ -2421,8 +2383,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        136,
-        137
+        128,
+        129
       ],
       "loc": {
         "start": {
@@ -2439,8 +2401,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        138,
-        145
+        130,
+        137
       ],
       "loc": {
         "start": {
@@ -2457,8 +2419,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        145,
-        146
+        137,
+        138
       ],
       "loc": {
         "start": {
@@ -2475,8 +2437,8 @@
       "type": "Identifier",
       "value": "row",
       "range": [
-        149,
-        152
+        141,
+        144
       ],
       "loc": {
         "start": {
@@ -2493,8 +2455,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        152,
-        153
+        144,
+        145
       ],
       "loc": {
         "start": {
@@ -2511,8 +2473,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        154,
-        161
+        146,
+        153
       ],
       "loc": {
         "start": {
@@ -2529,8 +2491,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        161,
-        162
+        153,
+        154
       ],
       "loc": {
         "start": {
@@ -2547,8 +2509,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        162,
-        163
+        154,
+        155
       ],
       "loc": {
         "start": {
@@ -2565,8 +2527,8 @@
       "type": "Identifier",
       "value": "T",
       "range": [
-        163,
-        164
+        155,
+        156
       ],
       "loc": {
         "start": {
@@ -2583,8 +2545,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        164,
-        165
+        156,
+        157
       ],
       "loc": {
         "start": {
@@ -2601,8 +2563,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        165,
-        166
+        157,
+        158
       ],
       "loc": {
         "start": {
@@ -2619,8 +2581,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        166,
-        167
+        158,
+        159
       ],
       "loc": {
         "start": {
@@ -2637,8 +2599,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        169,
-        170
+        161,
+        162
       ],
       "loc": {
         "start": {
@@ -2653,19 +2615,37 @@
     },
     {
       "type": "Punctuator",
-      "value": ">",
+      "value": "=",
       "range": [
-        170,
+        163,
+        164
+      ],
+      "loc": {
+        "start": {
+          "line": 8,
+          "column": 3
+        },
+        "end": {
+          "line": 8,
+          "column": 4
+        }
+      }
+    },
+    {
+      "type": "Identifier",
+      "value": "$props",
+      "range": [
+        165,
         171
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 2
+          "column": 5
         },
         "end": {
           "line": 8,
-          "column": 3
+          "column": 11
         }
       }
     },
@@ -2679,11 +2659,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 3
+          "column": 11
         },
         "end": {
           "line": 8,
-          "column": 4
+          "column": 12
         }
       }
     },
@@ -2697,11 +2677,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 4
+          "column": 12
         },
         "end": {
           "line": 8,
-          "column": 5
+          "column": 13
         }
       }
     },
@@ -2715,11 +2695,11 @@
       "loc": {
         "start": {
           "line": 8,
-          "column": 5
+          "column": 13
         },
         "end": {
           "line": 8,
-          "column": 6
+          "column": 14
         }
       }
     },
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-scope-output.json b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-scope-output.json
index c602f4a9..53a8cf5a 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              104,
-              110
+              165,
+              171
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
@@ -190,8 +190,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  138,
-                  145
+                  130,
+                  137
                 ],
                 "loc": {
                   "start": {
@@ -230,8 +230,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  154,
-                  161
+                  146,
+                  153
                 ],
                 "loc": {
                   "start": {
@@ -487,97 +487,44 @@
                       }
                     }
                   ],
-                  "range": [
-                    78,
-                    101
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      104,
-                      110
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                115,
-                                119
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              107,
+                              111
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "T",
-                                    "range": [
-                                      121,
-                                      122
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 5,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 5,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "T",
                                   "range": [
-                                    121,
-                                    122
+                                    113,
+                                    114
                                   ],
                                   "loc": {
                                     "start": {
@@ -591,8 +538,8 @@
                                   }
                                 },
                                 "range": [
-                                  121,
-                                  124
+                                  113,
+                                  114
                                 ],
                                 "loc": {
                                   "start": {
@@ -601,18 +548,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                119,
-                                124
+                                113,
+                                116
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -621,66 +568,66 @@
                               }
                             },
                             "range": [
-                              115,
-                              125
+                              111,
+                              116
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                128,
-                                136
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            107,
+                            117
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              120,
+                              128
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    138,
-                                    145
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  138,
-                                  145
+                                  130,
+                                  137
                                 ],
                                 "loc": {
                                   "start": {
@@ -694,13 +641,13 @@
                                 }
                               },
                               "range": [
-                                136,
-                                145
+                                130,
+                                137
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -710,73 +657,73 @@
                             },
                             "range": [
                               128,
-                              146
+                              137
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                149,
-                                152
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            120,
+                            138
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              141,
+                              144
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "T",
-                                            "range": [
-                                              163,
-                                              164
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 7,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 7,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "T",
                                           "range": [
-                                            163,
-                                            164
+                                            155,
+                                            156
                                           ],
                                           "loc": {
                                             "start": {
@@ -788,60 +735,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        162,
-                                        165
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 18
+                                        "range": [
+                                          155,
+                                          156
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    161,
-                                    166
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      154,
+                                      157
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    154,
-                                    161
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  153,
+                                  158
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  154,
-                                  166
+                                  146,
+                                  153
                                 ],
                                 "loc": {
                                   "start": {
@@ -850,18 +797,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                152,
-                                166
+                                146,
+                                158
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -870,80 +817,131 @@
                               }
                             },
                             "range": [
-                              149,
-                              167
+                              144,
+                              158
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          111,
-                          170
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            141,
+                            159
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        103,
+                        162
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      110,
-                      171
+                      101,
+                      162
                     ],
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    104,
-                    173
+                    78,
+                    162
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
                       "line": 8,
-                      "column": 5
+                      "column": 2
                     }
                   }
                 },
-                "range": [
-                  78,
-                  173
-                ],
-                "loc": {
-                  "start": {
-                    "line": 4,
-                    "column": 5
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      165,
+                      171
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 11
+                      }
+                    }
                   },
-                  "end": {
-                    "line": 8,
-                    "column": 5
-                  }
+                  "optional": false,
+                  "range": [
+                    165,
+                    173
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 13
+                    }
+                  }
+                },
+                "range": [
+                  78,
+                  173
+                ],
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 13
+                  }
                 }
               }
             }
@@ -1251,97 +1249,44 @@
                       }
                     }
                   ],
-                  "range": [
-                    78,
-                    101
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      104,
-                      110
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                115,
-                                119
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              107,
+                              111
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "T",
-                                    "range": [
-                                      121,
-                                      122
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 5,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 5,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "T",
                                   "range": [
-                                    121,
-                                    122
+                                    113,
+                                    114
                                   ],
                                   "loc": {
                                     "start": {
@@ -1355,8 +1300,8 @@
                                   }
                                 },
                                 "range": [
-                                  121,
-                                  124
+                                  113,
+                                  114
                                 ],
                                 "loc": {
                                   "start": {
@@ -1365,18 +1310,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                119,
-                                124
+                                113,
+                                116
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -1385,66 +1330,66 @@
                               }
                             },
                             "range": [
-                              115,
-                              125
+                              111,
+                              116
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                128,
-                                136
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            107,
+                            117
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              120,
+                              128
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    138,
-                                    145
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  138,
-                                  145
+                                  130,
+                                  137
                                 ],
                                 "loc": {
                                   "start": {
@@ -1458,13 +1403,13 @@
                                 }
                               },
                               "range": [
-                                136,
-                                145
+                                130,
+                                137
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -1474,73 +1419,73 @@
                             },
                             "range": [
                               128,
-                              146
+                              137
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                149,
-                                152
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            120,
+                            138
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              141,
+                              144
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "T",
-                                            "range": [
-                                              163,
-                                              164
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 7,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 7,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "T",
                                           "range": [
-                                            163,
-                                            164
+                                            155,
+                                            156
                                           ],
                                           "loc": {
                                             "start": {
@@ -1552,60 +1497,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        162,
-                                        165
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 18
+                                        "range": [
+                                          155,
+                                          156
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    161,
-                                    166
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      154,
+                                      157
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    154,
-                                    161
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  153,
+                                  158
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  154,
-                                  166
+                                  146,
+                                  153
                                 ],
                                 "loc": {
                                   "start": {
@@ -1614,18 +1559,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                152,
-                                166
+                                146,
+                                158
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -1634,64 +1579,115 @@
                               }
                             },
                             "range": [
-                              149,
-                              167
+                              144,
+                              158
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          111,
-                          170
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            141,
+                            159
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        103,
+                        162
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      110,
-                      171
+                      101,
+                      162
                     ],
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    104,
-                    173
+                    78,
+                    162
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 8,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      165,
+                      171
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    165,
+                    173
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 8,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 13
                     }
                   }
                 },
@@ -1706,7 +1702,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -2030,122 +2026,69 @@
                         ],
                         "loc": {
                           "start": {
-                            "line": 4,
-                            "column": 23
-                          },
-                          "end": {
-                            "line": 4,
-                            "column": 26
-                          }
-                        }
-                      },
-                      "range": [
-                        96,
-                        99
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 4,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 4,
-                          "column": 26
-                        }
-                      }
-                    }
-                  ],
-                  "range": [
-                    78,
-                    101
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 4,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 4,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      104,
-                      110
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 31
+                            "line": 4,
+                            "column": 23
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 26
+                          }
+                        }
                       },
-                      "end": {
-                        "line": 4,
-                        "column": 37
+                      "range": [
+                        96,
+                        99
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 26
+                        }
                       }
                     }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                115,
-                                119
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 6
-                                }
+                  ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              107,
+                              111
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "T",
-                                    "range": [
-                                      121,
-                                      122
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 5,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 5,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "T",
                                   "range": [
-                                    121,
-                                    122
+                                    113,
+                                    114
                                   ],
                                   "loc": {
                                     "start": {
@@ -2159,8 +2102,8 @@
                                   }
                                 },
                                 "range": [
-                                  121,
-                                  124
+                                  113,
+                                  114
                                 ],
                                 "loc": {
                                   "start": {
@@ -2169,18 +2112,18 @@
                                   },
                                   "end": {
                                     "line": 5,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                119,
-                                124
+                                113,
+                                116
                               ],
                               "loc": {
                                 "start": {
                                   "line": 5,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 5,
@@ -2189,66 +2132,66 @@
                               }
                             },
                             "range": [
-                              115,
-                              125
+                              111,
+                              116
                             ],
                             "loc": {
                               "start": {
                                 "line": 5,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 5,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                128,
-                                136
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            107,
+                            117
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 5,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              120,
+                              128
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    138,
-                                    145
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  138,
-                                  145
+                                  130,
+                                  137
                                 ],
                                 "loc": {
                                   "start": {
@@ -2262,13 +2205,13 @@
                                 }
                               },
                               "range": [
-                                136,
-                                145
+                                130,
+                                137
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 6,
@@ -2278,73 +2221,73 @@
                             },
                             "range": [
                               128,
-                              146
+                              137
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 6,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                149,
-                                152
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            120,
+                            138
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              141,
+                              144
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "T",
-                                            "range": [
-                                              163,
-                                              164
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 7,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 7,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "T",
                                           "range": [
-                                            163,
-                                            164
+                                            155,
+                                            156
                                           ],
                                           "loc": {
                                             "start": {
@@ -2356,60 +2299,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        162,
-                                        165
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 7,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 7,
-                                          "column": 18
+                                        "range": [
+                                          155,
+                                          156
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 7,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 7,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    161,
-                                    166
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      154,
+                                      157
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 7,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 7,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    154,
-                                    161
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  153,
+                                  158
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 7,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 7,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  154,
-                                  166
+                                  146,
+                                  153
                                 ],
                                 "loc": {
                                   "start": {
@@ -2418,18 +2361,18 @@
                                   },
                                   "end": {
                                     "line": 7,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                152,
-                                166
+                                146,
+                                158
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 7,
@@ -2438,64 +2381,115 @@
                               }
                             },
                             "range": [
-                              149,
-                              167
+                              144,
+                              158
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          111,
-                          170
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 8,
-                            "column": 2
+                          "range": [
+                            141,
+                            159
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        103,
+                        162
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      110,
-                      171
+                      101,
+                      162
                     ],
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 8,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    104,
-                    173
+                    78,
+                    162
                   ],
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 8,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      165,
+                      171
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    165,
+                    173
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 8,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 13
                     }
                   }
                 },
@@ -2510,7 +2504,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -2688,8 +2682,8 @@
                 "type": "Identifier",
                 "name": "T",
                 "range": [
-                  121,
-                  122
+                  113,
+                  114
                 ],
                 "loc": {
                   "start": {
@@ -2728,8 +2722,8 @@
                 "type": "Identifier",
                 "name": "T",
                 "range": [
-                  163,
-                  164
+                  155,
+                  156
                 ],
                 "loc": {
                   "start": {
@@ -2892,17 +2886,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              104,
-              110
+              165,
+              171
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
@@ -2915,8 +2909,8 @@
             "type": "Identifier",
             "name": "T",
             "range": [
-              121,
-              122
+              113,
+              114
             ],
             "loc": {
               "start": {
@@ -2955,8 +2949,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              138,
-              145
+              130,
+              137
             ],
             "loc": {
               "start": {
@@ -2995,8 +2989,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              154,
-              161
+              146,
+              153
             ],
             "loc": {
               "start": {
@@ -3035,8 +3029,8 @@
             "type": "Identifier",
             "name": "T",
             "range": [
-              163,
-              164
+              155,
+              156
             ],
             "loc": {
               "start": {
@@ -3671,17 +3665,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              104,
-              110
+              165,
+              171
             ],
             "loc": {
               "start": {
-                "line": 4,
-                "column": 31
+                "line": 8,
+                "column": 5
               },
               "end": {
-                "line": 4,
-                "column": 37
+                "line": 8,
+                "column": 11
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-type-output.svelte b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-type-output.svelte
index 9eda792c..870bfb79 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-type-output.svelte
+++ b/tests/fixtures/parser/ast/svelte5/docs/snippets/11-typing-snippets-type-output.svelte
@@ -1,11 +1,11 @@
 <script lang="ts" generics="T"> // T: unknown
 	import type { Snippet } from 'svelte'; // Snippet: Snippet<T>, Snippet: Snippet<T>
 
-	let { data, children, row } = $props<{ // data: unknown[], data: unknown[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, $props<{ data: T[]; children: Snippet; row: Snippet<[T]>; }>(): { data: unknown[]; children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }; row: (this: void, args_0: unknown) => unique symbol & { ...; }; }
-		data: T[];
-		children: Snippet;
-		row: Snippet<[T]>;
-	}>();
+	let { data, children, row }: { // data: unknown[], data: unknown[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		data: T[]; // T: unknown, data: unknown[]
+		children: Snippet; // Snippet: Snippet<T>, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		row: Snippet<[T]>; // Snippet: Snippet<T>, T: unknown, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+	} = $props(); // $props(): any
 </script>
 
 <table>
diff --git a/tests/fixtures/parser/ast/svelte5/generics01-snippets-input.svelte b/tests/fixtures/parser/ast/svelte5/generics01-snippets-input.svelte
index a9600a08..8b5eed46 100644
--- a/tests/fixtures/parser/ast/svelte5/generics01-snippets-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/generics01-snippets-input.svelte
@@ -2,11 +2,11 @@
 	import type { Snippet } from 'svelte';
 
 	type A = T
-	let { data, children, row } = $props<{
+	let { data, children, row }:{
 		data: A[];
 		children: Snippet;
 		row: Snippet<[A]>;
-	}>();
+	} = $props();
 </script>
 
 <table>
diff --git a/tests/fixtures/parser/ast/svelte5/generics01-snippets-output.json b/tests/fixtures/parser/ast/svelte5/generics01-snippets-output.json
index 097a30d3..02e226b9 100644
--- a/tests/fixtures/parser/ast/svelte5/generics01-snippets-output.json
+++ b/tests/fixtures/parser/ast/svelte5/generics01-snippets-output.json
@@ -517,97 +517,44 @@
                     }
                   }
                 ],
-                "range": [
-                  90,
-                  113
-                ],
-                "loc": {
-                  "start": {
-                    "line": 5,
-                    "column": 5
-                  },
-                  "end": {
-                    "line": 5,
-                    "column": 28
-                  }
-                }
-              },
-              "init": {
-                "type": "CallExpression",
-                "arguments": [],
-                "callee": {
-                  "type": "Identifier",
-                  "name": "$props",
-                  "range": [
-                    116,
-                    122
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 5,
-                      "column": 31
-                    },
-                    "end": {
-                      "line": 5,
-                      "column": 37
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeLiteral",
-                      "members": [
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "data",
-                            "range": [
-                              127,
-                              131
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 6,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 6,
-                                "column": 6
-                              }
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeLiteral",
+                    "members": [
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "data",
+                          "range": [
+                            118,
+                            122
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 6,
+                              "column": 6
                             }
-                          },
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSArrayType",
-                              "elementType": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "A",
-                                  "range": [
-                                    133,
-                                    134
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 8
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 9
-                                    }
-                                  }
-                                },
+                            "type": "TSArrayType",
+                            "elementType": {
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "A",
                                 "range": [
-                                  133,
-                                  134
+                                  124,
+                                  125
                                 ],
                                 "loc": {
                                   "start": {
@@ -621,8 +568,8 @@
                                 }
                               },
                               "range": [
-                                133,
-                                136
+                                124,
+                                125
                               ],
                               "loc": {
                                 "start": {
@@ -631,18 +578,18 @@
                                 },
                                 "end": {
                                   "line": 6,
-                                  "column": 11
+                                  "column": 9
                                 }
                               }
                             },
                             "range": [
-                              131,
-                              136
+                              124,
+                              127
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 6
+                                "column": 8
                               },
                               "end": {
                                 "line": 6,
@@ -651,66 +598,66 @@
                             }
                           },
                           "range": [
-                            127,
-                            137
+                            122,
+                            127
                           ],
                           "loc": {
                             "start": {
                               "line": 6,
-                              "column": 2
+                              "column": 6
                             },
                             "end": {
                               "line": 6,
-                              "column": 12
+                              "column": 11
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "children",
-                            "range": [
-                              140,
-                              148
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 7,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 7,
-                                "column": 10
-                              }
-                            }
+                        "range": [
+                          118,
+                          128
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 6,
+                            "column": 12
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "children",
+                          "range": [
+                            131,
+                            139
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 10
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  150,
-                                  157
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 7,
-                                    "column": 12
-                                  },
-                                  "end": {
-                                    "line": 7,
-                                    "column": 19
-                                  }
-                                }
-                              },
+                            "type": "TSTypeReference",
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                150,
-                                157
+                                141,
+                                148
                               ],
                               "loc": {
                                 "start": {
@@ -724,13 +671,13 @@
                               }
                             },
                             "range": [
-                              148,
-                              157
+                              141,
+                              148
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 10
+                                "column": 12
                               },
                               "end": {
                                 "line": 7,
@@ -739,74 +686,74 @@
                             }
                           },
                           "range": [
-                            140,
-                            158
+                            139,
+                            148
                           ],
                           "loc": {
                             "start": {
                               "line": 7,
-                              "column": 2
+                              "column": 10
                             },
                             "end": {
                               "line": 7,
-                              "column": 20
+                              "column": 19
                             }
                           }
                         },
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "row",
-                            "range": [
-                              161,
-                              164
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 8,
-                                "column": 2
-                              },
-                              "end": {
-                                "line": 8,
-                                "column": 5
-                              }
-                            }
+                        "range": [
+                          131,
+                          149
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 2
                           },
+                          "end": {
+                            "line": 7,
+                            "column": 20
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "row",
+                          "range": [
+                            152,
+                            155
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 5
+                            }
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSTypeReference",
-                              "typeArguments": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "TSTupleType",
-                                    "elementTypes": [
-                                      {
-                                        "type": "TSTypeReference",
-                                        "typeName": {
-                                          "type": "Identifier",
-                                          "name": "A",
-                                          "range": [
-                                            175,
-                                            176
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 8,
-                                              "column": 16
-                                            },
-                                            "end": {
-                                              "line": 8,
-                                              "column": 17
-                                            }
-                                          }
-                                        },
+                            "type": "TSTypeReference",
+                            "typeArguments": {
+                              "type": "TSTypeParameterInstantiation",
+                              "params": [
+                                {
+                                  "type": "TSTupleType",
+                                  "elementTypes": [
+                                    {
+                                      "type": "TSTypeReference",
+                                      "typeName": {
+                                        "type": "Identifier",
+                                        "name": "A",
                                         "range": [
-                                          175,
-                                          176
+                                          166,
+                                          167
                                         ],
                                         "loc": {
                                           "start": {
@@ -818,60 +765,60 @@
                                             "column": 17
                                           }
                                         }
-                                      }
-                                    ],
-                                    "range": [
-                                      174,
-                                      177
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 8,
-                                        "column": 15
                                       },
-                                      "end": {
-                                        "line": 8,
-                                        "column": 18
+                                      "range": [
+                                        166,
+                                        167
+                                      ],
+                                      "loc": {
+                                        "start": {
+                                          "line": 8,
+                                          "column": 16
+                                        },
+                                        "end": {
+                                          "line": 8,
+                                          "column": 17
+                                        }
                                       }
                                     }
-                                  }
-                                ],
-                                "range": [
-                                  173,
-                                  178
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 8,
-                                    "column": 14
-                                  },
-                                  "end": {
-                                    "line": 8,
-                                    "column": 19
+                                  ],
+                                  "range": [
+                                    165,
+                                    168
+                                  ],
+                                  "loc": {
+                                    "start": {
+                                      "line": 8,
+                                      "column": 15
+                                    },
+                                    "end": {
+                                      "line": 8,
+                                      "column": 18
+                                    }
                                   }
                                 }
-                              },
-                              "typeName": {
-                                "type": "Identifier",
-                                "name": "Snippet",
-                                "range": [
-                                  166,
-                                  173
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 8,
-                                    "column": 7
-                                  },
-                                  "end": {
-                                    "line": 8,
-                                    "column": 14
-                                  }
+                              ],
+                              "range": [
+                                164,
+                                169
+                              ],
+                              "loc": {
+                                "start": {
+                                  "line": 8,
+                                  "column": 14
+                                },
+                                "end": {
+                                  "line": 8,
+                                  "column": 19
                                 }
-                              },
+                              }
+                            },
+                            "typeName": {
+                              "type": "Identifier",
+                              "name": "Snippet",
                               "range": [
-                                166,
-                                178
+                                157,
+                                164
                               ],
                               "loc": {
                                 "start": {
@@ -880,18 +827,18 @@
                                 },
                                 "end": {
                                   "line": 8,
-                                  "column": 19
+                                  "column": 14
                                 }
                               }
                             },
                             "range": [
-                              164,
-                              178
+                              157,
+                              169
                             ],
                             "loc": {
                               "start": {
                                 "line": 8,
-                                "column": 5
+                                "column": 7
                               },
                               "end": {
                                 "line": 8,
@@ -900,70 +847,121 @@
                             }
                           },
                           "range": [
-                            161,
-                            179
+                            155,
+                            169
                           ],
                           "loc": {
                             "start": {
                               "line": 8,
-                              "column": 2
+                              "column": 5
                             },
                             "end": {
                               "line": 8,
-                              "column": 20
+                              "column": 19
                             }
                           }
-                        }
-                      ],
-                      "range": [
-                        123,
-                        182
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 5,
-                          "column": 38
                         },
-                        "end": {
-                          "line": 9,
-                          "column": 2
+                        "range": [
+                          152,
+                          170
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 2
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 20
+                          }
                         }
                       }
+                    ],
+                    "range": [
+                      114,
+                      173
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 29
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 2
+                      }
                     }
-                  ],
+                  },
                   "range": [
-                    122,
-                    183
+                    113,
+                    173
                   ],
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 37
+                      "column": 28
                     },
                     "end": {
                       "line": 9,
-                      "column": 3
+                      "column": 2
                     }
                   }
                 },
                 "range": [
-                  116,
-                  185
+                  90,
+                  173
                 ],
                 "loc": {
                   "start": {
                     "line": 5,
-                    "column": 31
+                    "column": 5
                   },
                   "end": {
+                    "line": 9,
+                    "column": 2
+                  }
+                }
+              },
+              "init": {
+                "type": "CallExpression",
+                "arguments": [],
+                "callee": {
+                  "type": "Identifier",
+                  "name": "$props",
+                  "range": [
+                    176,
+                    182
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 9,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 11
+                    }
+                  }
+                },
+                "optional": false,
+                "range": [
+                  176,
+                  184
+                ],
+                "loc": {
+                  "start": {
                     "line": 9,
                     "column": 5
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 13
                   }
                 }
               },
               "range": [
                 90,
-                185
+                184
               ],
               "loc": {
                 "start": {
@@ -972,14 +970,14 @@
                 },
                 "end": {
                   "line": 9,
-                  "column": 5
+                  "column": 13
                 }
               }
             }
           ],
           "range": [
             86,
-            186
+            185
           ],
           "loc": {
             "start": {
@@ -988,7 +986,7 @@
             },
             "end": {
               "line": 9,
-              "column": 6
+              "column": 14
             }
           }
         }
@@ -996,8 +994,8 @@
       "endTag": {
         "type": "SvelteEndTag",
         "range": [
-          187,
-          196
+          186,
+          195
         ],
         "loc": {
           "start": {
@@ -1012,7 +1010,7 @@
       },
       "range": [
         0,
-        196
+        195
       ],
       "loc": {
         "start": {
@@ -1029,8 +1027,8 @@
       "type": "SvelteText",
       "value": "\n\n",
       "range": [
-        196,
-        198
+        195,
+        197
       ],
       "loc": {
         "start": {
@@ -1050,8 +1048,8 @@
         "type": "SvelteName",
         "name": "table",
         "range": [
-          199,
-          204
+          198,
+          203
         ],
         "loc": {
           "start": {
@@ -1069,8 +1067,8 @@
         "attributes": [],
         "selfClosing": false,
         "range": [
-          198,
-          205
+          197,
+          204
         ],
         "loc": {
           "start": {
@@ -1088,8 +1086,8 @@
           "type": "SvelteText",
           "value": "\n\t",
           "range": [
-            205,
-            207
+            204,
+            206
           ],
           "loc": {
             "start": {
@@ -1109,8 +1107,8 @@
             "type": "Identifier",
             "name": "children",
             "range": [
-              212,
-              220
+              211,
+              219
             ],
             "loc": {
               "start": {
@@ -1131,8 +1129,8 @@
                 "type": "SvelteName",
                 "name": "thead",
                 "range": [
-                  225,
-                  230
+                  224,
+                  229
                 ],
                 "loc": {
                   "start": {
@@ -1150,8 +1148,8 @@
                 "attributes": [],
                 "selfClosing": false,
                 "range": [
-                  224,
-                  231
+                  223,
+                  230
                 ],
                 "loc": {
                   "start": {
@@ -1169,8 +1167,8 @@
                   "type": "SvelteText",
                   "value": "\n\t\t\t",
                   "range": [
-                    231,
-                    235
+                    230,
+                    234
                   ],
                   "loc": {
                     "start": {
@@ -1190,8 +1188,8 @@
                     "type": "SvelteName",
                     "name": "tr",
                     "range": [
-                      236,
-                      238
+                      235,
+                      237
                     ],
                     "loc": {
                       "start": {
@@ -1209,8 +1207,8 @@
                     "attributes": [],
                     "selfClosing": false,
                     "range": [
-                      235,
-                      239
+                      234,
+                      238
                     ],
                     "loc": {
                       "start": {
@@ -1233,8 +1231,8 @@
                           "type": "Identifier",
                           "name": "children",
                           "range": [
-                            248,
-                            256
+                            247,
+                            255
                           ],
                           "loc": {
                             "start": {
@@ -1249,8 +1247,8 @@
                         },
                         "optional": false,
                         "range": [
-                          248,
-                          258
+                          247,
+                          257
                         ],
                         "loc": {
                           "start": {
@@ -1264,8 +1262,8 @@
                         }
                       },
                       "range": [
-                        239,
-                        259
+                        238,
+                        258
                       ],
                       "loc": {
                         "start": {
@@ -1282,8 +1280,8 @@
                   "endTag": {
                     "type": "SvelteEndTag",
                     "range": [
-                      259,
-                      264
+                      258,
+                      263
                     ],
                     "loc": {
                       "start": {
@@ -1297,8 +1295,8 @@
                     }
                   },
                   "range": [
-                    235,
-                    264
+                    234,
+                    263
                   ],
                   "loc": {
                     "start": {
@@ -1315,8 +1313,8 @@
                   "type": "SvelteText",
                   "value": "\n\t\t",
                   "range": [
-                    264,
-                    267
+                    263,
+                    266
                   ],
                   "loc": {
                     "start": {
@@ -1333,8 +1331,8 @@
               "endTag": {
                 "type": "SvelteEndTag",
                 "range": [
-                  267,
-                  275
+                  266,
+                  274
                 ],
                 "loc": {
                   "start": {
@@ -1348,8 +1346,8 @@
                 }
               },
               "range": [
-                224,
-                275
+                223,
+                274
               ],
               "loc": {
                 "start": {
@@ -1365,8 +1363,8 @@
           ],
           "else": null,
           "range": [
-            207,
-            282
+            206,
+            281
           ],
           "loc": {
             "start": {
@@ -1383,8 +1381,8 @@
           "type": "SvelteText",
           "value": "\n\t",
           "range": [
-            282,
-            284
+            281,
+            283
           ],
           "loc": {
             "start": {
@@ -1404,8 +1402,8 @@
             "type": "SvelteName",
             "name": "tbody",
             "range": [
-              285,
-              290
+              284,
+              289
             ],
             "loc": {
               "start": {
@@ -1423,8 +1421,8 @@
             "attributes": [],
             "selfClosing": false,
             "range": [
-              284,
-              291
+              283,
+              290
             ],
             "loc": {
               "start": {
@@ -1442,8 +1440,8 @@
               "type": "SvelteText",
               "value": "\n\t\t",
               "range": [
-                291,
-                294
+                290,
+                293
               ],
               "loc": {
                 "start": {
@@ -1462,8 +1460,8 @@
                 "type": "Identifier",
                 "name": "data",
                 "range": [
-                  301,
-                  305
+                  300,
+                  304
                 ],
                 "loc": {
                   "start": {
@@ -1480,8 +1478,8 @@
                 "type": "Identifier",
                 "name": "d",
                 "range": [
-                  309,
-                  310
+                  308,
+                  309
                 ],
                 "loc": {
                   "start": {
@@ -1504,8 +1502,8 @@
                     "type": "SvelteName",
                     "name": "tr",
                     "range": [
-                      316,
-                      318
+                      315,
+                      317
                     ],
                     "loc": {
                       "start": {
@@ -1523,8 +1521,8 @@
                     "attributes": [],
                     "selfClosing": false,
                     "range": [
-                      315,
-                      319
+                      314,
+                      318
                     ],
                     "loc": {
                       "start": {
@@ -1547,8 +1545,8 @@
                             "type": "Identifier",
                             "name": "d",
                             "range": [
-                              332,
-                              333
+                              331,
+                              332
                             ],
                             "loc": {
                               "start": {
@@ -1566,8 +1564,8 @@
                           "type": "Identifier",
                           "name": "row",
                           "range": [
-                            328,
-                            331
+                            327,
+                            330
                           ],
                           "loc": {
                             "start": {
@@ -1582,8 +1580,8 @@
                         },
                         "optional": false,
                         "range": [
-                          328,
-                          334
+                          327,
+                          333
                         ],
                         "loc": {
                           "start": {
@@ -1597,8 +1595,8 @@
                         }
                       },
                       "range": [
-                        319,
-                        335
+                        318,
+                        334
                       ],
                       "loc": {
                         "start": {
@@ -1615,8 +1613,8 @@
                   "endTag": {
                     "type": "SvelteEndTag",
                     "range": [
-                      335,
-                      340
+                      334,
+                      339
                     ],
                     "loc": {
                       "start": {
@@ -1630,8 +1628,8 @@
                     }
                   },
                   "range": [
-                    315,
-                    340
+                    314,
+                    339
                   ],
                   "loc": {
                     "start": {
@@ -1647,8 +1645,8 @@
               ],
               "else": null,
               "range": [
-                294,
-                350
+                293,
+                349
               ],
               "loc": {
                 "start": {
@@ -1665,8 +1663,8 @@
               "type": "SvelteText",
               "value": "\n\t",
               "range": [
-                350,
-                352
+                349,
+                351
               ],
               "loc": {
                 "start": {
@@ -1683,8 +1681,8 @@
           "endTag": {
             "type": "SvelteEndTag",
             "range": [
-              352,
-              360
+              351,
+              359
             ],
             "loc": {
               "start": {
@@ -1698,8 +1696,8 @@
             }
           },
           "range": [
-            284,
-            360
+            283,
+            359
           ],
           "loc": {
             "start": {
@@ -1716,8 +1714,8 @@
           "type": "SvelteText",
           "value": "\n",
           "range": [
-            360,
-            361
+            359,
+            360
           ],
           "loc": {
             "start": {
@@ -1734,8 +1732,8 @@
       "endTag": {
         "type": "SvelteEndTag",
         "range": [
-          361,
-          369
+          360,
+          368
         ],
         "loc": {
           "start": {
@@ -1749,8 +1747,8 @@
         }
       },
       "range": [
-        198,
-        369
+        197,
+        368
       ],
       "loc": {
         "start": {
@@ -2363,55 +2361,19 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
-      "range": [
-        114,
-        115
-      ],
-      "loc": {
-        "start": {
-          "line": 5,
-          "column": 29
-        },
-        "end": {
-          "line": 5,
-          "column": 30
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "$props",
-      "range": [
-        116,
-        122
-      ],
-      "loc": {
-        "start": {
-          "line": 5,
-          "column": 31
-        },
-        "end": {
-          "line": 5,
-          "column": 37
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "<",
+      "value": ":",
       "range": [
-        122,
-        123
+        113,
+        114
       ],
       "loc": {
         "start": {
           "line": 5,
-          "column": 37
+          "column": 28
         },
         "end": {
           "line": 5,
-          "column": 38
+          "column": 29
         }
       }
     },
@@ -2419,17 +2381,17 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        123,
-        124
+        114,
+        115
       ],
       "loc": {
         "start": {
           "line": 5,
-          "column": 38
+          "column": 29
         },
         "end": {
           "line": 5,
-          "column": 39
+          "column": 30
         }
       }
     },
@@ -2437,8 +2399,8 @@
       "type": "Identifier",
       "value": "data",
       "range": [
-        127,
-        131
+        118,
+        122
       ],
       "loc": {
         "start": {
@@ -2455,8 +2417,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        131,
-        132
+        122,
+        123
       ],
       "loc": {
         "start": {
@@ -2473,8 +2435,8 @@
       "type": "Identifier",
       "value": "A",
       "range": [
-        133,
-        134
+        124,
+        125
       ],
       "loc": {
         "start": {
@@ -2491,8 +2453,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        134,
-        135
+        125,
+        126
       ],
       "loc": {
         "start": {
@@ -2509,8 +2471,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        135,
-        136
+        126,
+        127
       ],
       "loc": {
         "start": {
@@ -2527,8 +2489,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        136,
-        137
+        127,
+        128
       ],
       "loc": {
         "start": {
@@ -2545,8 +2507,8 @@
       "type": "Identifier",
       "value": "children",
       "range": [
-        140,
-        148
+        131,
+        139
       ],
       "loc": {
         "start": {
@@ -2563,8 +2525,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        148,
-        149
+        139,
+        140
       ],
       "loc": {
         "start": {
@@ -2581,8 +2543,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        150,
-        157
+        141,
+        148
       ],
       "loc": {
         "start": {
@@ -2599,8 +2561,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        157,
-        158
+        148,
+        149
       ],
       "loc": {
         "start": {
@@ -2617,8 +2579,8 @@
       "type": "Identifier",
       "value": "row",
       "range": [
-        161,
-        164
+        152,
+        155
       ],
       "loc": {
         "start": {
@@ -2635,8 +2597,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        164,
-        165
+        155,
+        156
       ],
       "loc": {
         "start": {
@@ -2653,8 +2615,8 @@
       "type": "Identifier",
       "value": "Snippet",
       "range": [
-        166,
-        173
+        157,
+        164
       ],
       "loc": {
         "start": {
@@ -2671,8 +2633,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        173,
-        174
+        164,
+        165
       ],
       "loc": {
         "start": {
@@ -2689,8 +2651,8 @@
       "type": "Punctuator",
       "value": "[",
       "range": [
-        174,
-        175
+        165,
+        166
       ],
       "loc": {
         "start": {
@@ -2707,8 +2669,8 @@
       "type": "Identifier",
       "value": "A",
       "range": [
-        175,
-        176
+        166,
+        167
       ],
       "loc": {
         "start": {
@@ -2725,8 +2687,8 @@
       "type": "Punctuator",
       "value": "]",
       "range": [
-        176,
-        177
+        167,
+        168
       ],
       "loc": {
         "start": {
@@ -2743,8 +2705,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        177,
-        178
+        168,
+        169
       ],
       "loc": {
         "start": {
@@ -2761,8 +2723,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        178,
-        179
+        169,
+        170
       ],
       "loc": {
         "start": {
@@ -2779,8 +2741,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        181,
-        182
+        172,
+        173
       ],
       "loc": {
         "start": {
@@ -2795,19 +2757,37 @@
     },
     {
       "type": "Punctuator",
-      "value": ">",
+      "value": "=",
       "range": [
-        182,
-        183
+        174,
+        175
       ],
       "loc": {
         "start": {
           "line": 9,
-          "column": 2
+          "column": 3
         },
         "end": {
           "line": 9,
-          "column": 3
+          "column": 4
+        }
+      }
+    },
+    {
+      "type": "Identifier",
+      "value": "$props",
+      "range": [
+        176,
+        182
+      ],
+      "loc": {
+        "start": {
+          "line": 9,
+          "column": 5
+        },
+        "end": {
+          "line": 9,
+          "column": 11
         }
       }
     },
@@ -2815,17 +2795,17 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        183,
-        184
+        182,
+        183
       ],
       "loc": {
         "start": {
           "line": 9,
-          "column": 3
+          "column": 11
         },
         "end": {
           "line": 9,
-          "column": 4
+          "column": 12
         }
       }
     },
@@ -2833,17 +2813,17 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        184,
-        185
+        183,
+        184
       ],
       "loc": {
         "start": {
           "line": 9,
-          "column": 4
+          "column": 12
         },
         "end": {
           "line": 9,
-          "column": 5
+          "column": 13
         }
       }
     },
@@ -2851,17 +2831,17 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        185,
-        186
+        184,
+        185
       ],
       "loc": {
         "start": {
           "line": 9,
-          "column": 5
+          "column": 13
         },
         "end": {
           "line": 9,
-          "column": 6
+          "column": 14
         }
       }
     },
@@ -2869,8 +2849,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        187,
-        188
+        186,
+        187
       ],
       "loc": {
         "start": {
@@ -2887,8 +2867,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        188,
-        189
+        187,
+        188
       ],
       "loc": {
         "start": {
@@ -2905,8 +2885,8 @@
       "type": "HTMLIdentifier",
       "value": "script",
       "range": [
-        189,
-        195
+        188,
+        194
       ],
       "loc": {
         "start": {
@@ -2923,8 +2903,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        195,
-        196
+        194,
+        195
       ],
       "loc": {
         "start": {
@@ -2941,8 +2921,8 @@
       "type": "HTMLText",
       "value": "\n\n",
       "range": [
-        196,
-        198
+        195,
+        197
       ],
       "loc": {
         "start": {
@@ -2959,8 +2939,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        198,
-        199
+        197,
+        198
       ],
       "loc": {
         "start": {
@@ -2977,8 +2957,8 @@
       "type": "HTMLIdentifier",
       "value": "table",
       "range": [
-        199,
-        204
+        198,
+        203
       ],
       "loc": {
         "start": {
@@ -2995,8 +2975,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        204,
-        205
+        203,
+        204
       ],
       "loc": {
         "start": {
@@ -3013,8 +2993,8 @@
       "type": "HTMLText",
       "value": "\n\t",
       "range": [
-        205,
-        207
+        204,
+        206
       ],
       "loc": {
         "start": {
@@ -3031,8 +3011,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        207,
-        208
+        206,
+        207
       ],
       "loc": {
         "start": {
@@ -3049,8 +3029,8 @@
       "type": "MustacheKeyword",
       "value": "#if",
       "range": [
-        208,
-        211
+        207,
+        210
       ],
       "loc": {
         "start": {
@@ -3067,8 +3047,8 @@
       "type": "Identifier",
       "value": "children",
       "range": [
-        212,
-        220
+        211,
+        219
       ],
       "loc": {
         "start": {
@@ -3085,8 +3065,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        220,
-        221
+        219,
+        220
       ],
       "loc": {
         "start": {
@@ -3103,8 +3083,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        224,
-        225
+        223,
+        224
       ],
       "loc": {
         "start": {
@@ -3121,8 +3101,8 @@
       "type": "HTMLIdentifier",
       "value": "thead",
       "range": [
-        225,
-        230
+        224,
+        229
       ],
       "loc": {
         "start": {
@@ -3139,8 +3119,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        230,
-        231
+        229,
+        230
       ],
       "loc": {
         "start": {
@@ -3157,8 +3137,8 @@
       "type": "HTMLText",
       "value": "\n\t\t\t",
       "range": [
-        231,
-        235
+        230,
+        234
       ],
       "loc": {
         "start": {
@@ -3175,8 +3155,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        235,
-        236
+        234,
+        235
       ],
       "loc": {
         "start": {
@@ -3193,8 +3173,8 @@
       "type": "HTMLIdentifier",
       "value": "tr",
       "range": [
-        236,
-        238
+        235,
+        237
       ],
       "loc": {
         "start": {
@@ -3211,8 +3191,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        238,
-        239
+        237,
+        238
       ],
       "loc": {
         "start": {
@@ -3229,8 +3209,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        239,
-        240
+        238,
+        239
       ],
       "loc": {
         "start": {
@@ -3247,8 +3227,8 @@
       "type": "MustacheKeyword",
       "value": "@render",
       "range": [
-        240,
-        247
+        239,
+        246
       ],
       "loc": {
         "start": {
@@ -3265,8 +3245,8 @@
       "type": "Identifier",
       "value": "children",
       "range": [
-        248,
-        256
+        247,
+        255
       ],
       "loc": {
         "start": {
@@ -3283,8 +3263,8 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        256,
-        257
+        255,
+        256
       ],
       "loc": {
         "start": {
@@ -3301,8 +3281,8 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        257,
-        258
+        256,
+        257
       ],
       "loc": {
         "start": {
@@ -3319,8 +3299,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        258,
-        259
+        257,
+        258
       ],
       "loc": {
         "start": {
@@ -3337,8 +3317,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        259,
-        260
+        258,
+        259
       ],
       "loc": {
         "start": {
@@ -3355,8 +3335,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        260,
-        261
+        259,
+        260
       ],
       "loc": {
         "start": {
@@ -3373,8 +3353,8 @@
       "type": "HTMLIdentifier",
       "value": "tr",
       "range": [
-        261,
-        263
+        260,
+        262
       ],
       "loc": {
         "start": {
@@ -3391,8 +3371,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        263,
-        264
+        262,
+        263
       ],
       "loc": {
         "start": {
@@ -3409,8 +3389,8 @@
       "type": "HTMLText",
       "value": "\n\t\t",
       "range": [
-        264,
-        267
+        263,
+        266
       ],
       "loc": {
         "start": {
@@ -3427,8 +3407,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        267,
-        268
+        266,
+        267
       ],
       "loc": {
         "start": {
@@ -3445,8 +3425,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        268,
-        269
+        267,
+        268
       ],
       "loc": {
         "start": {
@@ -3463,8 +3443,8 @@
       "type": "HTMLIdentifier",
       "value": "thead",
       "range": [
-        269,
-        274
+        268,
+        273
       ],
       "loc": {
         "start": {
@@ -3481,8 +3461,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        274,
-        275
+        273,
+        274
       ],
       "loc": {
         "start": {
@@ -3499,8 +3479,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        277,
-        278
+        276,
+        277
       ],
       "loc": {
         "start": {
@@ -3517,8 +3497,8 @@
       "type": "MustacheKeyword",
       "value": "/if",
       "range": [
-        278,
-        281
+        277,
+        280
       ],
       "loc": {
         "start": {
@@ -3535,8 +3515,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        281,
-        282
+        280,
+        281
       ],
       "loc": {
         "start": {
@@ -3553,8 +3533,8 @@
       "type": "HTMLText",
       "value": "\n\t",
       "range": [
-        282,
-        284
+        281,
+        283
       ],
       "loc": {
         "start": {
@@ -3571,8 +3551,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        284,
-        285
+        283,
+        284
       ],
       "loc": {
         "start": {
@@ -3589,8 +3569,8 @@
       "type": "HTMLIdentifier",
       "value": "tbody",
       "range": [
-        285,
-        290
+        284,
+        289
       ],
       "loc": {
         "start": {
@@ -3607,8 +3587,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        290,
-        291
+        289,
+        290
       ],
       "loc": {
         "start": {
@@ -3625,8 +3605,8 @@
       "type": "HTMLText",
       "value": "\n\t\t",
       "range": [
-        291,
-        294
+        290,
+        293
       ],
       "loc": {
         "start": {
@@ -3643,8 +3623,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        294,
-        295
+        293,
+        294
       ],
       "loc": {
         "start": {
@@ -3661,8 +3641,8 @@
       "type": "MustacheKeyword",
       "value": "#each",
       "range": [
-        295,
-        300
+        294,
+        299
       ],
       "loc": {
         "start": {
@@ -3679,8 +3659,8 @@
       "type": "Identifier",
       "value": "data",
       "range": [
-        301,
-        305
+        300,
+        304
       ],
       "loc": {
         "start": {
@@ -3697,8 +3677,8 @@
       "type": "Keyword",
       "value": "as",
       "range": [
-        306,
-        308
+        305,
+        307
       ],
       "loc": {
         "start": {
@@ -3715,8 +3695,8 @@
       "type": "Identifier",
       "value": "d",
       "range": [
-        309,
-        310
+        308,
+        309
       ],
       "loc": {
         "start": {
@@ -3733,8 +3713,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        310,
-        311
+        309,
+        310
       ],
       "loc": {
         "start": {
@@ -3751,8 +3731,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        315,
-        316
+        314,
+        315
       ],
       "loc": {
         "start": {
@@ -3769,8 +3749,8 @@
       "type": "HTMLIdentifier",
       "value": "tr",
       "range": [
-        316,
-        318
+        315,
+        317
       ],
       "loc": {
         "start": {
@@ -3787,8 +3767,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        318,
-        319
+        317,
+        318
       ],
       "loc": {
         "start": {
@@ -3805,8 +3785,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        319,
-        320
+        318,
+        319
       ],
       "loc": {
         "start": {
@@ -3823,8 +3803,8 @@
       "type": "MustacheKeyword",
       "value": "@render",
       "range": [
-        320,
-        327
+        319,
+        326
       ],
       "loc": {
         "start": {
@@ -3841,8 +3821,8 @@
       "type": "Identifier",
       "value": "row",
       "range": [
-        328,
-        331
+        327,
+        330
       ],
       "loc": {
         "start": {
@@ -3859,8 +3839,8 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        331,
-        332
+        330,
+        331
       ],
       "loc": {
         "start": {
@@ -3877,8 +3857,8 @@
       "type": "Identifier",
       "value": "d",
       "range": [
-        332,
-        333
+        331,
+        332
       ],
       "loc": {
         "start": {
@@ -3895,8 +3875,8 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        333,
-        334
+        332,
+        333
       ],
       "loc": {
         "start": {
@@ -3913,8 +3893,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        334,
-        335
+        333,
+        334
       ],
       "loc": {
         "start": {
@@ -3931,8 +3911,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        335,
-        336
+        334,
+        335
       ],
       "loc": {
         "start": {
@@ -3949,8 +3929,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        336,
-        337
+        335,
+        336
       ],
       "loc": {
         "start": {
@@ -3967,8 +3947,8 @@
       "type": "HTMLIdentifier",
       "value": "tr",
       "range": [
-        337,
-        339
+        336,
+        338
       ],
       "loc": {
         "start": {
@@ -3985,8 +3965,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        339,
-        340
+        338,
+        339
       ],
       "loc": {
         "start": {
@@ -4003,8 +3983,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        343,
-        344
+        342,
+        343
       ],
       "loc": {
         "start": {
@@ -4021,8 +4001,8 @@
       "type": "MustacheKeyword",
       "value": "/each",
       "range": [
-        344,
-        349
+        343,
+        348
       ],
       "loc": {
         "start": {
@@ -4039,8 +4019,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        349,
-        350
+        348,
+        349
       ],
       "loc": {
         "start": {
@@ -4057,8 +4037,8 @@
       "type": "HTMLText",
       "value": "\n\t",
       "range": [
-        350,
-        352
+        349,
+        351
       ],
       "loc": {
         "start": {
@@ -4075,8 +4055,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        352,
-        353
+        351,
+        352
       ],
       "loc": {
         "start": {
@@ -4093,8 +4073,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        353,
-        354
+        352,
+        353
       ],
       "loc": {
         "start": {
@@ -4111,8 +4091,8 @@
       "type": "HTMLIdentifier",
       "value": "tbody",
       "range": [
-        354,
-        359
+        353,
+        358
       ],
       "loc": {
         "start": {
@@ -4129,8 +4109,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        359,
-        360
+        358,
+        359
       ],
       "loc": {
         "start": {
@@ -4147,8 +4127,8 @@
       "type": "HTMLText",
       "value": "\n",
       "range": [
-        360,
-        361
+        359,
+        360
       ],
       "loc": {
         "start": {
@@ -4165,8 +4145,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        361,
-        362
+        360,
+        361
       ],
       "loc": {
         "start": {
@@ -4183,8 +4163,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        362,
-        363
+        361,
+        362
       ],
       "loc": {
         "start": {
@@ -4201,8 +4181,8 @@
       "type": "HTMLIdentifier",
       "value": "table",
       "range": [
-        363,
-        368
+        362,
+        367
       ],
       "loc": {
         "start": {
@@ -4219,8 +4199,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        368,
-        369
+        367,
+        368
       ],
       "loc": {
         "start": {
@@ -4236,7 +4216,7 @@
   ],
   "range": [
     0,
-    370
+    369
   ],
   "loc": {
     "start": {
diff --git a/tests/fixtures/parser/ast/svelte5/generics01-snippets-scope-output.json b/tests/fixtures/parser/ast/svelte5/generics01-snippets-scope-output.json
index 851915f2..d17e83d8 100644
--- a/tests/fixtures/parser/ast/svelte5/generics01-snippets-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/generics01-snippets-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              116,
-              122
+              176,
+              182
             ],
             "loc": {
               "start": {
-                "line": 5,
-                "column": 31
+                "line": 9,
+                "column": 5
               },
               "end": {
-                "line": 5,
-                "column": 37
+                "line": 9,
+                "column": 11
               }
             }
           },
@@ -190,8 +190,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  150,
-                  157
+                  141,
+                  148
                 ],
                 "loc": {
                   "start": {
@@ -230,8 +230,8 @@
                 "type": "Identifier",
                 "name": "Snippet",
                 "range": [
-                  166,
-                  173
+                  157,
+                  164
                 ],
                 "loc": {
                   "start": {
@@ -388,8 +388,8 @@
                 "type": "Identifier",
                 "name": "A",
                 "range": [
-                  133,
-                  134
+                  124,
+                  125
                 ],
                 "loc": {
                   "start": {
@@ -428,8 +428,8 @@
                 "type": "Identifier",
                 "name": "A",
                 "range": [
-                  175,
-                  176
+                  166,
+                  167
                 ],
                 "loc": {
                   "start": {
@@ -685,97 +685,44 @@
                       }
                     }
                   ],
-                  "range": [
-                    90,
-                    113
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 5,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 5,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      116,
-                      122
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 5,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 5,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                127,
-                                131
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              118,
+                              122
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "A",
-                                    "range": [
-                                      133,
-                                      134
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 6,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 6,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "A",
                                   "range": [
-                                    133,
-                                    134
+                                    124,
+                                    125
                                   ],
                                   "loc": {
                                     "start": {
@@ -789,8 +736,8 @@
                                   }
                                 },
                                 "range": [
-                                  133,
-                                  136
+                                  124,
+                                  125
                                 ],
                                 "loc": {
                                   "start": {
@@ -799,18 +746,18 @@
                                   },
                                   "end": {
                                     "line": 6,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                131,
-                                136
+                                124,
+                                127
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 6,
@@ -819,66 +766,66 @@
                               }
                             },
                             "range": [
-                              127,
-                              137
+                              122,
+                              127
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 6,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                140,
-                                148
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            118,
+                            128
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              131,
+                              139
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  150,
-                                  157
+                                  141,
+                                  148
                                 ],
                                 "loc": {
                                   "start": {
@@ -892,13 +839,13 @@
                                 }
                               },
                               "range": [
-                                148,
-                                157
+                                141,
+                                148
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 7,
@@ -907,74 +854,74 @@
                               }
                             },
                             "range": [
-                              140,
-                              158
+                              139,
+                              148
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                161,
-                                164
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 8,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 8,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            131,
+                            149
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              152,
+                              155
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 8,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 8,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "A",
-                                            "range": [
-                                              175,
-                                              176
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 8,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 8,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "A",
                                           "range": [
-                                            175,
-                                            176
+                                            166,
+                                            167
                                           ],
                                           "loc": {
                                             "start": {
@@ -986,60 +933,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        174,
-                                        177
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 8,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 8,
-                                          "column": 18
+                                        "range": [
+                                          166,
+                                          167
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 8,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 8,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    173,
-                                    178
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      165,
+                                      168
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 8,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 8,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    166,
-                                    173
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  164,
+                                  169
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 8,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 8,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  166,
-                                  178
+                                  157,
+                                  164
                                 ],
                                 "loc": {
                                   "start": {
@@ -1048,18 +995,18 @@
                                   },
                                   "end": {
                                     "line": 8,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                164,
-                                178
+                                157,
+                                169
                               ],
                               "loc": {
                                 "start": {
                                   "line": 8,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 8,
@@ -1068,79 +1015,130 @@
                               }
                             },
                             "range": [
-                              161,
-                              179
+                              155,
+                              169
                             ],
                             "loc": {
                               "start": {
                                 "line": 8,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 8,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          123,
-                          182
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 5,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 9,
-                            "column": 2
+                          "range": [
+                            152,
+                            170
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        114,
+                        173
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 9,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      122,
-                      183
+                      113,
+                      173
                     ],
                     "loc": {
                       "start": {
                         "line": 5,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 9,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    116,
-                    185
+                    90,
+                    173
                   ],
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
                       "line": 9,
-                      "column": 5
+                      "column": 2
                     }
                   }
                 },
-                "range": [
-                  90,
-                  185
-                ],
-                "loc": {
-                  "start": {
-                    "line": 5,
-                    "column": 5
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      176,
+                      182
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 9,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 11
+                      }
+                    }
                   },
-                  "end": {
-                    "line": 9,
-                    "column": 5
+                  "optional": false,
+                  "range": [
+                    176,
+                    184
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 9,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 13
+                    }
+                  }
+                },
+                "range": [
+                  90,
+                  184
+                ],
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 13
                   }
                 }
               }
@@ -1192,8 +1190,8 @@
                 "type": "Identifier",
                 "name": "data",
                 "range": [
-                  301,
-                  305
+                  300,
+                  304
                 ],
                 "loc": {
                   "start": {
@@ -1449,97 +1447,44 @@
                       }
                     }
                   ],
-                  "range": [
-                    90,
-                    113
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 5,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 5,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      116,
-                      122
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 5,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 5,
-                        "column": 37
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                127,
-                                131
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 6
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              118,
+                              122
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "A",
-                                    "range": [
-                                      133,
-                                      134
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 6,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 6,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "A",
                                   "range": [
-                                    133,
-                                    134
+                                    124,
+                                    125
                                   ],
                                   "loc": {
                                     "start": {
@@ -1553,8 +1498,8 @@
                                   }
                                 },
                                 "range": [
-                                  133,
-                                  136
+                                  124,
+                                  125
                                 ],
                                 "loc": {
                                   "start": {
@@ -1563,18 +1508,18 @@
                                   },
                                   "end": {
                                     "line": 6,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                131,
-                                136
+                                124,
+                                127
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 6,
@@ -1583,66 +1528,66 @@
                               }
                             },
                             "range": [
-                              127,
-                              137
+                              122,
+                              127
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 6,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                140,
-                                148
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            118,
+                            128
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              131,
+                              139
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  150,
-                                  157
+                                  141,
+                                  148
                                 ],
                                 "loc": {
                                   "start": {
@@ -1656,13 +1601,13 @@
                                 }
                               },
                               "range": [
-                                148,
-                                157
+                                141,
+                                148
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 7,
@@ -1671,74 +1616,74 @@
                               }
                             },
                             "range": [
-                              140,
-                              158
+                              139,
+                              148
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                161,
-                                164
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 8,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 8,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            131,
+                            149
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              152,
+                              155
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 8,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 8,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "A",
-                                            "range": [
-                                              175,
-                                              176
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 8,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 8,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "A",
                                           "range": [
-                                            175,
-                                            176
+                                            166,
+                                            167
                                           ],
                                           "loc": {
                                             "start": {
@@ -1750,60 +1695,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        174,
-                                        177
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 8,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 8,
-                                          "column": 18
+                                        "range": [
+                                          166,
+                                          167
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 8,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 8,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    173,
-                                    178
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      165,
+                                      168
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 8,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 8,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    166,
-                                    173
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  164,
+                                  169
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 8,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 8,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  166,
-                                  178
+                                  157,
+                                  164
                                 ],
                                 "loc": {
                                   "start": {
@@ -1812,18 +1757,18 @@
                                   },
                                   "end": {
                                     "line": 8,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                164,
-                                178
+                                157,
+                                169
                               ],
                               "loc": {
                                 "start": {
                                   "line": 8,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 8,
@@ -1832,70 +1777,121 @@
                               }
                             },
                             "range": [
-                              161,
-                              179
+                              155,
+                              169
                             ],
                             "loc": {
                               "start": {
                                 "line": 8,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 8,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          123,
-                          182
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 5,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 9,
-                            "column": 2
+                          "range": [
+                            152,
+                            170
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        114,
+                        173
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 9,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      122,
-                      183
+                      113,
+                      173
                     ],
                     "loc": {
                       "start": {
                         "line": 5,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 9,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    116,
-                    185
+                    90,
+                    173
                   ],
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 9,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      176,
+                      182
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 9,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    176,
+                    184
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 9,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 13
                     }
                   }
                 },
                 "range": [
                   90,
-                  185
+                  184
                 ],
                 "loc": {
                   "start": {
@@ -1904,7 +1900,7 @@
                   },
                   "end": {
                     "line": 9,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -1956,8 +1952,8 @@
                 "type": "Identifier",
                 "name": "children",
                 "range": [
-                  212,
-                  220
+                  211,
+                  219
                 ],
                 "loc": {
                   "start": {
@@ -1996,8 +1992,8 @@
                 "type": "Identifier",
                 "name": "children",
                 "range": [
-                  248,
-                  256
+                  247,
+                  255
                 ],
                 "loc": {
                   "start": {
@@ -2233,117 +2229,64 @@
                           },
                           "end": {
                             "line": 5,
-                            "column": 26
-                          }
-                        }
-                      },
-                      "range": [
-                        108,
-                        111
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 5,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 5,
-                          "column": 26
-                        }
-                      }
-                    }
-                  ],
-                  "range": [
-                    90,
-                    113
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 5,
-                      "column": 5
-                    },
-                    "end": {
-                      "line": 5,
-                      "column": 28
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      116,
-                      122
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 5,
-                        "column": 31
+                            "column": 26
+                          }
+                        }
                       },
-                      "end": {
-                        "line": 5,
-                        "column": 37
+                      "range": [
+                        108,
+                        111
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 26
+                        }
                       }
                     }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "data",
-                              "range": [
-                                127,
-                                131
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 6,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 6,
-                                  "column": 6
-                                }
+                  ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "data",
+                            "range": [
+                              118,
+                              122
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 6,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 6,
+                                "column": 6
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSArrayType",
-                                "elementType": {
-                                  "type": "TSTypeReference",
-                                  "typeName": {
-                                    "type": "Identifier",
-                                    "name": "A",
-                                    "range": [
-                                      133,
-                                      134
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 6,
-                                        "column": 8
-                                      },
-                                      "end": {
-                                        "line": 6,
-                                        "column": 9
-                                      }
-                                    }
-                                  },
+                              "type": "TSArrayType",
+                              "elementType": {
+                                "type": "TSTypeReference",
+                                "typeName": {
+                                  "type": "Identifier",
+                                  "name": "A",
                                   "range": [
-                                    133,
-                                    134
+                                    124,
+                                    125
                                   ],
                                   "loc": {
                                     "start": {
@@ -2357,8 +2300,8 @@
                                   }
                                 },
                                 "range": [
-                                  133,
-                                  136
+                                  124,
+                                  125
                                 ],
                                 "loc": {
                                   "start": {
@@ -2367,18 +2310,18 @@
                                   },
                                   "end": {
                                     "line": 6,
-                                    "column": 11
+                                    "column": 9
                                   }
                                 }
                               },
                               "range": [
-                                131,
-                                136
+                                124,
+                                127
                               ],
                               "loc": {
                                 "start": {
                                   "line": 6,
-                                  "column": 6
+                                  "column": 8
                                 },
                                 "end": {
                                   "line": 6,
@@ -2387,66 +2330,66 @@
                               }
                             },
                             "range": [
-                              127,
-                              137
+                              122,
+                              127
                             ],
                             "loc": {
                               "start": {
                                 "line": 6,
-                                "column": 2
+                                "column": 6
                               },
                               "end": {
                                 "line": 6,
-                                "column": 12
+                                "column": 11
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "children",
-                              "range": [
-                                140,
-                                148
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 7,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 7,
-                                  "column": 10
-                                }
-                              }
+                          "range": [
+                            118,
+                            128
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 6,
+                              "column": 12
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "children",
+                            "range": [
+                              131,
+                              139
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 7,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 7,
+                                "column": 10
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    150,
-                                    157
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 7,
-                                      "column": 12
-                                    },
-                                    "end": {
-                                      "line": 7,
-                                      "column": 19
-                                    }
-                                  }
-                                },
+                              "type": "TSTypeReference",
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  150,
-                                  157
+                                  141,
+                                  148
                                 ],
                                 "loc": {
                                   "start": {
@@ -2460,13 +2403,13 @@
                                 }
                               },
                               "range": [
-                                148,
-                                157
+                                141,
+                                148
                               ],
                               "loc": {
                                 "start": {
                                   "line": 7,
-                                  "column": 10
+                                  "column": 12
                                 },
                                 "end": {
                                   "line": 7,
@@ -2475,74 +2418,74 @@
                               }
                             },
                             "range": [
-                              140,
-                              158
+                              139,
+                              148
                             ],
                             "loc": {
                               "start": {
                                 "line": 7,
-                                "column": 2
+                                "column": 10
                               },
                               "end": {
                                 "line": 7,
-                                "column": 20
+                                "column": 19
                               }
                             }
                           },
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "row",
-                              "range": [
-                                161,
-                                164
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 8,
-                                  "column": 2
-                                },
-                                "end": {
-                                  "line": 8,
-                                  "column": 5
-                                }
-                              }
+                          "range": [
+                            131,
+                            149
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 2
                             },
+                            "end": {
+                              "line": 7,
+                              "column": 20
+                            }
+                          }
+                        },
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "row",
+                            "range": [
+                              152,
+                              155
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 8,
+                                "column": 2
+                              },
+                              "end": {
+                                "line": 8,
+                                "column": 5
+                              }
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSTypeReference",
-                                "typeArguments": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "TSTupleType",
-                                      "elementTypes": [
-                                        {
-                                          "type": "TSTypeReference",
-                                          "typeName": {
-                                            "type": "Identifier",
-                                            "name": "A",
-                                            "range": [
-                                              175,
-                                              176
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 8,
-                                                "column": 16
-                                              },
-                                              "end": {
-                                                "line": 8,
-                                                "column": 17
-                                              }
-                                            }
-                                          },
+                              "type": "TSTypeReference",
+                              "typeArguments": {
+                                "type": "TSTypeParameterInstantiation",
+                                "params": [
+                                  {
+                                    "type": "TSTupleType",
+                                    "elementTypes": [
+                                      {
+                                        "type": "TSTypeReference",
+                                        "typeName": {
+                                          "type": "Identifier",
+                                          "name": "A",
                                           "range": [
-                                            175,
-                                            176
+                                            166,
+                                            167
                                           ],
                                           "loc": {
                                             "start": {
@@ -2554,60 +2497,60 @@
                                               "column": 17
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        174,
-                                        177
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 8,
-                                          "column": 15
                                         },
-                                        "end": {
-                                          "line": 8,
-                                          "column": 18
+                                        "range": [
+                                          166,
+                                          167
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 8,
+                                            "column": 16
+                                          },
+                                          "end": {
+                                            "line": 8,
+                                            "column": 17
+                                          }
                                         }
                                       }
-                                    }
-                                  ],
-                                  "range": [
-                                    173,
-                                    178
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 19
+                                    ],
+                                    "range": [
+                                      165,
+                                      168
+                                    ],
+                                    "loc": {
+                                      "start": {
+                                        "line": 8,
+                                        "column": 15
+                                      },
+                                      "end": {
+                                        "line": 8,
+                                        "column": 18
+                                      }
                                     }
                                   }
-                                },
-                                "typeName": {
-                                  "type": "Identifier",
-                                  "name": "Snippet",
-                                  "range": [
-                                    166,
-                                    173
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 8,
-                                      "column": 7
-                                    },
-                                    "end": {
-                                      "line": 8,
-                                      "column": 14
-                                    }
+                                ],
+                                "range": [
+                                  164,
+                                  169
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 8,
+                                    "column": 14
+                                  },
+                                  "end": {
+                                    "line": 8,
+                                    "column": 19
                                   }
-                                },
+                                }
+                              },
+                              "typeName": {
+                                "type": "Identifier",
+                                "name": "Snippet",
                                 "range": [
-                                  166,
-                                  178
+                                  157,
+                                  164
                                 ],
                                 "loc": {
                                   "start": {
@@ -2616,18 +2559,18 @@
                                   },
                                   "end": {
                                     "line": 8,
-                                    "column": 19
+                                    "column": 14
                                   }
                                 }
                               },
                               "range": [
-                                164,
-                                178
+                                157,
+                                169
                               ],
                               "loc": {
                                 "start": {
                                   "line": 8,
-                                  "column": 5
+                                  "column": 7
                                 },
                                 "end": {
                                   "line": 8,
@@ -2636,70 +2579,121 @@
                               }
                             },
                             "range": [
-                              161,
-                              179
+                              155,
+                              169
                             ],
                             "loc": {
                               "start": {
                                 "line": 8,
-                                "column": 2
+                                "column": 5
                               },
                               "end": {
                                 "line": 8,
-                                "column": 20
+                                "column": 19
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          123,
-                          182
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 5,
-                            "column": 38
                           },
-                          "end": {
-                            "line": 9,
-                            "column": 2
+                          "range": [
+                            152,
+                            170
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 2
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 20
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        114,
+                        173
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 9,
+                          "column": 2
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      122,
-                      183
+                      113,
+                      173
                     ],
                     "loc": {
                       "start": {
                         "line": 5,
-                        "column": 37
+                        "column": 28
                       },
                       "end": {
                         "line": 9,
-                        "column": 3
+                        "column": 2
                       }
                     }
                   },
                   "range": [
-                    116,
-                    185
+                    90,
+                    173
                   ],
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 31
+                      "column": 5
                     },
                     "end": {
+                      "line": 9,
+                      "column": 2
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      176,
+                      182
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 9,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 11
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    176,
+                    184
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 9,
                       "column": 5
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 13
                     }
                   }
                 },
                 "range": [
                   90,
-                  185
+                  184
                 ],
                 "loc": {
                   "start": {
@@ -2708,7 +2702,7 @@
                   },
                   "end": {
                     "line": 9,
-                    "column": 5
+                    "column": 13
                   }
                 }
               }
@@ -2760,8 +2754,8 @@
                 "type": "Identifier",
                 "name": "row",
                 "range": [
-                  328,
-                  331
+                  327,
+                  330
                 ],
                 "loc": {
                   "start": {
@@ -3090,17 +3084,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              116,
-              122
+              176,
+              182
             ],
             "loc": {
               "start": {
-                "line": 5,
-                "column": 31
+                "line": 9,
+                "column": 5
               },
               "end": {
-                "line": 5,
-                "column": 37
+                "line": 9,
+                "column": 11
               }
             }
           },
@@ -3113,8 +3107,8 @@
             "type": "Identifier",
             "name": "A",
             "range": [
-              133,
-              134
+              124,
+              125
             ],
             "loc": {
               "start": {
@@ -3153,8 +3147,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              150,
-              157
+              141,
+              148
             ],
             "loc": {
               "start": {
@@ -3193,8 +3187,8 @@
             "type": "Identifier",
             "name": "Snippet",
             "range": [
-              166,
-              173
+              157,
+              164
             ],
             "loc": {
               "start": {
@@ -3233,8 +3227,8 @@
             "type": "Identifier",
             "name": "A",
             "range": [
-              175,
-              176
+              166,
+              167
             ],
             "loc": {
               "start": {
@@ -3273,8 +3267,8 @@
             "type": "Identifier",
             "name": "children",
             "range": [
-              212,
-              220
+              211,
+              219
             ],
             "loc": {
               "start": {
@@ -3313,8 +3307,8 @@
             "type": "Identifier",
             "name": "data",
             "range": [
-              301,
-              305
+              300,
+              304
             ],
             "loc": {
               "start": {
@@ -3359,8 +3353,8 @@
                 "type": "Identifier",
                 "name": "children",
                 "range": [
-                  248,
-                  256
+                  247,
+                  255
                 ],
                 "loc": {
                   "start": {
@@ -3402,8 +3396,8 @@
                 "type": "Identifier",
                 "name": "children",
                 "range": [
-                  248,
-                  256
+                  247,
+                  255
                 ],
                 "loc": {
                   "start": {
@@ -3449,8 +3443,8 @@
                   "type": "Identifier",
                   "name": "d",
                   "range": [
-                    309,
-                    310
+                    308,
+                    309
                   ],
                   "loc": {
                     "start": {
@@ -3471,8 +3465,8 @@
                     "type": "Identifier",
                     "name": "d",
                     "range": [
-                      309,
-                      310
+                      308,
+                      309
                     ],
                     "loc": {
                       "start": {
@@ -3491,8 +3485,8 @@
                       "type": "Identifier",
                       "name": "data",
                       "range": [
-                        301,
-                        305
+                        300,
+                        304
                       ],
                       "loc": {
                         "start": {
@@ -3509,8 +3503,8 @@
                       "type": "Identifier",
                       "name": "d",
                       "range": [
-                        309,
-                        310
+                        308,
+                        309
                       ],
                       "loc": {
                         "start": {
@@ -3533,8 +3527,8 @@
                           "type": "SvelteName",
                           "name": "tr",
                           "range": [
-                            316,
-                            318
+                            315,
+                            317
                           ],
                           "loc": {
                             "start": {
@@ -3552,8 +3546,8 @@
                           "attributes": [],
                           "selfClosing": false,
                           "range": [
-                            315,
-                            319
+                            314,
+                            318
                           ],
                           "loc": {
                             "start": {
@@ -3576,8 +3570,8 @@
                                   "type": "Identifier",
                                   "name": "d",
                                   "range": [
-                                    332,
-                                    333
+                                    331,
+                                    332
                                   ],
                                   "loc": {
                                     "start": {
@@ -3595,8 +3589,8 @@
                                 "type": "Identifier",
                                 "name": "row",
                                 "range": [
-                                  328,
-                                  331
+                                  327,
+                                  330
                                 ],
                                 "loc": {
                                   "start": {
@@ -3611,8 +3605,8 @@
                               },
                               "optional": false,
                               "range": [
-                                328,
-                                334
+                                327,
+                                333
                               ],
                               "loc": {
                                 "start": {
@@ -3626,8 +3620,8 @@
                               }
                             },
                             "range": [
-                              319,
-                              335
+                              318,
+                              334
                             ],
                             "loc": {
                               "start": {
@@ -3644,8 +3638,8 @@
                         "endTag": {
                           "type": "SvelteEndTag",
                           "range": [
-                            335,
-                            340
+                            334,
+                            339
                           ],
                           "loc": {
                             "start": {
@@ -3659,8 +3653,8 @@
                           }
                         },
                         "range": [
-                          315,
-                          340
+                          314,
+                          339
                         ],
                         "loc": {
                           "start": {
@@ -3676,8 +3670,8 @@
                     ],
                     "else": null,
                     "range": [
-                      294,
-                      350
+                      293,
+                      349
                     ],
                     "loc": {
                       "start": {
@@ -3698,8 +3692,8 @@
                     "type": "Identifier",
                     "name": "d",
                     "range": [
-                      332,
-                      333
+                      331,
+                      332
                     ],
                     "loc": {
                       "start": {
@@ -3718,8 +3712,8 @@
                     "type": "Identifier",
                     "name": "d",
                     "range": [
-                      309,
-                      310
+                      308,
+                      309
                     ],
                     "loc": {
                       "start": {
@@ -3742,8 +3736,8 @@
                 "type": "Identifier",
                 "name": "row",
                 "range": [
-                  328,
-                  331
+                  327,
+                  330
                 ],
                 "loc": {
                   "start": {
@@ -3782,8 +3776,8 @@
                 "type": "Identifier",
                 "name": "d",
                 "range": [
-                  332,
-                  333
+                  331,
+                  332
                 ],
                 "loc": {
                   "start": {
@@ -3802,8 +3796,8 @@
                 "type": "Identifier",
                 "name": "d",
                 "range": [
-                  309,
-                  310
+                  308,
+                  309
                 ],
                 "loc": {
                   "start": {
@@ -3825,8 +3819,8 @@
                 "type": "Identifier",
                 "name": "row",
                 "range": [
-                  328,
-                  331
+                  327,
+                  330
                 ],
                 "loc": {
                   "start": {
@@ -3869,17 +3863,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              116,
-              122
+              176,
+              182
             ],
             "loc": {
               "start": {
-                "line": 5,
-                "column": 31
+                "line": 9,
+                "column": 5
               },
               "end": {
-                "line": 5,
-                "column": 37
+                "line": 9,
+                "column": 11
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte b/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte
index c88981da..d3648ad2 100644
--- a/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte
+++ b/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte
@@ -2,11 +2,11 @@
 	import type { Snippet } from 'svelte'; // Snippet: Snippet<T>, Snippet: Snippet<T>
 
 	type A = T // A: unknown, T: unknown
-	let { data, children, row } = $props<{ // data: unknown[], data: unknown[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, $props<{ data: A[]; children: Snippet; row: Snippet<[A]>; }>(): { data: unknown[]; children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }; row: (this: void, args_0: unknown) => unique symbol & { ...; }; }
-		data: A[];
-		children: Snippet;
-		row: Snippet<[A]>;
-	}>();
+	let { data, children, row }:{ // data: unknown[], data: unknown[], children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		data: A[]; // A: unknown, data: unknown[]
+		children: Snippet; // Snippet: Snippet<T>, children: (this: void) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+		row: Snippet<[A]>; // Snippet: Snippet<T>, A: unknown, row: (this: void, args_0: unknown) => unique symbol & { _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\""; }
+	} = $props(); // $props(): any
 </script>
 
 <table>
diff --git a/tests/fixtures/parser/ast/svelte5/ts-$props01-input.svelte b/tests/fixtures/parser/ast/svelte5/ts-$props01-input.svelte
index a1071d3e..2cf19028 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-$props01-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/ts-$props01-input.svelte
@@ -5,7 +5,7 @@
     c: boolean;
     d: number;
   }
-  let { a, b, c, ...everythingElse } = $props<MyProps>();
+  let { a, b, c, ...everythingElse }: MyProps = $props();
 </script>
 
 {a}
diff --git a/tests/fixtures/parser/ast/svelte5/ts-$props01-output.json b/tests/fixtures/parser/ast/svelte5/ts-$props01-output.json
index 286c113b..d1e003ba 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-$props01-output.json
+++ b/tests/fixtures/parser/ast/svelte5/ts-$props01-output.json
@@ -650,9 +650,61 @@
                     }
                   }
                 ],
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeReference",
+                    "typeName": {
+                      "type": "Identifier",
+                      "name": "MyProps",
+                      "range": [
+                        144,
+                        151
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      144,
+                      151
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 38
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 45
+                      }
+                    }
+                  },
+                  "range": [
+                    142,
+                    151
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 36
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 45
+                    }
+                  }
+                },
                 "range": [
                   112,
-                  142
+                  151
                 ],
                 "loc": {
                   "start": {
@@ -661,7 +713,7 @@
                   },
                   "end": {
                     "line": 8,
-                    "column": 36
+                    "column": 45
                   }
                 }
               },
@@ -672,68 +724,13 @@
                   "type": "Identifier",
                   "name": "$props",
                   "range": [
-                    145,
-                    151
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 8,
-                      "column": 39
-                    },
-                    "end": {
-                      "line": 8,
-                      "column": 45
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeReference",
-                      "typeName": {
-                        "type": "Identifier",
-                        "name": "MyProps",
-                        "range": [
-                          152,
-                          159
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 8,
-                            "column": 46
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 53
-                          }
-                        }
-                      },
-                      "range": [
-                        152,
-                        159
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 8,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 8,
-                          "column": 53
-                        }
-                      }
-                    }
-                  ],
-                  "range": [
-                    151,
+                    154,
                     160
                   ],
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 45
+                      "column": 48
                     },
                     "end": {
                       "line": 8,
@@ -741,14 +738,15 @@
                     }
                   }
                 },
+                "optional": false,
                 "range": [
-                  145,
+                  154,
                   162
                 ],
                 "loc": {
                   "start": {
                     "line": 8,
-                    "column": 39
+                    "column": 48
                   },
                   "end": {
                     "line": 8,
@@ -1744,33 +1742,33 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
+      "value": ":",
       "range": [
-        143,
-        144
+        142,
+        143
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 37
+          "column": 36
         },
         "end": {
           "line": 8,
-          "column": 38
+          "column": 37
         }
       }
     },
     {
       "type": "Identifier",
-      "value": "$props",
+      "value": "MyProps",
       "range": [
-        145,
+        144,
         151
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 39
+          "column": 38
         },
         "end": {
           "line": 8,
@@ -1780,28 +1778,10 @@
     },
     {
       "type": "Punctuator",
-      "value": "<",
-      "range": [
-        151,
-        152
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 45
-        },
-        "end": {
-          "line": 8,
-          "column": 46
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "MyProps",
+      "value": "=",
       "range": [
         152,
-        159
+        153
       ],
       "loc": {
         "start": {
@@ -1810,21 +1790,21 @@
         },
         "end": {
           "line": 8,
-          "column": 53
+          "column": 47
         }
       }
     },
     {
-      "type": "Punctuator",
-      "value": ">",
+      "type": "Identifier",
+      "value": "$props",
       "range": [
-        159,
+        154,
         160
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 53
+          "column": 48
         },
         "end": {
           "line": 8,
diff --git a/tests/fixtures/parser/ast/svelte5/ts-$props01-scope-output.json b/tests/fixtures/parser/ast/svelte5/ts-$props01-scope-output.json
index c8b02fd9..09a60632 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-$props01-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/ts-$props01-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              145,
-              151
+              154,
+              160
             ],
             "loc": {
               "start": {
                 "line": 8,
-                "column": 39
+                "column": 48
               },
               "end": {
                 "line": 8,
-                "column": 45
+                "column": 54
               }
             }
           },
@@ -471,17 +471,17 @@
                 "type": "Identifier",
                 "name": "MyProps",
                 "range": [
-                  152,
-                  159
+                  144,
+                  151
                 ],
                 "loc": {
                   "start": {
                     "line": 8,
-                    "column": 46
+                    "column": 38
                   },
                   "end": {
                     "line": 8,
-                    "column": 53
+                    "column": 45
                   }
                 }
               },
@@ -764,9 +764,61 @@
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          144,
+                          151
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        144,
+                        151
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      142,
+                      151
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
                     112,
-                    142
+                    151
                   ],
                   "loc": {
                     "start": {
@@ -775,7 +827,7 @@
                     },
                     "end": {
                       "line": 8,
-                      "column": 36
+                      "column": 45
                     }
                   }
                 },
@@ -786,68 +838,13 @@
                     "type": "Identifier",
                     "name": "$props",
                     "range": [
-                      145,
-                      151
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 8,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 8,
-                        "column": 45
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            152,
-                            159
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 8,
-                              "column": 46
-                            },
-                            "end": {
-                              "line": 8,
-                              "column": 53
-                            }
-                          }
-                        },
-                        "range": [
-                          152,
-                          159
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 8,
-                            "column": 46
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 53
-                          }
-                        }
-                      }
-                    ],
-                    "range": [
-                      151,
+                      154,
                       160
                     ],
                     "loc": {
                       "start": {
                         "line": 8,
-                        "column": 45
+                        "column": 48
                       },
                       "end": {
                         "line": 8,
@@ -855,14 +852,15 @@
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    145,
+                    154,
                     162
                   ],
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 39
+                      "column": 48
                     },
                     "end": {
                       "line": 8,
@@ -1226,9 +1224,61 @@
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          144,
+                          151
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        144,
+                        151
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      142,
+                      151
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
                     112,
-                    142
+                    151
                   ],
                   "loc": {
                     "start": {
@@ -1237,7 +1287,7 @@
                     },
                     "end": {
                       "line": 8,
-                      "column": 36
+                      "column": 45
                     }
                   }
                 },
@@ -1248,68 +1298,13 @@
                     "type": "Identifier",
                     "name": "$props",
                     "range": [
-                      145,
-                      151
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 8,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 8,
-                        "column": 45
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            152,
-                            159
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 8,
-                              "column": 46
-                            },
-                            "end": {
-                              "line": 8,
-                              "column": 53
-                            }
-                          }
-                        },
-                        "range": [
-                          152,
-                          159
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 8,
-                            "column": 46
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 53
-                          }
-                        }
-                      }
-                    ],
-                    "range": [
-                      151,
+                      154,
                       160
                     ],
                     "loc": {
                       "start": {
                         "line": 8,
-                        "column": 45
+                        "column": 48
                       },
                       "end": {
                         "line": 8,
@@ -1317,14 +1312,15 @@
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    145,
+                    154,
                     162
                   ],
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 39
+                      "column": 48
                     },
                     "end": {
                       "line": 8,
@@ -1688,9 +1684,61 @@
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          144,
+                          151
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        144,
+                        151
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      142,
+                      151
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
                     112,
-                    142
+                    151
                   ],
                   "loc": {
                     "start": {
@@ -1699,7 +1747,7 @@
                     },
                     "end": {
                       "line": 8,
-                      "column": 36
+                      "column": 45
                     }
                   }
                 },
@@ -1710,68 +1758,13 @@
                     "type": "Identifier",
                     "name": "$props",
                     "range": [
-                      145,
-                      151
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 8,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 8,
-                        "column": 45
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            152,
-                            159
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 8,
-                              "column": 46
-                            },
-                            "end": {
-                              "line": 8,
-                              "column": 53
-                            }
-                          }
-                        },
-                        "range": [
-                          152,
-                          159
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 8,
-                            "column": 46
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 53
-                          }
-                        }
-                      }
-                    ],
-                    "range": [
-                      151,
+                      154,
                       160
                     ],
                     "loc": {
                       "start": {
                         "line": 8,
-                        "column": 45
+                        "column": 48
                       },
                       "end": {
                         "line": 8,
@@ -1779,14 +1772,15 @@
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    145,
+                    154,
                     162
                   ],
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 39
+                      "column": 48
                     },
                     "end": {
                       "line": 8,
@@ -2150,9 +2144,61 @@
                       }
                     }
                   ],
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "MyProps",
+                        "range": [
+                          144,
+                          151
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 45
+                          }
+                        }
+                      },
+                      "range": [
+                        144,
+                        151
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 38
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 45
+                        }
+                      }
+                    },
+                    "range": [
+                      142,
+                      151
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 36
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 45
+                      }
+                    }
+                  },
                   "range": [
                     112,
-                    142
+                    151
                   ],
                   "loc": {
                     "start": {
@@ -2161,7 +2207,7 @@
                     },
                     "end": {
                       "line": 8,
-                      "column": 36
+                      "column": 45
                     }
                   }
                 },
@@ -2172,68 +2218,13 @@
                     "type": "Identifier",
                     "name": "$props",
                     "range": [
-                      145,
-                      151
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 8,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 8,
-                        "column": 45
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "MyProps",
-                          "range": [
-                            152,
-                            159
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 8,
-                              "column": 46
-                            },
-                            "end": {
-                              "line": 8,
-                              "column": 53
-                            }
-                          }
-                        },
-                        "range": [
-                          152,
-                          159
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 8,
-                            "column": 46
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 53
-                          }
-                        }
-                      }
-                    ],
-                    "range": [
-                      151,
+                      154,
                       160
                     ],
                     "loc": {
                       "start": {
                         "line": 8,
-                        "column": 45
+                        "column": 48
                       },
                       "end": {
                         "line": 8,
@@ -2241,14 +2232,15 @@
                       }
                     }
                   },
+                  "optional": false,
                   "range": [
-                    145,
+                    154,
                     162
                   ],
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 39
+                      "column": 48
                     },
                     "end": {
                       "line": 8,
@@ -2523,17 +2515,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              145,
-              151
+              154,
+              160
             ],
             "loc": {
               "start": {
                 "line": 8,
-                "column": 39
+                "column": 48
               },
               "end": {
                 "line": 8,
-                "column": 45
+                "column": 54
               }
             }
           },
@@ -2546,17 +2538,17 @@
             "type": "Identifier",
             "name": "MyProps",
             "range": [
-              152,
-              159
+              144,
+              151
             ],
             "loc": {
               "start": {
                 "line": 8,
-                "column": 46
+                "column": 38
               },
               "end": {
                 "line": 8,
-                "column": 53
+                "column": 45
               }
             }
           },
@@ -2749,17 +2741,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              145,
-              151
+              154,
+              160
             ],
             "loc": {
               "start": {
                 "line": 8,
-                "column": 39
+                "column": 48
               },
               "end": {
                 "line": 8,
-                "column": 45
+                "column": 54
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/ts-$props01-type-output.svelte b/tests/fixtures/parser/ast/svelte5/ts-$props01-type-output.svelte
index 619009a9..5bccb22f 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-$props01-type-output.svelte
+++ b/tests/fixtures/parser/ast/svelte5/ts-$props01-type-output.svelte
@@ -5,7 +5,7 @@
     c: boolean; // c: boolean
     d: number; // d: number
   }
-  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
+  let { a, b, c, ...everythingElse }: MyProps = $props(); // a: number, a: number, b: string, b: string, c: boolean, c: boolean, everythingElse: { d: number; }, MyProps: MyProps, $props(): any
 </script>
 
 {a} <!-- a: number -->
diff --git a/tests/fixtures/parser/ast/svelte5/ts-event03-input.svelte b/tests/fixtures/parser/ast/svelte5/ts-event03-input.svelte
index afb1098f..9b8c23c4 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-event03-input.svelte
+++ b/tests/fixtures/parser/ast/svelte5/ts-event03-input.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    const {onfoo} = $props<{
+    const {onfoo}:{
         onfoo: (e: { detail: number }) => void
-    }>()
+    } = $props()
     onfoo({detail: 1})
 </script>
 
diff --git a/tests/fixtures/parser/ast/svelte5/ts-event03-output.json b/tests/fixtures/parser/ast/svelte5/ts-event03-output.json
index 7cd7a34d..ff171cf1 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-event03-output.json
+++ b/tests/fixtures/parser/ast/svelte5/ts-event03-output.json
@@ -165,131 +165,78 @@
                     }
                   }
                 ],
-                "range": [
-                  29,
-                  36
-                ],
-                "loc": {
-                  "start": {
-                    "line": 2,
-                    "column": 10
-                  },
-                  "end": {
-                    "line": 2,
-                    "column": 17
-                  }
-                }
-              },
-              "init": {
-                "type": "CallExpression",
-                "arguments": [],
-                "callee": {
-                  "type": "Identifier",
-                  "name": "$props",
-                  "range": [
-                    39,
-                    45
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 2,
-                      "column": 20
-                    },
-                    "end": {
-                      "line": 2,
-                      "column": 26
-                    }
-                  }
-                },
-                "optional": false,
-                "typeArguments": {
-                  "type": "TSTypeParameterInstantiation",
-                  "params": [
-                    {
-                      "type": "TSTypeLiteral",
-                      "members": [
-                        {
-                          "type": "TSPropertySignature",
-                          "computed": false,
-                          "key": {
-                            "type": "Identifier",
-                            "name": "onfoo",
-                            "range": [
-                              56,
-                              61
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 3,
-                                "column": 8
-                              },
-                              "end": {
-                                "line": 3,
-                                "column": 13
-                              }
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSTypeLiteral",
+                    "members": [
+                      {
+                        "type": "TSPropertySignature",
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "name": "onfoo",
+                          "range": [
+                            47,
+                            52
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 13
                             }
-                          },
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeAnnotation",
                           "typeAnnotation": {
-                            "type": "TSTypeAnnotation",
-                            "typeAnnotation": {
-                              "type": "TSFunctionType",
-                              "params": [
-                                {
-                                  "type": "Identifier",
-                                  "name": "e",
+                            "type": "TSFunctionType",
+                            "params": [
+                              {
+                                "type": "Identifier",
+                                "name": "e",
+                                "typeAnnotation": {
+                                  "type": "TSTypeAnnotation",
                                   "typeAnnotation": {
-                                    "type": "TSTypeAnnotation",
-                                    "typeAnnotation": {
-                                      "type": "TSTypeLiteral",
-                                      "members": [
-                                        {
-                                          "type": "TSPropertySignature",
-                                          "computed": false,
-                                          "key": {
-                                            "type": "Identifier",
-                                            "name": "detail",
-                                            "range": [
-                                              69,
-                                              75
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 3,
-                                                "column": 21
-                                              },
-                                              "end": {
-                                                "line": 3,
-                                                "column": 27
-                                              }
+                                    "type": "TSTypeLiteral",
+                                    "members": [
+                                      {
+                                        "type": "TSPropertySignature",
+                                        "computed": false,
+                                        "key": {
+                                          "type": "Identifier",
+                                          "name": "detail",
+                                          "range": [
+                                            60,
+                                            66
+                                          ],
+                                          "loc": {
+                                            "start": {
+                                              "line": 3,
+                                              "column": 21
+                                            },
+                                            "end": {
+                                              "line": 3,
+                                              "column": 27
                                             }
-                                          },
+                                          }
+                                        },
+                                        "typeAnnotation": {
+                                          "type": "TSTypeAnnotation",
                                           "typeAnnotation": {
-                                            "type": "TSTypeAnnotation",
-                                            "typeAnnotation": {
-                                              "type": "TSNumberKeyword",
-                                              "range": [
-                                                77,
-                                                83
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 3,
-                                                  "column": 29
-                                                },
-                                                "end": {
-                                                  "line": 3,
-                                                  "column": 35
-                                                }
-                                              }
-                                            },
+                                            "type": "TSNumberKeyword",
                                             "range": [
-                                              75,
-                                              83
+                                              68,
+                                              74
                                             ],
                                             "loc": {
                                               "start": {
                                                 "line": 3,
-                                                "column": 27
+                                                "column": 29
                                               },
                                               "end": {
                                                 "line": 3,
@@ -298,44 +245,44 @@
                                             }
                                           },
                                           "range": [
-                                            69,
-                                            83
+                                            66,
+                                            74
                                           ],
                                           "loc": {
                                             "start": {
                                               "line": 3,
-                                              "column": 21
+                                              "column": 27
                                             },
                                             "end": {
                                               "line": 3,
                                               "column": 35
                                             }
                                           }
-                                        }
-                                      ],
-                                      "range": [
-                                        67,
-                                        85
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 3,
-                                          "column": 19
                                         },
-                                        "end": {
-                                          "line": 3,
-                                          "column": 37
+                                        "range": [
+                                          60,
+                                          74
+                                        ],
+                                        "loc": {
+                                          "start": {
+                                            "line": 3,
+                                            "column": 21
+                                          },
+                                          "end": {
+                                            "line": 3,
+                                            "column": 35
+                                          }
                                         }
                                       }
-                                    },
+                                    ],
                                     "range": [
-                                      65,
-                                      85
+                                      58,
+                                      76
                                     ],
                                     "loc": {
                                       "start": {
                                         "line": 3,
-                                        "column": 17
+                                        "column": 19
                                       },
                                       "end": {
                                         "line": 3,
@@ -344,48 +291,48 @@
                                     }
                                   },
                                   "range": [
-                                    64,
-                                    85
+                                    56,
+                                    76
                                   ],
                                   "loc": {
                                     "start": {
                                       "line": 3,
-                                      "column": 16
+                                      "column": 17
                                     },
                                     "end": {
                                       "line": 3,
                                       "column": 37
                                     }
                                   }
-                                }
-                              ],
-                              "returnType": {
-                                "type": "TSTypeAnnotation",
-                                "typeAnnotation": {
-                                  "type": "TSVoidKeyword",
-                                  "range": [
-                                    90,
-                                    94
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 3,
-                                      "column": 42
-                                    },
-                                    "end": {
-                                      "line": 3,
-                                      "column": 46
-                                    }
-                                  }
                                 },
                                 "range": [
-                                  87,
-                                  94
+                                  55,
+                                  76
                                 ],
                                 "loc": {
                                   "start": {
                                     "line": 3,
-                                    "column": 39
+                                    "column": 16
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 37
+                                  }
+                                }
+                              }
+                            ],
+                            "returnType": {
+                              "type": "TSTypeAnnotation",
+                              "typeAnnotation": {
+                                "type": "TSVoidKeyword",
+                                "range": [
+                                  81,
+                                  85
+                                ],
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 42
                                   },
                                   "end": {
                                     "line": 3,
@@ -394,13 +341,13 @@
                                 }
                               },
                               "range": [
-                                63,
-                                94
+                                78,
+                                85
                               ],
                               "loc": {
                                 "start": {
                                   "line": 3,
-                                  "column": 15
+                                  "column": 39
                                 },
                                 "end": {
                                   "line": 3,
@@ -409,13 +356,13 @@
                               }
                             },
                             "range": [
-                              61,
-                              94
+                              54,
+                              85
                             ],
                             "loc": {
                               "start": {
                                 "line": 3,
-                                "column": 13
+                                "column": 15
                               },
                               "end": {
                                 "line": 3,
@@ -424,70 +371,121 @@
                             }
                           },
                           "range": [
-                            56,
-                            94
+                            52,
+                            85
                           ],
                           "loc": {
                             "start": {
                               "line": 3,
-                              "column": 8
+                              "column": 13
                             },
                             "end": {
                               "line": 3,
                               "column": 46
                             }
                           }
-                        }
-                      ],
-                      "range": [
-                        46,
-                        100
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 2,
-                          "column": 27
                         },
-                        "end": {
-                          "line": 4,
-                          "column": 5
+                        "range": [
+                          47,
+                          85
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 8
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 46
+                          }
                         }
                       }
+                    ],
+                    "range": [
+                      37,
+                      91
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 5
+                      }
                     }
-                  ],
+                  },
                   "range": [
-                    45,
-                    101
+                    36,
+                    91
                   ],
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 26
+                      "column": 17
                     },
                     "end": {
                       "line": 4,
-                      "column": 6
+                      "column": 5
                     }
                   }
                 },
                 "range": [
-                  39,
-                  103
+                  29,
+                  91
                 ],
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 20
+                    "column": 10
                   },
                   "end": {
+                    "line": 4,
+                    "column": 5
+                  }
+                }
+              },
+              "init": {
+                "type": "CallExpression",
+                "arguments": [],
+                "callee": {
+                  "type": "Identifier",
+                  "name": "$props",
+                  "range": [
+                    94,
+                    100
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 14
+                    }
+                  }
+                },
+                "optional": false,
+                "range": [
+                  94,
+                  102
+                ],
+                "loc": {
+                  "start": {
                     "line": 4,
                     "column": 8
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 16
                   }
                 }
               },
               "range": [
                 29,
-                103
+                102
               ],
               "loc": {
                 "start": {
@@ -496,14 +494,14 @@
                 },
                 "end": {
                   "line": 4,
-                  "column": 8
+                  "column": 16
                 }
               }
             }
           ],
           "range": [
             23,
-            103
+            102
           ],
           "loc": {
             "start": {
@@ -512,7 +510,7 @@
             },
             "end": {
               "line": 4,
-              "column": 8
+              "column": 16
             }
           }
         },
@@ -532,8 +530,8 @@
                       "type": "Identifier",
                       "name": "detail",
                       "range": [
-                        115,
-                        121
+                        114,
+                        120
                       ],
                       "loc": {
                         "start": {
@@ -553,8 +551,8 @@
                       "raw": "1",
                       "value": 1,
                       "range": [
-                        123,
-                        124
+                        122,
+                        123
                       ],
                       "loc": {
                         "start": {
@@ -568,8 +566,8 @@
                       }
                     },
                     "range": [
-                      115,
-                      124
+                      114,
+                      123
                     ],
                     "loc": {
                       "start": {
@@ -584,8 +582,8 @@
                   }
                 ],
                 "range": [
-                  114,
-                  125
+                  113,
+                  124
                 ],
                 "loc": {
                   "start": {
@@ -603,8 +601,8 @@
               "type": "Identifier",
               "name": "onfoo",
               "range": [
-                108,
-                113
+                107,
+                112
               ],
               "loc": {
                 "start": {
@@ -619,8 +617,8 @@
             },
             "optional": false,
             "range": [
-              108,
-              126
+              107,
+              125
             ],
             "loc": {
               "start": {
@@ -634,8 +632,8 @@
             }
           },
           "range": [
-            108,
-            126
+            107,
+            125
           ],
           "loc": {
             "start": {
@@ -652,8 +650,8 @@
       "endTag": {
         "type": "SvelteEndTag",
         "range": [
-          127,
-          136
+          126,
+          135
         ],
         "loc": {
           "start": {
@@ -668,7 +666,7 @@
       },
       "range": [
         0,
-        136
+        135
       ],
       "loc": {
         "start": {
@@ -685,8 +683,8 @@
       "type": "SvelteText",
       "value": "\n\n",
       "range": [
-        136,
-        138
+        135,
+        137
       ],
       "loc": {
         "start": {
@@ -706,8 +704,8 @@
         "type": "SvelteName",
         "name": "button",
         "range": [
-          139,
-          145
+          138,
+          144
         ],
         "loc": {
           "start": {
@@ -729,8 +727,8 @@
               "type": "SvelteName",
               "name": "onclick",
               "range": [
-                146,
-                153
+                145,
+                152
               ],
               "loc": {
                 "start": {
@@ -763,8 +761,8 @@
                             "type": "Identifier",
                             "name": "e",
                             "range": [
-                              165,
-                              166
+                              164,
+                              165
                             ],
                             "loc": {
                               "start": {
@@ -782,8 +780,8 @@
                             "type": "Identifier",
                             "name": "currentTarget",
                             "range": [
-                              167,
-                              180
+                              166,
+                              179
                             ],
                             "loc": {
                               "start": {
@@ -797,8 +795,8 @@
                             }
                           },
                           "range": [
-                            165,
-                            180
+                            164,
+                            179
                           ],
                           "loc": {
                             "start": {
@@ -812,8 +810,8 @@
                           }
                         },
                         "range": [
-                          165,
-                          181
+                          164,
+                          180
                         ],
                         "loc": {
                           "start": {
@@ -828,8 +826,8 @@
                       }
                     ],
                     "range": [
-                      159,
-                      183
+                      158,
+                      182
                     ],
                     "loc": {
                       "start": {
@@ -850,8 +848,8 @@
                       "type": "Identifier",
                       "name": "e",
                       "range": [
-                        156,
-                        157
+                        155,
+                        156
                       ],
                       "loc": {
                         "start": {
@@ -866,8 +864,8 @@
                     }
                   ],
                   "range": [
-                    156,
-                    183
+                    155,
+                    182
                   ],
                   "loc": {
                     "start": {
@@ -881,8 +879,8 @@
                   }
                 },
                 "range": [
-                  155,
-                  184
+                  154,
+                  183
                 ],
                 "loc": {
                   "start": {
@@ -897,8 +895,8 @@
               }
             ],
             "range": [
-              146,
-              185
+              145,
+              184
             ],
             "loc": {
               "start": {
@@ -914,8 +912,8 @@
         ],
         "selfClosing": false,
         "range": [
-          138,
-          186
+          137,
+          185
         ],
         "loc": {
           "start": {
@@ -932,8 +930,8 @@
       "endTag": {
         "type": "SvelteEndTag",
         "range": [
-          186,
-          195
+          185,
+          194
         ],
         "loc": {
           "start": {
@@ -947,8 +945,8 @@
         }
       },
       "range": [
-        138,
-        195
+        137,
+        194
       ],
       "loc": {
         "start": {
@@ -965,8 +963,8 @@
       "type": "SvelteText",
       "value": "\n",
       "range": [
-        195,
-        196
+        194,
+        195
       ],
       "loc": {
         "start": {
@@ -986,8 +984,8 @@
         "type": "SvelteName",
         "name": "input",
         "range": [
-          197,
-          202
+          196,
+          201
         ],
         "loc": {
           "start": {
@@ -1009,8 +1007,8 @@
               "type": "SvelteName",
               "name": "oninput",
               "range": [
-                203,
-                210
+                202,
+                209
               ],
               "loc": {
                 "start": {
@@ -1043,8 +1041,8 @@
                             "type": "Identifier",
                             "name": "e",
                             "range": [
-                              222,
-                              223
+                              221,
+                              222
                             ],
                             "loc": {
                               "start": {
@@ -1062,8 +1060,8 @@
                             "type": "Identifier",
                             "name": "currentTarget",
                             "range": [
-                              224,
-                              237
+                              223,
+                              236
                             ],
                             "loc": {
                               "start": {
@@ -1077,8 +1075,8 @@
                             }
                           },
                           "range": [
-                            222,
-                            237
+                            221,
+                            236
                           ],
                           "loc": {
                             "start": {
@@ -1092,8 +1090,8 @@
                           }
                         },
                         "range": [
-                          222,
-                          238
+                          221,
+                          237
                         ],
                         "loc": {
                           "start": {
@@ -1108,8 +1106,8 @@
                       }
                     ],
                     "range": [
-                      216,
-                      240
+                      215,
+                      239
                     ],
                     "loc": {
                       "start": {
@@ -1130,8 +1128,8 @@
                       "type": "Identifier",
                       "name": "e",
                       "range": [
-                        213,
-                        214
+                        212,
+                        213
                       ],
                       "loc": {
                         "start": {
@@ -1146,8 +1144,8 @@
                     }
                   ],
                   "range": [
-                    213,
-                    240
+                    212,
+                    239
                   ],
                   "loc": {
                     "start": {
@@ -1161,8 +1159,8 @@
                   }
                 },
                 "range": [
-                  212,
-                  241
+                  211,
+                  240
                 ],
                 "loc": {
                   "start": {
@@ -1177,8 +1175,8 @@
               }
             ],
             "range": [
-              203,
-              242
+              202,
+              241
             ],
             "loc": {
               "start": {
@@ -1194,8 +1192,8 @@
         ],
         "selfClosing": false,
         "range": [
-          196,
-          243
+          195,
+          242
         ],
         "loc": {
           "start": {
@@ -1211,8 +1209,8 @@
       "children": [],
       "endTag": null,
       "range": [
-        196,
-        243
+        195,
+        242
       ],
       "loc": {
         "start": {
@@ -1447,55 +1445,19 @@
     },
     {
       "type": "Punctuator",
-      "value": "=",
-      "range": [
-        37,
-        38
-      ],
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 18
-        },
-        "end": {
-          "line": 2,
-          "column": 19
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "$props",
-      "range": [
-        39,
-        45
-      ],
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 20
-        },
-        "end": {
-          "line": 2,
-          "column": 26
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "<",
+      "value": ":",
       "range": [
-        45,
-        46
+        36,
+        37
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 26
+          "column": 17
         },
         "end": {
           "line": 2,
-          "column": 27
+          "column": 18
         }
       }
     },
@@ -1503,17 +1465,17 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        46,
-        47
+        37,
+        38
       ],
       "loc": {
         "start": {
           "line": 2,
-          "column": 27
+          "column": 18
         },
         "end": {
           "line": 2,
-          "column": 28
+          "column": 19
         }
       }
     },
@@ -1521,8 +1483,8 @@
       "type": "Identifier",
       "value": "onfoo",
       "range": [
-        56,
-        61
+        47,
+        52
       ],
       "loc": {
         "start": {
@@ -1539,8 +1501,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        61,
-        62
+        52,
+        53
       ],
       "loc": {
         "start": {
@@ -1557,8 +1519,8 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        63,
-        64
+        54,
+        55
       ],
       "loc": {
         "start": {
@@ -1575,8 +1537,8 @@
       "type": "Identifier",
       "value": "e",
       "range": [
-        64,
-        65
+        55,
+        56
       ],
       "loc": {
         "start": {
@@ -1593,8 +1555,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        65,
-        66
+        56,
+        57
       ],
       "loc": {
         "start": {
@@ -1611,8 +1573,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        67,
-        68
+        58,
+        59
       ],
       "loc": {
         "start": {
@@ -1629,8 +1591,8 @@
       "type": "Identifier",
       "value": "detail",
       "range": [
-        69,
-        75
+        60,
+        66
       ],
       "loc": {
         "start": {
@@ -1647,8 +1609,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        75,
-        76
+        66,
+        67
       ],
       "loc": {
         "start": {
@@ -1665,8 +1627,8 @@
       "type": "Identifier",
       "value": "number",
       "range": [
-        77,
-        83
+        68,
+        74
       ],
       "loc": {
         "start": {
@@ -1683,8 +1645,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        84,
-        85
+        75,
+        76
       ],
       "loc": {
         "start": {
@@ -1701,8 +1663,8 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        85,
-        86
+        76,
+        77
       ],
       "loc": {
         "start": {
@@ -1719,8 +1681,8 @@
       "type": "Punctuator",
       "value": "=>",
       "range": [
-        87,
-        89
+        78,
+        80
       ],
       "loc": {
         "start": {
@@ -1737,8 +1699,8 @@
       "type": "Keyword",
       "value": "void",
       "range": [
-        90,
-        94
+        81,
+        85
       ],
       "loc": {
         "start": {
@@ -1755,8 +1717,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        99,
-        100
+        90,
+        91
       ],
       "loc": {
         "start": {
@@ -1771,19 +1733,37 @@
     },
     {
       "type": "Punctuator",
-      "value": ">",
+      "value": "=",
       "range": [
-        100,
-        101
+        92,
+        93
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 5
+          "column": 6
         },
         "end": {
           "line": 4,
-          "column": 6
+          "column": 7
+        }
+      }
+    },
+    {
+      "type": "Identifier",
+      "value": "$props",
+      "range": [
+        94,
+        100
+      ],
+      "loc": {
+        "start": {
+          "line": 4,
+          "column": 8
+        },
+        "end": {
+          "line": 4,
+          "column": 14
         }
       }
     },
@@ -1791,17 +1771,17 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        101,
-        102
+        100,
+        101
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 6
+          "column": 14
         },
         "end": {
           "line": 4,
-          "column": 7
+          "column": 15
         }
       }
     },
@@ -1809,17 +1789,17 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        102,
-        103
+        101,
+        102
       ],
       "loc": {
         "start": {
           "line": 4,
-          "column": 7
+          "column": 15
         },
         "end": {
           "line": 4,
-          "column": 8
+          "column": 16
         }
       }
     },
@@ -1827,8 +1807,8 @@
       "type": "Identifier",
       "value": "onfoo",
       "range": [
-        108,
-        113
+        107,
+        112
       ],
       "loc": {
         "start": {
@@ -1845,8 +1825,8 @@
       "type": "Punctuator",
       "value": "(",
       "range": [
-        113,
-        114
+        112,
+        113
       ],
       "loc": {
         "start": {
@@ -1863,8 +1843,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        114,
-        115
+        113,
+        114
       ],
       "loc": {
         "start": {
@@ -1881,8 +1861,8 @@
       "type": "Identifier",
       "value": "detail",
       "range": [
-        115,
-        121
+        114,
+        120
       ],
       "loc": {
         "start": {
@@ -1899,8 +1879,8 @@
       "type": "Punctuator",
       "value": ":",
       "range": [
-        121,
-        122
+        120,
+        121
       ],
       "loc": {
         "start": {
@@ -1917,8 +1897,8 @@
       "type": "Numeric",
       "value": "1",
       "range": [
-        123,
-        124
+        122,
+        123
       ],
       "loc": {
         "start": {
@@ -1935,8 +1915,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        124,
-        125
+        123,
+        124
       ],
       "loc": {
         "start": {
@@ -1953,8 +1933,8 @@
       "type": "Punctuator",
       "value": ")",
       "range": [
-        125,
-        126
+        124,
+        125
       ],
       "loc": {
         "start": {
@@ -1971,8 +1951,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        127,
-        128
+        126,
+        127
       ],
       "loc": {
         "start": {
@@ -1989,8 +1969,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        128,
-        129
+        127,
+        128
       ],
       "loc": {
         "start": {
@@ -2007,8 +1987,8 @@
       "type": "HTMLIdentifier",
       "value": "script",
       "range": [
-        129,
-        135
+        128,
+        134
       ],
       "loc": {
         "start": {
@@ -2025,8 +2005,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        135,
-        136
+        134,
+        135
       ],
       "loc": {
         "start": {
@@ -2043,8 +2023,8 @@
       "type": "HTMLText",
       "value": "\n\n",
       "range": [
-        136,
-        138
+        135,
+        137
       ],
       "loc": {
         "start": {
@@ -2061,8 +2041,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        138,
-        139
+        137,
+        138
       ],
       "loc": {
         "start": {
@@ -2079,8 +2059,8 @@
       "type": "HTMLIdentifier",
       "value": "button",
       "range": [
-        139,
-        145
+        138,
+        144
       ],
       "loc": {
         "start": {
@@ -2097,8 +2077,8 @@
       "type": "HTMLIdentifier",
       "value": "onclick",
       "range": [
-        146,
-        153
+        145,
+        152
       ],
       "loc": {
         "start": {
@@ -2115,8 +2095,8 @@
       "type": "Punctuator",
       "value": "=",
       "range": [
-        153,
-        154
+        152,
+        153
       ],
       "loc": {
         "start": {
@@ -2133,8 +2113,8 @@
       "type": "Punctuator",
       "value": "\"",
       "range": [
-        154,
-        155
+        153,
+        154
       ],
       "loc": {
         "start": {
@@ -2151,8 +2131,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        155,
-        156
+        154,
+        155
       ],
       "loc": {
         "start": {
@@ -2169,8 +2149,8 @@
       "type": "Identifier",
       "value": "e",
       "range": [
-        156,
-        157
+        155,
+        156
       ],
       "loc": {
         "start": {
@@ -2187,8 +2167,8 @@
       "type": "Punctuator",
       "value": "=>",
       "range": [
-        157,
-        159
+        156,
+        158
       ],
       "loc": {
         "start": {
@@ -2205,8 +2185,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        159,
-        160
+        158,
+        159
       ],
       "loc": {
         "start": {
@@ -2223,8 +2203,8 @@
       "type": "Identifier",
       "value": "e",
       "range": [
-        165,
-        166
+        164,
+        165
       ],
       "loc": {
         "start": {
@@ -2241,8 +2221,8 @@
       "type": "Punctuator",
       "value": ".",
       "range": [
-        166,
-        167
+        165,
+        166
       ],
       "loc": {
         "start": {
@@ -2259,8 +2239,8 @@
       "type": "Identifier",
       "value": "currentTarget",
       "range": [
-        167,
-        180
+        166,
+        179
       ],
       "loc": {
         "start": {
@@ -2277,8 +2257,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        180,
-        181
+        179,
+        180
       ],
       "loc": {
         "start": {
@@ -2295,8 +2275,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        182,
-        183
+        181,
+        182
       ],
       "loc": {
         "start": {
@@ -2313,8 +2293,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        183,
-        184
+        182,
+        183
       ],
       "loc": {
         "start": {
@@ -2331,8 +2311,8 @@
       "type": "Punctuator",
       "value": "\"",
       "range": [
-        184,
-        185
+        183,
+        184
       ],
       "loc": {
         "start": {
@@ -2349,8 +2329,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        185,
-        186
+        184,
+        185
       ],
       "loc": {
         "start": {
@@ -2367,8 +2347,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        186,
-        187
+        185,
+        186
       ],
       "loc": {
         "start": {
@@ -2385,8 +2365,8 @@
       "type": "Punctuator",
       "value": "/",
       "range": [
-        187,
-        188
+        186,
+        187
       ],
       "loc": {
         "start": {
@@ -2403,8 +2383,8 @@
       "type": "HTMLIdentifier",
       "value": "button",
       "range": [
-        188,
-        194
+        187,
+        193
       ],
       "loc": {
         "start": {
@@ -2421,8 +2401,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        194,
-        195
+        193,
+        194
       ],
       "loc": {
         "start": {
@@ -2439,8 +2419,8 @@
       "type": "HTMLText",
       "value": "\n",
       "range": [
-        195,
-        196
+        194,
+        195
       ],
       "loc": {
         "start": {
@@ -2457,8 +2437,8 @@
       "type": "Punctuator",
       "value": "<",
       "range": [
-        196,
-        197
+        195,
+        196
       ],
       "loc": {
         "start": {
@@ -2475,8 +2455,8 @@
       "type": "HTMLIdentifier",
       "value": "input",
       "range": [
-        197,
-        202
+        196,
+        201
       ],
       "loc": {
         "start": {
@@ -2493,8 +2473,8 @@
       "type": "HTMLIdentifier",
       "value": "oninput",
       "range": [
-        203,
-        210
+        202,
+        209
       ],
       "loc": {
         "start": {
@@ -2511,8 +2491,8 @@
       "type": "Punctuator",
       "value": "=",
       "range": [
-        210,
-        211
+        209,
+        210
       ],
       "loc": {
         "start": {
@@ -2529,8 +2509,8 @@
       "type": "Punctuator",
       "value": "\"",
       "range": [
-        211,
-        212
+        210,
+        211
       ],
       "loc": {
         "start": {
@@ -2547,8 +2527,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        212,
-        213
+        211,
+        212
       ],
       "loc": {
         "start": {
@@ -2565,8 +2545,8 @@
       "type": "Identifier",
       "value": "e",
       "range": [
-        213,
-        214
+        212,
+        213
       ],
       "loc": {
         "start": {
@@ -2583,8 +2563,8 @@
       "type": "Punctuator",
       "value": "=>",
       "range": [
-        214,
-        216
+        213,
+        215
       ],
       "loc": {
         "start": {
@@ -2601,8 +2581,8 @@
       "type": "Punctuator",
       "value": "{",
       "range": [
-        216,
-        217
+        215,
+        216
       ],
       "loc": {
         "start": {
@@ -2619,8 +2599,8 @@
       "type": "Identifier",
       "value": "e",
       "range": [
-        222,
-        223
+        221,
+        222
       ],
       "loc": {
         "start": {
@@ -2637,8 +2617,8 @@
       "type": "Punctuator",
       "value": ".",
       "range": [
-        223,
-        224
+        222,
+        223
       ],
       "loc": {
         "start": {
@@ -2655,8 +2635,8 @@
       "type": "Identifier",
       "value": "currentTarget",
       "range": [
-        224,
-        237
+        223,
+        236
       ],
       "loc": {
         "start": {
@@ -2673,8 +2653,8 @@
       "type": "Punctuator",
       "value": ";",
       "range": [
-        237,
-        238
+        236,
+        237
       ],
       "loc": {
         "start": {
@@ -2691,8 +2671,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        239,
-        240
+        238,
+        239
       ],
       "loc": {
         "start": {
@@ -2709,8 +2689,8 @@
       "type": "Punctuator",
       "value": "}",
       "range": [
-        240,
-        241
+        239,
+        240
       ],
       "loc": {
         "start": {
@@ -2727,8 +2707,8 @@
       "type": "Punctuator",
       "value": "\"",
       "range": [
-        241,
-        242
+        240,
+        241
       ],
       "loc": {
         "start": {
@@ -2745,8 +2725,8 @@
       "type": "Punctuator",
       "value": ">",
       "range": [
-        242,
-        243
+        241,
+        242
       ],
       "loc": {
         "start": {
@@ -2762,7 +2742,7 @@
   ],
   "range": [
     0,
-    244
+    243
   ],
   "loc": {
     "start": {
diff --git a/tests/fixtures/parser/ast/svelte5/ts-event03-scope-output.json b/tests/fixtures/parser/ast/svelte5/ts-event03-scope-output.json
index ac118605..82ea3206 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-event03-scope-output.json
+++ b/tests/fixtures/parser/ast/svelte5/ts-event03-scope-output.json
@@ -47,17 +47,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              39,
-              45
+              94,
+              100
             ],
             "loc": {
               "start": {
-                "line": 2,
-                "column": 20
+                "line": 4,
+                "column": 8
               },
               "end": {
-                "line": 2,
-                "column": 26
+                "line": 4,
+                "column": 14
               }
             }
           },
@@ -191,131 +191,78 @@
                       }
                     }
                   ],
-                  "range": [
-                    29,
-                    36
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 2,
-                      "column": 10
-                    },
-                    "end": {
-                      "line": 2,
-                      "column": 17
-                    }
-                  }
-                },
-                "init": {
-                  "type": "CallExpression",
-                  "arguments": [],
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "$props",
-                    "range": [
-                      39,
-                      45
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 2,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 2,
-                        "column": 26
-                      }
-                    }
-                  },
-                  "optional": false,
-                  "typeArguments": {
-                    "type": "TSTypeParameterInstantiation",
-                    "params": [
-                      {
-                        "type": "TSTypeLiteral",
-                        "members": [
-                          {
-                            "type": "TSPropertySignature",
-                            "computed": false,
-                            "key": {
-                              "type": "Identifier",
-                              "name": "onfoo",
-                              "range": [
-                                56,
-                                61
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 3,
-                                  "column": 8
-                                },
-                                "end": {
-                                  "line": 3,
-                                  "column": 13
-                                }
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "typeAnnotation": {
+                      "type": "TSTypeLiteral",
+                      "members": [
+                        {
+                          "type": "TSPropertySignature",
+                          "computed": false,
+                          "key": {
+                            "type": "Identifier",
+                            "name": "onfoo",
+                            "range": [
+                              47,
+                              52
+                            ],
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 13
                               }
-                            },
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "TSTypeAnnotation",
                             "typeAnnotation": {
-                              "type": "TSTypeAnnotation",
-                              "typeAnnotation": {
-                                "type": "TSFunctionType",
-                                "params": [
-                                  {
-                                    "type": "Identifier",
-                                    "name": "e",
+                              "type": "TSFunctionType",
+                              "params": [
+                                {
+                                  "type": "Identifier",
+                                  "name": "e",
+                                  "typeAnnotation": {
+                                    "type": "TSTypeAnnotation",
                                     "typeAnnotation": {
-                                      "type": "TSTypeAnnotation",
-                                      "typeAnnotation": {
-                                        "type": "TSTypeLiteral",
-                                        "members": [
-                                          {
-                                            "type": "TSPropertySignature",
-                                            "computed": false,
-                                            "key": {
-                                              "type": "Identifier",
-                                              "name": "detail",
-                                              "range": [
-                                                69,
-                                                75
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 3,
-                                                  "column": 21
-                                                },
-                                                "end": {
-                                                  "line": 3,
-                                                  "column": 27
-                                                }
+                                      "type": "TSTypeLiteral",
+                                      "members": [
+                                        {
+                                          "type": "TSPropertySignature",
+                                          "computed": false,
+                                          "key": {
+                                            "type": "Identifier",
+                                            "name": "detail",
+                                            "range": [
+                                              60,
+                                              66
+                                            ],
+                                            "loc": {
+                                              "start": {
+                                                "line": 3,
+                                                "column": 21
+                                              },
+                                              "end": {
+                                                "line": 3,
+                                                "column": 27
                                               }
-                                            },
+                                            }
+                                          },
+                                          "typeAnnotation": {
+                                            "type": "TSTypeAnnotation",
                                             "typeAnnotation": {
-                                              "type": "TSTypeAnnotation",
-                                              "typeAnnotation": {
-                                                "type": "TSNumberKeyword",
-                                                "range": [
-                                                  77,
-                                                  83
-                                                ],
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 3,
-                                                    "column": 29
-                                                  },
-                                                  "end": {
-                                                    "line": 3,
-                                                    "column": 35
-                                                  }
-                                                }
-                                              },
+                                              "type": "TSNumberKeyword",
                                               "range": [
-                                                75,
-                                                83
+                                                68,
+                                                74
                                               ],
                                               "loc": {
                                                 "start": {
                                                   "line": 3,
-                                                  "column": 27
+                                                  "column": 29
                                                 },
                                                 "end": {
                                                   "line": 3,
@@ -324,44 +271,44 @@
                                               }
                                             },
                                             "range": [
-                                              69,
-                                              83
+                                              66,
+                                              74
                                             ],
                                             "loc": {
                                               "start": {
                                                 "line": 3,
-                                                "column": 21
+                                                "column": 27
                                               },
                                               "end": {
                                                 "line": 3,
                                                 "column": 35
                                               }
                                             }
-                                          }
-                                        ],
-                                        "range": [
-                                          67,
-                                          85
-                                        ],
-                                        "loc": {
-                                          "start": {
-                                            "line": 3,
-                                            "column": 19
                                           },
-                                          "end": {
-                                            "line": 3,
-                                            "column": 37
+                                          "range": [
+                                            60,
+                                            74
+                                          ],
+                                          "loc": {
+                                            "start": {
+                                              "line": 3,
+                                              "column": 21
+                                            },
+                                            "end": {
+                                              "line": 3,
+                                              "column": 35
+                                            }
                                           }
                                         }
-                                      },
+                                      ],
                                       "range": [
-                                        65,
-                                        85
+                                        58,
+                                        76
                                       ],
                                       "loc": {
                                         "start": {
                                           "line": 3,
-                                          "column": 17
+                                          "column": 19
                                         },
                                         "end": {
                                           "line": 3,
@@ -370,48 +317,48 @@
                                       }
                                     },
                                     "range": [
-                                      64,
-                                      85
+                                      56,
+                                      76
                                     ],
                                     "loc": {
                                       "start": {
                                         "line": 3,
-                                        "column": 16
+                                        "column": 17
                                       },
                                       "end": {
                                         "line": 3,
                                         "column": 37
                                       }
                                     }
-                                  }
-                                ],
-                                "returnType": {
-                                  "type": "TSTypeAnnotation",
-                                  "typeAnnotation": {
-                                    "type": "TSVoidKeyword",
-                                    "range": [
-                                      90,
-                                      94
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 3,
-                                        "column": 42
-                                      },
-                                      "end": {
-                                        "line": 3,
-                                        "column": 46
-                                      }
-                                    }
                                   },
                                   "range": [
-                                    87,
-                                    94
+                                    55,
+                                    76
+                                  ],
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 16
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 37
+                                    }
+                                  }
+                                }
+                              ],
+                              "returnType": {
+                                "type": "TSTypeAnnotation",
+                                "typeAnnotation": {
+                                  "type": "TSVoidKeyword",
+                                  "range": [
+                                    81,
+                                    85
                                   ],
                                   "loc": {
                                     "start": {
                                       "line": 3,
-                                      "column": 39
+                                      "column": 42
                                     },
                                     "end": {
                                       "line": 3,
@@ -420,13 +367,13 @@
                                   }
                                 },
                                 "range": [
-                                  63,
-                                  94
+                                  78,
+                                  85
                                 ],
                                 "loc": {
                                   "start": {
                                     "line": 3,
-                                    "column": 15
+                                    "column": 39
                                   },
                                   "end": {
                                     "line": 3,
@@ -435,13 +382,13 @@
                                 }
                               },
                               "range": [
-                                61,
-                                94
+                                54,
+                                85
                               ],
                               "loc": {
                                 "start": {
                                   "line": 3,
-                                  "column": 13
+                                  "column": 15
                                 },
                                 "end": {
                                   "line": 3,
@@ -450,70 +397,121 @@
                               }
                             },
                             "range": [
-                              56,
-                              94
+                              52,
+                              85
                             ],
                             "loc": {
                               "start": {
                                 "line": 3,
-                                "column": 8
+                                "column": 13
                               },
                               "end": {
                                 "line": 3,
                                 "column": 46
                               }
                             }
-                          }
-                        ],
-                        "range": [
-                          46,
-                          100
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 2,
-                            "column": 27
                           },
-                          "end": {
-                            "line": 4,
-                            "column": 5
+                          "range": [
+                            47,
+                            85
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 46
+                            }
                           }
                         }
+                      ],
+                      "range": [
+                        37,
+                        91
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 5
+                        }
                       }
-                    ],
+                    },
                     "range": [
-                      45,
-                      101
+                      36,
+                      91
                     ],
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 26
+                        "column": 17
                       },
                       "end": {
                         "line": 4,
-                        "column": 6
+                        "column": 5
                       }
                     }
                   },
                   "range": [
-                    39,
-                    103
+                    29,
+                    91
                   ],
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 20
+                      "column": 10
                     },
                     "end": {
+                      "line": 4,
+                      "column": 5
+                    }
+                  }
+                },
+                "init": {
+                  "type": "CallExpression",
+                  "arguments": [],
+                  "callee": {
+                    "type": "Identifier",
+                    "name": "$props",
+                    "range": [
+                      94,
+                      100
+                    ],
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 14
+                      }
+                    }
+                  },
+                  "optional": false,
+                  "range": [
+                    94,
+                    102
+                  ],
+                  "loc": {
+                    "start": {
                       "line": 4,
                       "column": 8
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 16
                     }
                   }
                 },
                 "range": [
                   29,
-                  103
+                  102
                 ],
                 "loc": {
                   "start": {
@@ -522,7 +520,7 @@
                   },
                   "end": {
                     "line": 4,
-                    "column": 8
+                    "column": 16
                   }
                 }
               }
@@ -574,8 +572,8 @@
                 "type": "Identifier",
                 "name": "onfoo",
                 "range": [
-                  108,
-                  113
+                  107,
+                  112
                 ],
                 "loc": {
                   "start": {
@@ -658,17 +656,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              39,
-              45
+              94,
+              100
             ],
             "loc": {
               "start": {
-                "line": 2,
-                "column": 20
+                "line": 4,
+                "column": 8
               },
               "end": {
-                "line": 2,
-                "column": 26
+                "line": 4,
+                "column": 14
               }
             }
           },
@@ -681,8 +679,8 @@
             "type": "Identifier",
             "name": "onfoo",
             "range": [
-              108,
-              113
+              107,
+              112
             ],
             "loc": {
               "start": {
@@ -739,8 +737,8 @@
                             "type": "Identifier",
                             "name": "detail",
                             "range": [
-                              69,
-                              75
+                              60,
+                              66
                             ],
                             "loc": {
                               "start": {
@@ -758,8 +756,8 @@
                             "typeAnnotation": {
                               "type": "TSNumberKeyword",
                               "range": [
-                                77,
-                                83
+                                68,
+                                74
                               ],
                               "loc": {
                                 "start": {
@@ -773,8 +771,8 @@
                               }
                             },
                             "range": [
-                              75,
-                              83
+                              66,
+                              74
                             ],
                             "loc": {
                               "start": {
@@ -788,8 +786,8 @@
                             }
                           },
                           "range": [
-                            69,
-                            83
+                            60,
+                            74
                           ],
                           "loc": {
                             "start": {
@@ -804,8 +802,8 @@
                         }
                       ],
                       "range": [
-                        67,
-                        85
+                        58,
+                        76
                       ],
                       "loc": {
                         "start": {
@@ -819,8 +817,8 @@
                       }
                     },
                     "range": [
-                      65,
-                      85
+                      56,
+                      76
                     ],
                     "loc": {
                       "start": {
@@ -834,8 +832,8 @@
                     }
                   },
                   "range": [
-                    64,
-                    85
+                    55,
+                    76
                   ],
                   "loc": {
                     "start": {
@@ -867,8 +865,8 @@
                               "type": "Identifier",
                               "name": "detail",
                               "range": [
-                                69,
-                                75
+                                60,
+                                66
                               ],
                               "loc": {
                                 "start": {
@@ -886,8 +884,8 @@
                               "typeAnnotation": {
                                 "type": "TSNumberKeyword",
                                 "range": [
-                                  77,
-                                  83
+                                  68,
+                                  74
                                 ],
                                 "loc": {
                                   "start": {
@@ -901,8 +899,8 @@
                                 }
                               },
                               "range": [
-                                75,
-                                83
+                                66,
+                                74
                               ],
                               "loc": {
                                 "start": {
@@ -916,8 +914,8 @@
                               }
                             },
                             "range": [
-                              69,
-                              83
+                              60,
+                              74
                             ],
                             "loc": {
                               "start": {
@@ -932,8 +930,8 @@
                           }
                         ],
                         "range": [
-                          67,
-                          85
+                          58,
+                          76
                         ],
                         "loc": {
                           "start": {
@@ -947,8 +945,8 @@
                         }
                       },
                       "range": [
-                        65,
-                        85
+                        56,
+                        76
                       ],
                       "loc": {
                         "start": {
@@ -962,8 +960,8 @@
                       }
                     },
                     "range": [
-                      64,
-                      85
+                      55,
+                      76
                     ],
                     "loc": {
                       "start": {
@@ -994,8 +992,8 @@
                                   "type": "Identifier",
                                   "name": "detail",
                                   "range": [
-                                    69,
-                                    75
+                                    60,
+                                    66
                                   ],
                                   "loc": {
                                     "start": {
@@ -1013,8 +1011,8 @@
                                   "typeAnnotation": {
                                     "type": "TSNumberKeyword",
                                     "range": [
-                                      77,
-                                      83
+                                      68,
+                                      74
                                     ],
                                     "loc": {
                                       "start": {
@@ -1028,8 +1026,8 @@
                                     }
                                   },
                                   "range": [
-                                    75,
-                                    83
+                                    66,
+                                    74
                                   ],
                                   "loc": {
                                     "start": {
@@ -1043,8 +1041,8 @@
                                   }
                                 },
                                 "range": [
-                                  69,
-                                  83
+                                  60,
+                                  74
                                 ],
                                 "loc": {
                                   "start": {
@@ -1059,8 +1057,8 @@
                               }
                             ],
                             "range": [
-                              67,
-                              85
+                              58,
+                              76
                             ],
                             "loc": {
                               "start": {
@@ -1074,8 +1072,8 @@
                             }
                           },
                           "range": [
-                            65,
-                            85
+                            56,
+                            76
                           ],
                           "loc": {
                             "start": {
@@ -1089,8 +1087,8 @@
                           }
                         },
                         "range": [
-                          64,
-                          85
+                          55,
+                          76
                         ],
                         "loc": {
                           "start": {
@@ -1109,8 +1107,8 @@
                       "typeAnnotation": {
                         "type": "TSVoidKeyword",
                         "range": [
-                          90,
-                          94
+                          81,
+                          85
                         ],
                         "loc": {
                           "start": {
@@ -1124,8 +1122,8 @@
                         }
                       },
                       "range": [
-                        87,
-                        94
+                        78,
+                        85
                       ],
                       "loc": {
                         "start": {
@@ -1139,8 +1137,8 @@
                       }
                     },
                     "range": [
-                      63,
-                      94
+                      54,
+                      85
                     ],
                     "loc": {
                       "start": {
@@ -1172,8 +1170,8 @@
                   "type": "Identifier",
                   "name": "e",
                   "range": [
-                    156,
-                    157
+                    155,
+                    156
                   ],
                   "loc": {
                     "start": {
@@ -1194,8 +1192,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      156,
-                      157
+                      155,
+                      156
                     ],
                     "loc": {
                       "start": {
@@ -1223,8 +1221,8 @@
                               "type": "Identifier",
                               "name": "e",
                               "range": [
-                                165,
-                                166
+                                164,
+                                165
                               ],
                               "loc": {
                                 "start": {
@@ -1242,8 +1240,8 @@
                               "type": "Identifier",
                               "name": "currentTarget",
                               "range": [
-                                167,
-                                180
+                                166,
+                                179
                               ],
                               "loc": {
                                 "start": {
@@ -1257,8 +1255,8 @@
                               }
                             },
                             "range": [
-                              165,
-                              180
+                              164,
+                              179
                             ],
                             "loc": {
                               "start": {
@@ -1272,8 +1270,8 @@
                             }
                           },
                           "range": [
-                            165,
-                            181
+                            164,
+                            180
                           ],
                           "loc": {
                             "start": {
@@ -1288,8 +1286,8 @@
                         }
                       ],
                       "range": [
-                        159,
-                        183
+                        158,
+                        182
                       ],
                       "loc": {
                         "start": {
@@ -1310,8 +1308,8 @@
                         "type": "Identifier",
                         "name": "e",
                         "range": [
-                          156,
-                          157
+                          155,
+                          156
                         ],
                         "loc": {
                           "start": {
@@ -1326,8 +1324,8 @@
                       }
                     ],
                     "range": [
-                      156,
-                      183
+                      155,
+                      182
                     ],
                     "loc": {
                       "start": {
@@ -1348,8 +1346,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      165,
-                      166
+                      164,
+                      165
                     ],
                     "loc": {
                       "start": {
@@ -1368,8 +1366,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      156,
-                      157
+                      155,
+                      156
                     ],
                     "loc": {
                       "start": {
@@ -1392,8 +1390,8 @@
                 "type": "Identifier",
                 "name": "e",
                 "range": [
-                  165,
-                  166
+                  164,
+                  165
                 ],
                 "loc": {
                   "start": {
@@ -1412,8 +1410,8 @@
                 "type": "Identifier",
                 "name": "e",
                 "range": [
-                  156,
-                  157
+                  155,
+                  156
                 ],
                 "loc": {
                   "start": {
@@ -1441,8 +1439,8 @@
                   "type": "Identifier",
                   "name": "e",
                   "range": [
-                    213,
-                    214
+                    212,
+                    213
                   ],
                   "loc": {
                     "start": {
@@ -1463,8 +1461,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      213,
-                      214
+                      212,
+                      213
                     ],
                     "loc": {
                       "start": {
@@ -1492,8 +1490,8 @@
                               "type": "Identifier",
                               "name": "e",
                               "range": [
-                                222,
-                                223
+                                221,
+                                222
                               ],
                               "loc": {
                                 "start": {
@@ -1511,8 +1509,8 @@
                               "type": "Identifier",
                               "name": "currentTarget",
                               "range": [
-                                224,
-                                237
+                                223,
+                                236
                               ],
                               "loc": {
                                 "start": {
@@ -1526,8 +1524,8 @@
                               }
                             },
                             "range": [
-                              222,
-                              237
+                              221,
+                              236
                             ],
                             "loc": {
                               "start": {
@@ -1541,8 +1539,8 @@
                             }
                           },
                           "range": [
-                            222,
-                            238
+                            221,
+                            237
                           ],
                           "loc": {
                             "start": {
@@ -1557,8 +1555,8 @@
                         }
                       ],
                       "range": [
-                        216,
-                        240
+                        215,
+                        239
                       ],
                       "loc": {
                         "start": {
@@ -1579,8 +1577,8 @@
                         "type": "Identifier",
                         "name": "e",
                         "range": [
-                          213,
-                          214
+                          212,
+                          213
                         ],
                         "loc": {
                           "start": {
@@ -1595,8 +1593,8 @@
                       }
                     ],
                     "range": [
-                      213,
-                      240
+                      212,
+                      239
                     ],
                     "loc": {
                       "start": {
@@ -1617,8 +1615,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      222,
-                      223
+                      221,
+                      222
                     ],
                     "loc": {
                       "start": {
@@ -1637,8 +1635,8 @@
                     "type": "Identifier",
                     "name": "e",
                     "range": [
-                      213,
-                      214
+                      212,
+                      213
                     ],
                     "loc": {
                       "start": {
@@ -1661,8 +1659,8 @@
                 "type": "Identifier",
                 "name": "e",
                 "range": [
-                  222,
-                  223
+                  221,
+                  222
                 ],
                 "loc": {
                   "start": {
@@ -1681,8 +1679,8 @@
                 "type": "Identifier",
                 "name": "e",
                 "range": [
-                  213,
-                  214
+                  212,
+                  213
                 ],
                 "loc": {
                   "start": {
@@ -1707,17 +1705,17 @@
             "type": "Identifier",
             "name": "$props",
             "range": [
-              39,
-              45
+              94,
+              100
             ],
             "loc": {
               "start": {
-                "line": 2,
-                "column": 20
+                "line": 4,
+                "column": 8
               },
               "end": {
-                "line": 2,
-                "column": 26
+                "line": 4,
+                "column": 14
               }
             }
           },
diff --git a/tests/fixtures/parser/ast/svelte5/ts-event03-type-output.svelte b/tests/fixtures/parser/ast/svelte5/ts-event03-type-output.svelte
index c5deb9f4..e56a63cf 100644
--- a/tests/fixtures/parser/ast/svelte5/ts-event03-type-output.svelte
+++ b/tests/fixtures/parser/ast/svelte5/ts-event03-type-output.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    const {onfoo} = $props<{ // onfoo: (e: { detail: number; }) => void, onfoo: (e: { detail: number; }) => void, $props<{ onfoo: (e: { detail: number }) => void }>(): { onfoo: (e: { detail: number; }) => void; }
-        onfoo: (e: { detail: number }) => void
-    }>()
+    const {onfoo}:{ // onfoo: (e: { detail: number; }) => void, onfoo: (e: { detail: number; }) => void
+        onfoo: (e: { detail: number }) => void // e: { detail: number; }, onfoo: (e: { detail: number; }) => void
+    } = $props() // $props(): any
     onfoo({detail: 1}) // onfoo({detail: 1}): void
 </script>