From a6ceedbe749a6aff3954686654a260beb8a41999 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Mon, 20 Nov 2023 10:06:47 +0100 Subject: [PATCH] fix: adjust static attribute regex Svelte 5 version of #9551 --- .../compiler/phases/1-parse/state/element.js | 2 +- .../svelte/src/compiler/preprocess/index.js | 4 +- .../input.svelte | 7 + .../output.json | 178 ++++++++++++++++++ 4 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/input.svelte create mode 100644 packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json diff --git a/packages/svelte/src/compiler/phases/1-parse/state/element.js b/packages/svelte/src/compiler/phases/1-parse/state/element.js index c649d5f0239c..a5e2a2a82ab1 100644 --- a/packages/svelte/src/compiler/phases/1-parse/state/element.js +++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js @@ -382,7 +382,7 @@ function read_tag_name(parser) { // eslint-disable-next-line no-useless-escape const regex_token_ending_character = /[\s=\/>"']/; const regex_starts_with_quote_characters = /^["']/; -const regex_attribute_value = /^(?:"([^"]*)"|'([^'])*'|([^>\s]))/; +const regex_attribute_value = /^(?:"([^"]*)"|'([^'])*'|([^>\s]+))/; /** * @param {import('../index.js').Parser} parser diff --git a/packages/svelte/src/compiler/preprocess/index.js b/packages/svelte/src/compiler/preprocess/index.js index 35cb56589a40..d12c87076083 100644 --- a/packages/svelte/src/compiler/preprocess/index.js +++ b/packages/svelte/src/compiler/preprocess/index.js @@ -254,9 +254,9 @@ function stringify_tag_attributes(attributes) { } const regex_style_tags = - /|'"/]+=(?:"[^"]*"|'[^']*'|[^>\s])|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/style>)/g; + /|'"/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/style>)/g; const regex_script_tags = - /|'"/]+=(?:"[^"]*"|'[^']*'|[^>\s])|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/script>)/g; + /|'"/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/script>)/g; /** * Calculate the updates required to process all instances of the specified tag. diff --git a/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/input.svelte b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/input.svelte new file mode 100644 index 000000000000..b88dae2a65b2 --- /dev/null +++ b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/input.svelte @@ -0,0 +1,7 @@ + + + diff --git a/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json new file mode 100644 index 000000000000..072e10178289 --- /dev/null +++ b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json @@ -0,0 +1,178 @@ +{ + "html": { + "start": 62, + "end": 60, + "type": "Fragment", + "children": [ + { + "start": 60, + "end": 62, + "type": "Text", + "raw": "\n\n", + "data": "\n\n" + } + ] + }, + "instance": { + "type": "Script", + "start": 62, + "end": 86, + "context": "default", + "content": { + "type": "Program", + "start": 70, + "end": 77, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 7, + "column": 0 + } + }, + "body": [ + { + "type": "ExpressionStatement", + "start": 72, + "end": 76, + "loc": { + "start": { + "line": 6, + "column": 1 + }, + "end": { + "line": 6, + "column": 5 + } + }, + "expression": { + "type": "Identifier", + "start": 72, + "end": 75, + "loc": { + "start": { + "line": 6, + "column": 1 + }, + "end": { + "line": 6, + "column": 4 + } + }, + "name": "foo" + } + } + ], + "sourceType": "module" + } + }, + "module": { + "type": "Script", + "start": 0, + "end": 60, + "context": "module", + "content": { + "type": "Program", + "start": 23, + "end": 51, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 0 + } + }, + "body": [ + { + "type": "ExportNamedDeclaration", + "start": 25, + "end": 50, + "loc": { + "start": { + "line": 2, + "column": 1 + }, + "end": { + "line": 2, + "column": 26 + } + }, + "declaration": { + "type": "VariableDeclaration", + "start": 32, + "end": 50, + "loc": { + "start": { + "line": 2, + "column": 8 + }, + "end": { + "line": 2, + "column": 26 + } + }, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 38, + "end": 49, + "loc": { + "start": { + "line": 2, + "column": 14 + }, + "end": { + "line": 2, + "column": 25 + } + }, + "id": { + "type": "Identifier", + "start": 38, + "end": 41, + "loc": { + "start": { + "line": 2, + "column": 14 + }, + "end": { + "line": 2, + "column": 17 + } + }, + "name": "foo" + }, + "init": { + "type": "Literal", + "start": 44, + "end": 49, + "loc": { + "start": { + "line": 2, + "column": 20 + }, + "end": { + "line": 2, + "column": 25 + } + }, + "value": "bar", + "raw": "'bar'" + } + } + ], + "kind": "const" + }, + "specifiers": [], + "source": null + } + ], + "sourceType": "module" + } + } +}