refactor type

Author: ota-meshi

src/parser/compat.ts

@@ -12,24 +12,24 @@ export type Child =
 type HasChildren = { children?: SvAST.TemplateNode[] };
 // Root
 export function getFragmentFromRoot(
-  svelteAst: SvAST.Ast | SvAST.AstLegacy,
+  svelteAst: Compiler.Root | SvAST.AstLegacy,
 ): SvAST.Fragment | Compiler.Fragment | undefined {
   return (
-    (svelteAst as SvAST.Ast).fragment ?? (svelteAst as SvAST.AstLegacy).html
+    (svelteAst as Compiler.Root).fragment ?? (svelteAst as SvAST.AstLegacy).html
   );
 }
 export function getInstanceFromRoot(
-  svelteAst: SvAST.Ast | SvAST.AstLegacy,
-): SvAST.Script | Compiler.Script | undefined {
-  return (svelteAst as SvAST.AstLegacy).instance;
+  svelteAst: Compiler.Root | SvAST.AstLegacy,
+): SvAST.Script | Compiler.Script | null | undefined {
+  return svelteAst.instance;
 }
 export function getModuleFromRoot(
-  svelteAst: SvAST.Ast | SvAST.AstLegacy,
-): SvAST.Script | Compiler.Script | undefined {
-  return (svelteAst as SvAST.AstLegacy).module;
+  svelteAst: Compiler.Root | SvAST.AstLegacy,
+): SvAST.Script | Compiler.Script | null | undefined {
+  return svelteAst.module;
 }
 export function getOptionsFromRoot(
-  svelteAst: SvAST.Ast | SvAST.AstLegacy,
+  svelteAst: Compiler.Root | SvAST.AstLegacy,
 ): Compiler.SvelteOptionsRaw | null {
   return (svelteAst as any).options?.__raw__ ?? null;
 }

src/parser/converts/root.ts

@@ -1,4 +1,5 @@
 import type * as SvAST from "../svelte-ast-types";
+import * as Compiler from "svelte/compiler";
 import type {
   SvelteAttribute,
   SvelteGenericsDirective,
@@ -30,7 +31,7 @@ import {
  * Convert root
  */
 export function convertSvelteRoot(
-  svelteAst: SvAST.Ast | SvAST.AstLegacy,
+  svelteAst: Compiler.Root | SvAST.AstLegacy,
   ctx: Context,
 ): SvelteProgram {
   const ast: SvelteProgram = {

src/parser/svelte-ast-types.ts

@@ -1,14 +1,8 @@
 import type ESTree from "estree";
-import type * as Compiler from "svelte/compiler";
 interface BaseNode {
   start: number;
   end: number;
 }
-export interface Ast {
-  fragment?: Compiler.Fragment;
-  js: Compiler.Script[];
-  css?: Compiler.Style;
-}
 export interface AstLegacy {
   html?: Fragment;
   css?: Style;

src/parser/template.ts

@@ -1,5 +1,6 @@
 import type {} from "svelte"; // FIXME: Workaround to get type information for "svelte/compiler"
 import { parse } from "svelte/compiler";
+import * as Compiler from "svelte/compiler";
 import type * as SvAST from "./svelte-ast-types";
 import type { Context } from "../context";
 import { convertSvelteRoot } from "./converts/index";
@@ -18,13 +19,13 @@ export function parseTemplate(
   parserOptions: NormalizedParserOptions,
 ): {
   ast: SvelteProgram;
-  svelteAst: SvAST.Ast | SvAST.AstLegacy;
+  svelteAst: Compiler.Root | SvAST.AstLegacy;
 } {
   try {
     const svelteAst = parse(code, {
       filename: parserOptions.filePath,
       ...(svelteVersion.gte(5) ? { modern: true } : {}),
-    }) as never as SvAST.Ast | SvAST.AstLegacy;
+    }) as never as Compiler.Root | SvAST.AstLegacy;
     const ast = convertSvelteRoot(svelteAst, ctx);
     sortNodes(ast.body);