bobwen-dev/react-templates
1
0
Fork 0
mirror of https://github.com/bobwen-dev/react-templates synced 2025-04-12 00:56:39 +02:00
Code Issues Releases Wiki Activity

Restrict attributes on rt-virtual (fix #152)

Browse Source
This commit is contained in:
Antonino Porcino 2016-07-08 11:45:16 +02:00
parent 4559fdf744
commit 9b8d15a530
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/reactTemplates.js
View File

@ -366,7 +366,7 @@ function convertHtmlToReact(node, context) {
if (node.attribs[ifAttr]) {
validateIfAttribute(node, context, data);
data.condition = node.attribs[ifAttr].trim();
if (!node.attribs.key) {
if (!node.attribs.key && node.name !== virtualNode) {
_.set(node, ['attribs', 'key'], `${node.startIndex}`);
}
}
@ -384,14 +384,23 @@ function convertHtmlToReact(node, context) {
}
}
}
if (node.name === virtualNode) {
const invalidAttributes = _.without(_.keys(node.attribs), scopeAttr, ifAttr, repeatAttr);
if (invalidAttributes.length > 0) {
throw RTCodeError.build(context, node, "<rt-virtual> may not contain attributes other than 'rt-scope', 'rt-if' and 'rt-repeat'");
}
// provide a key to virtual node children if missing
if (node.name === virtualNode && node.children.length > 1) {
_(node.children)
.reject('attribs.key')
.forEach((child, i) => {
_.set(child, ['attribs', 'key'], `${node.startIndex}${i}`);
});
// provide a key to virtual node children if missing
if (node.children.length > 1) {
_(node.children)
.reject('attribs.key')
.forEach((child, i) => {
if (child.type === 'tag' && child.name !== virtualNode) {
_.set(child, ['attribs', 'key'], `${node.startIndex}${i}`);
}
});
}
}
const children = _.map(node.children, child => {

0
test/data/invalid/invalid-virtual.rt → test/data/invalid/invalid-virtual-1.rt
View File

5
test/data/invalid/invalid-virtual-2.rt Normal file
View File

@ -0,0 +1,5 @@
<div>
<rt-virtual rt-scope="'42' as fortytwo" onClick={console.log}>
The answer is {fortytwo}
</rt-virtual>
</div>

9
test/src/rt.invalid.spec.js
View File

@ -34,15 +34,14 @@ module.exports = {
{file: 'invalid-brace.rt', issue: new RTCodeError('Unexpected end of input', 128, 163, 5, 11)},
{file: 'invalid-style-1.rt', issue: new RTCodeError('Unexpected token ILLEGAL', 10, 39, 2, 5)},
{file: 'invalid-style-2.rt', issue: new RTCodeError('style attribute keys cannot contain { } expressions', 35, 68, 2, 5)},
{file: 'invalid-virtual.rt', issue: new RTCodeError('Document should not have <rt-virtual> as root element', 0, 60, 1, 1)}
{file: 'invalid-virtual-1.rt', issue: new RTCodeError('Document should not have <rt-virtual> as root element', 0, 60, 1, 1)},
{file: 'invalid-virtual-2.rt', issue: new RTCodeError("<rt-virtual> may not contain attributes other than 'rt-scope', 'rt-if' and 'rt-repeat'", 9, 119, 2, 4)}
];
test('invalid tests', t => {
t.plan(invalidFiles.length);
invalidFiles.forEach(check);
function check(testFile) {
invalidFiles.forEach(testFile => {
const filename = path.join(dataPath, testFile.file);
const html = testUtils.readFileNormalized(filename);
let error = null;
@ -52,7 +51,7 @@ module.exports = {
error = e;
}
t.deepEqual(omitStack(error), omitStack(testFile.issue), 'Expect convertTemplateToReact to throw an error');
}
});
});
/**