intlify · Feb 20, 2024 · Feb 20, 2024 · Feb 20, 2024
Showing with 919 additions and 37 deletions.

+5 −0 .changeset/ninety-snakes-scream.md

+1 −0 .changeset/pre.json

+9 −1 CHANGELOG.md

+20 −12 lib/rules/no-unused-keys.ts

+1 −1 package.json

+0 −7 tests/lib/rules/no-missing-keys.ts

+883 −16 tests/lib/rules/no-unused-keys.ts
diff --git a/.changeset/ninety-snakes-scream.md b/.changeset/ninety-snakes-scream.md
@@ -0,0 +1,5 @@
+---
+"@intlify/eslint-plugin-vue-i18n": patch
+---
+
+fix: wrong suggestion for remove all unused keys in `vue-i18n/no-unused-keys` rule
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -8,6 +8,7 @@
     "forty-tools-dream",
     "fresh-squids-build",
     "khaki-eyes-serve",
+    "ninety-snakes-scream",
     "olive-chairs-invent",
     "shiny-colts-search",
     "ten-insects-deny"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## 3.0.0-next.2
+# @intlify/eslint-plugin-vue-i18n
+
+## 3.0.0-next.7
+
+### Patch Changes
+
+- [#474](https://github.com/intlify/eslint-plugin-vue-i18n/pull/474) [`ebd7353`](https://github.com/intlify/eslint-plugin-vue-i18n/commit/ebd7353ada4d65eec0f504887db0911a80819979) Thanks [@ota-meshi](https://github.com/ota-meshi)! - fix: wrong suggestion for remove all unused keys in `vue-i18n/no-unused-keys` rule
 
 ## 3.0.0-next.6
 
@@ -28,6 +34,8 @@
 
 - [#413](https://github.com/intlify/eslint-plugin-vue-i18n/pull/413) [`0fadd81`](https://github.com/intlify/eslint-plugin-vue-i18n/commit/0fadd81f0551c380514744573b4c3fdac9b9d4fa) Thanks [@dargmuesli](https://github.com/dargmuesli)! - Pin `@intlify` dependencies to tag `beta` to try to prevent renovate from downgrading.
 
+## 3.0.0-next.2
+
 ### Patch Changes
 
 - [#394](https://github.com/intlify/eslint-plugin-vue-i18n/pull/394) [`3774e88`](https://github.com/intlify/eslint-plugin-vue-i18n/commit/3774e88ba06335efe2112594d0c92b8ac4e5d242) Thanks [@wolfgangwalther](https://github.com/wolfgangwalther)! - fix: no-missing-keys rule reports false positive with trailing dot

diff --git a/lib/rules/no-unused-keys.ts b/lib/rules/no-unused-keys.ts
@@ -208,36 +208,44 @@ function create(context: RuleContext): RuleListener {
     }
 
     function* fixAllRemoveKeys(fixer: RuleFixer, nodes: JSONAST.JSONNode[]) {
-      const ranges = nodes.map(node => fixRemoveRange(node))
-
+      const removed = new Set<JSONAST.JSONNode>()
       let preLast = 0
-      for (const range of ranges) {
-        yield fixer.removeRange([Math.max(preLast, range[0]), range[1]])
+      for (const node of nodes) {
+        const range = fixRemoveRange(node, removed)
+        const start = Math.max(preLast, range[0])
+        yield fixer.removeRange([start, range[1]])
         preLast = range[1]
       }
     }
 
-    /**
-     * @param {JSONNode} node
-     */
-    function fixRemoveRange(node: JSONAST.JSONNode): Range {
+    function fixRemoveRange(
+      node: JSONAST.JSONNode,
+      removedNodes: Set<JSONAST.JSONNode> = new Set()
+    ): Range {
       const parent = node.parent!
       let removeNode
       let isFirst = false
       let isLast = false
       if (parent.type === 'JSONProperty') {
         removeNode = parent
-        const index = parent.parent.properties.indexOf(parent)
+        const properties = parent.parent.properties.filter(
+          p => !removedNodes.has(p)
+        )
+        const index = properties.indexOf(parent)
         isFirst = index === 0
-        isLast = index === parent.parent.properties.length - 1
+        isLast = index === properties.length - 1
       } else {
         removeNode = node
         if (parent.type === 'JSONArrayExpression') {
-          const index = parent.elements.indexOf(node as never)
+          const elements = parent.elements.filter(
+            e => e == null || !removedNodes.has(e)
+          )
+          const index = elements.indexOf(node as never)
           isFirst = index === 0
-          isLast = index === parent.elements.length - 1
+          isLast = index === elements.length - 1
         }
       }
+      removedNodes.add(removeNode)
       const range: Range = [...removeNode.range]
 
       if (isLast || isFirst) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@intlify/eslint-plugin-vue-i18n",
   "description": "ESLint plugin for Vue I18n",
-  "version": "3.0.0-next.6",
+  "version": "3.0.0-next.7",
   "license": "MIT",
   "homepage": "https://github.com/intlify/eslint-plugin-vue-i18n#readme",
   "keywords": [

diff --git a/tests/lib/rules/no-missing-keys.ts b/tests/lib/rules/no-missing-keys.ts
@@ -297,13 +297,6 @@ tester.run('no-missing-keys', rule as never, {
           `'messages.missing' does not exist in localization message resources`
         ]
       },
-      {
-        // nested missing
-        code: `$t('messages.missing')`,
-        errors: [
-          `'messages.missing' does not exist in localization message resources`
-        ]
-      },
       {
         // @ts-expect-error -- Type error for eslint v9
         languageOptions: {