Replace isValidVariableName with isIdentifierName from Babel (#1975)

sindresorhus · Nov 18, 2022 · 046cf90 · 046cf90
1 parent f64a4a8
commit 046cf90
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 35 deletions.
diff --git a/rules/prefer-dom-node-dataset.js b/rules/prefer-dom-node-dataset.js
@@ -1,5 +1,5 @@
 'use strict';
-const isValidVariableName = require('./utils/is-valid-variable-name.js');
+const {isIdentifierName} = require('@babel/helper-validator-identifier');
 const quoteString = require('./utils/quote-string.js');
 const {methodCallSelector, matches} = require('./selectors/index.js');
 
@@ -44,7 +44,7 @@ const create = context => ({
 			case 'setAttribute':
 			case 'getAttribute':
 			case 'removeAttribute': {
-				text = isValidVariableName(name) ? `.${name}` : `[${quoteString(name, nameNode.raw.charAt(0))}]`;
+				text = isIdentifierName(name) ? `.${name}` : `[${quoteString(name, nameNode.raw.charAt(0))}]`;
 				text = `${datasetText}${text}`;
 				if (method === 'setAttribute') {
 					text += ` = ${sourceCode.getText(node.arguments[1])}`;

diff --git a/rules/utils/is-valid-variable-name.js b/rules/utils/is-valid-variable-name.js
diff --git a/test/prefer-dom-node-dataset.mjs b/test/prefer-dom-node-dataset.mjs
@@ -39,6 +39,7 @@ test.snapshot({
 		`,
 		'element.setAttribute(\'data-unicorn\', \'🦄\');',
 		'element.setAttribute(\'data-🦄\', \'🦄\');',
+		'element.setAttribute(\'data-ゆ\', \'ゆ\');',
 		'element.setAttribute(\'data-foo2\', \'🦄\');',
 		'element.setAttribute(\'data-foo:bar\', \'zaz\');',
 		'element.setAttribute("data-foo:bar", "zaz");',
@@ -91,6 +92,7 @@ test.snapshot({
 		'element.removeAttribute("data-unicorn");',
 		'element.removeAttribute("data-unicorn",);',
 		'element.removeAttribute("data-🦄");',
+		'element.removeAttribute("data-ゆ");',
 		'element.removeAttribute("data-foo2");',
 		'element.removeAttribute("data-foo:bar");',
 		'element.removeAttribute("data-foo:bar");',
@@ -142,6 +144,7 @@ test.snapshot({
 		'element.hasAttribute("data-unicorn");',
 		'element.hasAttribute("data-unicorn",);',
 		'element.hasAttribute("data-🦄");',
+		'element.hasAttribute("data-ゆ");',
 		'element.hasAttribute("data-foo2");',
 		'element.hasAttribute("data-foo:bar");',
 		'element.hasAttribute("data-foo:bar");',
@@ -188,6 +191,7 @@ test.snapshot({
 		'element.getAttribute("data-unicorn");',
 		'element.getAttribute("data-unicorn",);',
 		'element.getAttribute("data-🦄");',
+		'element.getAttribute("data-ゆ");',
 		'element.getAttribute("data-foo2");',
 		'element.getAttribute("data-foo:bar");',
 		'element.getAttribute("data-foo:bar");',