@tellaro/tql 1.4.2 → 1.5.0

package/dist/src/tokenizer.js

@@ -191,16 +191,16 @@ class g {
   line;
   column;
   tokens;
-  constructor(t) {
-    this.input = t ?? "", this.position = 0, this.line = 1, this.column = 1, this.tokens = [];
+  constructor(e) {
+    this.input = e ?? "", this.position = 0, this.line = 1, this.column = 1, this.tokens = [];
   }
   /**
    * Tokenize the entire input string
    */
   tokenize() {
     for (this.tokens = [], this.position = 0, this.line = 1, this.column = 1; !this.isAtEnd(); ) {
-      const t = this.scanToken();
-      t && this.tokens.push(t);
+      const e = this.scanToken();
+      e && this.tokens.push(e);
     }
     return this.tokens;
   }
@@ -210,42 +210,44 @@ class g {
   scanToken() {
     if (this.isWhitespace(this.peek()))
       return this.scanWhitespace();
-    const t = this.position, n = this.line, i = this.column, e = this.advance();
-    switch (e) {
+    const e = this.position, n = this.line, i = this.column, t = this.advance();
+    switch (t) {
       case "(":
       case ")":
-        return this.makeToken("paren", e, t, n, i);
+        return this.makeToken("paren", t, e, n, i);
       case "[":
       case "]":
-        return this.makeToken("bracket", e, t, n, i);
+        return this.makeToken("bracket", t, e, n, i);
       case ",":
-        return this.makeToken("comma", e, t, n, i);
+        return this.makeToken("comma", t, e, n, i);
       case "|":
-        return this.makeToken("pipe", e, t, n, i);
+        return this.makeToken("pipe", t, e, n, i);
     }
-    return e === "=" && this.peek() === ">" ? (this.advance(), this.makeToken("arrow", "=>", t, n, i)) : e === ":" && this.peek() === ":" ? (this.advance(), this.makeToken("doubleColon", "::", t, n, i)) : e === '"' || e === "'" ? this.scanString(e, t, n, i) : this.isDigit(e) || e === "-" && this.isDigit(this.peek()) ? this.scanNumber(t, n, i) : this.isOperatorChar(e) ? this.scanSymbolOperator(t, n, i) : this.isIdentifierStart(e) ? this.scanIdentifier(t, n, i) : this.makeToken("unknown", e, t, n, i);
+    return t === "=" && this.peek() === ">" ? (this.advance(), this.makeToken("arrow", "=>", e, n, i)) : t === ":" && this.peek() === ":" ? (this.advance(), this.makeToken("doubleColon", "::", e, n, i)) : t === '"' || t === "'" ? this.scanString(t, e, n, i) : this.isDigit(t) || t === "-" && this.isDigit(this.peek()) ? this.scanNumber(e, n, i) : this.isOperatorChar(t) ? this.scanSymbolOperator(e, n, i) : this.isIdentifierStart(t) ? this.scanIdentifier(e, n, i) : this.makeToken("unknown", t, e, n, i);
   }
   /**
    * Scan whitespace characters
    */
   scanWhitespace() {
-    const t = this.position, n = this.line, i = this.column;
-    let e = "";
+    const e = this.position, n = this.line, i = this.column;
+    let t = "";
     for (; !this.isAtEnd() && this.isWhitespace(this.peek()); ) {
       const s = this.advance();
-      e += s;
+      t += s;
     }
-    return this.makeToken("whitespace", e, t, n, i);
+    return this.makeToken("whitespace", t, e, n, i);
   }
   /**
    * Scan a string literal (single or double quoted)
    */
-  scanString(t, n, i, e) {
+  scanString(e, n, i, t) {
     let s = "";
-    const r = t;
-    for (; !this.isAtEnd() && this.peek() !== t; )
-      if (this.peek() === "\\") {
-        if (this.advance(), !this.isAtEnd()) {
+    const r = e;
+    for (; !this.isAtEnd() && this.peek() !== e; )
+      if (this.peek() === "\\")
+        if (this.advance(), this.isAtEnd())
+          s += "\\";
+        else {
           const a = this.advance();
           switch (a) {
             case "n":
@@ -268,10 +270,10 @@ class g {
               s += "'";
               break;
             default:
-              s += a;
+              s += "\\" + a;
           }
         }
-      } else
+      else
         s += this.advance();
     return this.isAtEnd() ? {
       type: "error",
@@ -279,7 +281,7 @@ class g {
       start: n,
       end: this.position,
       line: i,
-      column: e,
+      column: t,
       raw: r + s
     } : (this.advance(), {
       type: "string",
@@ -287,88 +289,88 @@ class g {
       start: n,
       end: this.position,
       line: i,
-      column: e,
-      raw: t + s + t
+      column: t,
+      raw: e + s + e
     });
   }
   /**
    * Scan a numeric literal
    */
-  scanNumber(t, n, i) {
-    this.position = t, this.column = i;
-    let e = "";
-    for (this.peek() === "-" && (e += this.advance()); !this.isAtEnd() && this.isDigit(this.peek()); )
-      e += this.advance();
+  scanNumber(e, n, i) {
+    this.position = e, this.column = i;
+    let t = "";
+    for (this.peek() === "-" && (t += this.advance()); !this.isAtEnd() && this.isDigit(this.peek()); )
+      t += this.advance();
     if (this.peek() === "." && this.isDigit(this.peekNext()))
-      for (e += this.advance(); !this.isAtEnd() && this.isDigit(this.peek()); )
-        e += this.advance();
+      for (t += this.advance(); !this.isAtEnd() && this.isDigit(this.peek()); )
+        t += this.advance();
     if (this.peek() === "e" || this.peek() === "E")
-      for (e += this.advance(), (this.peek() === "+" || this.peek() === "-") && (e += this.advance()); !this.isAtEnd() && this.isDigit(this.peek()); )
-        e += this.advance();
-    return this.makeToken("number", e, t, n, i);
+      for (t += this.advance(), (this.peek() === "+" || this.peek() === "-") && (t += this.advance()); !this.isAtEnd() && this.isDigit(this.peek()); )
+        t += this.advance();
+    return this.makeToken("number", t, e, n, i);
   }
   /**
    * Scan symbol-based operators (==, !=, >, >=, <, <=, !)
    */
-  scanSymbolOperator(t, n, i) {
-    this.position = t, this.column = i;
-    let e = this.advance();
+  scanSymbolOperator(e, n, i) {
+    this.position = e, this.column = i;
+    let t = this.advance();
     if (!this.isAtEnd()) {
-      const s = e + this.peek();
+      const s = t + this.peek();
       if (s === "=>")
-        return this.advance(), this.makeToken("arrow", "=>", t, n, i);
-      (s in h || s === "==" || s === "!=") && (e = s, this.advance());
+        return this.advance(), this.makeToken("arrow", "=>", e, n, i);
+      (s in h || s === "==" || s === "!=") && (t = s, this.advance());
     }
-    if (e === "!") {
+    if (t === "!") {
       const s = this.position;
       let r = "";
       for (; !this.isAtEnd() && this.isIdentifierChar(this.peek()); )
         r += this.advance();
       if (r) {
         if ("!" + r in u)
-          return this.makeToken("operator", "!" + r, t, n, i);
+          return this.makeToken("operator", "!" + r, e, n, i);
         this.position = s, this.column = i + 1;
       }
     }
-    return e in h || e === "==" || e === "=" || e === "!=" || e === ">" || e === ">=" || e === "<" || e === "<=" ? this.makeToken("operator", e, t, n, i) : this.makeToken("unknown", e, t, n, i);
+    return t in h || t === "==" || t === "=" || t === "!=" || t === ">" || t === ">=" || t === "<" || t === "<=" ? this.makeToken("operator", t, e, n, i) : this.makeToken("unknown", t, e, n, i);
   }
   /**
    * Scan an identifier (field name, operator keyword, etc.)
    */
-  scanIdentifier(t, n, i) {
-    this.position = t, this.column = i;
-    let e = "";
+  scanIdentifier(e, n, i) {
+    this.position = e, this.column = i;
+    let t = "";
     const s = this.advance();
-    if (e += s, s === "@" && this.peek() === "@")
-      return this.makeToken("unknown", e, t, n, i);
+    if (t += s, s === "@" && this.peek() === "@")
+      return this.makeToken("unknown", t, e, n, i);
     let r = s;
     for (; !this.isAtEnd() && this.isIdentifierChar(this.peek()); ) {
       const c = this.advance();
       if (c === "." && r === ".")
-        return this.position--, this.column--, e = e.slice(0, -1), this.makeToken("unknown", e, t, n, i);
-      e += c, r = c;
+        return this.position--, this.column--, t = t.slice(0, -1), this.makeToken("unknown", t, e, n, i);
+      t += c, r = c;
     }
-    e.endsWith(".") && (this.position--, this.column--, e = e.slice(0, -1));
-    const a = this.classifyIdentifier(e);
-    return this.makeToken(a, e, t, n, i);
+    t.endsWith(".") && (this.position--, this.column--, t = t.slice(0, -1));
+    const a = this.classifyIdentifier(t);
+    return this.makeToken(a, t, e, n, i);
   }
   /**
    * Classify an identifier into the appropriate token type
    */
-  classifyIdentifier(t) {
-    const n = t.toUpperCase(), i = t.toLowerCase();
+  classifyIdentifier(e) {
+    const n = e.toUpperCase(), i = e.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" : _.includes(i) ? "aggregation" : k.includes(i) ? "mutator" : f.includes(i) ? "typeHint" : m.includes(i) ? "visualization" : w.includes(i) ? "keyword" : "field";
   }
   // ============================================================================
   // Helper Methods
   // ============================================================================
-  makeToken(t, n, i, e, s) {
+  makeToken(e, n, i, t, s) {
     return {
-      type: t,
+      type: e,
       value: n,
       start: i,
       end: this.position,
-      line: e,
+      line: t,
       column: s
     };
   }
@@ -382,64 +384,64 @@ class g {
     return this.position + 1 >= this.input.length ? "\0" : this.input[this.position + 1];
   }
   advance() {
-    const t = this.input[this.position];
-    return this.position++, t === `
-` ? (this.line++, this.column = 1) : this.column++, t;
+    const e = this.input[this.position];
+    return this.position++, e === `
+` ? (this.line++, this.column = 1) : this.column++, e;
   }
-  isWhitespace(t) {
-    return t === " " || t === "	" || t === `
-` || t === "\r";
+  isWhitespace(e) {
+    return e === " " || e === "	" || e === `
+` || e === "\r";
   }
-  isDigit(t) {
-    return t >= "0" && t <= "9";
+  isDigit(e) {
+    return e >= "0" && e <= "9";
   }
-  isIdentifierStart(t) {
-    return t >= "a" && t <= "z" || t >= "A" && t <= "Z" || t === "_" || t === "@";
+  isIdentifierStart(e) {
+    return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_" || e === "@";
   }
   /**
    * Check if char can continue an identifier (NOT including @ which is only valid at start)
    */
-  isIdentifierChar(t) {
-    return t >= "a" && t <= "z" || t >= "A" && t <= "Z" || t === "_" || this.isDigit(t) || t === "." || // For nested field access
-    t === "-";
+  isIdentifierChar(e) {
+    return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_" || this.isDigit(e) || e === "." || // For nested field access
+    e === "-";
   }
-  isOperatorChar(t) {
-    return t === "=" || t === "!" || t === ">" || t === "<";
+  isOperatorChar(e) {
+    return e === "=" || e === "!" || e === ">" || e === "<";
   }
 }
 function T(o) {
   return new g(o).tokenize();
 }
 function b(o) {
-  return T(o).filter((t) => t.type !== "whitespace");
+  return T(o).filter((e) => e.type !== "whitespace");
 }
-function v(o, t) {
+function v(o, e) {
   for (const n of o)
-    if (t >= n.start && t < n.end)
+    if (e >= n.start && e < n.end)
       return n;
   return null;
 }
-function O(o, t, n) {
-  return o.filter((i) => i.start < n && i.end > t);
+function O(o, e, n) {
+  return o.filter((i) => i.start < n && i.end > e);
 }
-function A(o, t) {
+function A(o, e) {
   let n = null;
   for (const i of o)
-    if (i.end <= t)
+    if (i.end <= e)
       n = i;
     else
       break;
   return n;
 }
-function E(o, t, n = !0) {
+function E(o, e, n = !0) {
   const i = n ? o.filter((s) => s.type !== "whitespace") : o;
-  let e = null;
+  let t = null;
   for (const s of i)
-    if (s.end <= t)
-      e = s;
+    if (s.end <= e)
+      t = s;
     else
       break;
-  return e;
+  return t;
 }
 export {
   _ as AGGREGATION_FUNCTIONS,

package/package.json

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