eslint-plugin-nextfriday 1.17.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eslint-plugin-nextfriday
 
+## 1.18.0
+
+### Minor Changes
+
+- [#81](https://github.com/next-friday/eslint-plugin-nextfriday/pull/81) [`081326a`](https://github.com/next-friday/eslint-plugin-nextfriday/commit/081326adf199aee711e97b1627def3bf867ad89c) Thanks [@joetakara](https://github.com/joetakara)! - Add hyphenated string group to jsx-sort-props for props like aria-label and data-slot. Fix jsx-newline-between-elements to include self-closing elements
+
 ## 1.17.0
 
 ### Minor Changes

package/docs/rules/JSX_SORT_PROPS.md

@@ -6,13 +6,14 @@ Enforce JSX props are sorted by value type.
 
 This rule enforces a consistent ordering of JSX props based on the type of their value. Props must appear in the following order:
 
-1. **String** - String literals and template literals
-2. **Number/Boolean/Null** - Numeric literals, boolean literals, null, and undefined
-3. **Expression** - Variable references, member expressions, call expressions, and other dynamic values
-4. **Object/Array** - Inline objects and arrays
-5. **Function** - Arrow functions and function expressions
-6. **JSX Element** - JSX elements and fragments
-7. **Shorthand boolean** - Props with no value (e.g., `disabled`, `required`)
+1. **String** - String literals and template literals (e.g., `className="cover"`)
+2. **Hyphenated string** - Props with hyphenated names and string values (e.g., `aria-label="label"`, `data-slot="nav"`)
+3. **Number/Boolean/Null** - Numeric literals, boolean literals, null, and undefined
+4. **Expression** - Variable references, member expressions, call expressions, and other dynamic values
+5. **Object/Array** - Inline objects and arrays
+6. **Function** - Arrow functions and function expressions
+7. **JSX Element** - JSX elements and fragments
+8. **Shorthand boolean** - Props with no value (e.g., `disabled`, `required`)
 
 Spread attributes (`{...props}`) reset the ordering context.
 
@@ -29,7 +30,6 @@ Spread attributes (`{...props}`) reset the ordering context.
 ```tsx
 <Component disabled title="hello" />
 <Component onClick={() => {}} count={42} />
-<Component icon={<Icon />} style={{ color: "red" }} />
 <Component className="cover" src={src} fill sizes={sizes} />
 ```
 
@@ -38,6 +38,7 @@ Spread attributes (`{...props}`) reset the ordering context.
 ```tsx
 <Component
   title="hello"
+  aria-label="close"
   count={100}
   src={src}
   style={{ color: "red" }}

package/lib/index.cjs

@@ -42,7 +42,7 @@ var import_eslint_plugin_unicorn = __toESM(require("eslint-plugin-unicorn"), 1);
 // package.json
 var package_default = {
   name: "eslint-plugin-nextfriday",
-  version: "1.17.0",
+  version: "1.18.0",
   description: "A comprehensive ESLint plugin providing custom rules and configurations for Next Friday development workflows.",
   keywords: [
     "eslint",
@@ -932,13 +932,7 @@ var jsxNewlineBetweenElements = createRule11({
   create(context) {
     const { sourceCode } = context;
     function isJSXElementOrFragment2(node) {
-      if (node.type === import_utils11.AST_NODE_TYPES.JSXFragment) {
-        return true;
-      }
-      if (node.type === import_utils11.AST_NODE_TYPES.JSXElement) {
-        return node.closingElement !== null;
-      }
-      return false;
+      return node.type === import_utils11.AST_NODE_TYPES.JSXElement || node.type === import_utils11.AST_NODE_TYPES.JSXFragment;
     }
     function isMultiLine(node) {
       return node.loc.start.line !== node.loc.end.line;
@@ -1416,15 +1410,15 @@ var createRule19 = import_utils21.ESLintUtils.RuleCreator(
 );
 var TYPE_GROUP = {
   STRING: 1,
-  NUMBER_BOOLEAN_NULL: 2,
-  EXPRESSION: 3,
-  OBJECT_ARRAY: 4,
-  FUNCTION: 5,
-  JSX: 6,
-  SHORTHAND: 7
+  HYPHENATED_STRING: 2,
+  NUMBER_BOOLEAN_NULL: 3,
+  EXPRESSION: 4,
+  OBJECT_ARRAY: 5,
+  FUNCTION: 6,
+  JSX: 7,
+  SHORTHAND: 8
 };
 var EXPRESSION_TYPE_TO_GROUP = /* @__PURE__ */ new Map([
-  [import_utils21.AST_NODE_TYPES.TemplateLiteral, TYPE_GROUP.STRING],
   [import_utils21.AST_NODE_TYPES.ObjectExpression, TYPE_GROUP.OBJECT_ARRAY],
   [import_utils21.AST_NODE_TYPES.ArrayExpression, TYPE_GROUP.OBJECT_ARRAY],
   [import_utils21.AST_NODE_TYPES.ArrowFunctionExpression, TYPE_GROUP.FUNCTION],
@@ -1432,15 +1426,24 @@ var EXPRESSION_TYPE_TO_GROUP = /* @__PURE__ */ new Map([
   [import_utils21.AST_NODE_TYPES.JSXElement, TYPE_GROUP.JSX],
   [import_utils21.AST_NODE_TYPES.JSXFragment, TYPE_GROUP.JSX]
 ]);
-function getLiteralGroup(value) {
+function isHyphenatedName(node) {
+  return node.name.type === import_utils21.AST_NODE_TYPES.JSXIdentifier && node.name.name.includes("-");
+}
+function getStringGroup(node) {
+  return isHyphenatedName(node) ? TYPE_GROUP.HYPHENATED_STRING : TYPE_GROUP.STRING;
+}
+function getLiteralValueGroup(value) {
   if (typeof value === "string") {
-    return TYPE_GROUP.STRING;
+    return null;
   }
   return TYPE_GROUP.NUMBER_BOOLEAN_NULL;
 }
 function getExpressionGroup(expression) {
   if (expression.type === import_utils21.AST_NODE_TYPES.Literal) {
-    return getLiteralGroup(expression.value);
+    return getLiteralValueGroup(expression.value);
+  }
+  if (expression.type === import_utils21.AST_NODE_TYPES.TemplateLiteral) {
+    return null;
   }
   if (expression.type === import_utils21.AST_NODE_TYPES.Identifier && expression.name === "undefined") {
     return TYPE_GROUP.NUMBER_BOOLEAN_NULL;
@@ -1452,7 +1455,10 @@ function getTypeGroup(node) {
     return TYPE_GROUP.SHORTHAND;
   }
   if (node.value.type === import_utils21.AST_NODE_TYPES.Literal) {
-    return getLiteralGroup(node.value.value);
+    if (typeof node.value.value === "string") {
+      return getStringGroup(node);
+    }
+    return TYPE_GROUP.NUMBER_BOOLEAN_NULL;
   }
   if (node.value.type !== import_utils21.AST_NODE_TYPES.JSXExpressionContainer) {
     return null;
@@ -1461,7 +1467,11 @@ function getTypeGroup(node) {
   if (expression.type === import_utils21.AST_NODE_TYPES.JSXEmptyExpression) {
     return null;
   }
-  return getExpressionGroup(expression);
+  const group = getExpressionGroup(expression);
+  if (group === null) {
+    return getStringGroup(node);
+  }
+  return group;
 }
 function hasUnsortedProps(attributes) {
   let lastGroup = 0;
@@ -1486,10 +1496,10 @@ var jsxSortProps = createRule19({
   meta: {
     type: "suggestion",
     docs: {
-      description: "Enforce JSX props are sorted by value type: strings, numbers/booleans, expressions, objects/arrays, functions, JSX elements, then shorthand booleans"
+      description: "Enforce JSX props are sorted by value type: strings, hyphenated strings, numbers/booleans, expressions, objects/arrays, functions, JSX elements, then shorthand booleans"
     },
     messages: {
-      unsortedProps: "JSX props should be sorted by value type: strings, numbers/booleans/null, expressions, objects/arrays, functions, JSX elements, then shorthand booleans."
+      unsortedProps: "JSX props should be sorted by value type: strings, hyphenated strings, numbers/booleans/null, expressions, objects/arrays, functions, JSX elements, then shorthand booleans."
     },
     schema: []
   },