refactor: improve settings handling (#1080)

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.additionalHooks;
   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/shared/docs/functions/getReactVersion.md

@@ -12,7 +12,7 @@
 
 ### fallback
 
-`string` = `"19.0.0"`
+`string`
 
 ## Returns
 

packages/shared/docs/functions/normalizeSettings.md

@@ -128,10 +128,6 @@
 
 `object`
 
-### additionalComponents
-
-> `readonly` **additionalComponents**: `object`[]
-
 ### additionalHooks
 
 > **additionalHooks**: `object`
@@ -212,6 +208,10 @@
 
 > `optional` **useTransition**: `string`[]
 
+### components
+
+> `readonly` **components**: `object`[]
+
 ### importSource
 
 > **importSource**: `string`

packages/shared/docs/interfaces/ESLintReactSettingsNormalized.md

@@ -8,12 +8,6 @@
 
 ## Properties
 
-### additionalComponents
-
-> **additionalComponents**: [`CustomComponentNormalized`](CustomComponentNormalized.md)[]
-
-***
-
 ### additionalHooks
 
 > **additionalHooks**: `object`
@@ -96,6 +90,12 @@
 
 ***
 
+### components
+
+> **components**: [`CustomComponentNormalized`](CustomComponentNormalized.md)[]
+
+***
+
 ### importSource
 
 > **importSource**: `string`

packages/shared/src/get-react-version.ts

@@ -5,7 +5,7 @@ import { match, P } from "ts-pattern";
 
 const _require = module.createRequire(import.meta.url);
 
-export function getReactVersion(fallback = "19.0.0"): string {
+export function getReactVersion(fallback: string): string {
   try {
     return match(_require("react"))
       .with({ version: P.select(P.string) }, identity)

packages/shared/src/index.ts

@@ -2,5 +2,4 @@ export * from "./constants";
 export * from "./get-doc-url";
 export * from "./get-id";
 export * from "./get-react-version";
-export * from "./schemas";
 export * from "./settings";