accept bounds on time expression

implydata · Sep 15, 2023 · 24c122c · 24c122c
1 parent 53bd4c3
commit 24c122c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/expressions/baseExpression.ts b/src/expressions/baseExpression.ts
@@ -251,6 +251,7 @@ export interface ExpressionValue {
   mvArray?: string[];
   ipToSearch?: Ip;
   ipSearchType?: string;
+  bounds?: string;
 }
 
 export interface ExpressionJS {
@@ -290,6 +291,7 @@ export interface ExpressionJS {
   mvArray?: string[];
   ipToSearch?: Ip;
   ipSearchType?: string;
+  bounds?: string;
 }
 
 export interface ExtractAndRest {

diff --git a/src/expressions/timeRangeExpression.ts b/src/expressions/timeRangeExpression.ts
@@ -40,12 +40,14 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
   public duration: Duration;
   public step: number;
   public timezone: Timezone;
+  public bounds: string;
 
   constructor(parameters: ExpressionValue) {
     super(parameters, dummyObject);
     this.duration = parameters.duration;
     this.step = parameters.step || TimeRangeExpression.DEFAULT_STEP;
     this.timezone = parameters.timezone;
+    this.bounds = parameters.bounds;
     this._ensureOp('timeRange');
     this._checkOperandTypes('TIME');
     if (!(this.duration instanceof Duration)) {
@@ -59,6 +61,7 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
     value.duration = this.duration;
     value.step = this.step;
     if (this.timezone) value.timezone = this.timezone;
+    if (this.bounds) value.bounds = this.bounds;
     return value;
   }
 
@@ -67,6 +70,7 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
     js.duration = this.duration.toJS();
     js.step = this.step;
     if (this.timezone) js.timezone = this.timezone.toJS();
+    if (this.bounds) js.bounds = this.bounds;
     return js;
   }
 
@@ -75,6 +79,7 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
       super.equals(other) &&
       this.duration.equals(other.duration) &&
       this.step === other.step &&
+      this.bounds === other.bounds &&
       immutableEqual(this.timezone, other.timezone)
     );
   }
@@ -99,9 +104,9 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
     if (operandValue === null) return null;
     const other = duration.shift(operandValue, timezone, step);
     if (step > 0) {
-      return new TimeRange({ start: operandValue, end: other });
+      return new TimeRange({ start: operandValue, end: other, bounds: this.bounds });
     } else {
-      return new TimeRange({ start: other, end: operandValue });
+      return new TimeRange({ start: other, end: operandValue, bounds: this.bounds });
     }
   }
 
@@ -112,6 +117,8 @@ export class TimeRangeExpression extends ChainableExpression implements HasTimez
   // HasTimezone mixin:
   public getTimezone: () => Timezone;
   public changeTimezone: (timezone: Timezone) => TimeRangeExpression;
+  public getBounds: () => String;
+  public changeBounds: (bounds: String) => TimeRangeExpression;
 }
 
 Expression.applyMixins(TimeRangeExpression, [HasTimezone]);