@elastic/esql 4.0.0 → 4.1.0

package/lib/index.mjs

@@ -156,10 +156,13 @@ function* childrenOfPromqlNode(node) {
       return;
     }
     case "function": {
-      if (node.grouping) {
+      if (node.grouping && node.groupingPosition !== "after") {
         yield node.grouping;
       }
       yield* node.args;
+      if (node.grouping && node.groupingPosition === "after") {
+        yield node.grouping;
+      }
       return;
     }
     case "selector": {
@@ -172,6 +175,49 @@ function* childrenOfPromqlNode(node) {
       if (value) yield value;
       return;
     }
+    case "binary-expression": {
+      yield node.left;
+      if (node.modifier) yield node.modifier;
+      yield node.right;
+      return;
+    }
+    case "unary-expression": {
+      yield node.arg;
+      return;
+    }
+    case "subquery": {
+      yield node.expr;
+      yield node.range;
+      if (node.resolution) yield node.resolution;
+      if (node.evaluation) yield node.evaluation;
+      return;
+    }
+    case "parens": {
+      if (node.child) yield node.child;
+      return;
+    }
+    case "evaluation": {
+      if (node.offset) yield node.offset;
+      if (node.at) yield node.at;
+      return;
+    }
+    case "offset": {
+      if (node.duration) yield node.duration;
+      return;
+    }
+    case "at": {
+      if (typeof node.value !== "string") yield node.value;
+      return;
+    }
+    case "modifier": {
+      yield* node.labels;
+      if (node.groupModifier) yield node.groupModifier;
+      return;
+    }
+    case "group-modifier": {
+      yield* node.labels;
+      return;
+    }
   }
   if ("args" in node && Array.isArray(node.args)) {
     yield* node.args;
@@ -910,9 +956,18 @@ var Walker = class _Walker {
     _Walker.walk(tree, { ...options, visitAny });
   };
   aborted = false;
+  skippedChildren = false;
   abort() {
     this.aborted = true;
   }
+  skipChildren() {
+    this.skippedChildren = true;
+  }
+  readAndResetSkippedChildren() {
+    const skipped = this.skippedChildren;
+    this.skippedChildren = false;
+    return skipped;
+  }
   walk(tree, parent = void 0) {
     if (this.aborted) return;
     if (!tree) return;
@@ -950,17 +1005,20 @@ var Walker = class _Walker {
     if (this.aborted) return;
     const { options } = this;
     (options.visitCommand ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.args, node);
   }
   walkHeaderCommand(node, parent) {
     if (this.aborted) return;
     const { options } = this;
     (options.visitHeaderCommand ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.args, node);
   }
   walkOption(node, parent) {
     const { options } = this;
     (options.visitCommandOption ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.args, node);
   }
   walkExpression(node, parent = void 0) {
@@ -975,11 +1033,13 @@ var Walker = class _Walker {
   walkListLiteral(node, parent) {
     const { options } = this;
     (options.visitListLiteral ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.values, node);
   }
   walkSource(node, parent) {
     const { options } = this;
     (options.visitSource ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     const children2 = [];
     if (node.prefix) {
       children2.push(node.prefix);
@@ -996,6 +1056,7 @@ var Walker = class _Walker {
     const { options } = this;
     const { args } = node;
     (options.visitColumn ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     if (args) {
       this.walkList(args, node);
     }
@@ -1003,27 +1064,32 @@ var Walker = class _Walker {
   walkOrder(node, parent) {
     const { options } = this;
     (options.visitOrder ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.args, node);
   }
   walkInlineCast(node, parent) {
     const { options } = this;
     (options.visitInlineCast ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkExpression(node.value, node);
   }
   walkFunction(node, parent = void 0) {
     const { options } = this;
     (options.visitFunction ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     if (node.operator) this.walkSingleAstItem(node.operator, node);
     this.walkList(node.args, node);
   }
   walkMap(node, parent) {
     const { options } = this;
     (options.visitMap ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     this.walkList(node.entries, node);
   }
   walkMapEntry(node, parent) {
     const { options } = this;
     (options.visitMapEntry ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     if (options.order === "backward") {
       this.walkSingleAstItem(resolveItem(node.value), node);
       this.walkSingleAstItem(resolveItem(node.key), node);
@@ -1035,6 +1101,7 @@ var Walker = class _Walker {
   walkParens(node, parent) {
     const { options } = this;
     (options.visitParens ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     if (node.child) {
       this.walkSingleAstItem(node.child, node);
     }
@@ -1042,6 +1109,7 @@ var Walker = class _Walker {
   walkQuery(node, parent) {
     const { options } = this;
     (options.visitQuery ?? options.visitAny)?.(node, parent, this);
+    if (this.readAndResetSkippedChildren()) return;
     if (node.header && !options.skipHeader) {
       this.walkList(node.header, node);
     }
@@ -1110,6 +1178,7 @@ var Walker = class _Walker {
       }
       case "literal": {
         (options.visitLiteral ?? options.visitAny)?.(node, parent, this);
+        this.readAndResetSkippedChildren();
         break;
       }
       case "list": {
@@ -1126,10 +1195,12 @@ var Walker = class _Walker {
       }
       case "identifier": {
         (options.visitIdentifier ?? options.visitAny)?.(node, parent, this);
+        this.readAndResetSkippedChildren();
         break;
       }
       case "unknown": {
         (options.visitUnknown ?? options.visitAny)?.(node, parent, this);
+        this.readAndResetSkippedChildren();
         break;
       }
     }
@@ -61011,6 +61082,140 @@ var PromQLCstToAstConverter = class {
   }
 };
 
+// src/embedded_languages/promql/ast/find_node.ts
+var sortedLocatedChildren = (node) => {
+  const children2 = [];
+  for (const child of childrenOfPromqlNode(node)) {
+    if (child.location) children2.push(child);
+  }
+  children2.sort((a, b) => a.location.min - b.location.min);
+  return children2;
+};
+var findForward = (node, pos) => {
+  for (const child of sortedLocatedChildren(node)) {
+    const { min, max } = child.location;
+    if (min <= pos && max >= pos) {
+      return findForward(child, pos) ?? child;
+    }
+    if (min > pos) {
+      return child;
+    }
+  }
+  return null;
+};
+var findBackward = (node, pos) => {
+  const children2 = sortedLocatedChildren(node);
+  for (let i = children2.length - 1; i >= 0; i--) {
+    const child = children2[i];
+    const { min, max } = child.location;
+    if (min <= pos && max >= pos) {
+      return findBackward(child, pos) ?? child;
+    }
+    if (max < pos) {
+      return child;
+    }
+  }
+  return null;
+};
+var findNodeAtOrAfter = (ast, pos) => findForward(ast, pos);
+var findNodeAtOrBefore = (ast, pos) => findBackward(ast, pos);
+
+// src/embedded_languages/promql/parser/decorations.ts
+var HIDDEN_CHANNEL2 = 1;
+var punctuationChars2 = /* @__PURE__ */ new Set([".", ",", ";", ":", "(", ")", "[", "]", "{", "}"]);
+var isLikelyPunctuation2 = (text2) => text2.length === 1 && punctuationChars2.has(text2);
+var cleanCommentText = (text2) => {
+  let end = text2.length;
+  if (text2[end - 1] === "\n") {
+    end--;
+  }
+  if (end > 0 && text2[end - 1] === "\r") {
+    end--;
+  }
+  return text2.slice(1, end);
+};
+var collectPromQLDecorations = (tokens, offset = 0) => {
+  const result = [];
+  const list12 = tokens.tokens;
+  const length = list12.length;
+  let pos = 0;
+  let hasContentToLeft = false;
+  for (let i = 0; i < length - 1; i++) {
+    const token = list12[i];
+    const { channel, text: text2 } = token;
+    const min = pos;
+    const max = min + text2.length - 1;
+    pos = max + 1;
+    if (channel !== HIDDEN_CHANNEL2) {
+      if (!isLikelyPunctuation2(text2)) {
+        hasContentToLeft = true;
+      }
+      continue;
+    }
+    if (text2[0] !== "#") {
+      if (text2.indexOf("\n") !== -1) {
+        hasContentToLeft = false;
+      }
+      continue;
+    }
+    const cleanText = cleanCommentText(text2);
+    const endsWithNewline = text2[text2.length - 1] === "\n";
+    const maxOffset = endsWithNewline ? text2[text2.length - 2] === "\r" ? 2 : 1 : 0;
+    const node = Builder.comment("single-line", cleanText, {
+      min: min + offset,
+      max: max - maxOffset + offset
+    });
+    result.push({
+      type: "comment",
+      hasContentToLeft,
+      node
+    });
+    if (endsWithNewline) {
+      hasContentToLeft = false;
+    }
+  }
+  return result;
+};
+var ensureFormatting = (node) => {
+  if (!node.formatting) {
+    node.formatting = {};
+  }
+  return node.formatting;
+};
+var attachTopComment2 = (node, comment) => {
+  const formatting = ensureFormatting(node);
+  if (!formatting.top) formatting.top = [];
+  formatting.top.push(comment);
+};
+var attachBottomComment2 = (node, comment) => {
+  const formatting = ensureFormatting(node);
+  if (!formatting.bottom) formatting.bottom = [];
+  formatting.bottom.push(comment);
+};
+var attachTrailingComment = (node, comment) => {
+  const formatting = ensureFormatting(node);
+  formatting.rightSingleLine = comment;
+};
+var attachPromQLDecorations = (ast, comments) => {
+  for (const comment of comments) {
+    const { location } = comment.node;
+    if (!location) continue;
+    if (!comment.hasContentToLeft) {
+      const target2 = findNodeAtOrAfter(ast, location.max);
+      if (target2) {
+        attachTopComment2(target2, comment.node);
+      } else {
+        attachBottomComment2(ast, comment.node);
+      }
+      continue;
+    }
+    const target = findNodeAtOrBefore(ast, location.min);
+    if (target) {
+      attachTrailingComment(target, comment.node);
+    }
+  }
+};
+
 // src/embedded_languages/promql/parser/parser.ts
 var PromQLParser = class _PromQLParser {
   constructor(src2, options = {}) {
@@ -61076,6 +61281,11 @@ var PromQLParser = class _PromQLParser {
           errors: this.errors.getErrors()
         };
       }
+      if (this.options.withFormatting) {
+        this.tokens.fill();
+        const comments = collectPromQLDecorations(this.tokens, this.options.offset ?? 0);
+        attachPromQLDecorations(root, comments);
+      }
       return {
         root,
         errors: this.errors.getErrors()