0
0
mirror of https://github.com/sveltejs/svelte.git synced 2024-12-01 01:11:24 +01:00

disallow simultaneous foo / {foo} / bind:foo (#4343)

* disallow matching attributes/shorthands/bindings (#4325)

* add tests

* update changelog
This commit is contained in:
Conduitry 2020-01-30 09:25:16 -05:00 committed by GitHub
parent 9e7df1e41a
commit 5076613256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 11 deletions

View File

@ -1,5 +1,9 @@
# Svelte changelog
## Unreleased
* Disallow attribute/prop names from matching two-way-bound names or `{shorthand}` attribute/prop names ([#4325](https://github.com/sveltejs/svelte/issues/4325))
## 3.18.1
* Fix code generation error with adjacent inline and block comments ([#4312](https://github.com/sveltejs/svelte/issues/4312))

View File

@ -288,6 +288,16 @@ function read_tag_name(parser: Parser) {
function read_attribute(parser: Parser, unique_names: Set<string>) {
const start = parser.index;
function check_unique(name: string) {
if (unique_names.has(name)) {
parser.error({
code: `duplicate-attribute`,
message: 'Attributes need to be unique'
}, start);
}
unique_names.add(name);
}
if (parser.eat('{')) {
parser.allow_whitespace();
@ -310,6 +320,8 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
parser.allow_whitespace();
parser.eat('}', true);
check_unique(name);
return {
start,
end: parser.index,
@ -341,17 +353,6 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
const colon_index = name.indexOf(':');
const type = colon_index !== -1 && get_directive_type(name.slice(0, colon_index));
if (unique_names.has(name)) {
parser.error({
code: `duplicate-attribute`,
message: 'Attributes need to be unique'
}, start);
}
if (type !== "EventHandler") {
unique_names.add(name);
}
let value: any[] | true = true;
if (parser.eat('=')) {
parser.allow_whitespace();
@ -367,6 +368,12 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
if (type) {
const [directive_name, ...modifiers] = name.slice(colon_index + 1).split('|');
if (type === 'Binding' && directive_name !== 'this') {
check_unique(directive_name);
} else if (type !== 'EventHandler') {
check_unique(name);
}
if (type === 'Ref') {
parser.error({
code: `invalid-ref-directive`,
@ -410,6 +417,8 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
return directive;
}
check_unique(name);
return {
start,
end,

View File

@ -0,0 +1,10 @@
{
"code": "duplicate-attribute",
"message": "Attributes need to be unique",
"start": {
"line": 1,
"column": 17,
"character": 17
},
"pos": 17
}

View File

@ -0,0 +1 @@
<Widget foo={42} bind:foo/>

View File

@ -0,0 +1,10 @@
{
"code": "duplicate-attribute",
"message": "Attributes need to be unique",
"start": {
"line": 1,
"column": 17,
"character": 17
},
"pos": 17
}

View File

@ -0,0 +1 @@
<div title='foo' {title}></div>