feat: upgrade to @jsonquerylang/jsonquery@5

josdejong · josdejong · commit 7cff6893e3cb · 2025-05-23T12:42:42.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "@codemirror/view": "^6.34.1",
     "@fortawesome/free-regular-svg-icons": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
-    "@jsonquerylang/jsonquery": "^3.1.1 || ^4.0.0",
+    "@jsonquerylang/jsonquery": "^3.1.1 || ^4.0.0 || ^5.0.0",
     "@lezer/highlight": "^1.2.1",
     "@replit/codemirror-indentation-markers": "^6.5.3",
     "ajv": "^8.17.1",
diff --git a/src/lib/plugins/query/jsonQueryLanguage.test.ts b/src/lib/plugins/query/jsonQueryLanguage.test.ts
@@ -1,9 +1,11 @@
 import { test, describe } from 'vitest'
 import assert from 'assert'
 import { cloneDeep } from 'lodash-es'
-import { LosslessNumber } from 'lossless-json'
+import { LosslessNumber, parse, stringify } from 'lossless-json'
 import { jsonQueryLanguage } from '$lib/plugins/query/jsonQueryLanguage'
 
+const LosslessJSON = { parse, stringify }
+
 const { createQuery, executeQuery } = jsonQueryLanguage
 
 const user1 = { _id: '1', user: { name: 'Stuart', age: 6, registered: true } }
@@ -183,7 +185,7 @@ describe('jsonQueryLanguage', () => {
       assert.deepStrictEqual(users, originalUsers) // must not touch the original users
     })
 
-    test('should work with alternative parsers and non-native JSON data types', () => {
+    test('should convert alternative parsers into regular JSON', () => {
       const data = [new LosslessNumber('4'), new LosslessNumber('7'), new LosslessNumber('5')]
       const query = createQuery(data, {
         sort: {
@@ -192,12 +194,8 @@ describe('jsonQueryLanguage', () => {
         }
       })
 
-      const result = executeQuery(data, query, JSON)
-      assert.deepStrictEqual(result, [
-        new LosslessNumber('4'),
-        new LosslessNumber('5'),
-        new LosslessNumber('7')
-      ])
+      const result = executeQuery(data, query, LosslessJSON)
+      assert.deepStrictEqual(result, [4, 5, 7])
     })
 
     test('should throw an exception the query is not valid', () => {
@@ -208,12 +206,12 @@ describe('jsonQueryLanguage', () => {
       }, /SyntaxError: Value expected \(pos: 7\)/)
     })
 
-    test('should return null when trying to use a non existing function', () => {
+    test('should throw an exception when trying to use a non existing function', () => {
       assert.throws(() => {
         const data = {}
         const query = 'foo(.bar)'
         executeQuery(data, query, JSON)
-      }, /SyntaxError: Unknown function 'foo' \(pos: 4\)/)
+      }, /TypeError: Unknown function 'foo'/)
     })
   })
 })
diff --git a/src/lib/plugins/query/jsonQueryLanguage.ts b/src/lib/plugins/query/jsonQueryLanguage.ts
@@ -1,7 +1,8 @@
 import { jsonquery, type JSONQuery, parse, stringify } from '@jsonquerylang/jsonquery'
 import { parseString } from '$lib/utils/stringUtils.js'
-import type { QueryLanguage, QueryLanguageOptions } from '$lib/types.js'
+import type { JSONParser, QueryLanguage, QueryLanguageOptions } from '$lib/types.js'
 import type { JSONPath } from 'immutable-json-patch'
+import { isEqualParser } from '$lib/utils/jsonUtils'
 
 const description = `
 <p>
@@ -55,8 +56,15 @@ function getter(path: JSONPath): ['get', ...path: JSONPath] {
   return ['get', ...path]
 }
 
-function executeQuery(json: unknown, query: string): unknown {
-  return query.trim() !== '' ? jsonquery(json, query) : json
+function executeQuery(json: unknown, query: string, parser: JSONParser): unknown {
+  function stringifyAndParse(json: unknown) {
+    const text = parser.stringify(json)
+    return text !== undefined ? JSON.parse(text) : undefined
+  }
+
+  const preprocessedJson = isEqualParser(parser, JSON) ? json : stringifyAndParse(json)
+
+  return query.trim() !== '' ? jsonquery(preprocessedJson, query) : preprocessedJson
 }
 
 function getOperatorName(operator: string): string {
