Skip to content

Commit

Permalink
disallow simultaneous foo / {foo} / bind:foo (sveltejs#4343)
Browse files Browse the repository at this point in the history
* disallow matching attributes/shorthands/bindings (sveltejs#4325)

* add tests

* update changelog
  • Loading branch information
Conduitry authored and jesseskinner committed Feb 27, 2020
1 parent dcb3031 commit 168c29a
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
31 changes: 20 additions & 11 deletions src/compiler/parse/state/tag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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,
Expand Down Expand Up @@ -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();
Expand All @@ -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`,
Expand Down Expand Up @@ -410,6 +417,8 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
return directive;
}

check_unique(name);

return {
start,
end,
Expand Down
10 changes: 10 additions & 0 deletions test/parser/samples/attribute-unique-binding-error/error.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"code": "duplicate-attribute",
"message": "Attributes need to be unique",
"start": {
"line": 1,
"column": 17,
"character": 17
},
"pos": 17
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<Widget foo={42} bind:foo/>
10 changes: 10 additions & 0 deletions test/parser/samples/attribute-unique-shorthand-error/error.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"code": "duplicate-attribute",
"message": "Attributes need to be unique",
"start": {
"line": 1,
"column": 17,
"character": 17
},
"pos": 17
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div title='foo' {title}></div>

0 comments on commit 168c29a

Please sign in to comment.