-
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: change it to use modern AST, if svelte v5 is installed (#437)
- Loading branch information
Showing
25 changed files
with
4,756 additions
and
637 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "svelte-eslint-parser": minor | ||
| --- | ||
|
|
||
| feat: change it to use modern AST, if svelte v5 is installed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,278 @@ | ||
| /** Compatibility for Svelte v4 <-> v5 */ | ||
| import type ESTree from "estree"; | ||
| import type * as SvAST from "./svelte-ast-types"; | ||
| import type * as Compiler from "svelte/compiler"; | ||
| import { parseAttributes } from "./html"; | ||
|
|
||
| export type Child = | ||
| | Compiler.Text | ||
| | Compiler.Tag | ||
| | Compiler.ElementLike | ||
| | Compiler.Block | ||
| | Compiler.Comment; | ||
| type HasChildren = { children?: SvAST.TemplateNode[] }; | ||
| // Root | ||
| export function getFragmentFromRoot( | ||
| svelteAst: Compiler.Root | SvAST.AstLegacy, | ||
| ): SvAST.Fragment | Compiler.Fragment | undefined { | ||
| return ( | ||
| (svelteAst as Compiler.Root).fragment ?? (svelteAst as SvAST.AstLegacy).html | ||
| ); | ||
| } | ||
| export function getInstanceFromRoot( | ||
| svelteAst: Compiler.Root | SvAST.AstLegacy, | ||
| ): SvAST.Script | Compiler.Script | null | undefined { | ||
| return svelteAst.instance; | ||
| } | ||
| export function getModuleFromRoot( | ||
| svelteAst: Compiler.Root | SvAST.AstLegacy, | ||
| ): SvAST.Script | Compiler.Script | null | undefined { | ||
| return svelteAst.module; | ||
| } | ||
| export function getOptionsFromRoot( | ||
| svelteAst: Compiler.Root | SvAST.AstLegacy, | ||
| code: string, | ||
| ): Compiler.SvelteOptionsRaw | null { | ||
| const root = svelteAst as Compiler.Root; | ||
| if (root.options) { | ||
| if ((root.options as any).__raw__) { | ||
| return (root.options as any).__raw__; | ||
| } | ||
| // If there is no `__raw__` property in the `SvelteOptions` node, | ||
| // we will parse `<svelte:options>` ourselves. | ||
| return parseSvelteOptions(root.options, code); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| export function getChildren( | ||
| fragment: Required<HasChildren> | { nodes: (Child | SvAST.TemplateNode)[] }, | ||
| ): (SvAST.TemplateNode | Child)[]; | ||
| export function getChildren( | ||
| fragment: HasChildren | { nodes: (Child | SvAST.TemplateNode)[] }, | ||
| ): (SvAST.TemplateNode | Child)[] | undefined; | ||
| export function getChildren( | ||
| fragment: HasChildren | { nodes: (Child | SvAST.TemplateNode)[] }, | ||
| ): (SvAST.TemplateNode | Child)[] | undefined { | ||
| return ( | ||
| (fragment as { nodes: (Child | SvAST.TemplateNode)[] }).nodes ?? | ||
| (fragment as HasChildren).children | ||
| ); | ||
| } | ||
| export function trimChildren( | ||
| children: (SvAST.TemplateNode | Child)[], | ||
| ): (SvAST.TemplateNode | Child)[] { | ||
| if ( | ||
| !startsWithWhitespace(children[0]) && | ||
| !endsWithWhitespace(children[children.length - 1]) | ||
| ) { | ||
| return children; | ||
| } | ||
|
|
||
| const nodes = [...children]; | ||
| while (isWhitespace(nodes[0])) { | ||
| nodes.shift(); | ||
| } | ||
| const first = nodes[0]; | ||
| if (startsWithWhitespace(first)) { | ||
| nodes[0] = { ...first, data: first.data.trimStart() }; | ||
| } | ||
| while (isWhitespace(nodes[nodes.length - 1])) { | ||
| nodes.pop(); | ||
| } | ||
| const last = nodes[nodes.length - 1]; | ||
| if (endsWithWhitespace(last)) { | ||
| nodes[nodes.length - 1] = { ...last, data: last.data.trimEnd() }; | ||
| } | ||
| return nodes; | ||
|
|
||
| function startsWithWhitespace( | ||
| child: SvAST.TemplateNode | Child | undefined, | ||
| ): child is SvAST.Text | Compiler.Text { | ||
| if (!child) { | ||
| return false; | ||
| } | ||
| return child.type === "Text" && child.data.trimStart() !== child.data; | ||
| } | ||
|
|
||
| function endsWithWhitespace( | ||
| child: SvAST.TemplateNode | Child | undefined, | ||
| ): child is SvAST.Text | Compiler.Text { | ||
| if (!child) { | ||
| return false; | ||
| } | ||
| return child.type === "Text" && child.data.trimEnd() !== child.data; | ||
| } | ||
|
|
||
| function isWhitespace(child: SvAST.TemplateNode | Child | undefined) { | ||
| if (!child) { | ||
| return false; | ||
| } | ||
| return child.type === "Text" && child.data.trim() === ""; | ||
| } | ||
| } | ||
| export function getFragment( | ||
| element: | ||
| | { | ||
| fragment: Compiler.Fragment; | ||
| } | ||
| | Required<HasChildren>, | ||
| ): Compiler.Fragment | Required<HasChildren>; | ||
| export function getFragment( | ||
| element: | ||
| | { | ||
| fragment: Compiler.Fragment; | ||
| } | ||
| | HasChildren, | ||
| ): Compiler.Fragment | HasChildren; | ||
| export function getFragment( | ||
| element: | ||
| | { | ||
| fragment: Compiler.Fragment; | ||
| } | ||
| | HasChildren, | ||
| ): Compiler.Fragment | HasChildren { | ||
| if ( | ||
| ( | ||
| element as { | ||
| fragment: Compiler.Fragment; | ||
| } | ||
| ).fragment | ||
| ) { | ||
| return ( | ||
| element as { | ||
| fragment: Compiler.Fragment; | ||
| } | ||
| ).fragment; | ||
| } | ||
| return element as HasChildren; | ||
| } | ||
| export function getModifiers( | ||
| node: SvAST.Directive | SvAST.StyleDirective | Compiler.Directive, | ||
| ): string[] { | ||
| return (node as { modifiers?: string[] }).modifiers ?? []; | ||
| } | ||
| // IfBlock | ||
| export function getTestFromIfBlock( | ||
| block: SvAST.IfBlock | Compiler.IfBlock, | ||
| ): ESTree.Expression { | ||
| return ( | ||
| (block as SvAST.IfBlock).expression ?? (block as Compiler.IfBlock).test | ||
| ); | ||
| } | ||
| export function getConsequentFromIfBlock( | ||
| block: SvAST.IfBlock | Compiler.IfBlock, | ||
| ): Compiler.Fragment | SvAST.IfBlock { | ||
| return (block as Compiler.IfBlock).consequent ?? (block as SvAST.IfBlock); | ||
| } | ||
| export function getAlternateFromIfBlock( | ||
| block: SvAST.IfBlock | Compiler.IfBlock, | ||
| ): Compiler.Fragment | SvAST.ElseBlock | null { | ||
| if ((block as Compiler.IfBlock).alternate) { | ||
| return (block as Compiler.IfBlock).alternate; | ||
| } | ||
| return (block as SvAST.IfBlock).else ?? null; | ||
| } | ||
| // EachBlock | ||
| export function getBodyFromEachBlock( | ||
| block: SvAST.EachBlock | Compiler.EachBlock, | ||
| ): Compiler.Fragment | SvAST.EachBlock { | ||
| if ((block as Compiler.EachBlock).body) { | ||
| return (block as Compiler.EachBlock).body; | ||
| } | ||
| return block as SvAST.EachBlock; | ||
| } | ||
| export function getFallbackFromEachBlock( | ||
| block: SvAST.EachBlock | Compiler.EachBlock, | ||
| ): Compiler.Fragment | SvAST.ElseBlock | null { | ||
| if ((block as Compiler.EachBlock).fallback) { | ||
| return (block as Compiler.EachBlock).fallback!; | ||
| } | ||
| return (block as SvAST.EachBlock).else ?? null; | ||
| } | ||
| // AwaitBlock | ||
| export function getPendingFromAwaitBlock( | ||
| block: SvAST.AwaitBlock | Compiler.AwaitBlock, | ||
| ): Compiler.Fragment | SvAST.PendingBlock | null { | ||
| const pending = block.pending; | ||
| if (!pending) { | ||
| return null; | ||
| } | ||
| if (pending.type === "Fragment") { | ||
| return pending; | ||
| } | ||
| return pending.skip ? null : pending; | ||
| } | ||
| export function getThenFromAwaitBlock( | ||
| block: SvAST.AwaitBlock | Compiler.AwaitBlock, | ||
| ): Compiler.Fragment | SvAST.ThenBlock | null { | ||
| const then = block.then; | ||
| if (!then) { | ||
| return null; | ||
| } | ||
| if (then.type === "Fragment") { | ||
| return then; | ||
| } | ||
| return then.skip ? null : then; | ||
| } | ||
| export function getCatchFromAwaitBlock( | ||
| block: SvAST.AwaitBlock | Compiler.AwaitBlock, | ||
| ): Compiler.Fragment | SvAST.CatchBlock | null { | ||
| const catchFragment = block.catch; | ||
| if (!catchFragment) { | ||
| return null; | ||
| } | ||
| if (catchFragment.type === "Fragment") { | ||
| return catchFragment; | ||
| } | ||
| return catchFragment.skip ? null : catchFragment; | ||
| } | ||
|
|
||
| // ConstTag | ||
| export function getDeclaratorFromConstTag( | ||
| node: SvAST.ConstTag | Compiler.ConstTag, | ||
| ): | ||
| | ESTree.AssignmentExpression | ||
| | Compiler.ConstTag["declaration"]["declarations"][0] { | ||
| return ( | ||
| (node as Compiler.ConstTag).declaration?.declarations?.[0] ?? | ||
| (node as SvAST.ConstTag).expression | ||
| ); | ||
| } | ||
|
|
||
| function parseSvelteOptions( | ||
| options: Compiler.SvelteOptions, | ||
| code: string, | ||
| ): Compiler.SvelteOptionsRaw { | ||
| const { start, end } = options; | ||
| const nameEndName = start + "<svelte:options".length; | ||
| const { attributes, index: tagEndIndex } = parseAttributes( | ||
| code, | ||
| nameEndName + 1, | ||
| ); | ||
| const fragment: Compiler.Fragment = { | ||
| type: "Fragment", | ||
| nodes: [], | ||
| transparent: true, | ||
| }; | ||
| if (code.startsWith(">", tagEndIndex)) { | ||
| const childEndIndex = code.indexOf("</svelte:options", tagEndIndex); | ||
| fragment.nodes.push({ | ||
| type: "Text", | ||
| data: code.slice(tagEndIndex + 1, childEndIndex), | ||
| start: tagEndIndex + 1, | ||
| end: childEndIndex, | ||
| raw: code.slice(tagEndIndex + 1, childEndIndex), | ||
| parent: fragment, | ||
| }); | ||
| } | ||
| return { | ||
| type: "SvelteOptions", | ||
| name: "svelte:options", | ||
| attributes, | ||
| fragment, | ||
| start, | ||
| end, | ||
| parent: null as any, | ||
| }; | ||
| } |
Oops, something went wrong.