fix: #24 operators in and not in not working correctly with nullish types

josdejong · josdejong · commit e09aeb2f87f9 · 2025-05-28T17:36:21.000+02:00
diff --git a/src/functions.ts b/src/functions.ts
@@ -318,7 +318,7 @@ export const functions: FunctionBuildersMap = {
       const _value = getValue(data)
       const _values = getValues(data) as unknown[]
 
-      return !!_values.find((item) => isEqual(item, _value))
+      return _values.findIndex((item) => isEqual(item, _value)) !== -1
     }
   },
   'not in': (value: JSONQuery, values: JSONQuery) => {
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.1/test-suite/compile.test.json",
-  "version": "5.0.1",
+  "source": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.3/test-suite/compile.test.json",
+  "version": "5.0.3",
   "groups": [
     {
       "category": "value",
@@ -1844,11 +1844,16 @@
           "query": ["in", ["get", "score"], ["array", 1, 2, 5, 8]],
           "output": false
         },
-        {
-          "input": null,
-          "query": ["in", 5, ["array", 1, 2, 5, 8]],
-          "output": true
-        }
+        { "input": null, "query": ["in", 5, ["array", 1, 2, 5, 8]], "output": true },
+        { "input": null, "query": ["in", false, ["array", true, false]], "output": true },
+        { "input": null, "query": ["in", true, ["array", true, false]], "output": true },
+        { "input": null, "query": ["in", false, ["array", true]], "output": false },
+        { "input": null, "query": ["in", true, ["array", false]], "output": false },
+        { "input": null, "query": ["in", null, ["array", 1, 2, 3]], "output": false },
+        { "input": null, "query": ["in", null, ["array", null, 1, 2, 3]], "output": true },
+        { "input": null, "query": ["in", "", ["array", "A", "", "B"]], "output": true },
+        { "input": null, "query": ["in", 0, ["array", 1, 2, 3]], "output": false },
+        { "input": null, "query": ["in", 0, ["array", 0, 1, 2, 3]], "output": true }
       ]
     },
     {
@@ -1914,11 +1919,15 @@
           "query": ["not in", ["get", "score"], ["array", 1, 2, 5, 8]],
           "output": true
         },
-        {
-          "input": null,
-          "query": ["not in", 7, ["array", 1, 2, 5, 8]],
-          "output": true
-        }
+        { "input": null, "query": ["not in", 7, ["array", 1, 2, 5, 8]], "output": true },
+        { "input": null, "query": ["not in", true, ["array", true, false]], "output": false },
+        { "input": null, "query": ["not in", false, ["array", true]], "output": true },
+        { "input": null, "query": ["not in", true, ["array", false]], "output": true },
+        { "input": null, "query": ["not in", null, ["array", 1, 2, 3]], "output": true },
+        { "input": null, "query": ["not in", null, ["array", null, 1, 2, 3]], "output": false },
+        { "input": null, "query": ["not in", "", ["array", "A", "", "B"]], "output": false },
+        { "input": null, "query": ["not in", 0, ["array", 1, 2, 3]], "output": true },
+        { "input": null, "query": ["not in", 0, ["array", 0, 1, 2, 3]], "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.1/test-suite/compile.test.schema.json",
+  "$id": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.3/test-suite/compile.test.schema.json",
   "type": "object",
   "properties": {
     "source": {
-      "const": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.1/test-suite/compile.test.json"
+      "const": "https://github.com/jsonquerylang/jsonquery/blob/v5.0.3/test-suite/compile.test.json"
     },
     "version": {
-      "const": "5.0.1"
+      "const": "5.0.3"
     },
     "groups": {
       "type": "array",

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ export const functions: FunctionBuildersMap = {`
`318`	`318`	`const _value = getValue(data)`
`319`	`319`	`const _values = getValues(data) as unknown[]`
`320`	`320`
`321`		`- return !!_values.find((item) => isEqual(item, _value))`
	`321`	`+ return _values.findIndex((item) => isEqual(item, _value)) !== -1`
`322`	`322`	`}`
`323`	`323`	`},`
`324`	`324`	`'not in': (value: JSONQuery, values: JSONQuery) => {`