Skip to content
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.

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

don't treat :foo as a directive #1245

Merged
merged 3 commits into from
Mar 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 41 additions & 41 deletions src/parse/read/directives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,52 @@ import { Parser } from '../index';

const DIRECTIVES = {
Ref: {
names: [ 'ref' ],
names: ['ref'],
attribute(start, end, type, name) {
return { start, end, type, name };
}
},
allowedExpressionTypes: [],
error: 'ref directives cannot have a value'
},

EventHandler: {
names: [ 'on' ],
allowedExpressionTypes: [ 'CallExpression' ],
names: ['on'],
attribute(start, end, type, name, expression) {
return { start, end, type, name, expression };
},
allowedExpressionTypes: ['CallExpression'],
error: 'Expected a method call'
},

Binding: {
names: [ '', 'bind' ],
allowedExpressionTypes: [ 'Identifier', 'MemberExpression' ],
attribute(start, end, type, name, expression, directiveName) {
let value;

// :foo is shorthand for foo='{{foo}}'
if (!directiveName) {
const valueStart = start + 1;
const valueEnd = start + name.length;
type = 'Attribute';
value = getShorthandValue(start + 1, name);
} else {
value = expression || {
names: ['bind'],
attribute(start, end, type, name, expression) {
return {
start, end, type, name,
value: expression || {
type: 'Identifier',
start: start + 5,
end,
name,
};
}

return { start, end, type, name, value };
}
};
},
allowedExpressionTypes: ['Identifier', 'MemberExpression'],
error: 'Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)'
},

Transition: {
names: [ 'in', 'out', 'transition' ],
allowedExpressionTypes: [ 'ObjectExpression' ],
names: ['in', 'out', 'transition'],
attribute(start, end, type, name, expression, directiveName) {
return {
start, end, type, name, expression,
intro: directiveName === 'in' || directiveName === 'transition',
outro: directiveName === 'out' || directiveName === 'transition',
}
};
},
},
allowedExpressionTypes: ['ObjectExpression'],
error: 'Transition argument must be an object literal, e.g. `{ duration: 400 }`'
}
};


Expand Down Expand Up @@ -83,7 +82,7 @@ function readExpression(parser: Parser, start: number, quoteMark: string|null) {
} else {
str += char;
}
} else if (/[\s\r\n\/>]/.test(char)) {
} else if (/[\s\/>]/.test(char)) {
break;
} else {
str += char;
Expand All @@ -106,12 +105,23 @@ export function readDirective(
start: number,
attrName: string
) {
const [ directiveName, name ] = attrName.split(':');
const [directiveName, name] = attrName.split(':');
if (name === undefined) return; // No colon in the name


if (directiveName === '') {
// not a directive — :foo is short for foo={{foo}}
return {
start: start,
end: start + name.length + 1,
type: 'Attribute',
name,
value: getShorthandValue(start + 1, name)
};
}

const type = lookupByName[directiveName];
if (!type) return; // not a registered directive

const directive = DIRECTIVES[type];
let expression = null;

Expand All @@ -133,21 +143,11 @@ export function readDirective(

expression = readExpression(parser, expressionStart, quoteMark);
if (directive.allowedExpressionTypes.indexOf(expression.type) === -1) {
parser.error(`Expected ${directive.allowedExpressionTypes.join(' or ')}`, expressionStart);
parser.error(directive.error, expressionStart);
}
}

if (directive.attribute) {
return directive.attribute(start, parser.index, type, name, expression, directiveName);
} else {
return {
start,
end: parser.index,
type: type,
name,
expression,
};
}
return directive.attribute(start, parser.index, type, name, expression, directiveName);
}


Expand Down
2 changes: 1 addition & 1 deletion test/parser/samples/error-binding-rvalue/error.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"message": "Expected Identifier or MemberExpression",
"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
"pos": 19,
"loc": {
"line": 1,
Expand Down
2 changes: 1 addition & 1 deletion test/parser/samples/error-event-handler/error.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"message": "Expected CallExpression",
"message": "Expected a method call",
"loc": {
"line": 1,
"column": 15
Expand Down
8 changes: 8 additions & 0 deletions test/parser/samples/error-ref-value/error.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"message": "ref directives cannot have a value",
"loc": {
"line": 1,
"column": 14
},
"pos": 14
}
1 change: 1 addition & 0 deletions test/parser/samples/error-ref-value/input.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div ref:foo='bar'></div>