Skip to content

Commit dfe5cb8

Browse files
ota-meshiota-meshi
authored
fix: update svelte to 5.0.0-next.181 and fix for {:else if} (#548)
1 parent 79b22e6 commit dfe5cb8

19 files changed

+179
-68
lines changed

‎.changeset/new-rats-sneeze.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"svelte-eslint-parser": minor
3+
---
4+
5+
fix: update svelte to 5.0.0-next.181 and fix for `{:else if}`

‎package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
4848
},
4949
"peerDependencies": {
50-
"svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.115"
50+
"svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.181"
5151
},
5252
"peerDependenciesMeta": {
5353
"svelte": {
@@ -58,22 +58,22 @@
5858
"eslint-scope": "^7.2.2",
5959
"eslint-visitor-keys": "^3.4.3",
6060
"espree": "^9.6.1",
61-
"postcss": "^8.4.38",
61+
"postcss": "^8.4.39",
6262
"postcss-scss": "^4.0.9"
6363
},
6464
"devDependencies": {
6565
"@changesets/changelog-github": "^0.5.0",
66-
"@changesets/cli": "^2.27.5",
67-
"@changesets/get-release-plan": "^4.0.2",
66+
"@changesets/cli": "^2.27.7",
67+
"@changesets/get-release-plan": "^4.0.3",
6868
"@ota-meshi/eslint-plugin": "^0.15.3",
6969
"@types/benchmark": "^2.1.5",
7070
"@types/chai": "^4.3.16",
7171
"@types/eslint": "^8.56.10",
7272
"@types/eslint-scope": "^3.7.7",
7373
"@types/eslint-visitor-keys": "^3.3.0",
7474
"@types/estree": "^1.0.5",
75-
"@types/mocha": "^10.0.6",
76-
"@types/node": "^20.14.4",
75+
"@types/mocha": "^10.0.7",
76+
"@types/node": "^20.14.10",
7777
"@types/semver": "^7.5.8",
7878
"@typescript-eslint/eslint-plugin": "^7.16.0",
7979
"@typescript-eslint/parser": "~7.16.0",
@@ -86,28 +86,28 @@
8686
"eslint": "^8.57.0",
8787
"eslint-config-prettier": "^9.1.0",
8888
"eslint-plugin-eslint-comments": "^3.2.0",
89-
"eslint-plugin-json-schema-validator": "^5.1.0",
89+
"eslint-plugin-json-schema-validator": "^5.1.2",
9090
"eslint-plugin-jsonc": "^2.16.0",
9191
"eslint-plugin-n": "^17.9.0",
9292
"eslint-plugin-node-dependencies": "^0.12.0",
9393
"eslint-plugin-prettier": "^5.1.3",
9494
"eslint-plugin-regexp": "^2.6.0",
95-
"eslint-plugin-svelte": "^2.40.0",
95+
"eslint-plugin-svelte": "^2.41.0",
9696
"eslint-plugin-yml": "^1.14.0",
9797
"estree-walker": "^3.0.3",
9898
"locate-character": "^3.0.0",
9999
"magic-string": "^0.30.10",
100-
"mocha": "^10.4.0",
100+
"mocha": "^10.6.0",
101101
"mocha-chai-jest-snapshot": "^1.1.4",
102102
"nyc": "^17.0.0",
103103
"prettier": "~3.3.2",
104104
"prettier-plugin-pkg": "^0.18.1",
105105
"prettier-plugin-svelte": "^3.2.5",
106106
"rimraf": "^6.0.0",
107107
"semver": "^7.6.2",
108-
"svelte": "^5.0.0-next.158",
109-
"svelte2tsx": "^0.7.10",
110-
"typescript": "~5.5.0",
108+
"svelte": "^5.0.0-next.181",
109+
"svelte2tsx": "^0.7.13",
110+
"typescript": "~5.5.3",
111111
"typescript-eslint-parser-for-extra-files": "^0.7.0"
112112
},
113113
"publishConfig": {

‎src/context/index.ts

+2-14
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {
1212
} from "../ast";
1313
import type ESTree from "estree";
1414
import type * as SvAST from "../parser/svelte-ast-types";
15-
import type * as Compiler from "svelte/compiler";
15+
import type * as Compiler from "../parser/svelte-ast-types-for-v5";
1616
import { ScriptLetContext } from "./script-let";
1717
import { LetDirectiveCollections } from "./let-directive-collection";
1818
import { parseAttributes } from "../parser/html";
@@ -169,19 +169,7 @@ export class Context {
169169
| SvAST.SlotTemplate
170170
| SvAST.Slot
171171
| SvAST.Title
172-
| Compiler.RegularElement
173-
| Compiler.Component
174-
| Compiler.SvelteComponent
175-
| Compiler.SvelteElement
176-
| Compiler.SvelteWindow
177-
| Compiler.SvelteBody
178-
| Compiler.SvelteHead
179-
| Compiler.SvelteDocument
180-
| Compiler.SvelteFragment
181-
| Compiler.SvelteSelf
182-
| Compiler.SvelteOptionsRaw
183-
| Compiler.SlotElement
184-
| Compiler.TitleElement
172+
| Compiler.ElementLike
185173
>();
186174

187175
public readonly snippets: SvelteSnippetBlock[] = [];

‎src/parser/compat.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** Compatibility for Svelte v4 <-> v5 */
22
import type ESTree from "estree";
33
import type * as SvAST from "./svelte-ast-types";
4-
import type * as Compiler from "svelte/compiler";
4+
import type * as Compiler from "./svelte-ast-types-for-v5";
55

66
export type Child =
77
| Compiler.Text

‎src/parser/converts/attr.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type {
2424
import type ESTree from "estree";
2525
import type { Context } from "../../context";
2626
import type * as SvAST from "../svelte-ast-types";
27-
import type * as Compiler from "svelte/compiler";
27+
import type * as Compiler from "../svelte-ast-types-for-v5";
2828
import { getWithLoc, indexOf } from "./common";
2929
import { convertMustacheTag } from "./mustache";
3030
import { convertTextToLiteral } from "./text";

‎src/parser/converts/block.ts

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type * as SvAST from "../svelte-ast-types";
2-
import type * as Compiler from "svelte/compiler";
2+
import type * as Compiler from "../svelte-ast-types-for-v5";
33
import type {
44
SvelteAwaitBlock,
55
SvelteAwaitBlockAwaitCatch,
@@ -114,20 +114,21 @@ export function convertIfBlock(
114114
node: SvAST.IfBlock | Compiler.IfBlock,
115115
parent: SvelteIfBlock["parent"],
116116
ctx: Context,
117-
elseif: true,
117+
elseifContext?: { start: number },
118118
): SvelteIfBlockElseIf;
119119
/** Convert for IfBlock */
120120
export function convertIfBlock(
121121
node: SvAST.IfBlock | Compiler.IfBlock,
122122
parent: SvelteIfBlock["parent"],
123123
ctx: Context,
124-
elseif?: true,
124+
elseifContext?: { start: number },
125125
): SvelteIfBlock {
126126
// {#if expr} {:else} {/if}
127127
// {:else if expr} {/if}
128+
const elseif = Boolean(elseifContext);
128129
const nodeStart = startBlockIndex(
129130
ctx.code,
130-
elseif ? node.start - 1 : node.start,
131+
elseifContext?.start ?? node.start,
131132
elseif ? ":else" : "#if",
132133
);
133134
const ifBlock: SvelteIfBlock = {
@@ -188,7 +189,9 @@ export function convertIfBlock(
188189
};
189190
ifBlock.else = elseBlock;
190191

191-
const elseIfBlock = convertIfBlock(c, elseBlock, ctx, true);
192+
const elseIfBlock = convertIfBlock(c, elseBlock, ctx, {
193+
start: elseStart,
194+
});
192195
// adjust loc
193196
elseBlock.range[1] = elseIfBlock.range[1];
194197
elseBlock.loc.end = {
@@ -238,22 +241,21 @@ function startBlockIndexForElse(
238241
lastExpression: ESTree.Node | { start: number; end: number },
239242
ctx: Context,
240243
) {
241-
let baseStart: number;
242244
const elseChildren = getChildren(elseFragment);
243245
if (elseChildren.length > 0) {
244246
const c = elseChildren[0];
245-
baseStart = c.start;
246247
if (c.type === "IfBlock" && c.elseif) {
247-
baseStart = Math.min(baseStart, getWithLoc(getTestFromIfBlock(c)).start);
248+
const contentStart = getWithLoc(getTestFromIfBlock(c)).start;
249+
if (contentStart <= c.start) {
250+
return startBlockIndex(ctx.code, contentStart - 1, ":else");
251+
}
248252
}
249-
} else {
250-
const beforeEnd = endIndexFromFragment(beforeFragment, () => {
251-
return ctx.code.indexOf("}", getWithLoc(lastExpression).end) + 1;
252-
});
253-
baseStart = beforeEnd + 1;
253+
return startBlockIndex(ctx.code, c.start, ":else");
254254
}
255-
256-
return startBlockIndex(ctx.code, baseStart - 1, ":else");
255+
const beforeEnd = endIndexFromFragment(beforeFragment, () => {
256+
return ctx.code.indexOf("}", getWithLoc(lastExpression).end) + 1;
257+
});
258+
return startBlockIndex(ctx.code, beforeEnd, ":else");
257259
}
258260

259261
/** Convert for EachBlock */
@@ -706,7 +708,7 @@ function extractMustacheBlockTokens(
706708
| SvelteKeyBlock
707709
| SvelteSnippetBlock,
708710
ctx: Context,
709-
option?: { startOnly?: true },
711+
option?: { startOnly?: boolean },
710712
) {
711713
const startSectionNameStart = indexOf(
712714
ctx.code,

‎src/parser/converts/const.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { SvelteConstTag } from "../../ast";
22
import type { Context } from "../../context";
33
import { getDeclaratorFromConstTag } from "../compat";
44
import type * as SvAST from "../svelte-ast-types";
5-
import type * as Compiler from "svelte/compiler";
5+
import type * as Compiler from "../svelte-ast-types-for-v5";
66

77
/** Convert for ConstTag */
88
export function convertConstTag(

‎src/parser/converts/element.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import type {
3030
import type ESTree from "estree";
3131
import type { Context } from "../../context";
3232
import type * as SvAST from "../svelte-ast-types";
33-
import type * as Compiler from "svelte/compiler";
33+
import type * as Compiler from "../svelte-ast-types-for-v5";
3434

3535
import {
3636
convertAwaitBlock,

‎src/parser/converts/mustache.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
import type { Context } from "../../context";
88
import type * as SvAST from "../svelte-ast-types";
99
import { hasTypeInfo } from "../../utils";
10-
import type * as Compiler from "svelte/compiler";
10+
import type * as Compiler from "../svelte-ast-types-for-v5";
1111

1212
/** Convert for MustacheTag */
1313
export function convertMustacheTag(

‎src/parser/converts/render.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type * as ESTree from "estree";
22
import type { SvelteRenderTag } from "../../ast";
33
import type { Context } from "../../context";
44
import { getWithLoc } from "./common";
5-
import type * as Compiler from "svelte/compiler";
5+
import type * as Compiler from "../svelte-ast-types-for-v5";
66

77
/** Convert for RenderTag */
88
export function convertRenderTag(

‎src/parser/converts/root.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type * as SvAST from "../svelte-ast-types";
2-
import type * as Compiler from "svelte/compiler";
2+
import type * as Compiler from "../svelte-ast-types-for-v5";
33
import type {
44
SvelteAttribute,
55
SvelteGenericsDirective,

‎src/parser/html.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type * as Compiler from "svelte/compiler";
1+
import type * as Compiler from "./svelte-ast-types-for-v5";
22
import type ESTree from "estree";
33
import { getEspree } from "./espree";
44

‎src/parser/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { ScopeManager } from "eslint-scope";
1212
import { Variable } from "eslint-scope";
1313
import { parseScript, parseScriptInSvelte } from "./script";
1414
import type * as SvAST from "./svelte-ast-types";
15-
import type * as Compiler from "svelte/compiler";
15+
import type * as Compiler from "./svelte-ast-types-for-v5";
1616
import { sortNodes } from "./sort";
1717
import { parseTemplate } from "./template";
1818
import {

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

+116
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
// FIXME Since the node type is not provided by "svelte/compiler",
2+
// we work around this by extracting the type from the parse function.
3+
// See also https://github.com/sveltejs/svelte/issues/12292
4+
5+
import type { parse } from "svelte/compiler";
6+
7+
export type Root = ModernParseReturnType<typeof parse>;
8+
export type Fragment = Root["fragment"];
9+
export type SvelteOptions = Root["options"];
10+
export type Script = Root["instance"];
11+
type FragmentChild = Fragment["nodes"][number];
12+
13+
export type Text = Extract<FragmentChild, { type: "Text" }>;
14+
15+
export type ExpressionTag = Extract<FragmentChild, { type: "ExpressionTag" }>;
16+
export type HtmlTag = Extract<FragmentChild, { type: "HtmlTag" }>;
17+
export type ConstTag = Extract<FragmentChild, { type: "ConstTag" }>;
18+
export type DebugTag = Extract<FragmentChild, { type: "DebugTag" }>;
19+
export type RenderTag = Extract<FragmentChild, { type: "RenderTag" }>;
20+
21+
export type Component = Extract<FragmentChild, { type: "Component" }>;
22+
export type TitleElement = Extract<FragmentChild, { type: "TitleElement" }>;
23+
export type SlotElement = Extract<FragmentChild, { type: "SlotElement" }>;
24+
export type RegularElement = Extract<FragmentChild, { type: "RegularElement" }>;
25+
export type SvelteBody = Extract<FragmentChild, { type: "SvelteBody" }>;
26+
export type SvelteComponent = Extract<
27+
FragmentChild,
28+
{ type: "SvelteComponent" }
29+
>;
30+
export type SvelteDocument = Extract<FragmentChild, { type: "SvelteDocument" }>;
31+
export type SvelteElement = Extract<FragmentChild, { type: "SvelteElement" }>;
32+
export type SvelteFragment = Extract<FragmentChild, { type: "SvelteFragment" }>;
33+
export type SvelteHead = Extract<FragmentChild, { type: "SvelteHead" }>;
34+
export type SvelteOptionsRaw = Extract<
35+
FragmentChild,
36+
{ type: "SvelteOptions" }
37+
>;
38+
export type SvelteSelf = Extract<FragmentChild, { type: "SvelteSelf" }>;
39+
export type SvelteWindow = Extract<FragmentChild, { type: "SvelteWindow" }>;
40+
41+
export type IfBlock = Extract<FragmentChild, { type: "IfBlock" }>;
42+
export type EachBlock = Extract<FragmentChild, { type: "EachBlock" }>;
43+
export type AwaitBlock = Extract<FragmentChild, { type: "AwaitBlock" }>;
44+
export type KeyBlock = Extract<FragmentChild, { type: "KeyBlock" }>;
45+
export type SnippetBlock = Extract<FragmentChild, { type: "SnippetBlock" }>;
46+
47+
export type Comment = Extract<FragmentChild, { type: "Comment" }>;
48+
type ComponentAttribute = Component["attributes"][number];
49+
export type Attribute = Extract<ComponentAttribute, { type: "Attribute" }>;
50+
export type SpreadAttribute = Extract<
51+
ComponentAttribute,
52+
{ type: "SpreadAttribute" }
53+
>;
54+
export type AnimateDirective = Extract<
55+
ComponentAttribute,
56+
{ type: "AnimateDirective" }
57+
>;
58+
export type BindDirective = Extract<
59+
ComponentAttribute,
60+
{ type: "BindDirective" }
61+
>;
62+
export type ClassDirective = Extract<
63+
ComponentAttribute,
64+
{ type: "ClassDirective" }
65+
>;
66+
export type LetDirective = Extract<
67+
ComponentAttribute,
68+
{ type: "LetDirective" }
69+
>;
70+
export type OnDirective = Extract<ComponentAttribute, { type: "OnDirective" }>;
71+
export type StyleDirective = Extract<
72+
ComponentAttribute,
73+
{ type: "StyleDirective" }
74+
>;
75+
export type TransitionDirective = Extract<
76+
ComponentAttribute,
77+
{ type: "TransitionDirective" }
78+
>;
79+
export type UseDirective = Extract<
80+
ComponentAttribute,
81+
{ type: "UseDirective" }
82+
>;
83+
84+
export type Tag = ExpressionTag | HtmlTag | ConstTag | DebugTag | RenderTag;
85+
export type ElementLike =
86+
| Component
87+
| TitleElement
88+
| SlotElement
89+
| RegularElement
90+
| SvelteBody
91+
| SvelteComponent
92+
| SvelteDocument
93+
| SvelteElement
94+
| SvelteFragment
95+
| SvelteHead
96+
| SvelteOptionsRaw
97+
| SvelteSelf
98+
| SvelteWindow;
99+
export type Block = EachBlock | IfBlock | AwaitBlock | KeyBlock | SnippetBlock;
100+
101+
export type Directive =
102+
| AnimateDirective
103+
| BindDirective
104+
| ClassDirective
105+
| LetDirective
106+
| OnDirective
107+
| StyleDirective
108+
| TransitionDirective
109+
| UseDirective;
110+
111+
type ModernParseReturnType<T> = T extends {
112+
(source: string, options: { filename?: string; modern: true }): infer R;
113+
(...args: any[]): any;
114+
}
115+
? R
116+
: any;

‎src/parser/svelte-parse-context.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type * as Compiler from "svelte/compiler";
1+
import type * as Compiler from "./svelte-ast-types-for-v5";
22
import type * as SvAST from "./svelte-ast-types";
33
import type { NormalizedParserOptions } from "./parser-options";
44
import { compilerVersion, svelteVersion } from "./svelte-version";

‎src/parser/template.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {} from "svelte"; // FIXME: Workaround to get type information for "svelte/compiler"
22
import { parse } from "svelte/compiler";
3-
import type * as Compiler from "svelte/compiler";
3+
import type * as Compiler from "./svelte-ast-types-for-v5";
44
import type * as SvAST from "./svelte-ast-types";
55
import type { Context } from "../context";
66
import { convertSvelteRoot } from "./converts/index";

0 commit comments

Comments
 (0)