refactor: minor improvements

Rel1cx · Rel1cx · commit da4be2ccff3a · 2025-01-16T13:14:58.000+08:00
diff --git a/packages/plugins/eslint-plugin-react-dom/src/rules/no-missing-button-type.ts b/packages/plugins/eslint-plugin-react-dom/src/rules/no-missing-button-type.ts
@@ -53,7 +53,7 @@ export default createRule<[], MessageID>({
         );
         if (attributeNode != null) {
           const attributeScope = context.sourceCode.getScope(attributeNode);
-          const attributeValue = JSX.getAttributeValue(propNameOnJsx, attributeNode, attributeScope);
+          const attributeValue = JSX.getAttributeValue(attributeNode, propNameOnJsx, attributeScope);
           if (attributeValue.kind === "some" && typeof attributeValue.value !== "string") {
             context.report({
               messageId: "noMissingButtonType",
diff --git a/packages/plugins/eslint-plugin-react-dom/src/rules/no-missing-iframe-sandbox.ts b/packages/plugins/eslint-plugin-react-dom/src/rules/no-missing-iframe-sandbox.ts
@@ -78,7 +78,7 @@ export default createRule<[], MessageID>({
         );
         if (attributeNode != null) {
           const attributeScope = context.sourceCode.getScope(attributeNode);
-          const attributeValue = JSX.getAttributeValue(propNameOnJsx, attributeNode, attributeScope);
+          const attributeValue = JSX.getAttributeValue(attributeNode, propNameOnJsx, attributeScope);
           if (attributeValue.kind === "some" && hasValidSandBox(attributeValue.value)) return;
           context.report({
             messageId: "noMissingIframeSandbox",
diff --git a/packages/plugins/eslint-plugin-react-dom/src/rules/no-script-url.ts b/packages/plugins/eslint-plugin-react-dom/src/rules/no-script-url.ts
@@ -38,7 +38,8 @@ export default createRule<[], MessageID>({
           return;
         }
         const attributeScope = context.sourceCode.getScope(node);
-        const attributeValue = JSX.getAttributeValue(JSX.toString(node.name), node, attributeScope);
+        const attributeName = JSX.getAttributeName(node);
+        const attributeValue = JSX.getAttributeValue(node, attributeName, attributeScope);
         if (attributeValue.kind === "none" || typeof attributeValue.value !== "string") return;
         if (RE_JAVASCRIPT_PROTOCOL.test(attributeValue.value)) {
           context.report({
diff --git a/packages/plugins/eslint-plugin-react-dom/src/rules/no-unsafe-iframe-sandbox.ts b/packages/plugins/eslint-plugin-react-dom/src/rules/no-unsafe-iframe-sandbox.ts
@@ -63,7 +63,7 @@ export default createRule<[], MessageID>({
         );
         if (attributeNode != null) {
           const attributeScope = context.sourceCode.getScope(attributeNode);
-          const attributeValue = JSX.getAttributeValue(propNameOnJsx, attributeNode, attributeScope);
+          const attributeValue = JSX.getAttributeValue(attributeNode, propNameOnJsx, attributeScope);
           if (attributeValue.kind === "some" && !hasSafeSandbox(attributeValue.value)) {
             context.report({
               messageId: "noUnsafeIframeSandbox",
diff --git a/packages/plugins/eslint-plugin-react-dom/src/rules/no-unsafe-target-blank.ts b/packages/plugins/eslint-plugin-react-dom/src/rules/no-unsafe-target-blank.ts
@@ -68,7 +68,7 @@ export default createRule<[], MessageID>({
           );
           if (attributeNode == null) return customComponentProp?.defaultValue;
           const attributeScope = context.sourceCode.getScope(attributeNode);
-          const attributeValue = JSX.getAttributeValue(propNameOnJsx, attributeNode, attributeScope);
+          const attributeValue = JSX.getAttributeValue(attributeNode, propNameOnJsx, attributeScope);
           if (attributeValue.kind === "some" && typeof attributeValue.value === "string") {
             return attributeValue.value;
           }
diff --git a/packages/plugins/eslint-plugin-react-dom/src/utils/get-element-name-on-jsx-and-dom.ts b/packages/plugins/eslint-plugin-react-dom/src/utils/get-element-name-on-jsx-and-dom.ts
@@ -24,7 +24,7 @@ export function getElementNameOnJsxAndDom(
     node.openingElement.attributes,
   );
   if (attributeNode == null) return [name, name];
-  const polymorphicPropValue = JSX.getAttributeValue(polymorphicPropName, attributeNode, initialScope);
+  const polymorphicPropValue = JSX.getAttributeValue(attributeNode, polymorphicPropName, initialScope);
   if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {
     return [name, polymorphicPropValue.value];
   }
diff --git a/packages/utilities/jsx/src/get-attribute-name.ts b/packages/utilities/jsx/src/get-attribute-name.ts
diff --git a/packages/utilities/jsx/src/get-attribute-value.ts b/packages/utilities/jsx/src/get-attribute-value.ts
@@ -6,14 +6,14 @@ import { match, P } from "ts-pattern";
 
 /**
  * Get a StaticValue of the attribute value
- * @param name The name of the attribute
  * @param node The JSX attribute node
+ * @param name The name of the attribute
  * @param initialScope The initial scope to use
  * @returns The StaticValue of the attribute value
  */
 export function getAttributeValue(
-  name: string,
   node: TSESTree.JSXAttribute | TSESTree.JSXSpreadAttribute,
+  name: string,
   initialScope: Scope,
 ): Exclude<VAR.LazyValue, { kind: "lazy" }> {
   switch (node.type) {
diff --git a/packages/utilities/jsx/src/get-attribute.ts b/packages/utilities/jsx/src/get-attribute.ts
@@ -4,7 +4,7 @@ import type { Scope } from "@typescript-eslint/scope-manager";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 import type { TSESTree } from "@typescript-eslint/utils";
 
-import { getAttributeName } from "./attribute-name";
+import { getAttributeName } from "./get-attribute-name";
 
 /**
  * Get the JSX attribute node with the given name
diff --git a/packages/utilities/jsx/src/get-element-name.ts b/packages/utilities/jsx/src/get-element-name.ts
diff --git a/packages/utilities/jsx/src/index.ts b/packages/utilities/jsx/src/index.ts
@@ -1,8 +1,8 @@
-export * from "./attribute-name";
-export * from "./element-name";
 export * from "./find-parent-attribute";
-export * from "./get-attribute";
+export * from "./get-attribute-name";
 export * from "./get-attribute-value";
+export * from "./get-attribute";
+export * from "./get-element-name";
 export * from "./has-attribute";
 export * from "./is-element";
 export * from "./is-jsx-value";

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export default createRule<[], MessageID>({`
`68`	`68`	`);`
`69`	`69`	`if (attributeNode == null) return customComponentProp?.defaultValue;`
`70`	`70`	`const attributeScope = context.sourceCode.getScope(attributeNode);`
`71`		`- const attributeValue = JSX.getAttributeValue(propNameOnJsx, attributeNode, attributeScope);`
	`71`	`+ const attributeValue = JSX.getAttributeValue(attributeNode, propNameOnJsx, attributeScope);`
`72`	`72`	`if (attributeValue.kind === "some" && typeof attributeValue.value === "string") {`
`73`	`73`	`return attributeValue.value;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export function getElementNameOnJsxAndDom(`
`24`	`24`	`node.openingElement.attributes,`
`25`	`25`	`);`
`26`	`26`	`if (attributeNode == null) return [name, name];`
`27`		`- const polymorphicPropValue = JSX.getAttributeValue(polymorphicPropName, attributeNode, initialScope);`
	`27`	`+ const polymorphicPropValue = JSX.getAttributeValue(attributeNode, polymorphicPropName, initialScope);`
`28`	`28`	`if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {`
`29`	`29`	`return [name, polymorphicPropValue.value];`
`30`	`30`	`}`