@nymphjs/query-parser 1.0.0-beta.13 → 1.0.0-beta.131

package/src/queryParser.ts

@@ -1,10 +1,10 @@
 import type { EntityConstructor, Options, Selector } from '@nymphjs/client';
-import splitn from '@sciactive/splitn';
+import { splitn } from '@sciactive/splitn';
 
 export type BareQueryHandler = (
   input: string,
   entityClass?: EntityConstructor,
-  defaultFields?: string[]
+  defaultFields?: string[],
 ) => Partial<Selector>;
 
 export type QRefMap = {
@@ -12,7 +12,7 @@ export type QRefMap = {
 };
 
 export default function queryParser<
-  T extends EntityConstructor = EntityConstructor
+  T extends EntityConstructor = EntityConstructor,
 >({
   query,
   entityClass,
@@ -27,7 +27,7 @@ export default function queryParser<
         type: '|',
         ilike: defaultFields.map((field) => [field, input]) as [
           string,
-          string
+          string,
         ][],
       };
     }
@@ -90,7 +90,8 @@ function selectorsParser({
     } else if (inQuote) {
       continue;
     } else if (curQuery[i] === '(') {
-      if (currentStart == null) {
+      const searchClause = i !== 0 && !curQuery[i - 1].match(/\s/);
+      if (currentStart == null && !searchClause) {
         currentStart = i;
       } else {
         nesting++;
@@ -144,7 +145,7 @@ function selectorsParser({
           defaultFields,
           qrefMap,
           bareHandler,
-        })
+        }),
       );
     }
   }
@@ -157,21 +158,31 @@ function selectorsParser({
   });
 
   if (options) {
-    const limitRegex = /(?: |^)limit:(\d+)(?= |$)/;
+    const limitRegex = /(?:\s|^)limit:(\d+)(?=\s|$)/;
     const limitMatch = curQuery.match(limitRegex);
     if (limitMatch) {
       options.limit = Number(limitMatch[1]);
     }
     curQuery = curQuery.replace(limitRegex, '');
 
-    const offsetRegex = /(?: |^)offset:(\d+)(?= |$)/;
+    const offsetRegex = /(?:\s|^)offset:(\d+)(?=\s|$)/;
     const offsetMatch = curQuery.match(offsetRegex);
     if (offsetMatch) {
       options.offset = Number(offsetMatch[1]);
     }
     curQuery = curQuery.replace(offsetRegex, '');
 
-    const reverseRegex = /(?: |^)reverse:(true|false|1|0)(?= |$)/;
+    // JavaScript variable names are ridiculously infeasable to check
+    // thoroughly, so this is a "best attempt".
+    const sortRegex =
+      /(?:\s|^)sort:(-|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*)(?=\s|$)/;
+    const sortMatch = curQuery.match(sortRegex);
+    if (sortMatch) {
+      options.sort = sortMatch[1] === '-' ? null : sortMatch[1];
+    }
+    curQuery = curQuery.replace(sortRegex, '');
+
+    const reverseRegex = /(?:\s|^)reverse:(true|false|1|0)(?=\s|$)/;
     const reverseMatch = curQuery.match(reverseRegex);
     if (reverseMatch) {
       options.reverse = reverseMatch[1] === 'true' || reverseMatch[1] === '1';
@@ -222,92 +233,270 @@ function selectorParser({
 }): string {
   let curQuery = query;
 
-  // eg. user<{User name="Hunter"}> or user!<{User name="Hunter"}>
-  const qrefRegex = /(?: |^)(\w+)!?<\{(\w+) (.*?[^\\])\}>(?= |$)/g;
-  const qrefMatch = curQuery.match(qrefRegex);
-  if (qrefMatch) {
-    selector.qref = [];
-    selector['!qref'] = [];
-    for (let match of qrefMatch) {
+  // This one needs to happen first, because it has entire queries in it.
+  // eg. user<{User name="Hunter"}> or -user<{User name="Hunter"}>
+  const qrefRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)<\{(\w+)(?=\s)/;
+  // This is used to bypass badly formatted things that match the above regex.
+  let offsetIndex = 0;
+  let qrefMatch = curQuery.match(qrefRegex);
+  while (qrefMatch) {
+    let endIndex = (qrefMatch.index ?? 0) + offsetIndex + qrefMatch[0].length;
+    let curOpen = 1;
+    while (curOpen) {
+      const indexOfNextOpen = curQuery.indexOf('<{', endIndex);
+      const indexOfNextClose = curQuery.slice(endIndex).search(/(?<!\\)\}>/);
+
+      if (indexOfNextClose < 0) {
+        endIndex = curQuery.length;
+        break;
+      }
+
+      if (
+        indexOfNextOpen > -1 &&
+        indexOfNextOpen < endIndex + indexOfNextClose
+      ) {
+        endIndex = indexOfNextOpen + 2;
+        curOpen++;
+      } else {
+        endIndex += indexOfNextClose + 2;
+        curOpen--;
+      }
+    }
+
+    if (!('qref' in selector)) {
+      selector.qref = [];
+    }
+    if (!('!qref' in selector)) {
+      selector['!qref'] = [];
+    }
+
+    const match = curQuery.slice(
+      (qrefMatch.index ?? 0) + offsetIndex,
+      endIndex,
+    );
+    try {
+      let [name, value] = splitn(match.trim().slice(0, -1), '<', 2);
+      value = unQuoteCurlies(value.slice(1, -1));
+      let [className, qrefQuery] = splitn(value, ' ', 2);
+      const EntityClass = qrefMap[className].class;
+      if (EntityClass == null) {
+        throw new Error();
+      }
+      const qref = queryParser({
+        query: qrefQuery,
+        entityClass: EntityClass,
+        defaultFields: qrefMap[className].defaultFields,
+        qrefMap,
+        bareHandler,
+      });
+      if (name.startsWith('-')) {
+        (selector['!qref'] as [string, any][]).push([name.slice(1), qref]);
+      } else {
+        (selector.qref as [string, any][]).push([name, qref]);
+      }
+    } catch (e: any) {
+      offsetIndex = endIndex;
+      qrefMatch = curQuery.slice(offsetIndex).match(qrefRegex);
+
+      if (!selector.qref?.length) {
+        delete selector.qref;
+      }
+      if (!selector['!qref']?.length) {
+        delete selector['!qref'];
+      }
+
+      continue;
+    }
+    if (!selector.qref?.length) {
+      delete selector.qref;
+    }
+    if (!selector['!qref']?.length) {
+      delete selector['!qref'];
+    }
+
+    curQuery =
+      curQuery.slice(0, (qrefMatch.index ?? 0) + offsetIndex) +
+      ' ' +
+      curQuery.slice(endIndex);
+    qrefMatch = curQuery.slice(offsetIndex).match(qrefRegex);
+  }
+
+  // eg. prop(some search string) or -prop(some search string)
+  const searchRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)\([^\)]+\)(?=\s|\)|\}>|$)/g;
+  const searchMatch = curQuery.match(searchRegex);
+  if (searchMatch) {
+    selector.search = [];
+    selector['!search'] = [];
+    for (let match of searchMatch) {
       try {
-        let [name, value] = splitn(match.trim().slice(0, -1), '<', 2);
-        value = unQuoteCurlies(value.slice(1, -1));
-        let [className, qrefQuery] = value.split(' ', 2);
-        const EntityClass = qrefMap[className].class;
-        if (EntityClass == null) {
-          continue;
+        let [name, value] = splitn(match.trim().slice(0, -1), '(', 2);
+        if (name.startsWith('-')) {
+          selector['!search'].push([name.slice(1), value]);
+        } else {
+          selector.search.push([name, value]);
         }
-        const qref = queryParser({
-          query: qrefQuery,
-          entityClass: EntityClass,
-          defaultFields: qrefMap[className].defaultFields,
-          qrefMap,
-          bareHandler,
-        });
-        if (name.endsWith('!')) {
-          selector['!qref'].push([name.slice(0, -1), qref]);
+      } catch (e: any) {
+        continue;
+      }
+    }
+    if (!selector.search.length) {
+      delete selector.search;
+    }
+    if (!selector['!search'].length) {
+      delete selector['!search'];
+    }
+  }
+  curQuery = curQuery.replace(searchRegex, '');
+
+  // eg. name:Marty or name:"Marty McFly" or -name:'Marty McFly'
+  const searchColonRegex =
+    /(?:\s|^)(?!(limit|offset|sort|reverse):)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?):("[^"]*?"|'[^']*?'|[^\s]+)(?=\s|\)|\}>|$)/g;
+  const searchColonMatch = curQuery.match(searchColonRegex);
+  if (searchColonMatch) {
+    if (!('search' in selector)) {
+      selector.search = [];
+    }
+    if (!('!search' in selector)) {
+      selector['!search'] = [];
+    }
+    for (let match of searchColonMatch) {
+      try {
+        let [name, value] = splitn(match.trim(), ':', 2);
+        if (name.startsWith('-')) {
+          (selector['!search'] as [string, string][]).push([
+            name.slice(1),
+            value,
+          ]);
         } else {
-          selector.qref.push([name, qref]);
+          (selector.search as [string, string][]).push([name, value]);
         }
       } catch (e: any) {
         continue;
       }
     }
-    if (!selector.qref.length) {
-      delete selector.qref;
+    if (selector.search == null || !selector.search.length) {
+      delete selector.search;
     }
-    if (!selector['!qref'].length) {
-      delete selector['!qref'];
+    if (selector['!search'] == null || !selector['!search'].length) {
+      delete selector['!search'];
     }
   }
-  curQuery = curQuery.replace(qrefRegex, '');
+  curQuery = curQuery.replace(searchColonRegex, '');
 
-  // eg. name=Marty or name="Marty McFly" or enabled=true or someArray=[1,2]
-  const equalRegex = /(?: |^)(\w+)!?=(""|".*?[^\\]"|[^ ]+)(?= |$)/g;
+  // eg. someArray=[1,2] or someObject={"prop":"some value"}
+  const equalJsonRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)=(\{|\[)/g;
+  const equalJsonMatch = [...curQuery.matchAll(equalJsonRegex)];
+  if (equalJsonMatch) {
+    if (!('equal' in selector)) {
+      selector.equal = [];
+    }
+    if (!('!equal' in selector)) {
+      selector['!equal'] = [];
+    }
+    // Work backward to find all long JSON values.
+    for (let i = equalJsonMatch.length - 1; i >= 0; i--) {
+      const match = equalJsonMatch[i];
+      let [name, opener] = splitn(match[0].trim(), '=', 2);
+      let start = match.index + match[0].length - 1;
+      let nextEndToken = curQuery.indexOf(opener === '{' ? '}' : ']', start);
+      while (nextEndToken !== -1) {
+        try {
+          if (name.startsWith('-')) {
+            (selector['!equal'] as [string, any][]).unshift([
+              name.slice(1),
+              JSON.parse(curQuery.substring(start, nextEndToken + 1)),
+            ]);
+          } else {
+            (selector.equal as [string, any][]).unshift([
+              name,
+              JSON.parse(curQuery.substring(start, nextEndToken + 1)),
+            ]);
+          }
+
+          curQuery =
+            curQuery.substring(0, match.index) +
+            curQuery.substring(nextEndToken + 1);
+          break;
+        } catch (e: any) {
+          nextEndToken = curQuery.indexOf(
+            opener === '{' ? '}' : ']',
+            nextEndToken + 1,
+          );
+        }
+      }
+    }
+    if (selector.equal == null || !selector.equal.length) {
+      delete selector.equal;
+    }
+    if (selector['!equal'] == null || !selector['!equal'].length) {
+      delete selector['!equal'];
+    }
+  }
+
+  // eg. name=Marty or name="Marty McFly" or enabled=true
+  const equalRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)=(""|".*?[^\\]"|[^\s]+)(?=\s|\)|\}>|$)/g;
   const equalMatch = curQuery.match(equalRegex);
   if (equalMatch) {
-    selector.equal = [];
-    selector['!equal'] = [];
+    if (!('equal' in selector)) {
+      selector.equal = [];
+    }
+    if (!('!equal' in selector)) {
+      selector['!equal'] = [];
+    }
     for (let match of equalMatch) {
       try {
-        let [name, value] = match.trim().split('=', 2);
+        let [name, value] = splitn(match.trim(), '=', 2);
         try {
-          if (name.endsWith('!')) {
-            selector['!equal'].push([name.slice(0, -1), JSON.parse(value)]);
+          if (name.startsWith('-')) {
+            (selector['!equal'] as [string, any][]).push([
+              name.slice(1),
+              JSON.parse(value),
+            ]);
           } else {
-            selector.equal.push([name, JSON.parse(value)]);
+            (selector.equal as [string, any][]).push([name, JSON.parse(value)]);
           }
         } catch (e: any) {
-          if (name.endsWith('!')) {
-            selector['!equal'].push([name.slice(0, -1), unQuoteString(value)]);
+          if (name.startsWith('-')) {
+            (selector['!equal'] as [string, any][]).push([
+              name.slice(1),
+              unQuoteString(value),
+            ]);
           } else {
-            selector.equal.push([name, unQuoteString(value)]);
+            (selector.equal as [string, any][]).push([
+              name,
+              unQuoteString(value),
+            ]);
           }
         }
       } catch (e: any) {
         continue;
       }
     }
-    if (!selector.equal.length) {
+    if (selector.equal == null || !selector.equal.length) {
       delete selector.equal;
     }
-    if (!selector['!equal'].length) {
+    if (selector['!equal'] == null || !selector['!equal'].length) {
       delete selector['!equal'];
     }
   }
   curQuery = curQuery.replace(equalRegex, '');
 
-  // eg. user<{790274347f9b3a018c2cedee}> or user!<{790274347f9b3a018c2cedee}>
-  const refRegex = /(?: |^)(\w+)!?<\{([0-9a-f]{24})\}>(?= |$)/g;
+  // eg. user<{790274347f9b3a018c2cedee}> or -user<{790274347f9b3a018c2cedee}>
+  const refRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)<\{([0-9a-f]{24})\}>(?=\s|\)|\}>|$)/g;
   const refMatch = curQuery.match(refRegex);
   if (refMatch) {
     selector.ref = [];
     selector['!ref'] = [];
     for (let match of refMatch) {
       try {
-        let [name, value] = match.trim().slice(0, -1).split('<', 2);
-        if (name.endsWith('!')) {
-          selector['!ref'].push([name.slice(0, -1), value.slice(1, -1)]);
+        let [name, value] = splitn(match.trim().slice(0, -1), '<', 2);
+        if (name.startsWith('-')) {
+          selector['!ref'].push([name.slice(1), value.slice(1, -1)]);
         } else {
           selector.ref.push([name, value.slice(1, -1)]);
         }
@@ -324,32 +513,30 @@ function selectorParser({
   }
   curQuery = curQuery.replace(refRegex, '');
 
-  // eg. someArrayOfNumbers<10> or someObject!<"some string">
-  const containRegex = /(?: |^)(\w+)!?(<.*?[^\\]>)(?= |$)/g;
+  // eg. someArrayOfNumbers<10> or -someObject<"some string">
+  const containRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)(<(?:[^"][^>]*?|".*?[^\\]"))>(?=\s|\)|\}>|$)/g;
   const containMatch = curQuery.match(containRegex);
   if (containMatch) {
     selector.contain = [];
     selector['!contain'] = [];
     for (let match of containMatch) {
       try {
-        let [name, value] = match.trim().slice(0, -1).split('<', 2);
+        let [name, value] = splitn(match.trim().slice(0, -1), '<', 2);
         try {
-          if (name.endsWith('!')) {
+          if (name.startsWith('-')) {
             selector['!contain'].push([
-              name.slice(0, -1),
-              JSON.parse(unQuoteAngles(value)),
+              name.slice(1),
+              JSON.parse(unQuoteString(value)),
             ]);
           } else {
-            selector.contain.push([name, JSON.parse(unQuoteAngles(value))]);
+            selector.contain.push([name, JSON.parse(unQuoteString(value))]);
           }
         } catch (e: any) {
-          if (name.endsWith('!')) {
-            selector['!contain'].push([
-              name.slice(0, -1),
-              unQuoteAngles(value),
-            ]);
+          if (name.startsWith('-')) {
+            selector['!contain'].push([name.slice(1), unQuoteString(value)]);
           } else {
-            selector.contain.push([name, unQuoteAngles(value)]);
+            selector.contain.push([name, unQuoteString(value)]);
           }
         }
       } catch (e: any) {
@@ -365,8 +552,9 @@ function selectorParser({
   }
   curQuery = curQuery.replace(containRegex, '');
 
-  // eg. name~/Hunter/ or name!~/hunter/i
-  const posixRegex = /(?: |^)(\w+)!?~(\/\/|\/.*?[^\\]\/)i?(?= |$)/g;
+  // eg. name~/Hunter/ or -name~/hunter/i
+  const posixRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)~(\/\/|\/.*?[^\\]\/)i?(?=\s|\)|\}>|$)/g;
   const posixMatch = curQuery.match(posixRegex);
   if (posixMatch) {
     selector.match = [];
@@ -375,16 +563,16 @@ function selectorParser({
     selector['!imatch'] = [];
     for (let match of posixMatch) {
       try {
-        let [name, value] = match.trim().split('~', 2);
-        if (name.endsWith('!')) {
+        let [name, value] = splitn(match.trim(), '~', 2);
+        if (name.startsWith('-')) {
           if (value.endsWith('i')) {
             selector['!imatch'].push([
-              name.slice(0, -1),
+              name.slice(1),
               value.replace(/^\/|\/i$/g, ''),
             ]);
           } else {
             selector['!match'].push([
-              name.slice(0, -1),
+              name.slice(1),
               value.replace(/^\/|\/$/g, ''),
             ]);
           }
@@ -414,8 +602,9 @@ function selectorParser({
   }
   curQuery = curQuery.replace(posixRegex, '');
 
-  // eg. name~Hunter or name!~"hunter"i
-  const likeRegex = /(?: |^)(\w+)!?~(""i?|".*?[^\\]"i?|[^ ]+)(?= |$)/g;
+  // eg. name~Hunter or -name~"hunter"i
+  const likeRegex =
+    /(?:\s|^)-?([^-\s=\[\]<>{}()][^\s=\[\]<>{}()]*?)~(""i?|".*?[^\\]"i?|[^\s]+)(?=\s|\)|\}>|$)/g;
   const likeMatch = curQuery.match(likeRegex);
   if (likeMatch) {
     selector.like = [];
@@ -424,15 +613,15 @@ function selectorParser({
     selector['!ilike'] = [];
     for (let match of likeMatch) {
       try {
-        let [name, value] = match.trim().split('~', 2);
-        if (name.endsWith('!')) {
+        let [name, value] = splitn(match.trim(), '~', 2);
+        if (name.startsWith('-')) {
           if (value.endsWith('"i')) {
             selector['!ilike'].push([
-              name.slice(0, -1),
+              name.slice(1),
               unQuoteString(value.slice(0, -1)),
             ]);
           } else {
-            selector['!like'].push([name.slice(0, -1), unQuoteString(value)]);
+            selector['!like'].push([name.slice(1), unQuoteString(value)]);
           }
         } else {
           if (value.endsWith('"i')) {
@@ -460,16 +649,16 @@ function selectorParser({
   }
   curQuery = curQuery.replace(likeRegex, '');
 
-  // eg. {790274347f9b3a018c2cedee} or {!790274347f9b3a018c2cedee}
-  const guidRegex = /(?: |^)\{!?([0-9a-f]{24})\}(?= |$)/g;
+  // eg. {790274347f9b3a018c2cedee} or -{790274347f9b3a018c2cedee}
+  const guidRegex = /(?:\s|^)-?\{([0-9a-f]{24})\}(?=\s|\)|\}>|$)/g;
   const guidMatch = curQuery.match(guidRegex);
   if (guidMatch) {
     selector.guid = [];
     selector['!guid'] = [];
     for (let match of guidMatch) {
       try {
-        let guid = match.trim().replace(/^\{|\}$/g, '');
-        if (guid.startsWith('!')) {
+        let guid = match.trim().replace(/^(-?)\{|\}$/g, '$1');
+        if (guid.startsWith('-')) {
           selector['!guid'].push(guid.slice(1));
         } else {
           selector.guid.push(guid);
@@ -487,16 +676,16 @@ function selectorParser({
   }
   curQuery = curQuery.replace(guidRegex, '');
 
-  // eg. [enabled] or [!defaultPrimaryGroup]
-  const truthyRegex = /(?: |^)\[(!?\w+)\](?= |$)/g;
+  // eg. [enabled] or -[defaultPrimaryGroup]
+  const truthyRegex = /(?:\s|^)-?\[([^\s=\[\]<>{}]+?)\](?=\s|\)|\}>|$)/g;
   const truthyMatch = curQuery.match(truthyRegex);
   if (truthyMatch) {
     selector.truthy = [];
     selector['!truthy'] = [];
     for (let match of truthyMatch) {
       try {
-        let name = match.trim().replace(/^\[|\]$/g, '');
-        if (name.startsWith('!')) {
+        let name = match.trim().replace(/^(-?)\[|\]$/g, '$1');
+        if (name.startsWith('-')) {
           selector['!truthy'].push(name.slice(1));
         } else {
           selector.truthy.push(name);
@@ -514,16 +703,16 @@ function selectorParser({
   }
   curQuery = curQuery.replace(truthyRegex, '');
 
-  // eg. <archived> or <!archived>
-  const tagRegex = /(?: |^)<(!?\w+)>(?= |$)/g;
+  // eg. <archived> or -<archived>
+  const tagRegex = /(?:\s|^)-?<(\w+)>(?=\s|\)|\}>|$)/g;
   const tagMatch = curQuery.match(tagRegex);
   if (tagMatch) {
     selector.tag = [];
     selector['!tag'] = [];
     for (let match of tagMatch) {
       try {
-        let name = match.trim().replace(/^<|>$/g, '');
-        if (name.startsWith('!')) {
+        let name = match.trim().replace(/^(-?)<|>$/g, '$1');
+        if (name.startsWith('-')) {
           selector['!tag'].push(name.slice(1));
         } else {
           selector.tag.push(name);
@@ -541,15 +730,21 @@ function selectorParser({
   }
   curQuery = curQuery.replace(tagRegex, '');
 
-  // eg. cdate>15
-  const gtRegex = /(?: |^)(\w+)>(-?\d+(?:\.\d+)?)(?= |$)/g;
+  // eg. cdate>15 or -cdate>15
+  const gtRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)>(-?\d+(?:\.\d+)?)(?=\s|\)|\}>|$)/g;
   const gtMatch = curQuery.match(gtRegex);
   if (gtMatch) {
     selector.gt = [];
+    selector['!gt'] = [];
     for (let match of gtMatch) {
       try {
-        let [name, value] = match.trim().split('>', 2);
-        selector.gt.push([name, Number(value)]);
+        let [name, value] = splitn(match.trim(), '>', 2);
+        if (name.startsWith('-')) {
+          selector['!gt'].push([name.slice(1), Number(value)]);
+        } else {
+          selector.gt.push([name, Number(value)]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -557,24 +752,39 @@ function selectorParser({
     if (!selector.gt.length) {
       delete selector.gt;
     }
+    if (!selector['!gt'].length) {
+      delete selector['!gt'];
+    }
   }
   curQuery = curQuery.replace(gtRegex, '');
 
-  // eg. cdate>yesterday or cdate>"2 days ago"
-  const gtRelativeRegex = /(?: |^)(\w+)>(\w+|"[^"]+")(?= |$)/g;
+  // eg. cdate>yesterday or -cdate>"2 days ago"
+  const gtRelativeRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)>(\w+|"[^"]+")(?=\s|\)|\}>|$)/g;
   const gtRelativeMatch = curQuery.match(gtRelativeRegex);
   if (gtRelativeMatch) {
     if (selector.gt == null) {
       selector.gt = [];
     }
+    if (selector['!gt'] == null) {
+      selector['!gt'] = [];
+    }
     for (let match of gtRelativeMatch) {
       try {
-        let [name, value] = match.trim().split('>', 2);
-        (selector.gt as [string, null, string][]).push([
-          name,
-          null,
-          value.replace(/"/g, ''),
-        ]);
+        let [name, value] = splitn(match.trim(), '>', 2);
+        if (name.startsWith('-')) {
+          (selector['!gt'] as [string, null, string][]).push([
+            name.slice(1),
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        } else {
+          (selector.gt as [string, null, string][]).push([
+            name,
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -582,18 +792,27 @@ function selectorParser({
     if (!selector.gt.length) {
       delete selector.gt;
     }
+    if (!selector['!gt'].length) {
+      delete selector['!gt'];
+    }
   }
   curQuery = curQuery.replace(gtRelativeRegex, '');
 
-  // eg. cdate>=15
-  const gteRegex = /(?: |^)(\w+)>=(-?\d+(?:\.\d+)?)(?= |$)/g;
+  // eg. cdate>=15 or -cdate>=15
+  const gteRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)>=(-?\d+(?:\.\d+)?)(?=\s|\)|\}>|$)/g;
   const gteMatch = curQuery.match(gteRegex);
   if (gteMatch) {
     selector.gte = [];
+    selector['!gte'] = [];
     for (let match of gteMatch) {
       try {
-        let [name, value] = match.trim().split('>=', 2);
-        selector.gte.push([name, Number(value)]);
+        let [name, value] = splitn(match.trim(), '>=', 2);
+        if (name.startsWith('-')) {
+          selector['!gte'].push([name.slice(1), Number(value)]);
+        } else {
+          selector.gte.push([name, Number(value)]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -601,24 +820,39 @@ function selectorParser({
     if (!selector.gte.length) {
       delete selector.gte;
     }
+    if (!selector['!gte'].length) {
+      delete selector['!gte'];
+    }
   }
   curQuery = curQuery.replace(gteRegex, '');
 
-  // eg. cdate>=yesterday or cdate>="2 days ago"
-  const gteRelativeRegex = /(?: |^)(\w+)>=(\w+|"[^"]+")(?= |$)/g;
+  // eg. cdate>=yesterday or -cdate>="2 days ago"
+  const gteRelativeRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)>=(\w+|"[^"]+")(?=\s|\)|\}>|$)/g;
   const gteRelativeMatch = curQuery.match(gteRelativeRegex);
   if (gteRelativeMatch) {
     if (selector.gte == null) {
       selector.gte = [];
     }
+    if (selector['!gte'] == null) {
+      selector['!gte'] = [];
+    }
     for (let match of gteRelativeMatch) {
       try {
-        let [name, value] = match.trim().split('>=', 2);
-        (selector.gte as [string, null, string][]).push([
-          name,
-          null,
-          value.replace(/"/g, ''),
-        ]);
+        let [name, value] = splitn(match.trim(), '>=', 2);
+        if (name.startsWith('-')) {
+          (selector['!gte'] as [string, null, string][]).push([
+            name.slice(1),
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        } else {
+          (selector.gte as [string, null, string][]).push([
+            name,
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -626,18 +860,27 @@ function selectorParser({
     if (!selector.gte.length) {
       delete selector.gte;
     }
+    if (!selector['!gte'].length) {
+      delete selector['!gte'];
+    }
   }
   curQuery = curQuery.replace(gteRelativeRegex, '');
 
-  // eg. cdate<15
-  const ltRegex = /(?: |^)(\w+)<(-?\d+(?:\.\d+)?)(?= |$)/g;
+  // eg. cdate<15 or -cdate<15
+  const ltRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)<(-?\d+(?:\.\d+)?)(?=\s|\)|\}>|$)/g;
   const ltMatch = curQuery.match(ltRegex);
   if (ltMatch) {
     selector.lt = [];
+    selector['!lt'] = [];
     for (let match of ltMatch) {
       try {
-        let [name, value] = match.trim().split('<', 2);
-        selector.lt.push([name, Number(value)]);
+        let [name, value] = splitn(match.trim(), '<', 2);
+        if (name.startsWith('-')) {
+          selector['!lt'].push([name.slice(1), Number(value)]);
+        } else {
+          selector.lt.push([name, Number(value)]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -645,24 +888,39 @@ function selectorParser({
     if (!selector.lt.length) {
       delete selector.lt;
     }
+    if (!selector['!lt'].length) {
+      delete selector['!lt'];
+    }
   }
   curQuery = curQuery.replace(ltRegex, '');
 
-  // eg. cdate<yesterday or cdate<"2 days ago"
-  const ltRelativeRegex = /(?: |^)(\w+)<(\w+|"[^"]+")(?= |$)/g;
+  // eg. cdate<yesterday or -cdate<"2 days ago"
+  const ltRelativeRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)<(\w+|"[^"]+")(?=\s|\)|\}>|$)/g;
   const ltRelativeMatch = curQuery.match(ltRelativeRegex);
   if (ltRelativeMatch) {
     if (selector.lt == null) {
       selector.lt = [];
     }
+    if (selector['!lt'] == null) {
+      selector['!lt'] = [];
+    }
     for (let match of ltRelativeMatch) {
       try {
-        let [name, value] = match.trim().split('<', 2);
-        (selector.lt as [string, null, string][]).push([
-          name,
-          null,
-          value.replace(/"/g, ''),
-        ]);
+        let [name, value] = splitn(match.trim(), '<', 2);
+        if (name.startsWith('-')) {
+          (selector['!lt'] as [string, null, string][]).push([
+            name.slice(1),
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        } else {
+          (selector.lt as [string, null, string][]).push([
+            name,
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -670,18 +928,27 @@ function selectorParser({
     if (!selector.lt.length) {
       delete selector.lt;
     }
+    if (!selector['!lt'].length) {
+      delete selector['!lt'];
+    }
   }
   curQuery = curQuery.replace(ltRelativeRegex, '');
 
-  // eg. cdate<=15
-  const lteRegex = /(?: |^)(\w+)<=(-?\d+(?:\.\d+)?)(?= |$)/g;
+  // eg. cdate<=15 or -cdate<=15
+  const lteRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)<=(-?\d+(?:\.\d+)?)(?=\s|\)|\}>|$)/g;
   const lteMatch = curQuery.match(lteRegex);
   if (lteMatch) {
     selector.lte = [];
+    selector['!lte'] = [];
     for (let match of lteMatch) {
       try {
-        let [name, value] = match.trim().split('<=', 2);
-        selector.lte.push([name, Number(value)]);
+        let [name, value] = splitn(match.trim(), '<=', 2);
+        if (name.startsWith('-')) {
+          selector['!lte'].push([name.slice(1), Number(value)]);
+        } else {
+          selector.lte.push([name, Number(value)]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -689,24 +956,39 @@ function selectorParser({
     if (!selector.lte.length) {
       delete selector.lte;
     }
+    if (!selector['!lte'].length) {
+      delete selector['!lte'];
+    }
   }
   curQuery = curQuery.replace(lteRegex, '');
 
-  // eg. cdate<=yesterday or cdate<="2 days ago"
-  const lteRelativeRegex = /(?: |^)(\w+)<=(\w+|"[^"]+")(?= |$)/g;
+  // eg. cdate<=yesterday or -cdate<="2 days ago"
+  const lteRelativeRegex =
+    /(?:\s|^)-?([^\s=\[\]<>{}]+?)<=(\w+|"[^"]+")(?=\s|\)|\}>|$)/g;
   const lteRelativeMatch = curQuery.match(lteRelativeRegex);
   if (lteRelativeMatch) {
     if (selector.lte == null) {
       selector.lte = [];
     }
+    if (selector['!lte'] == null) {
+      selector['!lte'] = [];
+    }
     for (let match of lteRelativeMatch) {
       try {
-        let [name, value] = match.trim().split('<=', 2);
-        (selector.lte as [string, null, string][]).push([
-          name,
-          null,
-          value.replace(/"/g, ''),
-        ]);
+        let [name, value] = splitn(match.trim(), '<=', 2);
+        if (name.startsWith('-')) {
+          (selector['!lte'] as [string, null, string][]).push([
+            name.slice(1),
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        } else {
+          (selector.lte as [string, null, string][]).push([
+            name,
+            null,
+            value.replace(/"/g, ''),
+          ]);
+        }
       } catch (e: any) {
         continue;
       }
@@ -714,6 +996,9 @@ function selectorParser({
     if (!selector.lte.length) {
       delete selector.lte;
     }
+    if (!selector['!lte'].length) {
+      delete selector['!lte'];
+    }
   }
   curQuery = curQuery.replace(lteRelativeRegex, '');