eslint-plugin-react-naming-convention 1.26.3-beta.6 → 1.26.3-beta.7

package/dist/index.d.mts

@@ -1,8 +1,10 @@
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 
-type MessageID$1 = "filenameExtensionInvalid" | "filenameExtensionUnexpected";
+type MessageID$2 = "useJsxFileExtension" | "useJsxFileExtensionAsNeeded";
 
-type MessageID = "filenameCaseMismatchSuggestion" | "filenameEmpty";
+type MessageID$1 = "filenameCaseMismatchSuggestion" | "filenameEmpty";
+
+type MessageID = "usePascalCase" | "useConstantCase";
 
 declare const _default: {
     readonly meta: {
@@ -10,24 +12,24 @@ declare const _default: {
         readonly version: string;
     };
     readonly rules: {
-        readonly "component-name": _typescript_eslint_utils_ts_eslint.RuleModule<"componentName", readonly [("CONSTANT_CASE" | "PascalCase") | {
+        readonly "component-name": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID, readonly [("CONSTANT_CASE" | "PascalCase") | {
             allowAllCaps?: boolean;
             allowLeadingUnderscore?: boolean;
             allowNamespace?: boolean;
             excepts?: readonly string[];
             rule?: "CONSTANT_CASE" | "PascalCase";
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly filename: _typescript_eslint_utils_ts_eslint.RuleModule<MessageID, readonly [("PascalCase" | "camelCase" | "kebab-case" | "snake_case") | {
+        readonly filename: _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$1, readonly [("PascalCase" | "camelCase" | "kebab-case" | "snake_case") | {
             excepts?: readonly string[];
             extensions?: readonly string[];
             rule?: "PascalCase" | "camelCase" | "kebab-case" | "snake_case";
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly "filename-extension": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$1, readonly [("always" | "as-needed") | {
+        readonly "filename-extension": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$2, readonly [("always" | "as-needed") | {
             allow?: "always" | "as-needed";
             extensions?: readonly string[];
             ignoreFilesWithoutCode?: boolean;
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly "use-state": _typescript_eslint_utils_ts_eslint.RuleModule<"useState", [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
+        readonly "use-state": _typescript_eslint_utils_ts_eslint.RuleModule<"unexpected", [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
     };
 };
 

package/dist/index.d.ts

@@ -1,8 +1,10 @@
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 
-type MessageID$1 = "filenameExtensionInvalid" | "filenameExtensionUnexpected";
+type MessageID$2 = "useJsxFileExtension" | "useJsxFileExtensionAsNeeded";
 
-type MessageID = "filenameCaseMismatchSuggestion" | "filenameEmpty";
+type MessageID$1 = "filenameCaseMismatchSuggestion" | "filenameEmpty";
+
+type MessageID = "usePascalCase" | "useConstantCase";
 
 declare const _default: {
     readonly meta: {
@@ -10,24 +12,24 @@ declare const _default: {
         readonly version: string;
     };
     readonly rules: {
-        readonly "component-name": _typescript_eslint_utils_ts_eslint.RuleModule<"componentName", readonly [("CONSTANT_CASE" | "PascalCase") | {
+        readonly "component-name": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID, readonly [("CONSTANT_CASE" | "PascalCase") | {
             allowAllCaps?: boolean;
             allowLeadingUnderscore?: boolean;
             allowNamespace?: boolean;
             excepts?: readonly string[];
             rule?: "CONSTANT_CASE" | "PascalCase";
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly filename: _typescript_eslint_utils_ts_eslint.RuleModule<MessageID, readonly [("PascalCase" | "camelCase" | "kebab-case" | "snake_case") | {
+        readonly filename: _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$1, readonly [("PascalCase" | "camelCase" | "kebab-case" | "snake_case") | {
             excepts?: readonly string[];
             extensions?: readonly string[];
             rule?: "PascalCase" | "camelCase" | "kebab-case" | "snake_case";
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly "filename-extension": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$1, readonly [("always" | "as-needed") | {
+        readonly "filename-extension": _typescript_eslint_utils_ts_eslint.RuleModule<MessageID$2, readonly [("always" | "as-needed") | {
             allow?: "always" | "as-needed";
             extensions?: readonly string[];
             ignoreFilesWithoutCode?: boolean;
         } | undefined], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
-        readonly "use-state": _typescript_eslint_utils_ts_eslint.RuleModule<"useState", [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
+        readonly "use-state": _typescript_eslint_utils_ts_eslint.RuleModule<"unexpected", [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener>;
     };
 };
 

package/dist/index.js

@@ -36,7 +36,7 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 
 // package.json
 var name = "eslint-plugin-react-naming-convention";
-var version = "1.26.3-beta.6";
+var version = "1.26.3-beta.7";
 var createRule = shared.createRuleForPlugin("naming-convention");
 
 // src/rules/component-name.ts
@@ -90,26 +90,32 @@ function normalizeOptions(options) {
     excepts: opts.excepts?.map((pattern) => new RegExp(pattern, "u")) ?? []
   };
 }
-function validate(name2, options) {
-  if (name2 == null) return false;
-  if (options.excepts.some((regex) => regex.test(name2))) {
-    return true;
+function getViolationMessage(name2, options) {
+  if (name2 == null) return eff._;
+  const {
+    allowAllCaps = false,
+    allowLeadingUnderscore = false,
+    allowNamespace = false,
+    excepts,
+    rule
+  } = options;
+  if (excepts.some((regex) => regex.test(name2))) {
+    return eff._;
   }
   let normalized = name2.normalize("NFKD").replace(/[\u0300-\u036F]/g, "");
   normalized = normalized.split(".").at(-1) ?? normalized;
-  const { allowLeadingUnderscore = false, allowNamespace = false } = options;
   if (allowNamespace) {
     normalized = normalized.replace(":", "");
   }
   if (allowLeadingUnderscore) {
     normalized = normalized.replace(/^_/, "");
   }
-  return tsPattern.match(options.rule).with("CONSTANT_CASE", () => shared.RE_CONSTANT_CASE.test(normalized)).with("PascalCase", () => {
+  return tsPattern.match(rule).with("CONSTANT_CASE", () => shared.RE_CONSTANT_CASE.test(normalized) ? eff._ : "useConstantCase").with("PascalCase", () => {
     if (normalized.length > 3 && /^[A-Z]+$/u.test(normalized)) {
-      return options.allowAllCaps ?? false;
+      return allowAllCaps ? eff._ : "usePascalCase";
     }
-    return shared.RE_PASCAL_CASE.test(normalized);
-  }).otherwise(eff.constFalse);
+    return shared.RE_PASCAL_CASE.test(normalized) ? eff._ : "usePascalCase";
+  }).otherwise(() => eff._);
 }
 var component_name_default = createRule({
   meta: {
@@ -119,7 +125,8 @@ var component_name_default = createRule({
       description: "enforce component naming convention to 'PascalCase' or 'CONSTANT_CASE'"
     },
     messages: {
-      componentName: "A component name must be in {{case}}."
+      useConstantCase: "Component name '{{name}}' must be in CONSTANT_CASE.",
+      usePascalCase: "Component name '{{name}}' must be in PascalCase."
     },
     schema
   },
@@ -136,14 +143,13 @@ var component_name_default = createRule({
         if (/^[a-z]/u.test(name2)) {
           return;
         }
-        if (validate(name2, options)) {
-          return;
-        }
+        const violation = getViolationMessage(name2, options);
+        if (violation == null) return;
         context.report({
-          messageId: "componentName",
+          messageId: violation,
           node,
           data: {
-            case: options.rule
+            name: name2
           }
         });
       },
@@ -153,29 +159,30 @@ var component_name_default = createRule({
         for (const { node: component } of functionComponents.values()) {
           const id = AST__namespace.getFunctionIdentifier(component);
           if (id?.name == null) continue;
-          if (validate(id.name, options)) {
-            continue;
-          }
+          const name2 = id.name;
+          const violation = getViolationMessage(name2, options);
+          if (violation == null) continue;
           context.report({
-            messageId: "componentName",
+            messageId: violation,
             node: id,
             data: {
-              case: options.rule
+              name: name2
             }
           });
         }
         for (const { node: component } of classComponents.values()) {
           const id = AST__namespace.getClassIdentifier(component);
           if (id?.name == null) continue;
-          if (!validate(id.name, options)) {
-            context.report({
-              messageId: "componentName",
-              node: id,
-              data: {
-                case: options.rule
-              }
-            });
-          }
+          const name2 = id.name;
+          const violation = getViolationMessage(name2, options);
+          if (violation == null) continue;
+          context.report({
+            messageId: violation,
+            node: id,
+            data: {
+              case: options.rule
+            }
+          });
         }
       }
     };
@@ -238,7 +245,7 @@ var filename_default = createRule({
     const options = context.options[0] ?? defaultOptions2[0];
     const rule = typeof options === "string" ? options : options.rule ?? "PascalCase";
     const excepts = typeof options === "string" ? [] : options.excepts ?? [];
-    function validate2(name2, casing = rule, ignores = excepts) {
+    function validate(name2, casing = rule, ignores = excepts) {
       const shouldIgnore = ignores.map((pattern) => new RegExp(pattern, "u")).some((pattern) => pattern.test(name2));
       if (shouldIgnore) return true;
       return tsPattern.match(casing).with("PascalCase", () => shared.RE_PASCAL_CASE.test(name2)).with("camelCase", () => shared.RE_CAMEL_CASE.test(name2)).with("kebab-case", () => shared.RE_KEBAB_CASE.test(name2)).with("snake_case", () => shared.RE_SNAKE_CASE.test(name2)).exhaustive();
@@ -253,7 +260,7 @@ var filename_default = createRule({
           context.report({ messageId: "filenameEmpty", node });
           return;
         }
-        if (validate2(basename)) {
+        if (validate(basename)) {
           return;
         }
         context.report({
@@ -314,8 +321,8 @@ var filename_extension_default = createRule({
       description: "enforce naming convention for JSX file extensions"
     },
     messages: {
-      filenameExtensionInvalid: "The JSX file extension is required.",
-      filenameExtensionUnexpected: "Use JSX file extension as needed."
+      useJsxFileExtension: "Use {{extensions}} file extension for JSX files.",
+      useJsxFileExtensionAsNeeded: "Do not use {{extensions}} file extension for files without JSX."
     },
     schema: schema3
   },
@@ -324,6 +331,7 @@ var filename_extension_default = createRule({
     const options = context.options[0] ?? defaultOptions3[0];
     const allow = eff.isObject(options) ? options.allow : options;
     const extensions = eff.isObject(options) && "extensions" in options ? options.extensions : defaultOptions3[0].extensions;
+    const extensionsString = extensions.map((ext) => `'${ext}'`).join(", ");
     const filename = context.filename;
     let hasJSXNode = false;
     return {
@@ -338,8 +346,11 @@ var filename_extension_default = createRule({
         const isJSXExt = extensions.includes(fileNameExt);
         if (hasJSXNode && !isJSXExt) {
           context.report({
-            messageId: "filenameExtensionInvalid",
-            node
+            messageId: "useJsxFileExtension",
+            node,
+            data: {
+              extensions: extensionsString
+            }
           });
           return;
         }
@@ -350,8 +361,11 @@ var filename_extension_default = createRule({
         }
         if (!hasJSXNode && isJSXExt && allow === "as-needed") {
           context.report({
-            messageId: "filenameExtensionUnexpected",
-            node
+            messageId: "useJsxFileExtensionAsNeeded",
+            node,
+            data: {
+              extensions: extensionsString
+            }
           });
         }
       }
@@ -371,11 +385,11 @@ var use_state_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "enforce destructuring and symmetric naming of 'useState' hook value and setter variables",
+      description: "enforce destructuring and symmetric naming of 'useState' hook value and setter",
       [Symbol.for("rule_features")]: RULE_FEATURES
     },
     messages: {
-      useState: "An useState call is not destructured into value + setter pair."
+      unexpected: "An useState call is not destructured into value + setter pair."
     },
     schema: []
   },
@@ -411,14 +425,14 @@ var use_state_default = createRule({
             const { id } = hookCall.parent;
             switch (id.type) {
               case types.AST_NODE_TYPES.Identifier: {
-                context.report({ messageId: "useState", node: id });
+                context.report({ messageId: "unexpected", node: id });
                 break;
               }
               case types.AST_NODE_TYPES.ArrayPattern: {
                 const [state, setState] = id.elements;
                 if (state?.type === types.AST_NODE_TYPES.ObjectPattern && setState?.type === types.AST_NODE_TYPES.Identifier) {
                   if (!isSetterNameLoose(setState.name)) {
-                    context.report({ messageId: "useState", node: id });
+                    context.report({ messageId: "unexpected", node: id });
                   }
                   break;
                 }
@@ -430,7 +444,7 @@ var use_state_default = createRule({
                 if (setStateName === expectedSetterName) {
                   return;
                 }
-                context.report({ messageId: "useState", node: id });
+                context.report({ messageId: "unexpected", node: id });
               }
             }
           }

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as AST from '@eslint-react/ast';
 import { useComponentCollector, useComponentCollectorLegacy, DEFAULT_COMPONENT_HINT, isUseStateCall, isReactHookCallWithNameLoose } from '@eslint-react/core';
-import { isObject, constFalse } from '@eslint-react/eff';
+import { isObject, _ } from '@eslint-react/eff';
 import * as JSX from '@eslint-react/jsx';
 import { createRuleForPlugin, getSettingsFromContext, RE_CONSTANT_CASE, RE_PASCAL_CASE, RE_CAMEL_CASE, RE_KEBAB_CASE, RE_SNAKE_CASE } from '@eslint-react/shared';
 import { match } from 'ts-pattern';
@@ -10,7 +10,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 
 // package.json
 var name = "eslint-plugin-react-naming-convention";
-var version = "1.26.3-beta.6";
+var version = "1.26.3-beta.7";
 var createRule = createRuleForPlugin("naming-convention");
 
 // src/rules/component-name.ts
@@ -64,26 +64,32 @@ function normalizeOptions(options) {
     excepts: opts.excepts?.map((pattern) => new RegExp(pattern, "u")) ?? []
   };
 }
-function validate(name2, options) {
-  if (name2 == null) return false;
-  if (options.excepts.some((regex) => regex.test(name2))) {
-    return true;
+function getViolationMessage(name2, options) {
+  if (name2 == null) return _;
+  const {
+    allowAllCaps = false,
+    allowLeadingUnderscore = false,
+    allowNamespace = false,
+    excepts,
+    rule
+  } = options;
+  if (excepts.some((regex) => regex.test(name2))) {
+    return _;
   }
   let normalized = name2.normalize("NFKD").replace(/[\u0300-\u036F]/g, "");
   normalized = normalized.split(".").at(-1) ?? normalized;
-  const { allowLeadingUnderscore = false, allowNamespace = false } = options;
   if (allowNamespace) {
     normalized = normalized.replace(":", "");
   }
   if (allowLeadingUnderscore) {
     normalized = normalized.replace(/^_/, "");
   }
-  return match(options.rule).with("CONSTANT_CASE", () => RE_CONSTANT_CASE.test(normalized)).with("PascalCase", () => {
+  return match(rule).with("CONSTANT_CASE", () => RE_CONSTANT_CASE.test(normalized) ? _ : "useConstantCase").with("PascalCase", () => {
     if (normalized.length > 3 && /^[A-Z]+$/u.test(normalized)) {
-      return options.allowAllCaps ?? false;
+      return allowAllCaps ? _ : "usePascalCase";
     }
-    return RE_PASCAL_CASE.test(normalized);
-  }).otherwise(constFalse);
+    return RE_PASCAL_CASE.test(normalized) ? _ : "usePascalCase";
+  }).otherwise(() => _);
 }
 var component_name_default = createRule({
   meta: {
@@ -93,7 +99,8 @@ var component_name_default = createRule({
       description: "enforce component naming convention to 'PascalCase' or 'CONSTANT_CASE'"
     },
     messages: {
-      componentName: "A component name must be in {{case}}."
+      useConstantCase: "Component name '{{name}}' must be in CONSTANT_CASE.",
+      usePascalCase: "Component name '{{name}}' must be in PascalCase."
     },
     schema
   },
@@ -110,14 +117,13 @@ var component_name_default = createRule({
         if (/^[a-z]/u.test(name2)) {
           return;
         }
-        if (validate(name2, options)) {
-          return;
-        }
+        const violation = getViolationMessage(name2, options);
+        if (violation == null) return;
         context.report({
-          messageId: "componentName",
+          messageId: violation,
           node,
           data: {
-            case: options.rule
+            name: name2
           }
         });
       },
@@ -127,29 +133,30 @@ var component_name_default = createRule({
         for (const { node: component } of functionComponents.values()) {
           const id = AST.getFunctionIdentifier(component);
           if (id?.name == null) continue;
-          if (validate(id.name, options)) {
-            continue;
-          }
+          const name2 = id.name;
+          const violation = getViolationMessage(name2, options);
+          if (violation == null) continue;
           context.report({
-            messageId: "componentName",
+            messageId: violation,
             node: id,
             data: {
-              case: options.rule
+              name: name2
             }
           });
         }
         for (const { node: component } of classComponents.values()) {
           const id = AST.getClassIdentifier(component);
           if (id?.name == null) continue;
-          if (!validate(id.name, options)) {
-            context.report({
-              messageId: "componentName",
-              node: id,
-              data: {
-                case: options.rule
-              }
-            });
-          }
+          const name2 = id.name;
+          const violation = getViolationMessage(name2, options);
+          if (violation == null) continue;
+          context.report({
+            messageId: violation,
+            node: id,
+            data: {
+              case: options.rule
+            }
+          });
         }
       }
     };
@@ -212,7 +219,7 @@ var filename_default = createRule({
     const options = context.options[0] ?? defaultOptions2[0];
     const rule = typeof options === "string" ? options : options.rule ?? "PascalCase";
     const excepts = typeof options === "string" ? [] : options.excepts ?? [];
-    function validate2(name2, casing = rule, ignores = excepts) {
+    function validate(name2, casing = rule, ignores = excepts) {
       const shouldIgnore = ignores.map((pattern) => new RegExp(pattern, "u")).some((pattern) => pattern.test(name2));
       if (shouldIgnore) return true;
       return match(casing).with("PascalCase", () => RE_PASCAL_CASE.test(name2)).with("camelCase", () => RE_CAMEL_CASE.test(name2)).with("kebab-case", () => RE_KEBAB_CASE.test(name2)).with("snake_case", () => RE_SNAKE_CASE.test(name2)).exhaustive();
@@ -227,7 +234,7 @@ var filename_default = createRule({
           context.report({ messageId: "filenameEmpty", node });
           return;
         }
-        if (validate2(basename)) {
+        if (validate(basename)) {
           return;
         }
         context.report({
@@ -288,8 +295,8 @@ var filename_extension_default = createRule({
       description: "enforce naming convention for JSX file extensions"
     },
     messages: {
-      filenameExtensionInvalid: "The JSX file extension is required.",
-      filenameExtensionUnexpected: "Use JSX file extension as needed."
+      useJsxFileExtension: "Use {{extensions}} file extension for JSX files.",
+      useJsxFileExtensionAsNeeded: "Do not use {{extensions}} file extension for files without JSX."
     },
     schema: schema3
   },
@@ -298,6 +305,7 @@ var filename_extension_default = createRule({
     const options = context.options[0] ?? defaultOptions3[0];
     const allow = isObject(options) ? options.allow : options;
     const extensions = isObject(options) && "extensions" in options ? options.extensions : defaultOptions3[0].extensions;
+    const extensionsString = extensions.map((ext) => `'${ext}'`).join(", ");
     const filename = context.filename;
     let hasJSXNode = false;
     return {
@@ -312,8 +320,11 @@ var filename_extension_default = createRule({
         const isJSXExt = extensions.includes(fileNameExt);
         if (hasJSXNode && !isJSXExt) {
           context.report({
-            messageId: "filenameExtensionInvalid",
-            node
+            messageId: "useJsxFileExtension",
+            node,
+            data: {
+              extensions: extensionsString
+            }
           });
           return;
         }
@@ -324,8 +335,11 @@ var filename_extension_default = createRule({
         }
         if (!hasJSXNode && isJSXExt && allow === "as-needed") {
           context.report({
-            messageId: "filenameExtensionUnexpected",
-            node
+            messageId: "useJsxFileExtensionAsNeeded",
+            node,
+            data: {
+              extensions: extensionsString
+            }
           });
         }
       }
@@ -345,11 +359,11 @@ var use_state_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "enforce destructuring and symmetric naming of 'useState' hook value and setter variables",
+      description: "enforce destructuring and symmetric naming of 'useState' hook value and setter",
       [Symbol.for("rule_features")]: RULE_FEATURES
     },
     messages: {
-      useState: "An useState call is not destructured into value + setter pair."
+      unexpected: "An useState call is not destructured into value + setter pair."
     },
     schema: []
   },
@@ -385,14 +399,14 @@ var use_state_default = createRule({
             const { id } = hookCall.parent;
             switch (id.type) {
               case AST_NODE_TYPES.Identifier: {
-                context.report({ messageId: "useState", node: id });
+                context.report({ messageId: "unexpected", node: id });
                 break;
               }
               case AST_NODE_TYPES.ArrayPattern: {
                 const [state, setState] = id.elements;
                 if (state?.type === AST_NODE_TYPES.ObjectPattern && setState?.type === AST_NODE_TYPES.Identifier) {
                   if (!isSetterNameLoose(setState.name)) {
-                    context.report({ messageId: "useState", node: id });
+                    context.report({ messageId: "unexpected", node: id });
                   }
                   break;
                 }
@@ -404,7 +418,7 @@ var use_state_default = createRule({
                 if (setStateName === expectedSetterName) {
                   return;
                 }
-                context.report({ messageId: "useState", node: id });
+                context.report({ messageId: "unexpected", node: id });
               }
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-naming-convention",
-  "version": "1.26.3-beta.6",
+  "version": "1.26.3-beta.7",
   "description": "ESLint React's ESLint plugin for naming convention related rules.",
   "keywords": [
     "react",
@@ -49,11 +49,11 @@
     "@typescript-eslint/utils": "^8.23.0",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.26.3-beta.6",
-    "@eslint-react/core": "1.26.3-beta.6",
-    "@eslint-react/jsx": "1.26.3-beta.6",
-    "@eslint-react/shared": "1.26.3-beta.6",
-    "@eslint-react/eff": "1.26.3-beta.6"
+    "@eslint-react/ast": "1.26.3-beta.7",
+    "@eslint-react/core": "1.26.3-beta.7",
+    "@eslint-react/eff": "1.26.3-beta.7",
+    "@eslint-react/jsx": "1.26.3-beta.7",
+    "@eslint-react/shared": "1.26.3-beta.7"
   },
   "devDependencies": {
     "@types/react": "^19.0.8",