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.

Sign up for GitHub

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

Jump to bottom

Handle logical expressions when getting attribute values #1014

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Handle logical expressions when getting attribute values #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa42255
feat: handle LogicalExpressions on getAttributeValue
K-Schaeffer Jan 16, 2024
244f2bb
test: assert logic expression behavior
K-Schaeffer Jan 16, 2024
833acb1
fix: remove ts-ignore statements
K-Schaeffer Jan 17, 2024
451d4a7
fix: verifying type of left and right bits of the expression
K-Schaeffer Jan 18, 2024
fbdf570
fix: typo
K-Schaeffer Jan 18, 2024
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
3 changes: 2 additions & 1 deletion src/rules/__tests__/interactive-supports-focus.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ makeRuleTester("interactive-supports-focus", rule, {
"<div role='textbox' aria-disabled='true' @click='void 0' />",
"<Foo.Bar @click='void 0' aria-hidden='false' />",
"<Input @click='void 0' type='hidden' />",
`<component role="button" :is="foo ? 'a' : 'button'" />`
`<component role="button" :is="foo ? 'a' : 'button'" />`,
"<div role='textbox' :tabindex='false || 0' :aria-disabled='false' @click='void 0' />",
],
invalid: [
...rule.interactiveRoles.flatMap((role) =>
Expand Down
16 changes: 16 additions & 0 deletions src/utils/getAttributeValue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ function getAttributeValue(node: AST.VAttribute | AST.VDirective) {
return node.value.expression.value;
}

if (node.value.expression.type === 'LogicalExpression') {
const operator = node.value.expression.operator;
let leftSideOfOperation;
let rightSideOfOperation;

if (node.value.expression.left.type === 'Literal') {
leftSideOfOperation = node.value.expression.left.value;
}

if (node.value.expression.right.type === 'Literal') {
rightSideOfOperation = node.value.expression.right.value;
}

return eval(`${leftSideOfOperation} ${operator} ${rightSideOfOperation}`);
}

// TODO we're effectively using this as just a placeholder to let rules know
// that a value has been passed in for this attribute. We should replace
// this with a stronger API to either explicitly handle all of the different
Expand Down