@sisense/sdk-data 2.21.0 → 2.23.0

package/dist/cjs/dimensional-model/attributes.d.ts

@@ -16,7 +16,15 @@ export declare class DimensionalAttribute extends DimensionalElement implements
     readonly expression: string;
     readonly panel: string;
     protected _sort: Sort;
-    constructor(name: string, expression: string, type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string);
+    /**
+     * @internal
+     */
+    readonly merged?: boolean;
+    /**
+     * @internal
+     */
+    readonly indexed?: boolean;
+    constructor(name: string, expression: string, type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string, indexed?: boolean, merged?: boolean);
     /**
      * gets the element's ID
      */
@@ -60,7 +68,7 @@ export declare class DimensionalLevelAttribute extends DimensionalAttribute impl
     private _format;
     readonly granularity: string;
     readonly panel: string;
-    constructor(name: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string);
+    constructor(name: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string, indexed?: boolean, merged?: boolean);
     /**
      * gets the element's ID
      */

package/dist/cjs/dimensional-model/attributes.js

@@ -21,7 +21,7 @@ exports.jaqlSimpleColumnType = jaqlSimpleColumnType;
  * @internal
  */
 class DimensionalAttribute extends base_js_1.DimensionalElement {
-    constructor(name, expression, type, desc, sort, dataSource, composeCode, panel) {
+    constructor(name, expression, type, desc, sort, dataSource, composeCode, panel, indexed, merged) {
         super(name, type || types_js_1.MetadataTypes.Attribute, desc, dataSource, composeCode);
         /**
          * @internal
@@ -40,6 +40,8 @@ class DimensionalAttribute extends base_js_1.DimensionalElement {
             this.panel = panel;
         }
         this._sort = sort || types_js_1.Sort.None;
+        this.merged = merged;
+        this.indexed = indexed;
     }
     /**
      * gets the element's ID
@@ -62,7 +64,7 @@ class DimensionalAttribute extends base_js_1.DimensionalElement {
      * @returns An instance representing the sorted {@link Attribute} of this instance
      */
     sort(sort) {
-        return new DimensionalAttribute(this.name, this.expression, this.type, this.description, sort, this.dataSource, this.composeCode, this.panel);
+        return new DimensionalAttribute(this.name, this.expression, this.type, this.description, sort, this.dataSource, this.composeCode, this.panel, this.indexed, this.merged);
     }
     /**
      * Gets the JAQL representation of this instance
@@ -109,8 +111,8 @@ exports.isDimensionalAttribute = isDimensionalAttribute;
  * @internal
  */
 class DimensionalLevelAttribute extends DimensionalAttribute {
-    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
-        super(name, expression, types_js_1.MetadataTypes.DateLevel, desc, sort, dataSource, composeCode);
+    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel, indexed, merged) {
+        super(name, expression, types_js_1.MetadataTypes.DateLevel, desc, sort, dataSource, composeCode, undefined, indexed, merged);
         /**
          * @internal
          */
@@ -156,7 +158,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      * @returns An instance representing the sorted {@link LevelAttribute} of this instance
      */
     sort(sort) {
-        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, this._format, this.description, sort, this.dataSource, this.composeCode);
+        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, this._format, this.description, sort, this.dataSource, this.composeCode, undefined, this.indexed, this.merged);
     }
     /**
      * The string formatting of this instance
@@ -173,7 +175,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      * @returns An instance representing the formatted {@link LevelAttribute} of this instance
      */
     format(format) {
-        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, format, this.description, this._sort, this.dataSource, this.composeCode);
+        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, format, this.description, this._sort, this.dataSource, this.composeCode, undefined, this.indexed, this.merged);
     }
     /**
      * Gets a {@link LevelAttribute} with the given granularity
@@ -182,7 +184,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      * @returns New instance representing {@link LevelAttribute} with provided granularity
      */
     setGranularity(granularity) {
-        return new DimensionalLevelAttribute(this.name, this.expression, granularity, this._format, this.description, this._sort, this.dataSource, this.composeCode);
+        return new DimensionalLevelAttribute(this.name, this.expression, granularity, this._format, this.description, this._sort, this.dataSource, this.composeCode, undefined, this.indexed, this.merged);
     }
     /**
      * Gets a serializable representation of the element
@@ -392,7 +394,7 @@ function createAttribute(json) {
     if (json.granularity) {
         return createLevel(json);
     }
-    return new DimensionalAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.type, json.desc || json.description, json.sort, json.dataSource);
+    return new DimensionalAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.type, json.desc || json.description, json.sort, json.dataSource, undefined, undefined, json.indexed, json.merged);
 }
 exports.createAttribute = createAttribute;
 /**
@@ -402,7 +404,7 @@ exports.createAttribute = createAttribute;
  * @internal
  */
 function createLevel(json) {
-    return new DimensionalLevelAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.granularity, json.format, json.desc || json.description, json.sort, json.dataSource);
+    return new DimensionalLevelAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.granularity, json.format, json.desc || json.description, json.sort, json.dataSource, undefined, undefined, json.indexed, json.merged);
 }
 exports.createLevel = createLevel;
 /**

package/dist/cjs/dimensional-model/dimensions/dimensions.d.ts

@@ -73,7 +73,7 @@ export declare class DimensionalDateDimension extends DimensionalDimension imple
      * @internal
      */
     readonly __serializable: string;
-    constructor(name: string, expression: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string);
+    constructor(name: string, expression: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, indexed?: boolean, merged?: boolean);
     /**
      * Years level
      */

package/dist/cjs/dimensional-model/dimensions/dimensions.js

@@ -177,27 +177,28 @@ exports.isDimensionalDimension = isDimensionalDimension;
  * @internal
  */
 class DimensionalDateDimension extends DimensionalDimension {
-    constructor(name, expression, desc, sort, dataSource, composeCode) {
+    constructor(name, expression, desc, sort, dataSource, composeCode, indexed, merged) {
         super(name, expression, [], [], types_js_1.MetadataTypes.DateDimension, desc, sort, dataSource, composeCode);
         /**
          * @internal
          */
         this.__serializable = 'DimensionalDateDimension';
+        const commonProps = [desc, sort, dataSource, undefined, undefined, indexed, merged];
         this.defaultLevel = types_js_1.DateLevels.Years;
-        this.Years = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Years, expression, types_js_1.DateLevels.Years, 'yyyy', desc, sort, dataSource);
-        this.Quarters = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Quarters, expression, types_js_1.DateLevels.Quarters, 'Q yyyy', desc, sort, dataSource);
-        this.Months = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Months, expression, types_js_1.DateLevels.Months, 'yyyy-MM', desc, sort, dataSource);
-        this.Weeks = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Weeks, expression, types_js_1.DateLevels.Weeks, 'ww yyyy', desc, sort, dataSource);
-        this.Days = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Days, expression, types_js_1.DateLevels.Days, 'yyyy-MM-dd', desc, sort, dataSource);
-        this.Hours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Hours, expression, types_js_1.DateLevels.Hours, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Years = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Years, expression, types_js_1.DateLevels.Years, 'yyyy', ...commonProps);
+        this.Quarters = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Quarters, expression, types_js_1.DateLevels.Quarters, 'Q yyyy', ...commonProps);
+        this.Months = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Months, expression, types_js_1.DateLevels.Months, 'yyyy-MM', ...commonProps);
+        this.Weeks = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Weeks, expression, types_js_1.DateLevels.Weeks, 'ww yyyy', ...commonProps);
+        this.Days = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Days, expression, types_js_1.DateLevels.Days, 'yyyy-MM-dd', ...commonProps);
+        this.Hours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Hours, expression, types_js_1.DateLevels.Hours, 'yyyy-MM-dd HH:mm', ...commonProps);
         this.MinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo30, expression, types_js_1.DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
-        this.MinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo15, expression, types_js_1.DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
-        this.Minutes = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Minutes, expression, types_js_1.DateLevels.Minutes, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo15, expression, types_js_1.DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', ...commonProps);
+        this.Minutes = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Minutes, expression, types_js_1.DateLevels.Minutes, 'yyyy-MM-dd HH:mm', ...commonProps);
         this.Seconds = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Seconds, expression, types_js_1.DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss', desc, sort, dataSource);
-        this.AggHours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggHours, expression, types_js_1.DateLevels.AggHours, 'HH:mm', desc, sort, dataSource);
+        this.AggHours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggHours, expression, types_js_1.DateLevels.AggHours, 'HH:mm', ...commonProps);
         this.AggMinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo30, expression, types_js_1.DateLevels.AggMinutesRoundTo30, 'HH:mm', desc, sort, dataSource);
-        this.AggMinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo15, expression, types_js_1.DateLevels.AggMinutesRoundTo15, 'HH:mm', desc, sort, dataSource);
-        this.AggMinutesRoundTo1 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo1, expression, types_js_1.DateLevels.AggMinutesRoundTo1, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo15, expression, types_js_1.DateLevels.AggMinutesRoundTo15, 'HH:mm', ...commonProps);
+        this.AggMinutesRoundTo1 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo1, expression, types_js_1.DateLevels.AggMinutesRoundTo1, 'HH:mm', ...commonProps);
         this.setAttributes([
             this.Years,
             this.Quarters,
@@ -242,7 +243,7 @@ class DimensionalDateDimension extends DimensionalDimension {
      * @returns An instance representing the sorted {@link Dimension} of this instance
      */
     sort(sort) {
-        return new DimensionalDateDimension(this.name, this.expression, this.description, sort, this.dataSource, this.composeCode);
+        return new DimensionalDateDimension(this.name, this.expression, this.description, sort, this.dataSource, this.composeCode, this.indexed, this.merged);
     }
     /**
      * Gets a serializable representation of the element
@@ -287,9 +288,11 @@ function createDimension(json) {
     const type = DimensionalDimension.parseType(json.dimtype || json.type);
     const sort = json.sort;
     const dataSource = json.dataSource;
+    const indexed = json.indexed;
+    const merged = json.merged;
     // date dimension
     if (type == types_js_1.MetadataTypes.DateDimension) {
-        return new DimensionalDateDimension(name, expression, description, sort, dataSource);
+        return new DimensionalDateDimension(name, expression, description, sort, dataSource, undefined, indexed, merged);
     }
     // attributes
     const atts = Object.getOwnPropertyNames(json)
@@ -300,12 +303,12 @@ function createDimension(json) {
             let att;
             for (let i = 0; i < json.attributes.length; i++) {
                 att = json.attributes[i];
-                atts.push(new attributes_js_1.DimensionalAttribute(att.name, att.expression, att.type, att.description, att.sort, att.dataSource));
+                atts.push(new attributes_js_1.DimensionalAttribute(att.name, att.expression, att.type, att.description, att.sort, att.dataSource, undefined, undefined, att.indexed, att.merged));
             }
         }
         // default attribute
         else if (expression) {
-            atts.push(new attributes_js_1.DimensionalAttribute(name, expression, type, description, sort, dataSource));
+            atts.push(new attributes_js_1.DimensionalAttribute(name, expression, type, description, sort, dataSource, undefined, undefined, indexed, merged));
         }
     }
     // nested dimensions
@@ -341,6 +344,6 @@ function createDateDimension(json) {
     const description = json.desc || json.description;
     const sort = json.sort;
     const dataSource = json.dataSource;
-    return new DimensionalDateDimension(name, expression, description, sort, dataSource);
+    return new DimensionalDateDimension(name, expression, description, sort, dataSource, undefined, json.indexed, json.merged);
 }
 exports.createDateDimension = createDateDimension;

package/dist/cjs/dimensional-model/dimensions/utils.js

@@ -37,6 +37,8 @@ const createAttributeEntry = (field, dataSource) => {
             expression: attributeId,
             dataSource: dataSourceConfig,
             description: field.description,
+            indexed: field.indexed,
+            merged: field.merged,
         })
         : (0, attributes_js_1.createAttribute)({
             name: attributeName,
@@ -44,6 +46,8 @@ const createAttributeEntry = (field, dataSource) => {
             expression: attributeId,
             dataSource: dataSourceConfig,
             description: field.description,
+            indexed: field.indexed,
+            merged: field.merged,
         });
     return {
         dimension: {

package/dist/cjs/dimensional-model/filters/factory.d.ts

@@ -1,4 +1,4 @@
-import { Attribute, BaseFilterConfig, BaseMeasure, DateDimension, Filter, FilterRelations, FilterRelationsNode, LevelAttribute, Measure, MembersFilterConfig } from '../interfaces.js';
+import { Attribute, BaseFilterConfig, BaseMeasure, CalculatedMeasure, DateDimension, Filter, FilterRelations, FilterRelationsNode, LevelAttribute, Measure, MembersFilterConfig } from '../interfaces.js';
 /**
  * Creates a filter representing the union of multiple filters on the same attribute. The resulting
  * union filter filters on items that match any of the given filters.
@@ -571,7 +571,7 @@ export declare function measureBase(attribute: Attribute, measure: Measure, oper
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureEquals: (measure: BaseMeasure, value: number, config?: BaseFilterConfig) => Filter;
+export declare const measureEquals: (measure: BaseMeasure | CalculatedMeasure, value: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value greater than to a given number.
  *
@@ -589,7 +589,7 @@ export declare const measureEquals: (measure: BaseMeasure, value: number, config
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureGreaterThan: (measure: BaseMeasure, value: number, config?: BaseFilterConfig) => Filter;
+export declare const measureGreaterThan: (measure: BaseMeasure | CalculatedMeasure, value: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value greater than or equal to a given number.
  *
@@ -607,7 +607,7 @@ export declare const measureGreaterThan: (measure: BaseMeasure, value: number, c
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureGreaterThanOrEqual: (measure: BaseMeasure, value: number, config?: BaseFilterConfig) => Filter;
+export declare const measureGreaterThanOrEqual: (measure: BaseMeasure | CalculatedMeasure, value: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value less than or equal to a given number.
  *
@@ -625,7 +625,7 @@ export declare const measureGreaterThanOrEqual: (measure: BaseMeasure, value: nu
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureLessThanOrEqual: (measure: BaseMeasure, value: number, config?: BaseFilterConfig) => Filter;
+export declare const measureLessThanOrEqual: (measure: BaseMeasure | CalculatedMeasure, value: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value less than a given number.
  *
@@ -642,7 +642,7 @@ export declare const measureLessThanOrEqual: (measure: BaseMeasure, value: numbe
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureLessThan: (measure: BaseMeasure, value: number, config?: BaseFilterConfig) => Filter;
+export declare const measureLessThan: (measure: BaseMeasure | CalculatedMeasure, value: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value between or equal to two given numbers.
  *
@@ -662,7 +662,7 @@ export declare const measureLessThan: (measure: BaseMeasure, value: number, conf
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureBetween: (measure: BaseMeasure, valueA: number, valueB: number, config?: BaseFilterConfig) => Filter;
+export declare const measureBetween: (measure: BaseMeasure | CalculatedMeasure, valueA: number, valueB: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate a measure value between but not equal to two given numbers.
  *
@@ -682,7 +682,7 @@ export declare const measureBetween: (measure: BaseMeasure, valueA: number, valu
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export declare const measureBetweenNotEqual: (measure: BaseMeasure, valueA: number, valueB: number, config?: BaseFilterConfig) => Filter;
+export declare const measureBetweenNotEqual: (measure: BaseMeasure | CalculatedMeasure, valueA: number, valueB: number, config?: BaseFilterConfig) => Filter;
 /**
  * Creates a filter to isolate items that rank towards the top for a given measure.
  *

package/dist/cjs/dimensional-model/filters/factory.js

@@ -566,6 +566,29 @@ exports.thisQuarter = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dim
  */
 exports.today = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dimension, config) => (0, exports.dateRelativeTo)(dimension.Days, 0, 1, undefined, config), 'today');
 // MEASURE-RELATED FILTERS
+/**
+ * Gets the attribute from a measure, resolving through nested CalculatedMeasures.
+ * @param measure - Measure to get the attribute from
+ * @returns Attribute from the first BaseMeasure found in the measure tree
+ */
+function getMeasureAttribute(measure) {
+    if ('attribute' in measure) {
+        return measure.attribute;
+    }
+    for (const contextMeasure of Object.values(measure.context)) {
+        if (typeof contextMeasure !== 'object' || contextMeasure === null) {
+            continue;
+        }
+        if ('attribute' in contextMeasure) {
+            return contextMeasure.attribute;
+        }
+        if ('context' in contextMeasure &&
+            typeof contextMeasure.context === 'object') {
+            return getMeasureAttribute(contextMeasure);
+        }
+    }
+    throw new Error('Cannot determine attribute from measure');
+}
 /**
  * Creates a filter on all measure values matching the provided criteria.
  *
@@ -599,7 +622,7 @@ exports.measureBase = measureBase;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureEquals = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.Equals, value, undefined, undefined, config), 'measureEquals');
+exports.measureEquals = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.Equals, value, undefined, undefined, config), 'measureEquals');
 /**
  * Creates a filter to isolate a measure value greater than to a given number.
  *
@@ -617,7 +640,7 @@ exports.measureEquals = (0, compose_code_utils_js_1.withComposeCodeForFilter)((m
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureGreaterThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.FromNotEqual, value, undefined, undefined, config), 'measureGreaterThan');
+exports.measureGreaterThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.FromNotEqual, value, undefined, undefined, config), 'measureGreaterThan');
 /**
  * Creates a filter to isolate a measure value greater than or equal to a given number.
  *
@@ -635,7 +658,7 @@ exports.measureGreaterThan = (0, compose_code_utils_js_1.withComposeCodeForFilte
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureGreaterThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.From, value, undefined, undefined, config), 'measureGreaterThanOrEqual');
+exports.measureGreaterThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.From, value, undefined, undefined, config), 'measureGreaterThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than or equal to a given number.
  *
@@ -653,7 +676,7 @@ exports.measureGreaterThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeF
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureLessThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.To, value, undefined, undefined, config), 'measureLessThanOrEqual');
+exports.measureLessThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.To, value, undefined, undefined, config), 'measureLessThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than a given number.
  *
@@ -670,7 +693,7 @@ exports.measureLessThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForF
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureLessThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.ToNotEqual, value, undefined, undefined, config), 'measureLessThan');
+exports.measureLessThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.ToNotEqual, value, undefined, undefined, config), 'measureLessThan');
 /**
  * Creates a filter to isolate a measure value between or equal to two given numbers.
  *
@@ -690,7 +713,7 @@ exports.measureLessThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)(
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureBetween = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, valueA, valueB, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.From, valueA, filters_js_1.NumericOperators.To, valueB, config), 'measureBetween');
+exports.measureBetween = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, valueA, valueB, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.From, valueA, filters_js_1.NumericOperators.To, valueB, config), 'measureBetween');
 /**
  * Creates a filter to isolate a measure value between but not equal to two given numbers.
  *
@@ -710,7 +733,7 @@ exports.measureBetween = (0, compose_code_utils_js_1.withComposeCodeForFilter)((
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-exports.measureBetweenNotEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, valueA, valueB, config) => measureBase(measure.attribute, measure, filters_js_1.NumericOperators.FromNotEqual, valueA, filters_js_1.NumericOperators.ToNotEqual, valueB, config), 'measureBetweenNotEqual');
+exports.measureBetweenNotEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((measure, valueA, valueB, config) => measureBase(getMeasureAttribute(measure), measure, filters_js_1.NumericOperators.FromNotEqual, valueA, filters_js_1.NumericOperators.ToNotEqual, valueB, config), 'measureBetweenNotEqual');
 // RANKING FILTERS
 /**
  * Creates a filter to isolate items that rank towards the top for a given measure.

package/dist/cjs/dimensional-model/filters/filter-relations.d.ts

@@ -36,6 +36,12 @@ export declare type FilterAction = {
 } | {
     type: 'remove';
     payload: Filter;
+} | {
+    type: 'replace';
+    payload: {
+        prevFilter: Filter;
+        newFilter: Filter;
+    };
 };
 /**
  * Merges source filters with target filters and recalculates relations.
@@ -77,9 +83,18 @@ export declare function isTrivialSingleNodeRelations(relations: FilterRelationsR
 /**
  * Calculates new relations based on the changes in filters.
  *
+ * @param prevFilters - The previous array of filters that the relations were built for.
+ * @param prevRelations - The previous relation rules.
+ * @param newFilters - The updated array of filters to build new relations for.
+ * @param options - Optional flags controlling how the diff is computed:
+ *   - `shouldReplaceSameAttributeFilters`: when `true`, a new filter on the same attribute as
+ *     an existing one (but with a different GUID) is treated as an in-place replacement rather
+ *     than a remove + add pair, preserving the original relation tree structure.
  * @internal
  */
-export declare function calculateNewRelations(prevFilters: Filter[], prevRelations: FilterRelationsRules, newFilters: Filter[]): FilterRelationsRules;
+export declare function calculateNewRelations(prevFilters: Filter[], prevRelations: FilterRelationsRules, newFilters: Filter[], options?: {
+    shouldReplaceSameAttributeFilters?: boolean;
+}): FilterRelationsRules;
 /**
  * Replaces a filter in the relations tree with a new filter.
  *

package/dist/cjs/dimensional-model/filters/filter-relations.js

@@ -148,14 +148,21 @@ exports.isTrivialSingleNodeRelations = isTrivialSingleNodeRelations;
 /**
  * Calculates new relations based on the changes in filters.
  *
+ * @param prevFilters - The previous array of filters that the relations were built for.
+ * @param prevRelations - The previous relation rules.
+ * @param newFilters - The updated array of filters to build new relations for.
+ * @param options - Optional flags controlling how the diff is computed:
+ *   - `shouldReplaceSameAttributeFilters`: when `true`, a new filter on the same attribute as
+ *     an existing one (but with a different GUID) is treated as an in-place replacement rather
+ *     than a remove + add pair, preserving the original relation tree structure.
  * @internal
  */
-function calculateNewRelations(prevFilters, prevRelations, newFilters) {
+function calculateNewRelations(prevFilters, prevRelations, newFilters, options = {}) {
     // If there are no previous relations - no need to recalculate them
     if (prevRelations === null) {
         return null;
     }
-    const performedActions = diffFilters(prevFilters, newFilters);
+    const performedActions = diffFilters(prevFilters, newFilters, options.shouldReplaceSameAttributeFilters);
     if (performedActions.length === 0) {
         return prevRelations;
     }
@@ -165,6 +172,8 @@ function calculateNewRelations(prevFilters, prevRelations, newFilters) {
                 return addFilterToRelations(action.payload, relations);
             case 'remove':
                 return removeFilterFromRelations(action.payload, relations);
+            case 'replace':
+                return getRelationsWithReplacedFilter(relations, action.payload.prevFilter, action.payload.newFilter);
         }
     }, prevRelations);
 }
@@ -207,26 +216,54 @@ exports.getRelationsWithReplacedFilter = getRelationsWithReplacedFilter;
  * Compares two arrays of Filter objects and determines the actions needed
  * to transform prevFilters into newFilters.
  *
+ * When `shouldReplaceSameAttributeFilters` is enabled, a new filter whose attribute matches
+ * an existing one (same `getFilterCompareId`) but has a different GUID is emitted as a single
+ * `replace` action instead of a `remove` + `add` pair. This preserves the relation tree node
+ * at the original position rather than appending the new filter with AND at the root.
+ * The disabled existing filters are excluded from the same-attribute replacement check
+ * and will therefore never be replaced in-place.
+ *
  * @param prevFilters - The original array of filters.
  * @param newFilters - The updated array of filters.
- * @param isEqualFilters - A function to determine if two filters are equal.
+ * @param shouldReplaceSameAttributeFilters - Optional flag to enable same-attribute filter replacement.
  * @returns An array of FilterAction objects representing the changes.
  */
-function diffFilters(prevFilters, newFilters) {
+function diffFilters(prevFilters, newFilters, shouldReplaceSameAttributeFilters = false) {
     const actions = [];
-    // Clone the arrays to avoid mutating the original data
-    const prevFiltersCopy = [...prevFilters];
-    const newFiltersCopy = [...newFilters];
-    // Determine removals
-    prevFiltersCopy.forEach((prevFilter) => {
-        const existsInNew = newFiltersCopy.some((newFilter) => areFiltersEqualForRelations(prevFilter, newFilter));
+    // Track which filters from each side have already been matched to avoid double-counting.
+    const matchedPrevFilters = new Set();
+    const matchedNewFilters = new Set();
+    if (shouldReplaceSameAttributeFilters) {
+        prevFilters.forEach((prevFilter, prevIdx) => {
+            // Disabled filters are never eligible for in-place replacement.
+            if (prevFilter.config.disabled) {
+                return;
+            }
+            // Look for a new filter on the same attribute with a different GUID.
+            const newIdx = newFilters.findIndex((newFilter, idx) => !matchedNewFilters.has(idx) &&
+                !areFiltersEqualForRelations(prevFilter, newFilter) &&
+                getFilterCompareId(prevFilter) === getFilterCompareId(newFilter));
+            if (newIdx !== -1) {
+                actions.push({ type: 'replace', payload: { prevFilter, newFilter: newFilters[newIdx] } });
+                matchedPrevFilters.add(prevIdx);
+                matchedNewFilters.add(newIdx);
+            }
+        });
+    }
+    // Removals: prev filters not matched by GUID in new filters (and not already handled as replace).
+    prevFilters.forEach((prevFilter, prevIdx) => {
+        if (matchedPrevFilters.has(prevIdx))
+            return;
+        const existsInNew = newFilters.some((newFilter) => areFiltersEqualForRelations(prevFilter, newFilter));
         if (!existsInNew) {
             actions.push({ type: 'remove', payload: prevFilter });
         }
     });
-    // Determine additions
-    newFiltersCopy.forEach((newFilter) => {
-        const existsInPrev = prevFiltersCopy.some((prevFilter) => areFiltersEqualForRelations(newFilter, prevFilter));
+    // Additions: new filters not matched by GUID in prev filters (and not already handled as replace).
+    newFilters.forEach((newFilter, newIdx) => {
+        if (matchedNewFilters.has(newIdx))
+            return;
+        const existsInPrev = prevFilters.some((prevFilter) => areFiltersEqualForRelations(newFilter, prevFilter));
         if (!existsInPrev) {
             actions.push({ type: 'add', payload: newFilter });
         }

package/dist/cjs/dimensional-model/filters/filters.js

@@ -481,7 +481,7 @@ class MeasureFilter extends DoubleOperatorFilter {
             return AbstractFilter.disabledJaql(nested);
         }
         const result = super.jaql(nested);
-        if ((0, measures_js_1.isDimensionalBaseMeasure)(this.measure)) {
+        if ((0, measures_js_1.isDimensionalBaseMeasure)(this.measure) || (0, measures_js_1.isDimensionalCalculatedMeasure)(this.measure)) {
             Object.entries(this.measure.jaql().jaql).forEach(([key, value]) => {
                 result.jaql[key] = value;
             });
@@ -574,7 +574,7 @@ class MeasureRankingFilter extends AbstractFilter {
             return AbstractFilter.disabledJaql(nested);
         }
         const result = super.jaql(nested);
-        if ((0, measures_js_1.isDimensionalBaseMeasure)(this.measure)) {
+        if ((0, measures_js_1.isDimensionalBaseMeasure)(this.measure) || (0, measures_js_1.isDimensionalCalculatedMeasure)(this.measure)) {
             Object.entries(this.measure.jaql().jaql).forEach(([key, value]) => {
                 result.jaql[key] = value;
             });

package/dist/cjs/dimensional-model/interfaces.d.ts

@@ -82,6 +82,18 @@ export interface Element {
      * @internal
      */
     composeCode?: string;
+    /**
+     * Merged from DataSourceField. It is used for the aggregation filtering
+     *
+     * @internal
+     */
+    readonly merged?: boolean;
+    /**
+     * Indexed from DataSourceField. It is used for the aggregation filtering
+     *
+     * @internal
+     */
+    readonly indexed?: boolean;
 }
 /**
  * Base interface for measure, which is typically numeric aggregation over {@link Attribute}(s).

package/dist/cjs/dimensional-model/measures/measures.d.ts

@@ -1,6 +1,6 @@
 import { DimensionalElement } from '../base.js';
 import { Attribute, BaseMeasure, CalculatedMeasure, Measure, MeasureContext, MeasureTemplate } from '../interfaces.js';
-import { AnyObject, JaqlDataSource, JSONObject, Sort } from '../types.js';
+import { AggregationType, AnyObject, JaqlDataSource, JSONObject, Sort } from '../types.js';
 /**
  * @internal
  */
@@ -57,7 +57,7 @@ export declare class DimensionalBaseMeasure extends AbstractMeasure implements B
      * @internal
      */
     readonly __serializable: string;
-    static aggregationFromJAQL(agg: string): string;
+    static aggregationFromJAQL(agg: string): AggregationType;
     static aggregationToJAQL(agg: string): string;
     constructor(name: string, attribute: Attribute, agg: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string);
     /**

package/dist/cjs/dimensional-model/measures/measures.js

@@ -264,7 +264,10 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
         };
         const context = {};
         const keys = Object.getOwnPropertyNames(this.context);
-        keys.forEach((k) => (context[k] = this.context[k].jaql(true)));
+        keys.forEach((k) => {
+            const v = this.context[k];
+            context[k] = v && typeof v.jaql === 'function' ? v.jaql(true) : v;
+        });
         r.jaql.context = context;
         if (this._format) {
             r.format = { number: this._format };

package/dist/cjs/dimensional-model/types.d.ts

@@ -9,24 +9,29 @@ export type { JaqlDataSource, JaqlDataSourceForDto };
  */
 export declare const AggregationTypes: {
     /** Sum aggregation type */
-    Sum: string;
+    readonly Sum: "sum";
     /** Average aggregation type */
-    Average: string;
+    readonly Average: "avg";
     /** Min aggregation type */
-    Min: string;
+    readonly Min: "min";
     /** Max aggregation type */
-    Max: string;
+    readonly Max: "max";
     /** Count aggregation type */
-    Count: string;
+    readonly Count: "count";
     /** Count distinct aggregation type */
-    CountDistinct: string;
+    readonly CountDistinct: "countDistinct";
     /** Median aggregation type */
-    Median: string;
+    readonly Median: "median";
     /** Variance aggregation type */
-    Variance: string;
+    readonly Variance: "var";
     /** Standard deviation aggregation type */
-    StandardDeviation: string;
+    readonly StandardDeviation: "stdev";
 };
+declare const aggTypes: ("sum" | "avg" | "min" | "max" | "count" | "countDistinct" | "median" | "var" | "stdev")[];
+/**
+ * @internal
+ */
+export declare type AggregationType = (typeof aggTypes)[number];
 /**
  * Different sort types.
  */
@@ -202,6 +207,7 @@ export declare type BaseJaql = {
             jaql: FilterJaql;
         };
     };
+    indexed?: boolean;
     merged?: boolean;
     panel?: 'rows' | 'columns';
 };