@tellaro/tql 0.1.10 → 0.1.12

package/dist/src/completionProvider.js

@@ -1,7 +1,7 @@
 var I = Object.defineProperty;
 var S = (e, t, a) => t in e ? I(e, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : e[t] = a;
 var p = (e, t, a) => S(e, typeof t != "symbol" ? t + "" : t, a);
-import { tokenizeTql as b, COMPARISON_OPERATORS as A, LOGICAL_OPERATORS as L, AGGREGATION_FUNCTIONS as R, VISUALIZATION_TYPES as $, TYPE_HINTS as P, MUTATORS as D } from "./tokenizer.js";
+import { tokenizeTql as b, COMPARISON_OPERATORS as A, LOGICAL_OPERATORS as L, AGGREGATION_FUNCTIONS as R, VISUALIZATION_TYPES as $, TYPE_HINTS as P, MUTATORS as D, ENRICHMENT_MUTATORS as ENRICHMENT_MUTATORS, MUTATOR_PARAMETERS as MUTATOR_PARAMETERS } from "./tokenizer.js";
 import { fuzzyMatch as _ } from "./fuzzyMatcher.js";
 import { getSchemaCache as M } from "./schemaCache.js";
 const E = [
@@ -256,8 +256,8 @@ class q {
   }
   set(t, a) {
     if (this.cache.size >= this.maxSize) {
-      const o = this.cache.keys().next().value;
-      o && this.cache.delete(o);
+      const i = this.cache.keys().next().value;
+      i && this.cache.delete(i);
     }
     this.cache.set(t, { result: a, timestamp: Date.now() });
   }
@@ -267,22 +267,28 @@ class q {
 }
 const v = new q();
 function B(e, t, a) {
-  const o = `${e.substring(0, t)}|${t}`, i = v.get(o);
-  if (i)
-    return i.fieldName && !i.fieldType && a && (i.fieldType = f(i.fieldName, a)), i;
+  const i = `${e.substring(0, t)}|${t}`, o = v.get(i);
+  if (o)
+    return o.fieldName && !o.fieldType && a && (o.fieldType = f(o.fieldName, a)), o;
   const n = G(e, t, a);
-  return v.set(o, n), n;
+  return v.set(i, n), n;
 }
 function G(e, t, a) {
   var u;
-  const i = b(e.substring(0, t)).filter((l) => l.type !== "whitespace");
-  if (i.length === 0)
+  const o = b(e.substring(0, t)).filter((l) => l.type !== "whitespace");
+  if (o.length === 0)
     return { type: "start" };
-  const n = i[i.length - 1], r = i.length > 1 ? i[i.length - 2] : null, d = n.end === t && !((u = e[t - 1]) != null && u.match(/\s/)), s = d ? n.value : void 0;
+  const n = o[o.length - 1], r = o.length > 1 ? o[o.length - 2] : null, d = n.end === t && !((u = e[t - 1]) != null && u.match(/\s/)), s = d ? n.value : void 0;
   if (n.type === "logicalOp")
     return { type: "start" };
-  if (n.type === "paren" && n.value === "(")
+  if (n.type === "paren" && n.value === "(") {
+    // Check if previous token is a mutator - we're inside mutator params
+    if (r && r.type === "mutator") {
+      const mutatorName = r.value.toLowerCase();
+      return { type: "mutator_params", mutatorName: mutatorName, usedParams: [], partialText: s };
+    }
     return { type: "after_paren" };
+  }
   if (n.type === "arrow")
     return { type: "after_arrow", partialText: s };
   if (n.type === "doubleColon")
@@ -347,21 +353,29 @@ function G(e, t, a) {
 function f(e, t) {
   return t ? M().getFieldType(t, e) : void 0;
 }
-function te(e, t = {}) {
-  const { query: a, cursorPosition: o } = e, i = B(a, o, t.fields), n = [];
-  switch (i.type) {
+function ae(e, t = {}) {
+  const { query: a, cursorPosition: i } = e, o = B(a, i, t.fields), n = [];
+  switch (o.type) {
     case "start":
     case "after_paren":
-      n.push(...y(t.fields, i.partialText)), n.push(N("NOT")), t.includeSnippets !== !1 && n.push(...Y(t, i.partialText));
+      n.push(...y(t.fields, o.partialText)), n.push(N("NOT")), t.includeSnippets !== !1 && n.push(...K(t, o.partialText));
       break;
     case "after_field":
-      n.push(...x(i.partialText, i.fieldType));
+      n.push(...x(o.partialText, o.fieldType)), n.push(H());
       break;
     case "after_mutator":
-      n.push(...x(i.partialText, i.mutatorOutputType));
+      // Check if this is an enrichment mutator (geo, nslookup, etc.)
+      // Enrichment mutators don't need operators - they transform the field into enriched data
+      if (o.mutatorName && ENRICHMENT_MUTATORS.includes(o.mutatorName)) {
+        // Suggest logical operators (AND, OR) or pipe for chaining
+        n.push(...C());
+        n.push(H());
+      } else {
+        n.push(...x(o.partialText, o.mutatorOutputType));
+      }
       break;
     case "after_operator":
-      n.push(...H(i.fieldName, t));
+      n.push(...Y(o.fieldName, t));
       break;
     case "after_value":
       n.push(...C());
@@ -369,28 +383,31 @@ function te(e, t = {}) {
     case "at_value_end":
       break;
     case "after_pipe":
-      n.push(...K(i.partialText));
+      n.push(...W(o.partialText));
       break;
     case "after_double_colon":
-      n.push(...W(i.partialText));
+      n.push(...Z(o.partialText));
       break;
     case "after_arrow":
-      n.push(...Z(i.partialText));
+      n.push(...J(o.partialText));
       break;
     case "after_stats":
-      n.push(...O(i.partialText));
+      n.push(...O(o.partialText));
       break;
     case "after_by":
-      n.push(...y(t.fields, i.partialText));
+      n.push(...y(t.fields, o.partialText));
+      break;
+    case "mutator_params":
+      n.push(...getMutatorParameterCompletions(o.mutatorName, o.usedParams, o.partialText));
       break;
     default:
-      n.push(...y(t.fields, i.partialText)), n.push(...x(i.partialText)), n.push(...C());
+      n.push(...y(t.fields, o.partialText)), n.push(...x(o.partialText)), n.push(...C());
   }
-  t.includeAggregations && i.type === "start" && n.push(...O(i.partialText));
+  t.includeAggregations && o.type === "start" && n.push(...O(o.partialText));
   let r = n;
   const d = t.fuzzyMatching !== !1, s = t.minFuzzyScore ?? 0;
-  if (i.partialText) {
-    const u = i.partialText.toLowerCase();
+  if (o.partialText) {
+    const u = o.partialText.toLowerCase();
     if (d) {
       const l = [];
       for (const c of n) {
@@ -416,11 +433,11 @@ function y(e, t) {
   if (!e || e.length === 0)
     return V(t);
   const a = [];
-  for (const o of e) {
-    const i = k(o);
-    if (a.push(i), o.nested)
-      for (const n of o.nested) {
-        const r = k(n, o.name);
+  for (const i of e) {
+    const o = k(i);
+    if (a.push(o), i.nested)
+      for (const n of i.nested) {
+        const r = k(n, i.name);
         a.push(r);
       }
   }
@@ -466,18 +483,18 @@ function k(e, t) {
 }
 function x(e, t) {
   let a = [...A];
-  return t && (a = a.filter((o) => {
-    const i = F[o];
-    return !i || i.includes(t);
-  })), e && (a = a.filter((o) => o.toLowerCase().includes(e.toLowerCase()))), a.map((o, i) => {
-    const n = U[o] || { detail: o, documentation: "" }, r = j(o, t);
+  return t && (a = a.filter((i) => {
+    const o = F[i];
+    return !o || o.includes(t);
+  })), e && (a = a.filter((i) => i.toLowerCase().includes(e.toLowerCase()))), a.map((i, o) => {
+    const n = U[i] || { detail: i, documentation: "" }, r = j(i, t);
     return {
-      label: o,
+      label: i,
       insertText: r,
       kind: "operator",
       detail: n.detail,
       documentation: n.documentation,
-      sortOrder: 20 + i
+      sortOrder: 20 + o
     };
   });
 }
@@ -494,14 +511,14 @@ function j(e, t) {
     "not_regexp",
     "matches",
     "not_matches"
-  ], o = ["exists", "not_exists"], i = ["is", "is_not"];
+  ], i = ["exists", "not_exists"], o = ["is", "is_not"];
   if (e === "in" || e === "not_in")
     return T(t) ? `${e} [$1]` : `${e} ["$1"]`;
   if (e === "between" || e === "not_between")
     return T(t) ? `${e} $1 AND $2` : `${e} "$1" AND "$2"`;
-  if (i.includes(e))
-    return `${e} null`;
   if (o.includes(e))
+    return `${e} null`;
+  if (i.includes(e))
     return e;
   if (e === "cidr" || e === "not_cidr")
     return `${e} "$1"`;
@@ -545,10 +562,21 @@ function N(e, t = 0) {
     sortOrder: 30 + t
   };
 }
-function H(e, t) {
-  var o;
+function H() {
+  return {
+    label: "|",
+    insertText: "| ",
+    kind: "operator",
+    detail: "Pipe to mutator",
+    documentation: "Chain field to a mutator function (e.g., hostname | lower)",
+    sortOrder: 19
+    // Just before operators (20+)
+  };
+}
+function Y(e, t) {
+  var i;
   const a = [];
-  return e && ((o = t == null ? void 0 : t.fieldValues) != null && o[e]) && t.fieldValues[e].forEach((n, r) => {
+  return e && ((i = t == null ? void 0 : t.fieldValues) != null && i[e]) && t.fieldValues[e].forEach((n, r) => {
     a.push({
       label: n,
       insertText: `"${n}"`,
@@ -587,26 +615,26 @@ function H(e, t) {
     }
   ), a;
 }
-function Y(e, t) {
-  return E.filter((o) => !t || o.label.toLowerCase().includes(t.toLowerCase())).map((o, i) => ({
-    label: o.label,
-    insertText: o.insertText,
+function K(e, t) {
+  return E.filter((i) => !t || i.label.toLowerCase().includes(t.toLowerCase())).map((i, o) => ({
+    label: i.label,
+    insertText: i.insertText,
     kind: "snippet",
-    detail: o.description,
-    documentation: `Insert: ${o.insertText}`,
-    sortOrder: 100 + i
+    detail: i.description,
+    documentation: `Insert: ${i.insertText}`,
+    sortOrder: 100 + o
   }));
 }
-function K(e) {
+function W(e) {
   return D.filter((t) => !e || t.toLowerCase().includes(e.toLowerCase())).map(
     (t, a) => {
-      const o = z[t] || { detail: "Field mutator", documentation: "" };
+      const i = z[t] || { detail: "Field mutator", documentation: "" };
       return {
         label: t,
         insertText: t,
         kind: "mutator",
-        detail: o.detail,
-        documentation: o.documentation,
+        detail: i.detail,
+        documentation: i.documentation,
         sortOrder: 60 + a
       };
     }
@@ -623,7 +651,7 @@ function O(e) {
     sortOrder: 70 + a
   }));
 }
-function W(e) {
+function Z(e) {
   return P.filter(
     (t) => !e || t.toLowerCase().includes(e.toLowerCase())
   ).map((t, a) => ({
@@ -634,7 +662,7 @@ function W(e) {
     sortOrder: 80 + a
   }));
 }
-function Z(e) {
+function J(e) {
   return $.filter(
     (t) => !e || t.toLowerCase().includes(e.toLowerCase())
   ).map((t, a) => ({
@@ -645,27 +673,73 @@ function Z(e) {
     sortOrder: 90 + a
   }));
 }
-function ae(e, t) {
-  const o = b(e).find(
-    (i) => i.start <= t && i.end >= t && i.type !== "whitespace"
+function ne(e, t) {
+  const i = b(e).find(
+    (o) => o.start <= t && o.end >= t && o.type !== "whitespace"
   );
-  return o ? {
-    word: o.value,
-    start: o.start,
-    end: o.end
+  return i ? {
+    word: i.value,
+    start: i.start,
+    end: i.end
   } : null;
 }
-function ne() {
+function oe() {
   return [" ", "(", ".", '"', "'", "|", ":", "="];
 }
 function ie(e, t, a) {
   if (a === " " || a === "(" || a === "." || a === "|" || a === ":" || a === "=") return !0;
-  const o = b(e.substring(0, t)), i = o[o.length - 1];
-  return !!(i && i.type === "field" && i.value.length >= 2);
+  const i = b(e.substring(0, t)), o = i[i.length - 1];
+  return !!(o && o.type === "field" && o.value.length >= 2);
+}
+/**
+ * Get mutator parameter completions
+ * @param mutatorName - The mutator name (e.g., "geo", "nslookup")
+ * @param usedParams - Parameters already used in the current call
+ * @param partialText - Partial text for filtering
+ */
+function getMutatorParameterCompletions(mutatorName, usedParams = [], partialText) {
+  const params = MUTATOR_PARAMETERS[mutatorName];
+  if (!params || params.length === 0) {
+    return [];
+  }
+
+  // Filter out already used parameters
+  const usedSet = new Set(usedParams.map(p => p.toLowerCase()));
+  const availableParams = params.filter(p => !usedSet.has(p.name.toLowerCase()));
+
+  // Filter by partial text if provided
+  let filteredParams = availableParams;
+  if (partialText) {
+    const searchText = partialText.toLowerCase();
+    filteredParams = availableParams.filter(p =>
+      p.name.toLowerCase().includes(searchText)
+    );
+  }
+
+  return filteredParams.map((param, idx) => {
+    // Generate insert text based on parameter type
+    let insertText = `${param.name}=`;
+    if (param.type === "boolean") {
+      insertText = `${param.name}=true`;
+    } else if (param.type === "string") {
+      insertText = `${param.name}="$1"`;
+    } else if (param.type === "number") {
+      insertText = `${param.name}=$1`;
+    }
+
+    return {
+      label: param.name,
+      insertText: insertText,
+      kind: "property",
+      detail: `${param.type} - ${param.description}`,
+      documentation: param.description,
+      sortOrder: 100 + idx
+    };
+  });
 }
 export {
-  ne as getCompletionTriggerCharacters,
-  te as getCompletions,
-  ae as getWordAtPosition,
+  oe as getCompletionTriggerCharacters,
+  ae as getCompletions,
+  ne as getWordAtPosition,
   ie as shouldTriggerCompletion
 };

package/dist/src/parser.js

@@ -1,7 +1,7 @@
 var c = Object.defineProperty;
 var d = (r, e, t) => e in r ? c(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
 var o = (r, e, t) => d(r, typeof e != "symbol" ? e + "" : e, t);
-import { tokenizeTql as p, COMPARISON_OPERATORS as v } from "./tokenizer.js";
+import { tokenizeTql as p, COMPARISON_OPERATORS as v, ENRICHMENT_MUTATORS as ENRICHMENT_MUTATORS } from "./tokenizer.js";
 const f = 50, k = /* @__PURE__ */ new Set(["logicalOp", "paren"]);
 class y {
   constructor(e) {
@@ -220,6 +220,22 @@ class y {
       mutators: n,
       end: this.previous().end
     }), !this.check("operator")) {
+      // Check if the last mutator is an enrichment mutator (geo, nslookup, etc.)
+      // Enrichment mutators don't require an operator - they transform the field into enriched data
+      const lastMutator = n.length > 0 ? n[n.length - 1] : null;
+      const isEnrichmentMutator = lastMutator && ENRICHMENT_MUTATORS.includes(lastMutator);
+
+      if (isEnrichmentMutator) {
+        // Return a valid enrichment expression without error
+        return {
+          type: "enrichment",
+          field: t,
+          mutator: lastMutator,
+          start: t.start,
+          end: t.end
+        };
+      }
+
       const s = this.isAtEnd() ? this.previous() : this.peek(), h = n.length > 0 ? `'${e.value}' with mutator` : `'${e.value}'`;
       return this.addError(
         `Expected operator after field ${h}`,

package/dist/src/tokenizer.d.ts

@@ -20,6 +20,20 @@ export declare const COLLECTION_OPERATORS: TqlCollectionOperator[];
  * Synchronized with Python/Rust implementations.
  */
 export declare const MUTATORS: TqlMutator[];
+/**
+ * Enrichment mutators that don't require an operator after them.
+ * These mutators transform the field into an enriched object/value that stands alone.
+ */
+export declare const ENRICHMENT_MUTATORS: string[];
+/**
+ * Parameters available for mutators that support function call syntax.
+ */
+export interface MutatorParameter {
+    name: string;
+    type: 'boolean' | 'string' | 'number';
+    description: string;
+}
+export declare const MUTATOR_PARAMETERS: Record<string, MutatorParameter[]>;
 /**
  * All aggregation functions supported by TQL.
  * Synchronized with Python/Rust implementations.

package/dist/src/tokenizer.js

@@ -1,6 +1,52 @@
 var l = Object.defineProperty;
 var u = (o, e, n) => e in o ? l(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
 var a = (o, e, n) => u(o, typeof e != "symbol" ? e + "" : e, n);
+// Enrichment mutators that don't require an operator after them
+// These mutators transform the field into an enriched object/value that stands alone
+const ENRICHMENT_MUTATORS = [
+  "geo",
+  "geoip",
+  "geoip_lookup",
+  "nslookup"
+];
+
+// Parameters available for mutators that support function call syntax
+// e.g., geo(force=true, save=true)
+const MUTATOR_PARAMETERS = {
+  geo: [
+    { name: "force", type: "boolean", description: "Force lookup even if geo data already exists" },
+    { name: "save", type: "boolean", description: "Save results to the record" },
+    { name: "field", type: "string", description: "Field name to save results to" },
+    { name: "cache", type: "boolean", description: "Enable caching of lookup results" },
+    { name: "cache_ttl", type: "number", description: "Cache TTL in seconds" }
+  ],
+  geoip: [
+    { name: "force", type: "boolean", description: "Force lookup even if geo data already exists" },
+    { name: "save", type: "boolean", description: "Save results to the record" },
+    { name: "field", type: "string", description: "Field name to save results to" },
+    { name: "cache", type: "boolean", description: "Enable caching of lookup results" },
+    { name: "cache_ttl", type: "number", description: "Cache TTL in seconds" }
+  ],
+  geoip_lookup: [
+    { name: "force", type: "boolean", description: "Force lookup even if geo data already exists" },
+    { name: "save", type: "boolean", description: "Save results to the record" },
+    { name: "field", type: "string", description: "Field name to save results to" },
+    { name: "cache", type: "boolean", description: "Enable caching of lookup results" },
+    { name: "cache_ttl", type: "number", description: "Cache TTL in seconds" }
+  ],
+  nslookup: [
+    { name: "record_type", type: "string", description: "DNS record type (A, AAAA, MX, etc.)" },
+    { name: "cache", type: "boolean", description: "Enable caching of lookup results" },
+    { name: "cache_ttl", type: "number", description: "Cache TTL in seconds" }
+  ],
+  split: [
+    { name: "delimiter", type: "string", description: "Delimiter to split on (default: comma)" }
+  ],
+  replace: [
+    { name: "find", type: "string", description: "Text to find" },
+    { name: "replace", type: "string", description: "Text to replace with" }
+  ]
+};
 const p = [
   // Equality
   "eq",
@@ -413,9 +459,11 @@ export {
   _ as AGGREGATION_FUNCTIONS,
   f as COLLECTION_OPERATORS,
   p as COMPARISON_OPERATORS,
+  ENRICHMENT_MUTATORS,
   w as KEYWORDS,
   k as LOGICAL_OPERATORS,
   m as MUTATORS,
+  MUTATOR_PARAMETERS,
   d as NEGATION_SYMBOL_OPERATORS,
   c as SYMBOL_OPERATORS,
   g as TYPE_HINTS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellaro/tql",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Tellaro Query Language (TQL) parser, validator, and autocomplete for JavaScript/TypeScript",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,17 +23,11 @@
     "README.md"
   ],
   "scripts": {
-    "build": "vite build",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:shared": "vitest run --grep 'shared-fixtures'",
     "test:e2e": "playwright test",
-    "test:e2e:ui": "playwright test --ui",
-    "playground:serve": "vite --config vite.playground.config.ts --port 5174",
-    "playground:dev": "vite --config vite.playground.config.ts",
-    "lint": "eslint src vue tests --ext .ts,.vue",
-    "typecheck": "vue-tsc --noEmit",
-    "prepublishOnly": "npm run build"
+    "test:e2e:ui": "playwright test --ui"
   },
   "repository": {
     "type": "git",