@tellaro/tql 1.4.1 → 1.4.3

package/dist/src/completionProvider.js

@@ -1,4 +1,4 @@
-import { tokenizeTql as x, COMPARISON_OPERATORS as S, LOGICAL_OPERATORS as N, AGGREGATION_FUNCTIONS as I, VISUALIZATION_TYPES as L, TYPE_HINTS as A, MUTATORS as R } from "./tokenizer.js";
+import { tokenizeTql as x, COMPARISON_OPERATORS as N, LOGICAL_OPERATORS as S, AGGREGATION_FUNCTIONS as I, VISUALIZATION_TYPES as A, TYPE_HINTS as L, MUTATORS as R } from "./tokenizer.js";
 import { fuzzyMatch as w } from "./fuzzyMatcher.js";
 import { getSchemaCache as $ } from "./schemaCache.js";
 const P = [
@@ -120,6 +120,7 @@ const P = [
   regexp: { detail: "Regular expression", documentation: "Match using regex pattern" },
   regex: { detail: "Regular expression", documentation: "Alias for regexp" },
   not_regexp: { detail: "Not matching regex", documentation: "Negative regex match" },
+  not_regex: { detail: "Not matching regex", documentation: "Alias for not_regexp" },
   matches: { detail: "Pattern match", documentation: "Match using pattern" },
   not_matches: { detail: "Not matching pattern", documentation: "Negative pattern match" },
   between: { detail: "Between range", documentation: "Usage: field between A AND B" },
@@ -228,6 +229,7 @@ const P = [
   regexp: ["text", "keyword"],
   regex: ["text", "keyword"],
   not_regexp: ["text", "keyword"],
+  not_regex: ["text", "keyword"],
   matches: ["text", "keyword"],
   not_matches: ["text", "keyword"],
   // IP-specific operators
@@ -260,14 +262,14 @@ class E {
     this.cache.clear();
   }
 }
-const v = new E();
+const k = new E();
 function U(e, t, i) {
   if (!e) return { type: "start", partialText: "" };
-  const o = `${e.substring(0, t)}|${t}`, a = v.get(o);
+  const o = `${e.substring(0, t)}|${t}`, a = k.get(o);
   if (a)
     return a.fieldName && !a.fieldType && i && (a.fieldType = p(a.fieldName, i)), a;
   const n = F(e, t, i);
-  return v.set(o, n), n;
+  return k.set(o, n), n;
 }
 function F(e, t, i) {
   const a = x(e.substring(0, t)).filter((l) => l.type !== "whitespace");
@@ -381,9 +383,7 @@ function p(e, t) {
   return t ? $().getFieldType(t, e) : void 0;
 }
 function Q(e, t = {}) {
-  const { query: i, cursorPosition: o } = e;
-  if (!i) return [];
-  const a = U(i, o, t.fields), n = [];
+  const { query: i, cursorPosition: o } = e, a = U(i, o, t.fields), n = [];
   switch (a.type) {
     case "start":
     case "after_paren":
@@ -489,10 +489,10 @@ function g(e, t) {
     return G(t);
   const i = [];
   for (const o of e) {
-    const a = k(o);
+    const a = v(o);
     if (i.push(a), o.nested)
       for (const n of o.nested) {
-        const s = k(n, o.name);
+        const s = v(n, o.name);
         i.push(s);
       }
   }
@@ -524,7 +524,7 @@ function G(e) {
     sortOrder: 10
   }));
 }
-function k(e, t) {
+function v(e, t) {
   const i = t ? `${t}.${e.name}` : e.name;
   return {
     label: i,
@@ -537,7 +537,7 @@ function k(e, t) {
   };
 }
 function y(e, t) {
-  let i = [...S];
+  let i = [...N];
   return t && (i = i.filter((o) => {
     const a = z[o];
     return !a || a.includes(t);
@@ -564,6 +564,7 @@ function q(e, t) {
     "regexp",
     "regex",
     "not_regexp",
+    "not_regex",
     "matches",
     "not_matches"
   ], o = ["exists", "not_exists"], a = ["is", "is_not"];
@@ -608,7 +609,7 @@ function T(e) {
   return e === "long" || e === "integer" || e === "double" || e === "float" || e === "short" || e === "byte" || e === "half_float" || e === "scaled_float" || e === "unsigned_long";
 }
 function _() {
-  return N.filter((e) => e !== "NOT").map(
+  return S.filter((e) => e !== "NOT").map(
     (e, t) => O(e, t)
   );
 }
@@ -699,7 +700,7 @@ function C(e) {
   }));
 }
 function H(e) {
-  return A.filter(
+  return L.filter(
     (t) => !e || t.toLowerCase().includes(e.toLowerCase())
   ).map((t, i) => ({
     label: t,
@@ -710,7 +711,7 @@ function H(e) {
   }));
 }
 function Y(e) {
-  return L.filter(
+  return A.filter(
     (t) => !e || t.toLowerCase().includes(e.toLowerCase())
   ).map((t, i) => ({
     label: t,

package/dist/src/complexityAnalyzer.js

@@ -96,7 +96,7 @@ class c {
         }));
     }
     const s = e.operator.toLowerCase();
-    if ((s === "regexp" || s === "regex" || s === "matches" || s === "not_regexp" || s === "not_matches") && t.regexCount++, this.analyzeValue(e.value, t, a, e), (s === "in" || s === "not_in") && Array.isArray(e.value)) {
+    if ((s === "regexp" || s === "regex" || s === "matches" || s === "not_regexp" || s === "not_regex" || s === "not_matches") && t.regexCount++, this.analyzeValue(e.value, t, a, e), (s === "in" || s === "not_in") && Array.isArray(e.value)) {
       const i = e.value.length;
       t.inListMaxSize = Math.max(t.inListMaxSize, i);
     }

package/dist/src/parser.js

@@ -444,6 +444,7 @@ class v {
       "!startswith": "not_startswith",
       "!endswith": "not_endswith",
       "!regexp": "not_regexp",
+      "!regex": "not_regex",
       "!matches": "not_matches",
       "!between": "not_between",
       "!exists": "not_exists",

package/dist/src/semanticPreview.js

@@ -1,11 +1,11 @@
-import { parseTql as g } from "./parser.js";
+import { parseTql as f } from "./parser.js";
 import { analyzeComplexity as m } from "./complexityAnalyzer.js";
 class u {
   /**
    * Generate a complete preview for a TQL query
    */
   generatePreview(t) {
-    const r = g(t), i = m(t), n = [], s = {};
+    const r = f(t), i = m(t), n = [], s = {};
     if (!r.ast)
       return {
         fields: [],
@@ -96,7 +96,7 @@ class u {
       return "null_check";
     if (t === "cidr" || t === "not_cidr")
       return "cidr";
-    if (t === "regexp" || t === "regex" || t === "matches" || t === "not_regexp" || t === "not_matches")
+    if (t === "regexp" || t === "regex" || t === "matches" || t === "not_regexp" || t === "not_regex" || t === "not_matches")
       return "regex";
     if (t === "between" || t === "not_between" || t === "gt" || t === "gte" || t === "lt" || t === "lte")
       return "range";
@@ -190,13 +190,13 @@ function F(e) {
 }
 function h(e) {
   if (e.type === "comparison") {
-    const t = e.mutators?.length ? ` | ${e.mutators.join(" | ")}` : "", r = f(e.value);
+    const t = e.mutators?.length ? ` | ${e.mutators.join(" | ")}` : "", r = g(e.value);
     return `${e.field}${t} ${e.operator} ${r}`;
   }
   return e.type === "NOT" && e.children?.length === 1 ? `NOT (${h(e.children[0])})` : e.type === "group" && e.children?.length === 1 ? `(${h(e.children[0])})` : (e.type === "AND" || e.type === "OR") && e.children ? e.children.map(h).join(` ${e.type} `) : "";
 }
-function f(e) {
-  return e === null ? "null" : e === void 0 ? "" : typeof e == "string" ? `"${e}"` : Array.isArray(e) ? `[${e.map(f).join(", ")}]` : String(e);
+function g(e) {
+  return e === null ? "null" : e === void 0 ? "" : typeof e == "string" ? `"${e}"` : Array.isArray(e) ? `[${e.map(g).join(", ")}]` : String(e);
 }
 function N(e, t = "") {
   if (!e)
@@ -208,7 +208,7 @@ function N(e, t = "") {
 function l(e, t, r, i) {
   const n = i ? "└── " : "├── ", s = i ? "    " : "│   ";
   if (e.type === "comparison") {
-    const a = e.mutators?.length ? ` | ${e.mutators.join(" | ")}` : "", c = f(e.value);
+    const a = e.mutators?.length ? ` | ${e.mutators.join(" | ")}` : "", c = g(e.value);
     t.push(`${r}${n}${e.field}${a} ${e.operator} ${c}`);
   } else e.type === "NOT" ? (t.push(`${r}${n}NOT`), e.children?.length && l(e.children[0], t, r + s, !0)) : e.type === "group" ? (t.push(`${r}${n}GROUP`), e.children?.length && l(e.children[0], t, r + s, !0)) : e.children && (t.push(`${r}${n}${e.type}`), e.children.forEach((a, c) => {
     const o = c === e.children.length - 1;

package/dist/src/tokenizer.js

@@ -26,6 +26,7 @@ const l = [
   "regexp",
   "regex",
   "not_regexp",
+  "not_regex",
   "matches",
   "not_matches",
   // Range operators
@@ -68,6 +69,7 @@ const l = [
   "!startswith": "not_startswith",
   "!endswith": "not_endswith",
   "!regexp": "not_regexp",
+  "!regex": "not_regex",
   "!matches": "not_matches",
   "!between": "not_between",
   "!exists": "not_exists",
@@ -114,7 +116,7 @@ const l = [
   "sum",
   "min",
   "max"
-], f = [
+], _ = [
   // Counting
   "count",
   "unique_count",
@@ -143,7 +145,7 @@ const l = [
   "values",
   "unique",
   "distinct"
-], _ = [
+], f = [
   "string",
   "str",
   "number",
@@ -355,7 +357,7 @@ class g {
    */
   classifyIdentifier(t) {
     const n = t.toUpperCase(), i = t.toLowerCase();
-    return d.includes(n) ? "logicalOp" : p.includes(n) ? "collectionOp" : i === "true" || i === "false" ? "boolean" : i === "null" ? "null" : i === "stats" ? "keyword" : l.includes(i) ? "operator" : f.includes(i) ? "aggregation" : k.includes(i) ? "mutator" : _.includes(i) ? "typeHint" : m.includes(i) ? "visualization" : w.includes(i) ? "keyword" : "field";
+    return d.includes(n) ? "logicalOp" : p.includes(n) ? "collectionOp" : i === "true" || i === "false" ? "boolean" : i === "null" ? "null" : i === "stats" ? "keyword" : l.includes(i) ? "operator" : _.includes(i) ? "aggregation" : k.includes(i) ? "mutator" : f.includes(i) ? "typeHint" : m.includes(i) ? "visualization" : w.includes(i) ? "keyword" : "field";
   }
   // ============================================================================
   // Helper Methods
@@ -440,7 +442,7 @@ function E(o, t, n = !0) {
   return e;
 }
 export {
-  f as AGGREGATION_FUNCTIONS,
+  _ as AGGREGATION_FUNCTIONS,
   p as COLLECTION_OPERATORS,
   l as COMPARISON_OPERATORS,
   w as KEYWORDS,
@@ -448,7 +450,7 @@ export {
   k as MUTATORS,
   u as NEGATION_SYMBOL_OPERATORS,
   h as SYMBOL_OPERATORS,
-  _ as TYPE_HINTS,
+  f as TYPE_HINTS,
   g as TqlTokenizer,
   m as VISUALIZATION_TYPES,
   E as findPreviousToken,

package/dist/src/types.d.ts

@@ -97,7 +97,7 @@ export interface TqlFieldReference {
     start: number;
     end: number;
 }
-export type TqlComparisonOperator = "eq" | "ne" | "=" | "!=" | "==" | "eq_ci" | "gt" | "gte" | "lt" | "lte" | ">" | ">=" | "<" | "<=" | "contains" | "not_contains" | "!contains" | "startswith" | "not_startswith" | "!startswith" | "endswith" | "not_endswith" | "!endswith" | "contains_cs" | "not_contains_cs" | "!contains_cs" | "startswith_cs" | "not_startswith_cs" | "!startswith_cs" | "endswith_cs" | "not_endswith_cs" | "!endswith_cs" | "regexp" | "regex" | "not_regexp" | "!regexp" | "matches" | "not_matches" | "!matches" | "between" | "not_between" | "!between" | "in" | "not_in" | "!in" | "in_cs" | "not_in_cs" | "!in_cs" | "exists" | "not_exists" | "!exists" | "is" | "is_not" | "!is" | "cidr" | "not_cidr" | "!cidr" | "any" | "all" | "none" | "not_any" | "not_all" | "not_none" | "!any" | "!all" | "!none";
+export type TqlComparisonOperator = "eq" | "ne" | "=" | "!=" | "==" | "eq_ci" | "gt" | "gte" | "lt" | "lte" | ">" | ">=" | "<" | "<=" | "contains" | "not_contains" | "!contains" | "startswith" | "not_startswith" | "!startswith" | "endswith" | "not_endswith" | "!endswith" | "contains_cs" | "not_contains_cs" | "!contains_cs" | "startswith_cs" | "not_startswith_cs" | "!startswith_cs" | "endswith_cs" | "not_endswith_cs" | "!endswith_cs" | "regexp" | "regex" | "not_regexp" | "not_regex" | "!regexp" | "!regex" | "matches" | "not_matches" | "!matches" | "between" | "not_between" | "!between" | "in" | "not_in" | "!in" | "in_cs" | "not_in_cs" | "!in_cs" | "exists" | "not_exists" | "!exists" | "is" | "is_not" | "!is" | "cidr" | "not_cidr" | "!cidr" | "any" | "all" | "none" | "not_any" | "not_all" | "not_none" | "!any" | "!all" | "!none";
 export type TqlLogicalOperator = "AND" | "OR" | "NOT";
 export type TqlCollectionOperator = "ANY" | "ALL" | "NONE";
 export type TqlMutator = "lowercase" | "uppercase" | "trim" | "split" | "length" | "replace" | "b64encode" | "b64decode" | "urldecode" | "hexencode" | "hexdecode" | "md5" | "sha256" | "refang" | "defang" | "is_private" | "is_global" | "is_multicast" | "is_loopback" | "is_link_local" | "nslookup" | "geoip_lookup" | "geoip" | "geo" | "any" | "all" | "avg" | "average" | "sum" | "min" | "max";

package/dist/src/validator.js

@@ -38,7 +38,9 @@ const c = {
   regexp: ["text", "keyword"],
   regex: ["text", "keyword"],
   not_regexp: ["text", "keyword"],
+  not_regex: ["text", "keyword"],
   "!regexp": ["text", "keyword"],
+  "!regex": ["text", "keyword"],
   matches: ["text", "keyword"],
   not_matches: ["text", "keyword"],
   "!matches": ["text", "keyword"],
@@ -114,7 +116,9 @@ const c = {
   regexp: ["string"],
   regex: ["string"],
   not_regexp: ["string"],
+  not_regex: ["string"],
   "!regexp": ["string"],
+  "!regex": ["string"],
   matches: ["string"],
   not_matches: ["string"],
   "!matches": ["string"],
@@ -239,7 +243,7 @@ class b {
         "TYPE_MISMATCH"
       );
     }
-    if ((e.operator === "regexp" || e.operator === "regex" || e.operator === "not_regexp" || e.operator === "matches" || e.operator === "not_matches") && !Array.isArray(e.value) && e.value.valueType === "string" && typeof e.value.value == "string")
+    if ((e.operator === "regexp" || e.operator === "regex" || e.operator === "not_regexp" || e.operator === "not_regex" || e.operator === "matches" || e.operator === "not_matches") && !Array.isArray(e.value) && e.value.valueType === "string" && typeof e.value.value == "string")
       try {
         new RegExp(e.value.value);
       } catch {
@@ -313,7 +317,7 @@ class b {
 function d(s, e) {
   return new b(e).validate(s);
 }
-function w(s) {
+function h(s) {
   return d(s).valid;
 }
 function y(s, e) {
@@ -334,6 +338,6 @@ export {
   b as TqlValidator,
   f as formatValidationResult,
   y as getTqlIssues,
-  w as isValidTqlSyntax,
+  h as isValidTqlSyntax,
   d as validateTql
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellaro/tql",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Tellaro Query Language (TQL) parser, validator, and autocomplete for JavaScript/TypeScript",
   "type": "module",
   "main": "./dist/index.js",
@@ -120,7 +120,9 @@
     "@microsoft/api-extractor": {
       "minimatch": ">=10.2.3"
     },
+    "esbuild": ">=0.28.1",
     "flatted": ">=3.4.0",
-    "lodash": ">=4.18.0"
+    "lodash": ">=4.18.0",
+    "postcss": ">=8.5.10"
   }
 }