Revert "fix: update svelte to 5.0.0-next.181 and fix for {:else if}"

ota-meshi · ota-meshi · commit 79b22e60194b · 2024-07-11T11:44:43.000+09:00
This reverts commit 01f0ed5.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
   },
   "peerDependencies": {
-    "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.181"
+    "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.115"
   },
   "peerDependenciesMeta": {
     "svelte": {
@@ -58,22 +58,22 @@
     "eslint-scope": "^7.2.2",
     "eslint-visitor-keys": "^3.4.3",
     "espree": "^9.6.1",
-    "postcss": "^8.4.39",
+    "postcss": "^8.4.38",
     "postcss-scss": "^4.0.9"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.7",
-    "@changesets/get-release-plan": "^4.0.3",
+    "@changesets/cli": "^2.27.5",
+    "@changesets/get-release-plan": "^4.0.2",
     "@ota-meshi/eslint-plugin": "^0.15.3",
     "@types/benchmark": "^2.1.5",
     "@types/chai": "^4.3.16",
     "@types/eslint": "^8.56.10",
     "@types/eslint-scope": "^3.7.7",
     "@types/eslint-visitor-keys": "^3.3.0",
     "@types/estree": "^1.0.5",
-    "@types/mocha": "^10.0.7",
-    "@types/node": "^20.14.10",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.14.4",
     "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "~7.16.0",
@@ -86,28 +86,28 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-json-schema-validator": "^5.1.2",
+    "eslint-plugin-json-schema-validator": "^5.1.0",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-node-dependencies": "^0.12.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-regexp": "^2.6.0",
-    "eslint-plugin-svelte": "^2.41.0",
+    "eslint-plugin-svelte": "^2.40.0",
     "eslint-plugin-yml": "^1.14.0",
     "estree-walker": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.10",
-    "mocha": "^10.6.0",
+    "mocha": "^10.4.0",
     "mocha-chai-jest-snapshot": "^1.1.4",
     "nyc": "^17.0.0",
     "prettier": "~3.3.2",
     "prettier-plugin-pkg": "^0.18.1",
     "prettier-plugin-svelte": "^3.2.5",
     "rimraf": "^6.0.0",
     "semver": "^7.6.2",
-    "svelte": "^5.0.0-next.181",
-    "svelte2tsx": "^0.7.13",
-    "typescript": "~5.5.3",
+    "svelte": "^5.0.0-next.158",
+    "svelte2tsx": "^0.7.10",
+    "typescript": "~5.5.0",
     "typescript-eslint-parser-for-extra-files": "^0.7.0"
   },
   "publishConfig": {
diff --git a/src/context/index.ts b/src/context/index.ts
@@ -12,7 +12,7 @@ import type {
 } from "../ast";
 import type ESTree from "estree";
 import type * as SvAST from "../parser/svelte-ast-types";
-import type * as Compiler from "../parser/svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import { ScriptLetContext } from "./script-let";
 import { LetDirectiveCollections } from "./let-directive-collection";
 import { parseAttributes } from "../parser/html";
@@ -169,7 +169,19 @@ export class Context {
     | SvAST.SlotTemplate
     | SvAST.Slot
     | SvAST.Title
-    | Compiler.ElementLike
+    | Compiler.RegularElement
+    | Compiler.Component
+    | Compiler.SvelteComponent
+    | Compiler.SvelteElement
+    | Compiler.SvelteWindow
+    | Compiler.SvelteBody
+    | Compiler.SvelteHead
+    | Compiler.SvelteDocument
+    | Compiler.SvelteFragment
+    | Compiler.SvelteSelf
+    | Compiler.SvelteOptionsRaw
+    | Compiler.SlotElement
+    | Compiler.TitleElement
   >();
 
   public readonly snippets: SvelteSnippetBlock[] = [];
diff --git a/src/parser/compat.ts b/src/parser/compat.ts
@@ -1,7 +1,7 @@
 /** Compatibility for Svelte v4 <-> v5 */
 import type ESTree from "estree";
 import type * as SvAST from "./svelte-ast-types";
-import type * as Compiler from "./svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 
 export type Child =
   | Compiler.Text
diff --git a/src/parser/converts/attr.ts b/src/parser/converts/attr.ts
@@ -24,7 +24,7 @@ import type {
 import type ESTree from "estree";
 import type { Context } from "../../context";
 import type * as SvAST from "../svelte-ast-types";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import { getWithLoc, indexOf } from "./common";
 import { convertMustacheTag } from "./mustache";
 import { convertTextToLiteral } from "./text";
diff --git a/src/parser/converts/block.ts b/src/parser/converts/block.ts
@@ -1,5 +1,5 @@
 import type * as SvAST from "../svelte-ast-types";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import type {
   SvelteAwaitBlock,
   SvelteAwaitBlockAwaitCatch,
@@ -114,21 +114,20 @@ export function convertIfBlock(
   node: SvAST.IfBlock | Compiler.IfBlock,
   parent: SvelteIfBlock["parent"],
   ctx: Context,
-  elseifContext?: { start: number },
+  elseif: true,
 ): SvelteIfBlockElseIf;
 /** Convert for IfBlock */
 export function convertIfBlock(
   node: SvAST.IfBlock | Compiler.IfBlock,
   parent: SvelteIfBlock["parent"],
   ctx: Context,
-  elseifContext?: { start: number },
+  elseif?: true,
 ): SvelteIfBlock {
   // {#if expr} {:else} {/if}
   // {:else if expr} {/if}
-  const elseif = Boolean(elseifContext);
   const nodeStart = startBlockIndex(
     ctx.code,
-    elseifContext?.start ?? node.start,
+    elseif ? node.start - 1 : node.start,
     elseif ? ":else" : "#if",
   );
   const ifBlock: SvelteIfBlock = {
@@ -189,9 +188,7 @@ export function convertIfBlock(
       };
       ifBlock.else = elseBlock;
 
-      const elseIfBlock = convertIfBlock(c, elseBlock, ctx, {
-        start: elseStart,
-      });
+      const elseIfBlock = convertIfBlock(c, elseBlock, ctx, true);
       // adjust loc
       elseBlock.range[1] = elseIfBlock.range[1];
       elseBlock.loc.end = {
@@ -241,21 +238,22 @@ function startBlockIndexForElse(
   lastExpression: ESTree.Node | { start: number; end: number },
   ctx: Context,
 ) {
+  let baseStart: number;
   const elseChildren = getChildren(elseFragment);
   if (elseChildren.length > 0) {
     const c = elseChildren[0];
+    baseStart = c.start;
     if (c.type === "IfBlock" && c.elseif) {
-      const contentStart = getWithLoc(getTestFromIfBlock(c)).start;
-      if (contentStart <= c.start) {
-        return startBlockIndex(ctx.code, contentStart - 1, ":else");
-      }
+      baseStart = Math.min(baseStart, getWithLoc(getTestFromIfBlock(c)).start);
     }
-    return startBlockIndex(ctx.code, c.start, ":else");
+  } else {
+    const beforeEnd = endIndexFromFragment(beforeFragment, () => {
+      return ctx.code.indexOf("}", getWithLoc(lastExpression).end) + 1;
+    });
+    baseStart = beforeEnd + 1;
   }
-  const beforeEnd = endIndexFromFragment(beforeFragment, () => {
-    return ctx.code.indexOf("}", getWithLoc(lastExpression).end) + 1;
-  });
-  return startBlockIndex(ctx.code, beforeEnd, ":else");
+
+  return startBlockIndex(ctx.code, baseStart - 1, ":else");
 }
 
 /** Convert for EachBlock */
@@ -708,7 +706,7 @@ function extractMustacheBlockTokens(
     | SvelteKeyBlock
     | SvelteSnippetBlock,
   ctx: Context,
-  option?: { startOnly?: boolean },
+  option?: { startOnly?: true },
 ) {
   const startSectionNameStart = indexOf(
     ctx.code,
diff --git a/src/parser/converts/const.ts b/src/parser/converts/const.ts
@@ -2,7 +2,7 @@ import type { SvelteConstTag } from "../../ast";
 import type { Context } from "../../context";
 import { getDeclaratorFromConstTag } from "../compat";
 import type * as SvAST from "../svelte-ast-types";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 
 /** Convert for ConstTag */
 export function convertConstTag(
diff --git a/src/parser/converts/element.ts b/src/parser/converts/element.ts
@@ -30,7 +30,7 @@ import type {
 import type ESTree from "estree";
 import type { Context } from "../../context";
 import type * as SvAST from "../svelte-ast-types";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 
 import {
   convertAwaitBlock,
diff --git a/src/parser/converts/mustache.ts b/src/parser/converts/mustache.ts
@@ -7,7 +7,7 @@ import type {
 import type { Context } from "../../context";
 import type * as SvAST from "../svelte-ast-types";
 import { hasTypeInfo } from "../../utils";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 
 /** Convert for MustacheTag */
 export function convertMustacheTag(
diff --git a/src/parser/converts/render.ts b/src/parser/converts/render.ts
@@ -2,7 +2,7 @@ import type * as ESTree from "estree";
 import type { SvelteRenderTag } from "../../ast";
 import type { Context } from "../../context";
 import { getWithLoc } from "./common";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 
 /** Convert for RenderTag */
 export function convertRenderTag(
diff --git a/src/parser/converts/root.ts b/src/parser/converts/root.ts
@@ -1,5 +1,5 @@
 import type * as SvAST from "../svelte-ast-types";
-import type * as Compiler from "../svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import type {
   SvelteAttribute,
   SvelteGenericsDirective,
diff --git a/src/parser/html.ts b/src/parser/html.ts
@@ -1,4 +1,4 @@
-import type * as Compiler from "./svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import type ESTree from "estree";
 import { getEspree } from "./espree";
 
diff --git a/src/parser/index.ts b/src/parser/index.ts
@@ -12,7 +12,7 @@ import type { ScopeManager } from "eslint-scope";
 import { Variable } from "eslint-scope";
 import { parseScript, parseScriptInSvelte } from "./script";
 import type * as SvAST from "./svelte-ast-types";
-import type * as Compiler from "./svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import { sortNodes } from "./sort";
 import { parseTemplate } from "./template";
 import {
diff --git a/src/parser/svelte-ast-types-for-v5.ts b/src/parser/svelte-ast-types-for-v5.ts
diff --git a/src/parser/svelte-parse-context.ts b/src/parser/svelte-parse-context.ts
@@ -1,4 +1,4 @@
-import type * as Compiler from "./svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import type * as SvAST from "./svelte-ast-types";
 import type { NormalizedParserOptions } from "./parser-options";
 import { compilerVersion, svelteVersion } from "./svelte-version";
diff --git a/src/parser/template.ts b/src/parser/template.ts
@@ -1,6 +1,6 @@
 import type {} from "svelte"; // FIXME: Workaround to get type information for "svelte/compiler"
 import { parse } from "svelte/compiler";
-import type * as Compiler from "./svelte-ast-types-for-v5";
+import type * as Compiler from "svelte/compiler";
 import type * as SvAST from "./svelte-ast-types";
 import type { Context } from "../context";
 import { convertSvelteRoot } from "./converts/index";
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
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
diff --git a/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte b/tests/fixtures/parser/ast/svelte5/generics01-snippets-type-output.svelte
