Merge branch 'main' into context-name

Rel1cx · web-flow · commit bc89f3554510 · 2025-02-28T21:37:14.000+08:00
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-mount.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-mount.ts
@@ -17,7 +17,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentWillMount(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentWillMount";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-receive-props.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-receive-props.ts
@@ -17,7 +17,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentWillUpdate(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentWillReceiveProps";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-component-will-update.ts
@@ -17,7 +17,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentWillUpdate(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentWillUpdate";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-direct-mutation-state.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-direct-mutation-state.ts
@@ -47,7 +47,7 @@ function isConstructorFunction(
   node: TSESTree.Node,
 ): node is TSESTree.FunctionDeclaration | TSESTree.FunctionExpression {
   return AST.isOneOf([T.FunctionDeclaration, T.FunctionExpression])(node)
-    && AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node.parent)
+    && AST.isMethodOrProperty(node.parent)
     && node.parent.key.type === T.Identifier
     && node.parent.key.name === "constructor";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-redundant-should-component-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-redundant-should-component-update.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isShouldComponentUpdate(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "shouldComponentUpdate";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-mount.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-mount.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentDidMount(node: TSESTree.Node) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentDidMount";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-update.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentDidUpdate(node: TSESTree.Node) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentDidUpdate";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-will-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-will-update.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isComponentWillUpdate(node: TSESTree.Node) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "componentWillUpdate";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-mount.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-mount.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isUnsafeComponentWillMount(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "UNSAFE_componentWillMount";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-receive-props.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-receive-props.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isUnsafeComponentWillReceiveProps(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "UNSAFE_componentWillReceiveProps";
 }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-unsafe-component-will-update.ts
@@ -16,7 +16,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function isUnsafeComponentWillUpdate(node: TSESTree.ClassElement) {
-  return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)
+  return AST.isMethodOrProperty(node)
     && node.key.type === T.Identifier
     && node.key.name === "UNSAFE_componentWillUpdate";
 }
diff --git a/packages/utilities/ast/src/get-function-identifier.ts b/packages/utilities/ast/src/get-function-identifier.ts
@@ -11,7 +11,7 @@ import { _ } from "@eslint-react/eff";
 import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-import { isOneOf, isTsAssertionExpression } from "./is";
+import { isMethodOrProperty, isTsAssertionExpression } from "./is";
 import type { TSESTreeFunction } from "./types";
 
 export function getFunctionIdentifier(node: TSESTree.Expression | TSESTreeFunction): TSESTree.Identifier | _ {
@@ -40,7 +40,7 @@ export function getFunctionIdentifier(node: TSESTree.Expression | TSESTreeFuncti
       return node.parent.key;
     // class {MaybeComponent = () => {}}
     // class {MaybeComponent() {}}
-    case isOneOf([T.MethodDefinition, T.PropertyDefinition])(node.parent)
+    case isMethodOrProperty(node.parent)
       && node.parent.value === node
       && node.parent.key.type === T.Identifier:
       return node.parent.key;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export const RULE_FEATURES = [`
`17`	`17`	`export type MessageID = CamelCase<typeof RULE_NAME>;`
`18`	`18`
`19`	`19`	`function isComponentWillMount(node: TSESTree.ClassElement) {`
`20`		`- return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)`
	`20`	`+ return AST.isMethodOrProperty(node)`
`21`	`21`	`&& node.key.type === T.Identifier`
`22`	`22`	`&& node.key.name === "componentWillMount";`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ function isConstructorFunction(`
`47`	`47`	`node: TSESTree.Node,`
`48`	`48`	`): node is TSESTree.FunctionDeclaration \| TSESTree.FunctionExpression {`
`49`	`49`	`return AST.isOneOf([T.FunctionDeclaration, T.FunctionExpression])(node)`
`50`		`- && AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node.parent)`
	`50`	`+ && AST.isMethodOrProperty(node.parent)`
`51`	`51`	`&& node.parent.key.type === T.Identifier`
`52`	`52`	`&& node.parent.key.name === "constructor";`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export const RULE_FEATURES = [`
`16`	`16`	`export type MessageID = CamelCase<typeof RULE_NAME>;`
`17`	`17`
`18`	`18`	`function isShouldComponentUpdate(node: TSESTree.ClassElement) {`
`19`		`- return AST.isOneOf([T.MethodDefinition, T.PropertyDefinition])(node)`
	`19`	`+ return AST.isMethodOrProperty(node)`
`20`	`20`	`&& node.key.type === T.Identifier`
`21`	`21`	`&& node.key.name === "shouldComponentUpdate";`
`22`	`22`	`}`