update according to review

Author: baseballyama

docs/AST.md

@@ -169,6 +169,7 @@ interface SvelteStartTag extends Node {
     | SvelteAttribute
     | SvelteShorthandAttribute
     | SvelteSpreadAttribute
+    | SvelteAttachTag
     | SvelteDirective
     | SvelteStyleDirective
     | SvelteSpecialDirective
@@ -451,6 +452,18 @@ interface SvelteRenderTag extends Node {
 }
 ```
 
+### SvelteAttachTag
+
+This is `{@attach}` tag node.
+
+```ts
+export interface SvelteAttachTag extends BaseNode {
+  type: "SvelteAttachTag";
+  expression: ESTree.Expression;
+  parent: SvelteStartTag;
+}
+```
+
 ### SvelteIfBlock
 
 This is the `{#if}` tag node. `{:else if}` is also included in this node.

src/parser/converts/attr.ts

@@ -352,7 +352,7 @@ function convertSpreadAttribute(
 }
 
 function convertAttachTag(
-  node: SvAST.AttachTag | Compiler.AttachTag,
+  node: Compiler.AttachTag,
   parent: SvelteAttachTag["parent"],
   ctx: Context,
 ): SvelteAttachTag {
@@ -367,6 +367,12 @@ function convertAttachTag(
     attachTag.expression = es;
   });
 
+  const atAttachStart = ctx.code.indexOf("@attach", attachTag.range[0]);
+  ctx.addToken("MustacheKeyword", {
+    start: atAttachStart,
+    end: atAttachStart + 7,
+  });
+
   return attachTag;
 }
 

src/parser/svelte-ast-types.ts

@@ -203,12 +203,6 @@ export interface AttributeShorthand extends BaseNode {
   type: "AttributeShorthand";
   expression: ESTree.Identifier;
 }
-
-export interface AttachTag extends BaseNode {
-  type: "AttachTag";
-  expression: ESTree.Expression;
-}
-
 export type AttributeOrDirective =
   | Attribute
   | Spread

tests/fixtures/parser/ast/svelte5/attach-ts-01-output.json

@@ -1939,124 +1939,16 @@
       }
     },
     {
-      "type": "Punctuator",
-      "value": "@",
+      "type": "MustacheKeyword",
+      "value": "@attach",
       "range": [
         242,
-        243
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 6
-        },
-        "end": {
-          "line": 14,
-          "column": 7
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "a",
-      "range": [
-        243,
-        244
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 7
-        },
-        "end": {
-          "line": 14,
-          "column": 8
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        244,
-        245
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 8
-        },
-        "end": {
-          "line": 14,
-          "column": 9
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        245,
-        246
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 9
-        },
-        "end": {
-          "line": 14,
-          "column": 10
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "a",
-      "range": [
-        246,
-        247
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 10
-        },
-        "end": {
-          "line": 14,
-          "column": 11
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "c",
-      "range": [
-        247,
-        248
-      ],
-      "loc": {
-        "start": {
-          "line": 14,
-          "column": 11
-        },
-        "end": {
-          "line": 14,
-          "column": 12
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "h",
-      "range": [
-        248,
         249
       ],
       "loc": {
         "start": {
           "line": 14,
-          "column": 12
+          "column": 6
         },
         "end": {
           "line": 14,

tests/fixtures/parser/ast/svelte5/attach-ts-02-output.json

@@ -2777,124 +2777,16 @@
       }
     },
     {
-      "type": "Punctuator",
-      "value": "@",
+      "type": "MustacheKeyword",
+      "value": "@attach",
       "range": [
         348,
-        349
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 9
-        },
-        "end": {
-          "line": 17,
-          "column": 10
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "a",
-      "range": [
-        349,
-        350
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 10
-        },
-        "end": {
-          "line": 17,
-          "column": 11
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        350,
-        351
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 11
-        },
-        "end": {
-          "line": 17,
-          "column": 12
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        351,
-        352
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 12
-        },
-        "end": {
-          "line": 17,
-          "column": 13
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "a",
-      "range": [
-        352,
-        353
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 13
-        },
-        "end": {
-          "line": 17,
-          "column": 14
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "c",
-      "range": [
-        353,
-        354
-      ],
-      "loc": {
-        "start": {
-          "line": 17,
-          "column": 14
-        },
-        "end": {
-          "line": 17,
-          "column": 15
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "h",
-      "range": [
-        354,
         355
       ],
       "loc": {
         "start": {
           "line": 17,
-          "column": 15
+          "column": 9
         },
         "end": {
           "line": 17,