refactor

Author: ota-meshi

src/parser/compat.ts

@@ -179,15 +179,6 @@ export function getFallbackFromEachBlock(
   }
   return (block as SvAST.EachBlock).else ?? null;
 }
-// SnippetBlock
-export function getBodyFromSnippetBlock(
-  block: SvAST.SnippetBlock | Compiler.SnippetBlock,
-): Compiler.Fragment | SvAST.SnippetBlock {
-  if ((block as Compiler.SnippetBlock).body) {
-    return (block as Compiler.SnippetBlock).body;
-  }
-  return block as SvAST.SnippetBlock;
-}
 // AwaitBlock
 export function getPendingFromAwaitBlock(
   block: SvAST.AwaitBlock | Compiler.AwaitBlock,

src/parser/converts/attr.ts

@@ -38,6 +38,13 @@ import { svelteVersion } from "../svelte-version";
 import { hasTypeInfo } from "../../utils";
 import { getModifiers } from "../compat";
 
+type LetDirective = Omit<Compiler.LetDirective, "expression"> & {
+  expression: SvAST.LetDirective["expression"];
+};
+type StandardDirective =
+  | Exclude<Compiler.Directive, Compiler.StyleDirective | Compiler.LetDirective>
+  | LetDirective;
+
 /** Convert for Attributes */
 export function* convertAttributes(
   attributes: (
@@ -92,7 +99,11 @@ export function* convertAttributes(
       yield convertActionDirective(attr, parent, ctx);
       continue;
     }
-    if (attr.type === "LetDirective" || attr.type === "Let") {
+    if (attr.type === "LetDirective") {
+      yield convertLetDirective(attr as LetDirective, parent, ctx);
+      continue;
+    }
+    if (attr.type === "Let") {
       yield convertLetDirective(attr, parent, ctx);
       continue;
     }
@@ -272,7 +283,7 @@ function processAttributeValue(
     });
   if (
     nodes.length === 1 &&
-    (nodes[0].type === "MustacheTag" || nodes[0].type === "ExpressionTag") &&
+    (nodes[0].type === "ExpressionTag" || nodes[0].type === "MustacheTag") &&
     attribute.type === "SvelteAttribute"
   ) {
     const typing = buildAttributeType(
@@ -691,7 +702,7 @@ function convertActionDirective(
 
 /** Convert for Let Directive */
 function convertLetDirective(
-  node: SvAST.LetDirective | Compiler.LetDirective,
+  node: SvAST.LetDirective | LetDirective,
   parent: SvelteLetDirective["parent"],
   ctx: Context,
 ): SvelteLetDirective {
@@ -703,7 +714,7 @@ function convertLetDirective(
     parent,
     ...ctx.getConvertLocation(node),
   };
-  processDirective(node as any, directive, ctx, {
+  processDirective(node, directive, ctx, {
     processPattern(pattern) {
       return ctx.letDirCollections
         .getCollection()
@@ -799,9 +810,7 @@ function buildLetDirectiveType(
 }
 
 type DirectiveProcessors<
-  D extends
-    | SvAST.Directive
-    | Exclude<Compiler.Directive, Compiler.StyleDirective>,
+  D extends SvAST.Directive | StandardDirective,
   S extends SvelteDirective,
   E extends D["expression"] & S["expression"],
 > =
@@ -828,9 +837,7 @@ type DirectiveProcessors<
 
 /** Common process for directive */
 function processDirective<
-  D extends
-    | SvAST.Directive
-    | Exclude<Compiler.Directive, Compiler.StyleDirective>,
+  D extends SvAST.Directive | StandardDirective,
   S extends SvelteDirective,
   E extends D["expression"] & S["expression"],
 >(
@@ -848,7 +855,7 @@ function processDirectiveKey<
   D extends
     | SvAST.Directive
     | SvAST.StyleDirective
-    | Compiler.Directive
+    | StandardDirective
     | Compiler.StyleDirective,
   S extends SvelteDirective | SvelteStyleDirective,
 >(node: D, directive: S, ctx: Context) {
@@ -889,7 +896,9 @@ function processDirectiveKey<
   const key = (directive.key = {
     type: "SvelteDirectiveKey",
     name: null as any,
-    modifiers: getModifiers(node),
+    modifiers: getModifiers(
+      node as SvAST.Directive | SvAST.StyleDirective | Compiler.Directive,
+    ),
     parent: directive,
     ...ctx.getConvertLocation({ start: node.start, end: keyEndIndex }),
   });
@@ -905,9 +914,7 @@ function processDirectiveKey<
 
 /** Common process for directive expression */
 function processDirectiveExpression<
-  D extends
-    | SvAST.Directive
-    | Exclude<Compiler.Directive, Compiler.StyleDirective>,
+  D extends SvAST.Directive | StandardDirective,
   S extends SvelteDirective,
   E extends D["expression"],
 >(

src/parser/converts/block.ts

@@ -24,7 +24,6 @@ import type * as ESTree from "estree";
 import {
   getAlternateFromIfBlock,
   getBodyFromEachBlock,
-  getBodyFromSnippetBlock,
   getCatchFromAwaitBlock,
   getChildren,
   getConsequentFromIfBlock,
@@ -622,7 +621,7 @@ export function convertKeyBlock(
 
 /** Convert for SnippetBlock */
 export function convertSnippetBlock(
-  node: SvAST.SnippetBlock | Compiler.SnippetBlock,
+  node: Compiler.SnippetBlock,
   parent: SvelteSnippetBlock["parent"],
   ctx: Context,
 ): SvelteSnippetBlock {
@@ -656,13 +655,12 @@ export function convertSnippetBlock(
     },
   );
 
-  const body = getBodyFromSnippetBlock(node);
   snippetBlock.children.push(
     ...convertChildren(
       {
         nodes:
           // Adjust for Svelte v5
-          trimChildren(getChildren(body)),
+          trimChildren(node.body.nodes),
       },
       snippetBlock,
       ctx,

src/parser/converts/element.ts

@@ -239,7 +239,7 @@ function extractLetDirectives(fragment: {
     SvAST.LetDirective | Compiler.LetDirective
   >[] = [];
   for (const attr of fragment.attributes) {
-    if (attr.type === "Let" || attr.type === "LetDirective") {
+    if (attr.type === "LetDirective" || attr.type === "Let") {
       letDirectives.push(attr);
     } else {
       attributes.push(attr);

src/parser/converts/render.ts

@@ -1,12 +1,12 @@
 import type * as ESTree from "estree";
 import type { SvelteRenderTag } from "../../ast";
 import type { Context } from "../../context";
-import type * as SvAST from "../svelte-ast-types";
 import { getWithLoc } from "./common";
+import type * as Compiler from "svelte/compiler";
 
 /** Convert for RenderTag */
 export function convertRenderTag(
-  node: SvAST.RenderTag,
+  node: Compiler.RenderTag,
   parent: SvelteRenderTag["parent"],
   ctx: Context,
 ): SvelteRenderTag {

src/parser/svelte-ast-types.ts

@@ -21,7 +21,6 @@ export declare type TemplateNode =
   | RawMustacheTag
   | DebugTag
   | ConstTag
-  | RenderTag
   | Directive
   | StyleDirective
   | Element
@@ -38,8 +37,7 @@ export declare type TemplateNode =
   | IfBlock
   | EachBlock
   | AwaitBlock
-  | KeyBlock
-  | SnippetBlock;
+  | KeyBlock;
 export interface Fragment extends BaseNode {
   type: "Fragment";
   children: TemplateNode[];
@@ -64,12 +62,6 @@ export interface ConstTag extends BaseNode {
   type: "ConstTag";
   expression: ESTree.AssignmentExpression;
 }
-export interface RenderTag extends BaseNode {
-  type: "RenderTag";
-  expression:
-    | ESTree.SimpleCallExpression
-    | (ESTree.ChainExpression & { expression: ESTree.SimpleCallExpression });
-}
 export interface IfBlock extends BaseNode {
   type: "IfBlock";
   expression: ESTree.Expression;
@@ -120,13 +112,6 @@ export interface KeyBlock extends BaseNode {
   expression: ESTree.Expression;
   children: TemplateNode[];
 }
-export interface SnippetBlock extends BaseNode {
-  type: "SnippetBlock";
-  expression: ESTree.Identifier;
-  parameters: ESTree.Pattern[];
-  children: TemplateNode[];
-}
-
 export interface BaseElement extends BaseNode {
   type: "Element";
   name: string;