refactor: minor improvements

Author: Rel1cx

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

@@ -1,5 +1,5 @@
-export const RE_HOOK_NAME = /^use[A-Z\d].*$/u;
+export const RE_HOOK_NAME = /^use[A-Z\d]/u;
 
 export function isValidReactHookName(name: string) {
-  return !!name && RE_HOOK_NAME.test(name);
+  return name === "use" || RE_HOOK_NAME.test(name);
 }

packages/eslint-plugin-naming-convention/src/rules/component-name.ts

@@ -13,13 +13,15 @@ export const RULE_NAME = "component-name";
 
 export type MessageID = ConstantCase<typeof RULE_NAME>;
 
+type Case = "CONSTANT_CASE" | "PascalCase";
+
 /* eslint-disable no-restricted-syntax */
 type Options = readonly [
   | {
     excepts?: readonly string[];
-    rule?: "CONSTANT_CASE" | "PascalCase";
+    rule?: Case;
   }
-  | string
+  | Case
   | undefined,
 ];
 /* eslint-enable no-restricted-syntax */
@@ -76,12 +78,12 @@ export default createRule<Options, MessageID>({
     const excepts = P.isString(options) ? [] : options.excepts ?? [];
     const rule = P.isString(options) ? options : options.rule ?? "PascalCase";
 
+    const validator = getCaseValidator(rule, [...excepts]);
+    const validate = (name: string) => validator.validate(name);
+
     const collector = componentCollector(context);
     const collectorLegacy = componentCollectorLegacy(context);
 
-    const validator = getCaseValidator(rule, [...excepts]);
-    const validate = (n: string) => validator.validate(n);
-
     return {
       ...collector.listeners,
       ...collectorLegacy.listeners,

packages/eslint-plugin-naming-convention/src/rules/filename.ts

@@ -3,7 +3,6 @@ import { O, P } from "@eslint-react/tools";
 import { getCaseValidator } from "@eslint-react/utils";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 import type { JSONSchema4 } from "@typescript-eslint/utils/json-schema";
-import type { ReportDescriptor } from "@typescript-eslint/utils/ts-eslint";
 import path from "pathe";
 
 import { createRule } from "../utils";
@@ -15,14 +14,16 @@ export type MessageID =
   | "FILENAME_CASE_MISMATCH_SUGGESTION"
   | "FILENAME_EMPTY";
 
+type Case = "PascalCase" | "camelCase" | "kebab-case" | "snake_case";
+
 /* eslint-disable no-restricted-syntax */
 type Options = readonly [
   | {
     extensions?: readonly string[];
     excepts?: readonly string[];
-    rule?: "PascalCase" | "camelCase" | "kebab-case" | "snake_case";
+    rule?: Case;
   }
-  | string
+  | Case
   | undefined,
 ];
 /* eslint-enable no-restricted-syntax */
@@ -100,8 +101,8 @@ export default createRule<Options, MessageID>({
     }
 
     const validator = getCaseValidator(rule, [...excepts]);
-    const validate = (n: string) => validator.validate(n);
-    const getRecommendedName = (n: string) => validator.getRecommendedName(n);
+    const validate = (name: string) => validator.validate(name);
+    const getRecommendedName = (name: string) => validator.getRecommendedName(name);
 
     return {
       Program(node) {
@@ -116,27 +117,27 @@ export default createRule<Options, MessageID>({
         }
 
         const maybeSuggestion = O.liftThrowable(getRecommendedName)(basename);
-        const descriptor: ReportDescriptor<MessageID> = O.match(maybeSuggestion, {
-          onNone: () => ({
-            data: {
-              name: basename,
-              rule,
-            },
-            messageId: "FILENAME_CASE_MISMATCH",
-            node,
-          }),
-          onSome: (value) => ({
+
+        if (O.isNone(maybeSuggestion)) {
+          return context.report({
             data: {
               name: filename,
               rule,
-              suggestion: `${[value, ...rest].join(".")}`,
             },
-            messageId: "FILENAME_CASE_MISMATCH_SUGGESTION",
+            messageId: "FILENAME_CASE_MISMATCH",
             node,
-          }),
-        });
+          });
+        }
 
-        context.report(descriptor);
+        context.report({
+          data: {
+            name: filename,
+            rule,
+            suggestion: `${[maybeSuggestion.value, ...rest].join(".")}`,
+          },
+          messageId: "FILENAME_CASE_MISMATCH_SUGGESTION",
+          node,
+        });
       },
     };
   },

packages/utils/docs/README.md

@@ -16,6 +16,7 @@
 ### Functions
 
 - [createRuleForPlugin](README.md#createruleforplugin)
+- [getCaseConverter](README.md#getcaseconverter)
 - [getCaseValidator](README.md#getcasevalidator)
 - [getRule](README.md#getrule)
 - [mergeConfigs](README.md#mergeconfigs)
@@ -74,6 +75,22 @@ Function to create a rule with the docs URL format.
 
 ---
 
+### getCaseConverter
+
+▸ **getCaseConverter**(`rule`): \<T\>(`str`: `T`) => `ConstantCase`\<`T`\> \| \<T\>(`str`: `T`) => `PascalCase`\<`T`\> \| \<T\>(`str`: `T`) => `CamelCase`\<`T`\> \| \<T\>(`str`: `T`) => `KebabCase`\<`T`\> \| \<T\>(`str`: `T`) => `SnakeCase`\<`T`\>
+
+#### Parameters
+
+| Name   | Type                                                                                     |
+| :----- | :--------------------------------------------------------------------------------------- |
+| `rule` | `"CONSTANT_CASE"` \| `"PascalCase"` \| `"camelCase"` \| `"kebab-case"` \| `"snake_case"` |
+
+#### Returns
+
+\<T\>(`str`: `T`) => `ConstantCase`\<`T`\> \| \<T\>(`str`: `T`) => `PascalCase`\<`T`\> \| \<T\>(`str`: `T`) => `CamelCase`\<`T`\> \| \<T\>(`str`: `T`) => `KebabCase`\<`T`\> \| \<T\>(`str`: `T`) => `SnakeCase`\<`T`\>
+
+---
+
 ### getCaseValidator
 
 ▸ **getCaseValidator**(`ruleName`, `ignorePattern?`): [`CaseValidator`](classes/CaseValidator.md)

packages/utils/src/case-convert.ts

@@ -0,0 +1,12 @@
+import { camelCase, constantCase, kebabCase, pascalCase, snakeCase } from "string-ts";
+
+const converters = {
+  CONSTANT_CASE: constantCase,
+  PascalCase: pascalCase,
+  camelCase,
+  "kebab-case": kebabCase,
+  snake_case: snakeCase,
+} as const;
+
+// eslint-disable-next-line security/detect-object-injection
+export const getCaseConverter = (rule: keyof typeof converters) => converters[rule];

packages/utils/src/index.ts

@@ -1,3 +1,4 @@
+export * from "./case-convert";
 export * from "./case-validator";
 export * from "./create-rule";
 export * from "./merge-configs";