Quote single-element array values to handle spaces and colons

Values like ["foo bar"] or ["foo:bar"] produced broken queries
(e.g. field:foo bar) because the single-element path emitted bare
terms. Now all array element values are quoted as phrase queries,
consistent with the multi-element IN path.

Author: xrl

src/modifyQuery.test.ts

@@ -2,13 +2,13 @@ import { addAddHocFilter } from './modifyQuery';
 
 describe('addAddHocFilter', () => {
   describe('array values', () => {
-    it('unwraps single-element array into a term query', () => {
+    it('unwraps single-element array into a phrase query', () => {
       const result = addAddHocFilter('', {
         key: 'attributes.tags',
         operator: '=',
         value: '["paperclip"]',
       });
-      expect(result).toBe('attributes.tags:paperclip');
+      expect(result).toBe('attributes.tags:"paperclip"');
     });
 
     it('unwraps multi-element array into IN set query', () => {
@@ -20,13 +20,13 @@ describe('addAddHocFilter', () => {
       expect(result).toBe('attributes.tags:IN ["paperclip" "stapler"]');
     });
 
-    it('negated single-element array produces negated term query', () => {
+    it('negated single-element array produces negated phrase query', () => {
       const result = addAddHocFilter('', {
         key: 'attributes.tags',
         operator: '!=',
         value: '["paperclip"]',
       });
-      expect(result).toBe('-attributes.tags:paperclip');
+      expect(result).toBe('-attributes.tags:"paperclip"');
     });
 
     it('negated multi-element array produces negated IN set query', () => {
@@ -44,7 +44,43 @@ describe('addAddHocFilter', () => {
         operator: '=',
         value: '["paperclip"]',
       });
-      expect(result).toBe('status:200 AND attributes.tags:paperclip');
+      expect(result).toBe('status:200 AND attributes.tags:"paperclip"');
+    });
+
+    it('handles single-element array with spaces in value', () => {
+      const result = addAddHocFilter('', {
+        key: 'attributes.tags',
+        operator: '=',
+        value: '["foo bar"]',
+      });
+      expect(result).toBe('attributes.tags:"foo bar"');
+    });
+
+    it('handles single-element array with colons in value', () => {
+      const result = addAddHocFilter('', {
+        key: 'attributes.tags',
+        operator: '=',
+        value: '["foo:bar"]',
+      });
+      expect(result).toBe('attributes.tags:"foo:bar"');
+    });
+
+    it('handles multi-element array with spaces in values', () => {
+      const result = addAddHocFilter('', {
+        key: 'attributes.tags',
+        operator: '=',
+        value: '["foo bar","baz qux"]',
+      });
+      expect(result).toBe('attributes.tags:IN ["foo bar" "baz qux"]');
+    });
+
+    it('handles array values containing double quotes', () => {
+      const result = addAddHocFilter('', {
+        key: 'attributes.tags',
+        operator: '=',
+        value: '["say \\"hello\\""]',
+      });
+      expect(result).toBe('attributes.tags:"say \\"hello\\""');
     });
 
     it('passes through non-array bracket strings unchanged', () => {

src/modifyQuery.ts

@@ -46,7 +46,7 @@ export function addAddHocFilter(query: string, filter: AdHocVariableFilter): str
       const modifier = filter.operator === '=' ? '' : '-';
       const key = escapeFilter(filter.key);
       if (arrayElements.length === 1) {
-        return concatenate(query, `${modifier}${key}:${escapeFilterValue(arrayElements[0])}`, 'AND');
+        return concatenate(query, `${modifier}${key}:"${escapeFilterValue(arrayElements[0])}"`, 'AND');
       }
       const terms = arrayElements.map((el) => `"${escapeFilterValue(el)}"`).join(' ');
       return concatenate(query, `${modifier}${key}:IN [${terms}]`, 'AND');