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

prefer-dom-node-dataset: Remove broken fix for element.setAttribute #2169

Merged
merged 5 commits into from
Jul 10, 2023
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
86 changes: 49 additions & 37 deletions rules/prefer-dom-node-dataset.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
const {isIdentifierName} = require('@babel/helper-validator-identifier');
const {escapeString} = require('./utils/index.js');
const {escapeString, hasOptionalChainElement} = require('./utils/index.js');
const {isMethodCall, isStringLiteral} = require('./ast/index.js');

const MESSAGE_ID = 'prefer-dom-node-dataset';
Expand All @@ -10,50 +10,29 @@ const messages = {

const dashToCamelCase = string => string.replace(/-[a-z]/g, s => s[1].toUpperCase());

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => ({
CallExpression(node) {
if (!(
(
isMethodCall(node, {
method: 'setAttribute',
argumentsLength: 2,
optionalCall: false,
optionalMember: false,
})
|| isMethodCall(node, {
methods: ['getAttribute', 'removeAttribute', 'hasAttribute'],
argumentsLength: 1,
optionalCall: false,
optionalMember: false,
})
)
&& isStringLiteral(node.arguments[0])
)) {
return;
}
function getFix(callExpression, context) {
const method = callExpression.callee.property.name;

const [nameNode] = node.arguments;
const attributeName = nameNode.value.toLowerCase();

if (!attributeName.startsWith('data-')) {
return;
}

const method = node.callee.property.name;
const name = dashToCamelCase(attributeName.slice(5));
// `foo?.bar = ''` is invalid
// TODO: Remove this restriction if https://github.com/nicolo-ribaudo/ecma262/pull/4 get merged
if (method === 'setAttribute' && hasOptionalChainElement(callExpression.callee)) {
return;
}
Comment on lines +16 to +20
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual change.


return fixer => {
const [nameNode] = callExpression.arguments;
const name = dashToCamelCase(nameNode.value.toLowerCase().slice(5));
const {sourceCode} = context;
let text = '';
const datasetText = `${sourceCode.getText(node.callee.object)}.dataset`;
const datasetText = `${sourceCode.getText(callExpression.callee.object)}.dataset`;
switch (method) {
case 'setAttribute':
case 'getAttribute':
case 'removeAttribute': {
text = isIdentifierName(name) ? `.${name}` : `[${escapeString(name, nameNode.raw.charAt(0))}]`;
text = `${datasetText}${text}`;
if (method === 'setAttribute') {
text += ` = ${sourceCode.getText(node.arguments[1])}`;
text += ` = ${sourceCode.getText(callExpression.arguments[1])}`;
} else if (method === 'removeAttribute') {
text = `delete ${text}`;
}
Expand All @@ -72,11 +51,44 @@ const create = context => ({
// No default
}

return fixer.replaceText(callExpression, text);
};
}

/** @param {import('eslint').Rule.RuleContext} context */
const create = context => ({
CallExpression(callExpression) {
if (!(
(
isMethodCall(callExpression, {
method: 'setAttribute',
argumentsLength: 2,
optionalCall: false,
optionalMember: false,
})
|| isMethodCall(callExpression, {
methods: ['getAttribute', 'removeAttribute', 'hasAttribute'],
argumentsLength: 1,
optionalCall: false,
optionalMember: false,
})
)
&& isStringLiteral(callExpression.arguments[0])
)) {
return;
}

const attributeName = callExpression.arguments[0].value.toLowerCase();

if (!attributeName.startsWith('data-')) {
return;
}

return {
node,
node: callExpression,
messageId: MESSAGE_ID,
data: {method},
fix: fixer => fixer.replaceText(node, text),
data: {method: callExpression.callee.property.name},
fix: getFix(callExpression, context),
};
},
});
Expand Down
21 changes: 21 additions & 0 deletions rules/utils/has-optional-chain-element.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use strict';

const isChainElement = node => node.type === 'MemberExpression' || node.type === 'CallExpression';

function hasOptionalChainElement(node) {
if (!isChainElement(node)) {
return false;
}

if (node.optional) {
return true;
}

if (node.type === 'MemberExpression') {
return hasOptionalChainElement(node.object);
}

return false;
}

module.exports = hasOptionalChainElement;
1 change: 1 addition & 0 deletions rules/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
getReferences: require('./get-references.js'),
getScopes: require('./get-scopes.js'),
getVariableIdentifiers: require('./get-variable-identifiers.js'),
hasOptionalChainElement: require('./has-optional-chain-element.js'),
isArrayPrototypeProperty,
isBooleanNode,
isFunctionSelfUsedInside: require('./is-function-self-used-inside.js'),
Expand Down
5 changes: 5 additions & 0 deletions test/prefer-dom-node-dataset.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ test.snapshot({
'element.setAttribute("DATA--FOO", "🦄");',
'element.setAttribute("DATA- ", "🦄");',
'element.setAttribute("DATA-Foo-bar", "🦄");',
// Not fixable
'optional?.element.setAttribute("data-unicorn", "🦄");',
],
});

Expand Down Expand Up @@ -101,6 +103,7 @@ test.snapshot({
'element.removeAttribute("data-foo");',
'element.querySelector("#selector").removeAttribute("data-AllowAccess");',
'element.removeAttribute("data-");',
'optional?.element.removeAttribute("data-unicorn");',
],
});

Expand Down Expand Up @@ -152,6 +155,7 @@ test.snapshot({
'element.hasAttribute("data-foo-bar");',
'element.hasAttribute("data-foo");',
'element.querySelector("#selector").hasAttribute("data-AllowAccess");',
'optional?.element.hasAttribute("data-unicorn");',
],
});

Expand Down Expand Up @@ -199,5 +203,6 @@ test.snapshot({
'element.getAttribute("data-foo-bar");',
'element.getAttribute("data-foo");',
'element.querySelector("#selector").getAttribute("data-AllowAccess");',
'optional?.element.getAttribute("data-unicorn");',
],
});
58 changes: 58 additions & 0 deletions test/snapshots/prefer-dom-node-dataset.mjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,16 @@ Generated by [AVA](https://avajs.dev).
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`setAttribute(…)\`.␊
`

## Invalid #17
1 | optional?.element.setAttribute("data-unicorn", "🦄");

> Error 1/1

`␊
> 1 | optional?.element.setAttribute("data-unicorn", "🦄");␊
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`setAttribute(…)\`.␊
`

## Invalid #1
1 | element.removeAttribute(
2 | "data-foo", // comment
Expand Down Expand Up @@ -499,6 +509,22 @@ Generated by [AVA](https://avajs.dev).
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`removeAttribute(…)\`.␊
`

## Invalid #15
1 | optional?.element.removeAttribute("data-unicorn");

> Output

`␊
1 | delete optional?.element.dataset.unicorn;␊
`

> Error 1/1

`␊
> 1 | optional?.element.removeAttribute("data-unicorn");␊
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`removeAttribute(…)\`.␊
`

## Invalid #1
1 | element.hasAttribute(
2 | "data-foo", // comment
Expand Down Expand Up @@ -713,6 +739,22 @@ Generated by [AVA](https://avajs.dev).
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`hasAttribute(…)\`.␊
`

## Invalid #14
1 | optional?.element.hasAttribute("data-unicorn");

> Output

`␊
1 | Object.hasOwn(optional?.element.dataset, "unicorn");␊
`

> Error 1/1

`␊
> 1 | optional?.element.hasAttribute("data-unicorn");␊
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`hasAttribute(…)\`.␊
`

## Invalid #1
1 | element.getAttribute(
2 | "data-foo", // comment
Expand Down Expand Up @@ -926,3 +968,19 @@ Generated by [AVA](https://avajs.dev).
> 1 | element.querySelector("#selector").getAttribute("data-AllowAccess");␊
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`getAttribute(…)\`.␊
`

## Invalid #14
1 | optional?.element.getAttribute("data-unicorn");

> Output

`␊
1 | optional?.element.dataset.unicorn;␊
`

> Error 1/1

`␊
> 1 | optional?.element.getAttribute("data-unicorn");␊
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer \`.dataset\` over \`getAttribute(…)\`.␊
`
Binary file modified test/snapshots/prefer-dom-node-dataset.mjs.snap
Binary file not shown.