refactor: improve settings handling

Author: Rel1cx

packages/core/src/hook/hook-is.ts

@@ -3,10 +3,9 @@ import type { RuleContext } from "@eslint-react/kit";
 import type { TSESTree } from "@typescript-eslint/types";
 import * as AST from "@eslint-react/ast";
 import { constFalse, flip } from "@eslint-react/eff";
-import { coerceSettings } from "@eslint-react/shared";
+import { coerceSettings, DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-import { DEFAULT_ESLINT_REACT_SETTINGS } from "../../../shared/src/schemas";
 import { isInitializedFromReact } from "../utils";
 import { isReactHookName } from "./hook-name";
 

packages/plugins/eslint-plugin-react-dom/src/utils/create-jsx-element-resolver.ts

@@ -5,14 +5,11 @@ import * as ER from "@eslint-react/core";
 import { getSettingsFromContext } from "@eslint-react/shared";
 
 export function createJsxElementResolver(context: RuleContext) {
-  const {
-    additionalComponents,
-    polymorphicPropName,
-  } = getSettingsFromContext(context);
+  const { components, polymorphicPropName } = getSettingsFromContext(context);
   return {
     resolve(node: TSESTree.JSXElement) {
       const name = ER.getElementType(context, node);
-      const component = additionalComponents
+      const component = components
         .findLast((c) => c.name === name || c.re.test(name));
       const result = {
         attributes: component?.attributes ?? [],

packages/plugins/eslint-plugin-react-hooks-extra/src/hooks/use-no-direct-set-state-in-use-effect.ts

@@ -46,12 +46,12 @@ export function useNoDirectSetStateInUseEffect<Ctx extends RuleContext>(
 ): useNoDirectSetStateInUseEffect.ReturnType {
   const { onViolation, useEffectKind } = options;
   const settings = getSettingsFromContext(context);
-  const additionalHooks = settings.additionalHooks;
+  const hooks = settings.hooks;
   const getText = (n: TSESTree.Node) => context.sourceCode.getText(n);
-  const isUseEffectLikeCall = ER.isReactHookCallWithNameAlias(context, useEffectKind, additionalHooks[useEffectKind]);
-  const isUseStateCall = ER.isReactHookCallWithNameAlias(context, "useState", additionalHooks.useState);
-  const isUseMemoCall = ER.isReactHookCallWithNameAlias(context, "useMemo", additionalHooks.useMemo);
-  const isUseCallbackCall = ER.isReactHookCallWithNameAlias(context, "useCallback", additionalHooks.useCallback);
+  const isUseEffectLikeCall = ER.isReactHookCallWithNameAlias(context, useEffectKind, hooks[useEffectKind]);
+  const isUseStateCall = ER.isReactHookCallWithNameAlias(context, "useState", hooks.useState);
+  const isUseMemoCall = ER.isReactHookCallWithNameAlias(context, "useMemo", hooks.useMemo);
+  const isUseCallbackCall = ER.isReactHookCallWithNameAlias(context, "useCallback", hooks.useCallback);
   const isSetStateCall = isSetFunctionCall(context, settings);
   const isIdFromUseStateCall = isFromUseStateCall(context, settings);
 

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-unnecessary-use-callback.ts

@@ -39,7 +39,7 @@ export default createRule<[], MessageID>({
 
 export function create(context: RuleContext<MessageID, []>): RuleListener {
   if (!context.sourceCode.text.includes("use")) return {};
-  const alias = getSettingsFromContext(context).additionalHooks.useCallback ?? [];
+  const alias = getSettingsFromContext(context).hooks.useCallback ?? [];
   const isUseCallbackCall = ER.isReactHookCallWithNameAlias(context, "useCallback", alias);
   return {
     CallExpression(node) {

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-unnecessary-use-memo.ts

@@ -38,7 +38,7 @@ export default createRule<[], MessageID>({
 
 export function create(context: RuleContext<MessageID, []>): RuleListener {
   if (!context.sourceCode.text.includes("use")) return {};
-  const alias = getSettingsFromContext(context).additionalHooks.useMemo ?? [];
+  const alias = getSettingsFromContext(context).hooks.useMemo ?? [];
   const isUseMemoCall = ER.isReactHookCallWithNameAlias(context, "useMemo", alias);
   return {
     CallExpression(node) {

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/prefer-use-state-lazy-initialization.ts

@@ -43,7 +43,7 @@ export default createRule<[], MessageID>({
 });
 
 export function create(context: RuleContext<MessageID, []>): RuleListener {
-  const alias = getSettingsFromContext(context).additionalHooks.useState ?? [];
+  const alias = getSettingsFromContext(context).hooks.useState ?? [];
   const isUseStateCall = ER.isReactHookCallWithNameAlias(context, "useState", alias);
   return {
     CallExpression(node) {

packages/plugins/eslint-plugin-react-hooks-extra/src/utils/is-from-hook-call.ts

@@ -34,7 +34,7 @@ export function isFromHookCall(
   settings: ESLintReactSettingsNormalized,
   predicate: (topLevelId: TSESTree.Identifier, call: TSESTree.CallExpression) => boolean = constTrue,
 ) {
-  const hookAlias = settings.additionalHooks[name] ?? [];
+  const hookAlias = settings.hooks[name] ?? [];
   // eslint-disable-next-line function/function-return-boolean
   return (topLevelId: TSESTree.Identifier) => {
     const variable = VAR.findVariable(topLevelId, context.sourceCode.getScope(topLevelId));

packages/plugins/eslint-plugin-react-naming-convention/src/rules/use-state.ts

@@ -36,7 +36,7 @@ export default createRule<[], MessageID>({
 });
 
 export function create(context: RuleContext<MessageID, []>): RuleListener {
-  const alias = getSettingsFromContext(context).additionalHooks.useState ?? [];
+  const alias = getSettingsFromContext(context).hooks.useState ?? [];
   const isUseStateCall = ER.isReactHookCallWithNameAlias(context, "useState", alias);
   return {
     CallExpression(node: TSESTree.CallExpression) {

packages/shared/docs/functions/normalizeSettings.md

@@ -128,87 +128,87 @@
 
 `object`
 
-### additionalComponents
+### components
 
-> `readonly` **additionalComponents**: `object`[]
+> `readonly` **components**: `object`[]
 
-### additionalHooks
+### hooks
 
-> **additionalHooks**: `object`
+> `readonly` **hooks**: `object` = `additionalHooks`
 
-#### additionalHooks.use?
+#### hooks.use?
 
 > `optional` **use**: `string`[]
 
-#### additionalHooks.useActionState?
+#### hooks.useActionState?
 
 > `optional` **useActionState**: `string`[]
 
-#### additionalHooks.useCallback?
+#### hooks.useCallback?
 
 > `optional` **useCallback**: `string`[]
 
-#### additionalHooks.useContext?
+#### hooks.useContext?
 
 > `optional` **useContext**: `string`[]
 
-#### additionalHooks.useDebugValue?
+#### hooks.useDebugValue?
 
 > `optional` **useDebugValue**: `string`[]
 
-#### additionalHooks.useDeferredValue?
+#### hooks.useDeferredValue?
 
 > `optional` **useDeferredValue**: `string`[]
 
-#### additionalHooks.useEffect?
+#### hooks.useEffect?
 
 > `optional` **useEffect**: `string`[]
 
-#### additionalHooks.useFormStatus?
+#### hooks.useFormStatus?
 
 > `optional` **useFormStatus**: `string`[]
 
-#### additionalHooks.useId?
+#### hooks.useId?
 
 > `optional` **useId**: `string`[]
 
-#### additionalHooks.useImperativeHandle?
+#### hooks.useImperativeHandle?
 
 > `optional` **useImperativeHandle**: `string`[]
 
-#### additionalHooks.useInsertionEffect?
+#### hooks.useInsertionEffect?
 
 > `optional` **useInsertionEffect**: `string`[]
 
-#### additionalHooks.useLayoutEffect?
+#### hooks.useLayoutEffect?
 
 > `optional` **useLayoutEffect**: `string`[]
 
-#### additionalHooks.useMemo?
+#### hooks.useMemo?
 
 > `optional` **useMemo**: `string`[]
 
-#### additionalHooks.useOptimistic?
+#### hooks.useOptimistic?
 
 > `optional` **useOptimistic**: `string`[]
 
-#### additionalHooks.useReducer?
+#### hooks.useReducer?
 
 > `optional` **useReducer**: `string`[]
 
-#### additionalHooks.useRef?
+#### hooks.useRef?
 
 > `optional` **useRef**: `string`[]
 
-#### additionalHooks.useState?
+#### hooks.useState?
 
 > `optional` **useState**: `string`[]
 
-#### additionalHooks.useSyncExternalStore?
+#### hooks.useSyncExternalStore?
 
 > `optional` **useSyncExternalStore**: `string`[]
 
-#### additionalHooks.useTransition?
+#### hooks.useTransition?
 
 > `optional` **useTransition**: `string`[]
 

packages/shared/docs/interfaces/ESLintReactSettingsNormalized.md

@@ -8,15 +8,15 @@
 
 ## Properties
 
-### additionalComponents
+### components
 
-> **additionalComponents**: [`CustomComponentNormalized`](CustomComponentNormalized.md)[]
+> **components**: [`CustomComponentNormalized`](CustomComponentNormalized.md)[]
 
 ***
 
-### additionalHooks
+### hooks
 
-> **additionalHooks**: `object`
+> **hooks**: `object`
 
 #### use?