feat: integrate cleanJsonText function for json parsing (#3824)

kovsu · web-flow · commit 726647011840 · 2025-05-27T14:54:00.000+08:00
* feat: integrate cleanJsonText function for json parsing

* chore: update
diff --git a/plugins/eslint/eslint-check-i18n-json.js b/plugins/eslint/eslint-check-i18n-json.js
@@ -3,6 +3,8 @@
 import fs from "node:fs"
 import path from "node:path"
 
+import { cleanJsonText } from "../utils.js"
+
 export default {
   rules: {
     "valid-i18n-keys": {
@@ -24,7 +26,7 @@ export default {
 
             let json
             try {
-              json = JSON.parse(sourceCode.text)
+              json = JSON.parse(cleanJsonText(sourceCode.text))
             } catch {
               context.report({
                 node,
diff --git a/plugins/eslint/eslint-recursive-sort.js b/plugins/eslint/eslint-recursive-sort.js
@@ -1,19 +1,5 @@
-const sortObjectKeys = (obj) => {
-  if (typeof obj !== "object" || obj === null) {
-    return obj
-  }
+import { cleanJsonText, sortObjectKeys } from "../utils.js"
 
-  if (Array.isArray(obj)) {
-    return obj.map((element) => sortObjectKeys(element))
-  }
-
-  return Object.keys(obj)
-    .sort()
-    .reduce((acc, key) => {
-      acc[key] = sortObjectKeys(obj[key])
-      return acc
-    }, {})
-}
 /**
  * @type {import("eslint").ESLint.Plugin}
  */
@@ -29,7 +15,7 @@ export default {
           Program(node) {
             if (context.filename.endsWith(".json")) {
               const { sourceCode } = context
-              const text = sourceCode.getText()
+              const text = cleanJsonText(sourceCode.getText())
 
               try {
                 const json = JSON.parse(text)
diff --git a/plugins/utils.js b/plugins/utils.js
@@ -0,0 +1,26 @@
+export const sortObjectKeys = (obj) => {
+  if (typeof obj !== "object" || obj === null) {
+    return obj
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map((element) => sortObjectKeys(element))
+  }
+
+  return Object.keys(obj)
+    .sort()
+    .reduce((acc, key) => {
+      acc[key] = sortObjectKeys(obj[key])
+      return acc
+    }, {})
+}
+
+export const cleanJsonText = (text) => {
+  const cleaned = text.replaceAll(/,\s*\}/g, "}")
+  try {
+    JSON.parse(cleaned)
+    return cleaned
+  } catch {
+    return text
+  }
+}
