Merge branch 'main' into universal-pretty-printer

Author: vadimkibana

.github/workflows/backport.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
           node-version-file: .nvmrc
 

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           ref: ${{ inputs.branch }}
 
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -48,7 +48,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
           node-version-file: .nvmrc
           cache: yarn

src/ast/visitor/__tests__/commands.test.ts

@@ -139,6 +139,29 @@ test('can visit CHANGE_POINT command', () => {
   expect(list).toEqual(['CHANGE_POINT']);
 });
 
+test('can visit REGISTERED_DOMAIN command', () => {
+  const { ast } = EsqlQuery.fromSrc(`
+    FROM index
+      | REGISTERED_DOMAIN parts = host
+  `);
+  const visitor = new Visitor()
+    .on('visitExpression', () => {
+      return null;
+    })
+    .on('visitRegisteredDomainCommand', () => {
+      return 'REGISTERED_DOMAIN';
+    })
+    .on('visitCommand', () => {
+      return null;
+    })
+    .on('visitQuery', (ctx) => {
+      return [...ctx.visitCommands()].flat();
+    });
+  const list = visitor.visitQuery(ast).flat().filter(Boolean);
+
+  expect(list).toEqual(['REGISTERED_DOMAIN']);
+});
+
 test('can visit RERANK command', () => {
   const { ast } = EsqlQuery.fromSrc(`
     FROM movies
@@ -229,6 +252,29 @@ test('can visit COMPLETION command', () => {
   expect(list).toEqual(['COMPLETION']);
 });
 
+test('can visit URI_PARTS command', () => {
+  const { ast } = EsqlQuery.fromSrc(`
+FROM index
+| URI_PARTS parts = url
+`);
+  const visitor = new Visitor()
+    .on('visitExpression', (ctx) => {
+      return null;
+    })
+    .on('visitUriPartsCommand', (ctx) => {
+      return 'URI_PARTS';
+    })
+    .on('visitCommand', (ctx) => {
+      return null;
+    })
+    .on('visitQuery', (ctx) => {
+      return [...ctx.visitCommands()].flat();
+    });
+  const list = visitor.visitQuery(ast).flat().filter(Boolean);
+
+  expect(list).toEqual(['URI_PARTS']);
+});
+
 test('can visit MMR command', () => {
   const { ast } = EsqlQuery.fromSrc(`
     FROM movies

src/ast/visitor/contexts.ts

@@ -19,7 +19,9 @@ import type {
   ESQLAstItem,
   ESQLAstJoinCommand,
   ESQLAstQueryExpression,
+  ESQLAstRegisteredDomainCommand,
   ESQLAstRerankCommand,
+  ESQLAstUriPartsCommand,
   ESQLColumn,
   ESQLCommandOption,
   ESQLDecimalLiteral,
@@ -561,6 +563,12 @@ export class CompletionCommandVisitorContext<
   Data extends SharedData = SharedData,
 > extends CommandVisitorContext<Methods, Data, ESQLAstCommand> {}
 
+// REGISTERED_DOMAIN <qualifiedName> = <primaryExpression>
+export class RegisteredDomainCommandVisitorContext<
+  Methods extends VisitorMethods = VisitorMethods,
+  Data extends SharedData = SharedData,
+> extends CommandVisitorContext<Methods, Data, ESQLAstRegisteredDomainCommand> {}
+
 // SAMPLE <probability> [SEED <seed>]
 export class SampleCommandVisitorContext<
   Methods extends VisitorMethods = VisitorMethods,
@@ -579,6 +587,12 @@ export class MmrCommandVisitorContext<
   Data extends SharedData = SharedData,
 > extends CommandVisitorContext<Methods, Data, ESQLAstCommand> {}
 
+// URI_PARTS <qualifiedName> = <primaryExpression>
+export class UriPartsCommandVisitorContext<
+  Methods extends VisitorMethods = VisitorMethods,
+  Data extends SharedData = SharedData,
+> extends CommandVisitorContext<Methods, Data, ESQLAstUriPartsCommand> {}
+
 // Expressions -----------------------------------------------------------------
 
 export class ExpressionVisitorContext<

src/ast/visitor/global_visitor_context.ts

@@ -13,7 +13,9 @@ import type {
   ESQLAstHeaderCommand,
   ESQLAstJoinCommand,
   ESQLAstQueryExpression,
+  ESQLAstRegisteredDomainCommand,
   ESQLAstRerankCommand,
+  ESQLAstUriPartsCommand,
   ESQLColumn,
   ESQLFunction,
   ESQLIdentifier,
@@ -209,6 +211,14 @@ export class GlobalVisitorContext<
           input as any
         );
       }
+      case 'registered_domain': {
+        if (!this.methods.visitRegisteredDomainCommand) break;
+        return this.visitRegisteredDomainCommand(
+          parent,
+          commandNode as ESQLAstRegisteredDomainCommand,
+          input as any
+        );
+      }
       case 'sample': {
         if (!this.methods.visitSampleCommand) break;
         return this.visitSampleCommand(parent, commandNode, input as any);
@@ -221,6 +231,14 @@ export class GlobalVisitorContext<
         if (!this.methods.visitMmrCommand) break;
         return this.visitMmrCommand(parent, commandNode, input as any);
       }
+      case 'uri_parts': {
+        if (!this.methods.visitUriPartsCommand) break;
+        return this.visitUriPartsCommand(
+          parent,
+          commandNode as ESQLAstUriPartsCommand,
+          input as any
+        );
+      }
     }
     return this.visitCommandGeneric(parent, commandNode, input as any);
   }
@@ -464,6 +482,15 @@ export class GlobalVisitorContext<
     return this.visitWithSpecificContext('visitCompletionCommand', context, input);
   }
 
+  public visitRegisteredDomainCommand(
+    parent: contexts.VisitorContext | null,
+    node: ESQLAstRegisteredDomainCommand,
+    input: types.VisitorInput<Methods, 'visitRegisteredDomainCommand'>
+  ): types.VisitorOutput<Methods, 'visitRegisteredDomainCommand'> {
+    const context = new contexts.RegisteredDomainCommandVisitorContext(this, node, parent);
+    return this.visitWithSpecificContext('visitRegisteredDomainCommand', context, input);
+  }
+
   public visitSampleCommand(
     parent: contexts.VisitorContext | null,
     node: ESQLAstCommand,
@@ -491,6 +518,15 @@ export class GlobalVisitorContext<
     return this.visitWithSpecificContext('visitMmrCommand', context, input);
   }
 
+  public visitUriPartsCommand(
+    parent: contexts.VisitorContext | null,
+    node: ESQLAstUriPartsCommand,
+    input: types.VisitorInput<Methods, 'visitUriPartsCommand'>
+  ): types.VisitorOutput<Methods, 'visitUriPartsCommand'> {
+    const context = new contexts.UriPartsCommandVisitorContext(this, node, parent);
+    return this.visitWithSpecificContext('visitUriPartsCommand', context, input);
+  }
+
   // #endregion
 
   // #region Expression visiting -------------------------------------------------------

src/ast/visitor/types.ts

@@ -110,7 +110,9 @@ export type CommandVisitorInput<Methods extends VisitorMethods> = AnyToVoid<
     VisitorInput<Methods, 'visitMvExpandCommand'> &
     VisitorInput<Methods, 'visitJoinCommand'> &
     VisitorInput<Methods, 'visitRerankCommand'> &
-    VisitorInput<Methods, 'visitChangePointCommand'>
+    VisitorInput<Methods, 'visitChangePointCommand'> &
+    VisitorInput<Methods, 'visitUriPartsCommand'> &
+    VisitorInput<Methods, 'visitRegisteredDomainCommand'>
 >;
 
 /**
@@ -141,7 +143,9 @@ export type CommandVisitorOutput<Methods extends VisitorMethods> =
   | VisitorOutput<Methods, 'visitJoinCommand'>
   | VisitorOutput<Methods, 'visitRerankCommand'>
   | VisitorOutput<Methods, 'visitChangePointCommand'>
-  | VisitorOutput<Methods, 'visitCompletionCommand'>;
+  | VisitorOutput<Methods, 'visitCompletionCommand'>
+  | VisitorOutput<Methods, 'visitUriPartsCommand'>
+  | VisitorOutput<Methods, 'visitRegisteredDomainCommand'>;
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export interface VisitorMethods<
@@ -192,10 +196,16 @@ export interface VisitorMethods<
     any,
     any
   >;
+  visitRegisteredDomainCommand?: Visitor<
+    contexts.RegisteredDomainCommandVisitorContext<Visitors, Data>,
+    any,
+    any
+  >;
   visitSampleCommand?: Visitor<contexts.SampleCommandVisitorContext<Visitors, Data>, any, any>;
   visitCommandOption?: Visitor<contexts.CommandOptionVisitorContext<Visitors, Data>, any, any>;
   visitFuseCommand?: Visitor<contexts.FuseCommandVisitorContext<Visitors, Data>, any, any>;
-  visitMmrCommand?: Visitor<contexts.FuseCommandVisitorContext<Visitors, Data>, any, any>;
+  visitMmrCommand?: Visitor<contexts.MmrCommandVisitorContext<Visitors, Data>, any, any>;
+  visitUriPartsCommand?: Visitor<contexts.UriPartsCommandVisitorContext<Visitors, Data>, any, any>;
   visitExpression?: Visitor<contexts.ExpressionVisitorContext<Visitors, Data>, any, any>;
   visitSourceExpression?: Visitor<
     contexts.SourceExpressionVisitorContext<Visitors, Data>,

src/embedded_languages/promql/index.ts

@@ -19,3 +19,9 @@ export { PromqlWalker, type PromqlWalkerOptions } from './ast/walker';
 export { PromQLParser, type PromQLParseOptions } from './parser';
 export { PromQLErrorListener } from './parser/promql_error_listener';
 export { PromQLCstToAstConverter } from './parser/cst_to_ast_converter';
+
+// Pretty Printer
+export { PromQLBasicPrettyPrinter, type PromQLBasicPrettyPrinterOptions } from './pretty_print';
+
+// Type Guard
+export { isPromqlNode } from './ast/is';

src/embedded_languages/promql/parser/__tests__/parser.test.ts

@@ -12,6 +12,7 @@ import type {
   PromQLParens,
   PromQLSelector,
   PromQLStringLiteral,
+  PromQLSubquery,
   PromQLUnaryExpression,
 } from '../../types';
 import { PromQLParser } from '../parser';
@@ -197,6 +198,42 @@ describe('PromQL Parser', () => {
     });
   });
 
+  describe('subquery', () => {
+    it('parses a basic subquery with range and resolution', () => {
+      const result = PromQLParser.parse('rate(http_requests_total[5m])[30m:1m]');
+
+      expect(result.errors).toHaveLength(0);
+      expect(result.root.expression?.type).toBe('subquery');
+
+      const subquery = result.root.expression as PromQLSubquery;
+      const expr = subquery.expr as PromQLFunction;
+      const range = subquery.range as PromQLLiteral;
+      const resolution = subquery.resolution as PromQLLiteral;
+
+      expect(expr.type).toBe('function');
+      expect(expr.name).toBe('rate');
+      expect(range.value).toBe('30m');
+      expect(resolution.value).toBe('1m');
+    });
+
+    it('parses a subquery with arithmetic resolution', () => {
+      const result = PromQLParser.parse('http_requests_total[5m][30m:5m*2]');
+
+      expect(result.errors).toHaveLength(0);
+      expect(result.root.expression?.type).toBe('subquery');
+
+      const subquery = result.root.expression as PromQLSubquery;
+      const resolution = subquery.resolution as PromQLBinaryExpression;
+      const left = resolution.left as PromQLLiteral;
+      const right = resolution.right as PromQLLiteral;
+
+      expect(resolution.type).toBe('binary-expression');
+      expect(resolution.name).toBe('*');
+      expect(left.value).toBe('5m');
+      expect(right.value).toBe(2);
+    });
+  });
+
   describe('error handling', () => {
     it('returns errors for invalid syntax', () => {
       const result = PromQLParser.parse('rate(');

src/embedded_languages/promql/parser/cst_to_ast_converter.ts

@@ -498,11 +498,11 @@ export class PromQLCstToAstConverter {
       const groupLabelsCtx = ctx._groupLabels;
       const groupLabels = groupLabelsCtx ? this.fromLabelList(groupLabelsCtx) : [];
 
-      groupModifier = PromQLBuilder.groupModifier(joiningKind, groupLabels, {
-        text: joiningToken.text ?? '',
-        location: getPosition(joiningToken, joiningToken),
-        incomplete: false,
-      });
+      groupModifier = PromQLBuilder.groupModifier(
+        joiningKind,
+        groupLabels,
+        this.createParserFieldsFromToken(joiningToken, joiningToken.text ?? '')
+      );
 
       for (const label of groupLabels) {
         if (label.incomplete) {
@@ -574,7 +574,7 @@ export class PromQLCstToAstConverter {
       if (resDurationCtx) {
         resolution = this.fromDuration(resDurationCtx);
       } else {
-        // Check for TIME_VALUE_WITH_COLON (e.g., ":5m")
+        // Check for TIME_VALUE_WITH_COLON (e.g., ":5m", ":5m*2", ":5m^2")
         const timeValueWithColon = resolutionCtx.TIME_VALUE_WITH_COLON();
         if (timeValueWithColon) {
           // TIME_VALUE_WITH_COLON includes the leading colon, e.g., ":5m"
@@ -585,6 +585,28 @@ export class PromQLCstToAstConverter {
             timeValue,
             this.createParserFieldsFromToken(timeValueWithColon.symbol, timeValue)
           );
+
+          const opToken = resolutionCtx._op;
+          const rightCtx = resolutionCtx.expression();
+
+          if (opToken && rightCtx) {
+            const operator = this.toBinaryOperator(opToken.text ?? '');
+            const right =
+              this.fromExpression(rightCtx) ??
+              PromQLBuilder.unknown(this.getParserFields(rightCtx));
+
+            resolution = PromQLBuilder.expression.binary(
+              operator,
+              resolution,
+              right,
+              {},
+              this.getParserFields(resolutionCtx)
+            );
+
+            if (right.incomplete) {
+              resolution.incomplete = true;
+            }
+          }
         }
       }
     }