@eslint/json 1.1.0 → 1.2.0

package/README.md

@@ -296,7 +296,7 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 <p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a></p><h3>Gold Sponsors</h3>
 <p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://vite.dev/"><img src="https://images.opencollective.com/vite/d472863/logo.png" alt="Vite" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/2d6c3b6/logo.png" alt="Liftoff" height="64"></a> <a href="https://stackblitz.com"><img src="https://avatars.githubusercontent.com/u/28635252" alt="StackBlitz" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://opensource.sap.com"><img src="https://avatars.githubusercontent.com/u/2531208" alt="SAP" height="32"></a> <a href="https://www.crawljobs.com/"><img src="https://images.opencollective.com/crawljobs-poland/fa43a17/logo.png" alt="CrawlJobs" height="32"></a> <a href="https://depot.dev"><img src="https://images.opencollective.com/depot/39125a1/logo.png" alt="Depot" height="32"></a> <a href="https://www.n-ix.com/"><img src="https://images.opencollective.com/n-ix-ltd/575a7a5/logo.png" alt="N-iX Ltd" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="TestMu AI Open Source Office (Formerly LambdaTest)" height="32"></a></p>
+<p><a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://opensource.sap.com"><img src="https://avatars.githubusercontent.com/u/2531208" alt="SAP" height="32"></a> <a href="https://www.crawljobs.com/"><img src="https://images.opencollective.com/crawljobs-poland/fa43a17/logo.png" alt="CrawlJobs" height="32"></a> <a href="https://depot.dev"><img src="https://images.opencollective.com/depot/39125a1/logo.png" alt="Depot" height="32"></a> <a href="https://www.n-ix.com/"><img src="https://images.opencollective.com/n-ix-ltd/575a7a5/logo.png" alt="N-iX Ltd" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="TestMu AI Open Source Office (Formerly LambdaTest)" height="32"></a></p>
 <h3>Technology Sponsors</h3>
 Technology sponsors allow us to use their products and services for free as part of a contribution to the open source ecosystem and our work.
 <p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>

package/dist/index.js

@@ -15,7 +15,7 @@ import rules from "./build/rules.js";
 const plugin = {
     meta: {
         name: "@eslint/json",
-        version: "1.1.0", // x-release-please-version
+        version: "1.2.0", // x-release-please-version
     },
     languages: {
         json: new JSONLanguage({ mode: "json" }),

package/dist/rules/sort-keys.js

@@ -33,6 +33,7 @@ import { getKey, getRawKey } from "../util.js";
 // Helpers
 //-----------------------------------------------------------------------------
 const hasNonWhitespace = /\S/u;
+const commentTypes = new Set(["LineComment", "BlockComment"]);
 /** @type {ComparatorMap} */
 const comparators = {
     ascending: {
@@ -63,6 +64,7 @@ const comparators = {
 const rule = {
     meta: {
         type: "suggestion",
+        fixable: "code",
         defaultOptions: [
             "asc",
             {
@@ -144,6 +146,25 @@ const rule = {
             }
             return false;
         }
+        /**
+         * Checks if a member has a comment before or after it.
+         * @param {MemberNode} member The member to check.
+         * @returns {boolean} True if a comment is adjacent to the member.
+         */
+        function hasAdjacentComment(member) {
+            const before = sourceCode.getTokenBefore(member, {
+                includeComments: true,
+            });
+            let after = sourceCode.getTokenAfter(member, {
+                includeComments: true,
+            });
+            if (after.type === "Comma") {
+                after = sourceCode.getTokenAfter(after, {
+                    includeComments: true,
+                });
+            }
+            return (commentTypes.has(before.type) || commentTypes.has(after.type));
+        }
         return {
             Object(node) {
                 /** @type {MemberNode} */
@@ -158,6 +179,9 @@ const rule = {
                 for (const member of node.members) {
                     const thisName = getKey(member);
                     const thisRawName = getRawKey(member, sourceCode);
+                    // Capture `prevMember` for this iteration so the fixer closure uses the
+                    // intended node even though `prevMember` is reassigned in the loop.
+                    const prevMemberNode = prevMember;
                     if (prevMember &&
                         !isValidOrder(prevName, thisName) &&
                         (!allowLineSeparatedGroups ||
@@ -172,6 +196,16 @@ const rule = {
                                 sensitivity,
                                 sortName,
                             },
+                            fix(fixer) {
+                                if (hasAdjacentComment(member) ||
+                                    hasAdjacentComment(prevMemberNode)) {
+                                    return null;
+                                }
+                                return [
+                                    fixer.replaceText(member, sourceCode.getText(prevMemberNode)),
+                                    fixer.replaceText(prevMemberNode, sourceCode.getText(member)),
+                                ];
+                            },
                         });
                     }
                     prevMember = member;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint/json",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "JSON linting plugin for ESLint",
   "author": "Nicholas C. Zakas",
   "type": "module",
@@ -50,6 +50,7 @@
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "lint:types": "attw --pack --profile esm-only",
+    "lint:unused": "knip",
     "fmt": "prettier --write .",
     "fmt:check": "prettier --check .",
     "test": "mocha \"tests/**/*.test.js\"",
@@ -73,17 +74,19 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
+    "@types/node": "^20.19.0",
     "c8": "^11.0.0",
     "dedent": "^1.5.3",
     "eslint": "^10.0.0",
     "eslint-config-eslint": "^14.0.0",
     "eslint-plugin-eslint-plugin": "^7.3.2",
     "globals": "^17.0.0",
+    "knip": "^5.82.1",
     "lint-staged": "^16.0.0",
     "mdast-util-from-markdown": "^2.0.2",
     "mocha": "^11.3.0",
     "prettier": "3.8.1",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "yorkie": "^2.0.0"
   },
   "engines": {