@prometheus-io/lezer-promql 0.308.0 → 0.311.1

package/src/parser.terms.js

@@ -1,7 +1,7 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 export const
-  inf = 167,
-  nan = 168,
+  inf = 177,
+  nan = 178,
   Bool = 1,
   Ignoring = 2,
   On = 3,
@@ -32,135 +32,145 @@ export const
   End = 28,
   Smoothed = 29,
   Anchored = 30,
-  LineComment = 31,
-  PromQL = 32,
-  AggregateExpr = 33,
-  AggregateOp = 34,
-  AggregateModifier = 35,
-  GroupingLabels = 36,
-  LabelName = 37,
-  QuotedLabelName = 38,
-  StringLiteral = 39,
-  FunctionCallBody = 40,
-  BinaryExpr = 41,
-  Pow = 42,
-  BoolModifier = 43,
-  MatchingModifierClause = 44,
-  Mul = 45,
-  Div = 46,
-  Mod = 47,
-  Add = 48,
-  Sub = 49,
-  Eql = 50,
-  Gte = 51,
-  Gtr = 52,
-  Lte = 53,
-  Lss = 54,
-  Neq = 55,
-  FunctionCall = 56,
-  FunctionIdentifier = 57,
-  AbsentOverTime = 58,
-  Identifier = 59,
-  Absent = 60,
-  Abs = 61,
-  Acos = 62,
-  Acosh = 63,
-  Asin = 64,
-  Asinh = 65,
-  Atan = 66,
-  Atanh = 67,
-  AvgOverTime = 68,
-  Ceil = 69,
-  Changes = 70,
-  Clamp = 71,
-  ClampMax = 72,
-  ClampMin = 73,
-  Cos = 74,
-  Cosh = 75,
-  CountOverTime = 76,
-  DaysInMonth = 77,
-  DayOfMonth = 78,
-  DayOfWeek = 79,
-  DayOfYear = 80,
-  Deg = 81,
-  Delta = 82,
-  Deriv = 83,
-  Exp = 84,
-  FirstOverTime = 85,
-  Floor = 86,
-  HistogramCount = 87,
-  HistogramFraction = 88,
-  HistogramQuantile = 89,
-  HistogramStdDev = 90,
-  HistogramStdVar = 91,
-  HistogramSum = 92,
-  HistogramAvg = 93,
-  DoubleExponentialSmoothing = 94,
-  Hour = 95,
-  Idelta = 96,
-  Increase = 97,
-  Info = 98,
-  Irate = 99,
-  LabelReplace = 100,
-  LabelJoin = 101,
-  LastOverTime = 102,
-  Ln = 103,
-  Log10 = 104,
-  Log2 = 105,
-  MadOverTime = 106,
-  MaxOverTime = 107,
-  MinOverTime = 108,
-  TsOfFirstOverTime = 109,
-  TsOfMaxOverTime = 110,
-  TsOfMinOverTime = 111,
-  TsOfLastOverTime = 112,
-  Minute = 113,
-  Month = 114,
-  Pi = 115,
-  PredictLinear = 116,
-  PresentOverTime = 117,
-  QuantileOverTime = 118,
-  Rad = 119,
-  Rate = 120,
-  Resets = 121,
-  Round = 122,
-  Scalar = 123,
-  Sgn = 124,
-  Sin = 125,
-  Sinh = 126,
-  Sort = 127,
-  SortDesc = 128,
-  SortByLabel = 129,
-  SortByLabelDesc = 130,
-  Sqrt = 131,
-  StddevOverTime = 132,
-  StdvarOverTime = 133,
-  SumOverTime = 134,
-  Tan = 135,
-  Tanh = 136,
-  Timestamp = 137,
-  Time = 138,
-  Vector = 139,
-  Year = 140,
-  MatrixSelector = 141,
-  NumberDurationLiteralInDurationContext = 142,
-  NumberDurationLiteral = 143,
-  OffsetExpr = 144,
-  AnchoredExpr = 145,
-  SmoothedExpr = 146,
-  ParenExpr = 147,
-  SubqueryExpr = 148,
-  UnaryExpr = 149,
-  UnaryOp = 150,
-  VectorSelector = 151,
-  LabelMatchers = 152,
-  UnquotedLabelMatcher = 153,
-  MatchOp = 154,
-  EqlSingle = 155,
-  EqlRegex = 156,
-  NeqRegex = 157,
-  QuotedLabelMatcher = 158,
-  StepInvariantExpr = 159,
-  At = 160,
-  AtModifierPreprocessors = 161,
-  MetricName = 162
+  Fill = 31,
+  FillLeft = 32,
+  FillRight = 33,
+  LineComment = 34,
+  PromQL = 35,
+  AggregateExpr = 36,
+  AggregateOp = 37,
+  AggregateModifier = 38,
+  GroupingLabels = 39,
+  LabelName = 40,
+  QuotedLabelName = 41,
+  StringLiteral = 42,
+  FunctionCallBody = 43,
+  BinaryExpr = 44,
+  Pow = 45,
+  BoolModifier = 46,
+  MatchingModifierClause = 47,
+  FillModifier = 48,
+  FillClause = 49,
+  NumberDurationLiteral = 50,
+  FillLeftClause = 51,
+  FillRightClause = 52,
+  Mul = 53,
+  Div = 54,
+  Mod = 55,
+  Add = 56,
+  Sub = 57,
+  Eql = 58,
+  Gte = 59,
+  Gtr = 60,
+  TrimUpper = 61,
+  TrimLower = 62,
+  Lte = 63,
+  Lss = 64,
+  Neq = 65,
+  FunctionCall = 66,
+  FunctionIdentifier = 67,
+  AbsentOverTime = 68,
+  Identifier = 69,
+  Absent = 70,
+  Abs = 71,
+  Acos = 72,
+  Acosh = 73,
+  Asin = 74,
+  Asinh = 75,
+  Atan = 76,
+  Atanh = 77,
+  AvgOverTime = 78,
+  Ceil = 79,
+  Changes = 80,
+  Clamp = 81,
+  ClampMax = 82,
+  ClampMin = 83,
+  Cos = 84,
+  Cosh = 85,
+  CountOverTime = 86,
+  DaysInMonth = 87,
+  DayOfMonth = 88,
+  DayOfWeek = 89,
+  DayOfYear = 90,
+  Deg = 91,
+  Delta = 92,
+  Deriv = 93,
+  Exp = 94,
+  FirstOverTime = 95,
+  Floor = 96,
+  HistogramCount = 97,
+  HistogramFraction = 98,
+  HistogramQuantile = 99,
+  HistogramQuantiles = 100,
+  HistogramStdDev = 101,
+  HistogramStdVar = 102,
+  HistogramSum = 103,
+  HistogramAvg = 104,
+  DoubleExponentialSmoothing = 105,
+  Hour = 106,
+  Idelta = 107,
+  Increase = 108,
+  Info = 109,
+  Irate = 110,
+  LabelReplace = 111,
+  LabelJoin = 112,
+  LastOverTime = 113,
+  Ln = 114,
+  Log10 = 115,
+  Log2 = 116,
+  MadOverTime = 117,
+  MaxOverTime = 118,
+  MinOverTime = 119,
+  TsOfFirstOverTime = 120,
+  TsOfMaxOverTime = 121,
+  TsOfMinOverTime = 122,
+  TsOfLastOverTime = 123,
+  Minute = 124,
+  Month = 125,
+  Pi = 126,
+  PredictLinear = 127,
+  PresentOverTime = 128,
+  QuantileOverTime = 129,
+  Rad = 130,
+  Rate = 131,
+  Resets = 132,
+  Round = 133,
+  Scalar = 134,
+  Sgn = 135,
+  Sin = 136,
+  Sinh = 137,
+  Sort = 138,
+  SortDesc = 139,
+  SortByLabel = 140,
+  SortByLabelDesc = 141,
+  Sqrt = 142,
+  StddevOverTime = 143,
+  StdvarOverTime = 144,
+  SumOverTime = 145,
+  Tan = 146,
+  Tanh = 147,
+  Timestamp = 148,
+  Time = 149,
+  Vector = 150,
+  Year = 151,
+  MatrixSelector = 152,
+  NumberDurationLiteralInDurationContext = 153,
+  OffsetExpr = 154,
+  AnchoredExpr = 155,
+  SmoothedExpr = 156,
+  ParenExpr = 157,
+  SubqueryExpr = 158,
+  UnaryExpr = 159,
+  UnaryOp = 160,
+  VectorSelector = 161,
+  LabelMatchers = 162,
+  UnquotedLabelMatcher = 163,
+  MatchOp = 164,
+  EqlSingle = 165,
+  EqlRegex = 166,
+  NeqRegex = 167,
+  QuotedLabelMatcher = 168,
+  StepInvariantExpr = 169,
+  At = 170,
+  AtModifierPreprocessors = 171,
+  MetricName = 172

package/src/promql.grammar

@@ -88,6 +88,8 @@ BinaryExpr {
   expr !eql Eql    binModifiers expr |
   expr !eql Gte    binModifiers expr |
   expr !eql Gtr    binModifiers expr |
+  expr !eql TrimUpper  binModifiers expr |
+  expr !eql TrimLower  binModifiers expr |
   expr !eql Lte    binModifiers expr |
   expr !eql Lss    binModifiers expr |
   expr !eql Neq    binModifiers expr |
@@ -101,11 +103,30 @@ MatchingModifierClause {
   ((GroupLeft | GroupRight) (!group GroupingLabels)?)?
 }
 
+FillClause {
+  Fill "(" NumberDurationLiteral ")"
+}
+
+FillLeftClause {
+  FillLeft "(" NumberDurationLiteral ")"
+}
+
+FillRightClause {
+  FillRight "(" NumberDurationLiteral ")"
+}
+
+FillModifier {
+  (FillClause | FillLeftClause | FillRightClause) |
+  (FillLeftClause FillRightClause) |
+  (FillRightClause FillLeftClause)
+}
+
 BoolModifier { Bool }
 
 binModifiers {
   BoolModifier?
   MatchingModifierClause?
+  FillModifier?
 }
 
 GroupingLabels {
@@ -148,6 +169,7 @@ FunctionIdentifier {
   HistogramCount |
   HistogramFraction |
   HistogramQuantile |
+  HistogramQuantiles |
   HistogramStdDev |
   HistogramStdVar |
   HistogramSum |
@@ -318,6 +340,8 @@ NumberDurationLiteralInDurationContext {
   Lss { "<" }
   Gte { ">=" }
   Gtr { ">" }
+  TrimUpper { "</" }
+  TrimLower { ">/" }
   EqlRegex { "=~" }
   EqlSingle { "=" }
   NeqRegex { "!~" }
@@ -366,7 +390,10 @@ NumberDurationLiteralInDurationContext {
   Start,
   End,
   Smoothed,
-  Anchored
+  Anchored,
+  Fill,
+  FillLeft,
+  FillRight
 }
 
 @external propSource promQLHighLight from "./highlight"
@@ -404,6 +431,7 @@ NumberDurationLiteralInDurationContext {
   HistogramCount { condFn<"histogram_count"> }
   HistogramFraction { condFn<"histogram_fraction"> }
   HistogramQuantile { condFn<"histogram_quantile"> }
+  HistogramQuantiles { condFn<"histogram_quantiles"> }
   HistogramStdDev { condFn<"histogram_stddev"> }
   HistogramStdVar { condFn<"histogram_stdvar"> }
   HistogramSum { condFn<"histogram_sum"> }

package/src/tokens.js

@@ -1,4 +1,4 @@
-// Copyright 2021 The Prometheus Authors
+// Copyright The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -12,82 +12,88 @@
 // limitations under the License.
 
 import {
-    And,
-    Avg,
-    Atan2,
-    Bool,
-    Bottomk,
-    By,
-    Count,
-    CountValues,
-    End,
-    Group,
-    GroupLeft,
-    GroupRight,
-    Ignoring,
-    inf,
-    Max,
-    Min,
-    nan,
-    Offset,
-    On,
-    Or,
-    Quantile,
-    LimitK,
-    LimitRatio,
-    Start,
-    Stddev,
-    Stdvar,
-    Sum,
-    Topk,
-    Unless,
-    Without,
-    Smoothed,
-    Anchored,
-} from './parser.terms.js';
+  And,
+  Avg,
+  Atan2,
+  Bool,
+  Bottomk,
+  By,
+  Count,
+  CountValues,
+  End,
+  Group,
+  GroupLeft,
+  GroupRight,
+  Ignoring,
+  inf,
+  Max,
+  Min,
+  nan,
+  Offset,
+  On,
+  Or,
+  Quantile,
+  LimitK,
+  LimitRatio,
+  Start,
+  Stddev,
+  Stdvar,
+  Sum,
+  Topk,
+  Unless,
+  Without,
+  Smoothed,
+  Anchored,
+  Fill,
+  FillLeft,
+  FillRight,
+} from "./parser.terms.js";
 
 const keywordTokens = {
-    inf: inf,
-    nan: nan,
-    bool: Bool,
-    ignoring: Ignoring,
-    on: On,
-    group_left: GroupLeft,
-    group_right: GroupRight,
-    offset: Offset,
+  inf: inf,
+  nan: nan,
+  bool: Bool,
+  ignoring: Ignoring,
+  on: On,
+  group_left: GroupLeft,
+  group_right: GroupRight,
+  offset: Offset,
 };
 
 export const specializeIdentifier = (value, stack) => {
-    return keywordTokens[value.toLowerCase()] || -1;
+  return keywordTokens[value.toLowerCase()] || -1;
 };
 
 const contextualKeywordTokens = {
-    avg: Avg,
-    atan2: Atan2,
-    bottomk: Bottomk,
-    count: Count,
-    count_values: CountValues,
-    group: Group,
-    max: Max,
-    min: Min,
-    quantile: Quantile,
-    limitk: LimitK,
-    limit_ratio: LimitRatio,
-    stddev: Stddev,
-    stdvar: Stdvar,
-    sum: Sum,
-    topk: Topk,
-    by: By,
-    without: Without,
-    and: And,
-    or: Or,
-    unless: Unless,
-    start: Start,
-    end: End,
-    smoothed: Smoothed,
-    anchored: Anchored,
+  avg: Avg,
+  atan2: Atan2,
+  bottomk: Bottomk,
+  count: Count,
+  count_values: CountValues,
+  group: Group,
+  max: Max,
+  min: Min,
+  quantile: Quantile,
+  limitk: LimitK,
+  limit_ratio: LimitRatio,
+  stddev: Stddev,
+  stdvar: Stdvar,
+  sum: Sum,
+  topk: Topk,
+  by: By,
+  without: Without,
+  and: And,
+  or: Or,
+  unless: Unless,
+  start: Start,
+  end: End,
+  smoothed: Smoothed,
+  anchored: Anchored,
+  fill: Fill,
+  fill_left: FillLeft,
+  fill_right: FillRight,
 };
 
 export const extendIdentifier = (value, stack) => {
-    return contextualKeywordTokens[value.toLowerCase()] || -1;
+  return contextualKeywordTokens[value.toLowerCase()] || -1;
 };