fix types

Author: ota-meshi

package.json

@@ -107,7 +107,7 @@
     "semver": "^7.6.3",
     "svelte": "^5.0.0-next.245",
     "svelte2tsx": "^0.7.19",
-    "typescript": "~5.5.4",
+    "typescript": "~5.6.2",
     "typescript-eslint-parser-for-extra-files": "^0.7.0"
   },
   "publishConfig": {

src/parser/compat.ts

@@ -40,11 +40,9 @@ export function getOptionsFromRoot(
       fragment: {
         type: "Fragment",
         nodes: [],
-        transparent: true,
       },
       start: root.options.start,
       end: root.options.end,
-      parent: null as any,
     };
   }
   return null;

src/parser/html.ts

@@ -86,8 +86,6 @@ function parseAttribute(state: State): Compiler.Attribute {
       value: true,
       start,
       end: keyEnd,
-      metadata: null as any,
-      parent: null,
     };
   }
   state.skipSpaces();
@@ -98,8 +96,6 @@ function parseAttribute(state: State): Compiler.Attribute {
       value: true,
       start,
       end: keyEnd,
-      metadata: null as any,
-      parent: null,
     };
   }
   // parse value
@@ -110,8 +106,6 @@ function parseAttribute(state: State): Compiler.Attribute {
     value: [value],
     start,
     end: state.index,
-    metadata: null as any,
-    parent: null,
   };
 }
 
@@ -149,8 +143,6 @@ function parseAttributeValue(
         expression,
         start,
         end,
-        metadata: null as any,
-        parent: null,
       };
     }
   }
@@ -164,7 +156,6 @@ function parseAttributeValue(
         raw: quote,
         start,
         end: state.index,
-        parent: null,
       };
     }
     let c: string | undefined;
@@ -179,7 +170,6 @@ function parseAttributeValue(
           raw: data,
           start: start + 1,
           end: end - 1,
-          parent: null,
         };
       }
     }
@@ -198,7 +188,6 @@ function parseAttributeValue(
     raw: data,
     start,
     end,
-    parent: null,
   };
 }
 

src/parser/svelte-ast-types-for-v5.ts

@@ -2,84 +2,52 @@
 // we work around this by extracting the type from the parse function.
 // See also https://github.com/sveltejs/svelte/issues/12292
 
-import type { parse } from "svelte/compiler";
+import type { AST } from "svelte/compiler";
 
-export type Root = ModernParseReturnType<typeof parse>;
-export type Fragment = Root["fragment"];
-export type SvelteOptions = Root["options"];
-export type Script = Root["instance"];
-type FragmentChild = Fragment["nodes"][number];
+export type Root = AST.Root;
+export type Fragment = AST.Fragment;
+export type SvelteOptions = AST.SvelteOptions;
+export type Script = AST.Script;
 
-export type Text = Extract<FragmentChild, { type: "Text" }>;
+export type Text = AST.Text;
 
-export type ExpressionTag = Extract<FragmentChild, { type: "ExpressionTag" }>;
-export type HtmlTag = Extract<FragmentChild, { type: "HtmlTag" }>;
-export type ConstTag = Extract<FragmentChild, { type: "ConstTag" }>;
-export type DebugTag = Extract<FragmentChild, { type: "DebugTag" }>;
-export type RenderTag = Extract<FragmentChild, { type: "RenderTag" }>;
+export type ExpressionTag = AST.ExpressionTag;
+export type HtmlTag = AST.HtmlTag;
+export type ConstTag = AST.ConstTag;
+export type DebugTag = AST.DebugTag;
+export type RenderTag = AST.RenderTag;
 
-export type Component = Extract<FragmentChild, { type: "Component" }>;
-export type TitleElement = Extract<FragmentChild, { type: "TitleElement" }>;
-export type SlotElement = Extract<FragmentChild, { type: "SlotElement" }>;
-export type RegularElement = Extract<FragmentChild, { type: "RegularElement" }>;
-export type SvelteBody = Extract<FragmentChild, { type: "SvelteBody" }>;
-export type SvelteComponent = Extract<
-  FragmentChild,
-  { type: "SvelteComponent" }
->;
-export type SvelteDocument = Extract<FragmentChild, { type: "SvelteDocument" }>;
-export type SvelteElement = Extract<FragmentChild, { type: "SvelteElement" }>;
-export type SvelteFragment = Extract<FragmentChild, { type: "SvelteFragment" }>;
-export type SvelteHead = Extract<FragmentChild, { type: "SvelteHead" }>;
-export type SvelteOptionsRaw = Extract<
-  FragmentChild,
-  { type: "SvelteOptions" }
->;
-export type SvelteSelf = Extract<FragmentChild, { type: "SvelteSelf" }>;
-export type SvelteWindow = Extract<FragmentChild, { type: "SvelteWindow" }>;
+export type Component = AST.Component;
+export type TitleElement = AST.TitleElement;
+export type SlotElement = AST.SlotElement;
+export type RegularElement = AST.RegularElement;
+export type SvelteBody = AST.SvelteBody;
+export type SvelteComponent = AST.SvelteComponent;
+export type SvelteDocument = AST.SvelteDocument;
+export type SvelteElement = AST.SvelteElement;
+export type SvelteFragment = AST.SvelteFragment;
+export type SvelteHead = AST.SvelteHead;
+export type SvelteOptionsRaw = AST.SvelteOptionsRaw;
+export type SvelteSelf = AST.SvelteSelf;
+export type SvelteWindow = AST.SvelteWindow;
 
-export type IfBlock = Extract<FragmentChild, { type: "IfBlock" }>;
-export type EachBlock = Extract<FragmentChild, { type: "EachBlock" }>;
-export type AwaitBlock = Extract<FragmentChild, { type: "AwaitBlock" }>;
-export type KeyBlock = Extract<FragmentChild, { type: "KeyBlock" }>;
-export type SnippetBlock = Extract<FragmentChild, { type: "SnippetBlock" }>;
+export type IfBlock = AST.IfBlock;
+export type EachBlock = AST.EachBlock;
+export type AwaitBlock = AST.AwaitBlock;
+export type KeyBlock = AST.KeyBlock;
+export type SnippetBlock = AST.SnippetBlock;
 
-export type Comment = Extract<FragmentChild, { type: "Comment" }>;
-type ComponentAttribute = Component["attributes"][number];
-export type Attribute = Extract<ComponentAttribute, { type: "Attribute" }>;
-export type SpreadAttribute = Extract<
-  ComponentAttribute,
-  { type: "SpreadAttribute" }
->;
-export type AnimateDirective = Extract<
-  ComponentAttribute,
-  { type: "AnimateDirective" }
->;
-export type BindDirective = Extract<
-  ComponentAttribute,
-  { type: "BindDirective" }
->;
-export type ClassDirective = Extract<
-  ComponentAttribute,
-  { type: "ClassDirective" }
->;
-export type LetDirective = Extract<
-  ComponentAttribute,
-  { type: "LetDirective" }
->;
-export type OnDirective = Extract<ComponentAttribute, { type: "OnDirective" }>;
-export type StyleDirective = Extract<
-  ComponentAttribute,
-  { type: "StyleDirective" }
->;
-export type TransitionDirective = Extract<
-  ComponentAttribute,
-  { type: "TransitionDirective" }
->;
-export type UseDirective = Extract<
-  ComponentAttribute,
-  { type: "UseDirective" }
->;
+export type Comment = AST.Comment;
+export type Attribute = AST.Attribute;
+export type SpreadAttribute = AST.SpreadAttribute;
+export type AnimateDirective = AST.AnimateDirective;
+export type BindDirective = AST.BindDirective;
+export type ClassDirective = AST.ClassDirective;
+export type LetDirective = AST.LetDirective;
+export type OnDirective = AST.OnDirective;
+export type StyleDirective = AST.StyleDirective;
+export type TransitionDirective = AST.TransitionDirective;
+export type UseDirective = AST.UseDirective;
 
 export type Tag = ExpressionTag | HtmlTag | ConstTag | DebugTag | RenderTag;
 export type ElementLike =
@@ -107,10 +75,3 @@ export type Directive =
   | StyleDirective
   | TransitionDirective
   | UseDirective;
-
-type ModernParseReturnType<T> = T extends {
-  (source: string, options: { filename?: string; modern: true }): infer R;
-  (...args: any[]): any;
-}
-  ? R
-  : any;