fix: #24 function uniq not working correctly with nullish types

josdejong · josdejong · commit b6fd569fb276 · 2025-05-28T17:29:10.000+02:00
diff --git a/src/functions.ts b/src/functions.ts
@@ -248,7 +248,7 @@ export const functions: FunctionBuildersMap = {
       const res: T[] = []
 
       for (const item of data) {
-        if (!res.find((resItem) => isEqual(resItem, item))) {
+        if (res.findIndex((resItem) => isEqual(resItem, item)) === -1) {
           res.push(item)
         }
       }
diff --git a/test-suite/compile.test.json b/test-suite/compile.test.json
@@ -1,6 +1,6 @@
 {
-  "source": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.0/test-suite/compile.test.json",
-  "version": "5.0.0",
+  "source": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.1/test-suite/compile.test.json",
+  "version": "5.0.1",
   "groups": [
     {
       "category": "value",
@@ -960,6 +960,17 @@
         }
       ]
     },
+    {
+      "category": "uniq",
+      "description": "should get unique values from a list with mixed nullish types",
+      "tests": [
+        {
+          "input": [null, null, false, 0, "", null, false, 0, ""],
+          "query": ["uniq"],
+          "output": [null, false, 0, ""]
+        }
+      ]
+    },
     {
       "category": "uniqBy",
       "description": "should get unique objects by key (keeping the first)",
@@ -1208,7 +1219,10 @@
         { "input": null, "query": ["eq", true, false], "output": false },
         { "input": null, "query": ["eq", false, true], "output": false },
         { "input": null, "query": ["eq", false, true], "output": false },
-        { "input": null, "query": ["eq", null, null], "output": true }
+        { "input": null, "query": ["eq", false, false], "output": true },
+        { "input": null, "query": ["eq", null, null], "output": true },
+        { "input": null, "query": ["eq", 0, 0], "output": true },
+        { "input": null, "query": ["eq", "", ""], "output": true }
       ]
     },
     {
@@ -1550,7 +1564,11 @@
           "query": ["ne", ["get", "a"], ["get", "b"]],
           "output": true
         },
-        { "input": null, "query": ["ne", 3, 2], "output": true }
+        { "input": null, "query": ["ne", 3, 2], "output": true },
+        { "input": null, "query": ["ne", false, false], "output": false },
+        { "input": null, "query": ["ne", null, null], "output": false },
+        { "input": null, "query": ["ne", 0, 0], "output": false },
+        { "input": null, "query": ["ne", "", ""], "output": false }
       ]
     },
     {
diff --git a/test-suite/compile.test.schema.json b/test-suite/compile.test.schema.json
@@ -1,13 +1,13 @@
 {
   "$schema": "https://json-schema.org/draft-07/schema",
-  "$id": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.0/test-suite/compile.test.schema.json",
+  "$id": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.1/test-suite/compile.test.schema.json",
   "type": "object",
   "properties": {
     "source": {
-      "const": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.0/test-suite/compile.test.json"
+      "const": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.1/test-suite/compile.test.json"
     },
     "version": {
-      "const": "5.0.0"
+      "const": "5.0.1"
     },
     "groups": {
       "type": "array",

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ export const functions: FunctionBuildersMap = {`
`248`	`248`	`const res: T[] = []`
`249`	`249`
`250`	`250`	`for (const item of data) {`
`251`		`- if (!res.find((resItem) => isEqual(resItem, item))) {`
	`251`	`+ if (res.findIndex((resItem) => isEqual(resItem, item)) === -1) {`
`252`	`252`	`res.push(item)`
`253`	`253`	`}`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "source": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.0/test-suite/compile.test.json",`
`3`		`- "version": "5.0.0",`
	`2`	`+ "source": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.1/test-suite/compile.test.json",`
	`3`	`+ "version": "5.0.1",`
`4`	`4`	`"groups": [`
`5`	`5`	`{`
`6`	`6`	`"category": "value",`
`@@ -960,6 +960,17 @@`
`960`	`960`	`}`
`961`	`961`	`]`
`962`	`962`	`},`
	`963`	`+ {`
	`964`	`+ "category": "uniq",`
	`965`	`+ "description": "should get unique values from a list with mixed nullish types",`
	`966`	`+ "tests": [`
	`967`	`+ {`
	`968`	`+ "input": [null, null, false, 0, "", null, false, 0, ""],`
	`969`	`+ "query": ["uniq"],`
	`970`	`+ "output": [null, false, 0, ""]`
	`971`	`+ }`
	`972`	`+ ]`
	`973`	`+ },`
`963`	`974`	`{`
`964`	`975`	`"category": "uniqBy",`
`965`	`976`	`"description": "should get unique objects by key (keeping the first)",`
`@@ -1208,7 +1219,10 @@`
`1208`	`1219`	`{ "input": null, "query": ["eq", true, false], "output": false },`
`1209`	`1220`	`{ "input": null, "query": ["eq", false, true], "output": false },`
`1210`	`1221`	`{ "input": null, "query": ["eq", false, true], "output": false },`
`1211`		`- { "input": null, "query": ["eq", null, null], "output": true }`
	`1222`	`+ { "input": null, "query": ["eq", false, false], "output": true },`
	`1223`	`+ { "input": null, "query": ["eq", null, null], "output": true },`
	`1224`	`+ { "input": null, "query": ["eq", 0, 0], "output": true },`
	`1225`	`+ { "input": null, "query": ["eq", "", ""], "output": true }`
`1212`	`1226`	`]`
`1213`	`1227`	`},`
`1214`	`1228`	`{`
`@@ -1550,7 +1564,11 @@`
`1550`	`1564`	`"query": ["ne", ["get", "a"], ["get", "b"]],`
`1551`	`1565`	`"output": true`
`1552`	`1566`	`},`
`1553`		`- { "input": null, "query": ["ne", 3, 2], "output": true }`
	`1567`	`+ { "input": null, "query": ["ne", 3, 2], "output": true },`
	`1568`	`+ { "input": null, "query": ["ne", false, false], "output": false },`
	`1569`	`+ { "input": null, "query": ["ne", null, null], "output": false },`
	`1570`	`+ { "input": null, "query": ["ne", 0, 0], "output": false },`
	`1571`	`+ { "input": null, "query": ["ne", "", ""], "output": false }`
`1554`	`1572`	`]`
`1555`	`1573`	`},`
`1556`	`1574`	`{`