Account for potential not in conditional in custom query (#3081)

Author: laurakwhit

src/lib/utilities/is.ts

@@ -60,6 +60,7 @@ const conditionals = [
   'is',
   'is not',
   'in',
+  'not in',
 ] as const;
 
 const joins = ['and', 'or'] as const;
@@ -189,5 +190,5 @@ export const isStartsWith = (x: unknown) => {
 export const isInConditional = (x: unknown) => {
   if (!isString(x)) return false;
 
-  return x.toLocaleLowerCase() === 'in';
+  return ['in', 'not in'].includes(x.toLocaleLowerCase());
 };

src/lib/utilities/query/tokenize.test.ts

@@ -11,7 +11,6 @@ const combinedQuery =
   '`WorkflowId`="Hello" and `WorkflowType`="World" and `StartTime` BETWEEN "2022-04-18T18:09:49-06:00" AND "2022-04-20T18:09:49-06:00"';
 const valuesWithSpacesQuery =
   '`Custom Key Word`="Hello there world" AND `WorkflowId`="one and two = three" OR `WorkflowType`="example=\'one\'"';
-const keywordListQuery = '`CustomKeywordListField`in("Hello", "World")';
 const startsWithQuery = '`WorkflowType` STARTS_WITH "Hello"';
 
 describe('tokenize', () => {
@@ -106,14 +105,21 @@ describe('tokenize', () => {
     ]);
   });
 
-  it('should tokenize the keywordListQuery', () => {
-    const query = keywordListQuery;
+  it('should tokenize KeywordList queries', () => {
+    const keywordListInQuery = '`CustomKeywordListField`in("Hello", "World")';
+    const keywordListNotInQuery =
+      '`CustomKeywordListField`not in("Hello", "World")';
 
-    expect(tokenize(query)).toEqual([
+    expect(tokenize(keywordListInQuery)).toEqual([
       'CustomKeywordListField',
       'in',
       '("Hello", "World")',
     ]);
+    expect(tokenize(keywordListNotInQuery)).toEqual([
+      'CustomKeywordListField',
+      'not in',
+      '("Hello", "World")',
+    ]);
   });
 
   it('should tokenize with "`" not used in custom attributes with spaces', () => {

src/lib/utilities/query/tokenize.ts

@@ -72,24 +72,29 @@ export const tokenize = (string: string): Tokens => {
       }
     }
 
-    // Conditional can be up to three characters long (!==)
-    const midConditional = `${string[cursor]}${string[cursor + 1]}`;
-    const maxConditional = `${string[cursor]}${string[cursor + 1]}${
-      string[cursor + 2]
-    }`;
+    // Check for conditionals that are two, three or six characters long (e.g. not in)
+    const minConditional = string.slice(cursor, cursor + 2);
+    const midConditional = string.slice(cursor, cursor + 3);
+    const maxConditional = string.slice(cursor, cursor + 6);
+
     if (isConditional(maxConditional)) {
       buffer += maxConditional;
       addBufferToTokens();
+      cursor += 6;
+      continue;
+    } else if (isConditional(midConditional)) {
+      buffer += midConditional;
+      addBufferToTokens();
       cursor += 3;
       continue;
     } else if (
-      isConditional(midConditional) &&
+      isConditional(minConditional) &&
       (isSpace(string[cursor + 2]) ||
         isQuote(string[cursor + 2]) ||
         isParenthesis(string[cursor + 2]))
     ) {
       // To prevent false positives like "inspect" being a "in" conditional, check for space, quote, or parenthesis after the midConditional
-      buffer += midConditional;
+      buffer += minConditional;
       addBufferToTokens();
       cursor += 2;
       continue;