Skip to content

Commit b6344bc

Browse files
tylerturdenpantsTurbo87
authored andcommitted
Fix false negatives for link-to with data- prefixed route name (#214)
* derp data dash * explicit PathExpression * simplify * even simpler
1 parent 54e5719 commit b6344bc

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

transforms/angle-brackets/transform.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,16 @@ function transformNodeAttributes(tagName, node) {
262262
return node.params.concat(attributes);
263263
}
264264

265+
function isDataAttrPathExpression(node) {
266+
return node.type === 'PathExpression' && node.original.startsWith('data-');
267+
}
268+
265269
function getDataAttributesFromParams(params) {
266-
return params.filter(param => param.original && `${param.original}`.startsWith('data-'));
270+
return params.filter(it => isDataAttrPathExpression(it));
267271
}
268272

269273
function getNonDataAttributesFromParams(params) {
270-
return params.filter(p => !(p.original && `${p.original}`.startsWith('data-')));
274+
return params.filter(it => !isDataAttrPathExpression(it));
271275
}
272276

273277
function shouldIgnoreMustacheStatement(fullName, config, invokableData) {

transforms/angle-brackets/transform.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ test('let', () => {
376376
test('link-to', () => {
377377
let input = `
378378
{{#link-to "about"}}About Us{{/link-to}}
379+
{{#link-to "data-access"}}Accessing the Crates.io Data{{/link-to}}
379380
{{#link-to this.dynamicRoute}}About Us{{/link-to}}
380381
{{#link-to "user" this.first this.second}}Show{{/link-to}}
381382
{{#link-to "user" this.first this.second (query-params foo="baz")}}Show{{/link-to}}
@@ -386,6 +387,7 @@ test('link-to', () => {
386387
expect(runTest('link-to.hbs', input)).toMatchInlineSnapshot(`
387388
"
388389
<LinkTo @route=\\"about\\">About Us</LinkTo>
390+
<LinkTo @route=\\"data-access\\">Accessing the Crates.io Data</LinkTo>
389391
<LinkTo @route={{this.dynamicRoute}}>About Us</LinkTo>
390392
<LinkTo @route=\\"user\\" @models={{array this.first this.second}}>Show</LinkTo>
391393
<LinkTo @route=\\"user\\" @models={{array this.first this.second}} @query={{hash foo=\\"baz\\"}}>Show</LinkTo>

0 commit comments

Comments
 (0)