Merge pull request #324 from vfabioux/develop

fix removeComments from parseJson

Author: cars10

package-lock.json

@@ -41,6 +41,7 @@
     "pinia-plugin-persistedstate": "^4.5.0",
     "pretty-bytes": "^7.1.0",
     "quasar": "^2.18.5",
+    "strip-json-comments": "^5.0.3",
     "ua-parser-js": "^2.0.6",
     "uuid": "^13.0.0",
     "vue": "^3.5.22",
@@ -71,4 +72,4 @@
     "vitest": "^3.2.4",
     "vue-tsc": "^3.1.1"
   }
-}
+}

package.json

@@ -1,10 +1,10 @@
+import stripJsonComments from 'strip-json-comments'
 import { computed, ref, toRaw, watch, nextTick } from 'vue'
 import { clusterAuthHeader } from '../../../helpers/elasticsearchAdapter.ts'
 import { REQUEST_DEFAULT_HEADERS } from '../../../consts'
 import { useConnectionStore } from '../../../store/connection'
 import { useSnackbar } from '../../Snackbar'
 import { useIdbStore } from '../../../db/Idb'
-import { removeComments } from '../../../helpers/json/parse'
 import { fetchMethod } from '../../../helpers/fetch'
 import { IdbRestQueryTab, IdbRestQueryTabRequest } from '../../../db/types.ts'
 import { debounce } from '../../../helpers/debounce.ts'
@@ -39,7 +39,7 @@ export const useRestQueryForm = (props: RestQueryFormProps, emit: any) => {
 
     const options: RestFetchOptions = {
       method: props.tab.request.method,
-      body: ['GET', 'HEAD'].includes(props.tab.request.method) ? null : removeComments(props.tab.request.body),
+      body: ['GET', 'HEAD'].includes(props.tab.request.method) ? null : stripJsonComments(props.tab.request.body),
       headers: Object.assign({}, REQUEST_DEFAULT_HEADERS)
     }
 

src/composables/components/rest/RestQueryForm.ts

@@ -1,10 +1,7 @@
+import stripJsonComments from 'strip-json-comments'
 import { bigint } from './jsonBigint.ts'
 
-export const removeComments = (str: string): string => {
-  return str.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => (g ? '' : m))
-}
-
 export const parseJson = (jsonString: string): any => {
-  const clean = removeComments(jsonString)
+  const clean = stripJsonComments(jsonString)
   return bigint.parse(clean)
 }