Skip to content

fix: do not throw error if <script> exists inside {@html} #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2025
Merged

fix: do not throw error if <script> exists inside {@html} #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/sharp-guests-sniff.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte-eslint-parser": patch
---

fix: prevent errors when `<script>` tags are used inside `{@html}`
12 changes: 12 additions & 0 deletions src/context/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,14 @@ type SelfClosingBlock = {
startTagRange: [number, number];
};

function isValidStartTagOpenIndex(
code: string,
startTagOpenIndex: number,
): boolean {
const prev = code.slice(0, startTagOpenIndex);
return />\s*$|^\s*$/m.test(prev);
}

/** Extract <script> blocks */
function* extractBlocks(code: string): IterableIterator<Block> {
const startTagOpenRe = /<!--[\s\S]*?-->|<(script|style|template)([\s>])/giu;
Expand All @@ -396,6 +404,10 @@ function* extractBlocks(code: string): IterableIterator<Block> {
continue;
}
const startTagStart = startTagOpenMatch.index;
if (!isValidStartTagOpenIndex(code, startTagStart)) {
continue;
}

let startTagEnd = startTagOpenRe.lastIndex;

const lowerTag = tag.toLowerCase() as "script" | "style" | "template";
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/parser/ast/at-html01-input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{@html `<script>var x = ${50}</script>`}
233 changes: 233 additions & 0 deletions tests/fixtures/parser/ast/at-html01-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
{
"type": "Program",
"body": [
{
"type": "SvelteMustacheTag",
"kind": "raw",
"expression": {
"type": "TemplateLiteral",
"expressions": [
{
"type": "Literal",
"raw": "50",
"value": 50,
"range": [
26,
28
],
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 28
}
}
}
],
"quasis": [
{
"type": "TemplateElement",
"tail": false,
"value": {
"cooked": "<script>var x = ",
"raw": "<script>var x = "
},
"range": [
7,
26
],
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 26
}
}
},
{
"type": "TemplateElement",
"tail": true,
"value": {
"cooked": "</script>",
"raw": "</script>"
},
"range": [
28,
39
],
"loc": {
"start": {
"line": 1,
"column": 28
},
"end": {
"line": 1,
"column": 39
}
}
}
],
"range": [
7,
39
],
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 39
}
}
},
"range": [
0,
40
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 40
}
}
}
],
"sourceType": "module",
"comments": [],
"tokens": [
{
"type": "Punctuator",
"value": "{",
"range": [
0,
1
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
}
}
},
{
"type": "MustacheKeyword",
"value": "@html",
"range": [
1,
6
],
"loc": {
"start": {
"line": 1,
"column": 1
},
"end": {
"line": 1,
"column": 6
}
}
},
{
"type": "Template",
"value": "`<script>var x = ${",
"range": [
7,
26
],
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 26
}
}
},
{
"type": "Numeric",
"value": "50",
"range": [
26,
28
],
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 28
}
}
},
{
"type": "Template",
"value": "}</script>`",
"range": [
28,
39
],
"loc": {
"start": {
"line": 1,
"column": 28
},
"end": {
"line": 1,
"column": 39
}
}
},
{
"type": "Punctuator",
"value": "}",
"range": [
39,
40
],
"loc": {
"start": {
"line": 1,
"column": 39
},
"end": {
"line": 1,
"column": 40
}
}
}
],
"range": [
0,
41
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 0
}
}
}
34 changes: 34 additions & 0 deletions tests/fixtures/parser/ast/at-html01-scope-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "global",
"variables": [
{
"name": "$$slots",
"identifiers": [],
"defs": [],
"references": []
},
{
"name": "$$props",
"identifiers": [],
"defs": [],
"references": []
},
{
"name": "$$restProps",
"identifiers": [],
"defs": [],
"references": []
}
],
"references": [],
"childScopes": [
{
"type": "module",
"variables": [],
"references": [],
"childScopes": [],
"through": []
}
],
"through": []
}
Loading