@sisense/sdk-data 2.22.0 → 2.23.0

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

@@ -25,6 +25,7 @@ exports.AggregationTypes = {
     /** Standard deviation aggregation type */
     StandardDeviation: 'stdev',
 };
+const aggTypes = Object.values(exports.AggregationTypes);
 /**
  * Different sort types.
  */

package/dist/cjs/utils.d.ts

@@ -1,6 +1,6 @@
 import { FilterJaqlInternal, JaqlDataSource, JaqlDataSourceForDto, RankingFilterJaql } from './dimensional-model/filters/utils/types.js';
 import { Attribute, BaseMeasure, CalculatedMeasure, Filter, FilterRelations, FilterRelationsJaql, LevelAttribute, SortDirection } from './dimensional-model/interfaces.js';
-import { BaseJaql, FilterJaql, FormulaJaql, Jaql, JaqlSortDirection, MetadataItemJaql, Sort } from './dimensional-model/types.js';
+import { AggregationType, BaseJaql, FilterJaql, FormulaJaql, Jaql, JaqlSortDirection, MetadataItemJaql, Sort } from './dimensional-model/types.js';
 import { DataSource, DataSourceInfo } from './interfaces.js';
 /**
  * Generates a cryptographically secure random number between 0 and 1.
@@ -126,7 +126,7 @@ export declare function getSortType(jaqlSort: `${JaqlSortDirection}` | undefined
  * @returns attribute or level attribute
  * @internal
  */
-export declare const createAttributeHelper: ({ expression, dataType, granularity, format, sort, title, panel, dataSource, }: {
+export declare const createAttributeHelper: ({ expression, dataType, granularity, format, sort, title, panel, dataSource, indexed, merged, }: {
     /** Dimension expression */
     expression: string;
     /** Data type */
@@ -143,6 +143,10 @@ export declare const createAttributeHelper: ({ expression, dataType, granularity
     panel?: string | undefined;
     /** Jaql data source */
     dataSource?: JaqlDataSource | undefined;
+    /** Indexed */
+    indexed?: boolean | undefined;
+    /** Merged */
+    merged?: boolean | undefined;
 }) => Attribute | LevelAttribute;
 /**
  * Creates a measure from the provided parameters
@@ -150,7 +154,7 @@ export declare const createAttributeHelper: ({ expression, dataType, granularity
  * @returns measure
  * @internal
  */
-export declare const createMeasureHelper: ({ expression, dataType, agg, granularity, format, sort, title, dataSource, }: {
+export declare const createMeasureHelper: ({ expression, dataType, agg, granularity, format, sort, title, dataSource, indexed, merged, }: {
     /** Dimension expression */
     expression: string;
     /** Data type */
@@ -167,7 +171,16 @@ export declare const createMeasureHelper: ({ expression, dataType, agg, granular
     title?: string | undefined;
     /** Jaql data source */
     dataSource?: JaqlDataSource | undefined;
+    /** Indexed */
+    indexed?: boolean | undefined;
+    /** Merged */
+    merged?: boolean | undefined;
 }) => BaseMeasure;
+/**
+ * @returns measure
+ * @internal
+ */
+export declare function createMeasureByAggType(agg: AggregationType, attribute: Attribute | LevelAttribute, updatedTitle?: string, format?: string): BaseMeasure;
 /**
  * Creates a measure from the provided parameters
  *

package/dist/cjs/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateSharedFormulas = exports.getGranularityFromJaql = exports.createDimensionalElementFromJaql = exports.createCalculatedMeasureHelper = exports.createMeasureHelper = exports.createAttributeHelper = exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.parseExpression = exports.createFilterFromJaql = exports.convertSortToSortDirection = exports.convertSortDirectionToSort = exports.convertSort = exports.convertJaqlDataSourceForDto = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelationsJaql = exports.guidFast = exports.secureRandom = void 0;
+exports.translateSharedFormulas = exports.getGranularityFromJaql = exports.createDimensionalElementFromJaql = exports.createCalculatedMeasureHelper = exports.createMeasureByAggType = exports.createMeasureHelper = exports.createAttributeHelper = exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.parseExpression = exports.createFilterFromJaql = exports.convertSortToSortDirection = exports.convertSortDirectionToSort = exports.convertSort = exports.convertJaqlDataSourceForDto = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelationsJaql = exports.guidFast = exports.secureRandom = void 0;
 const cloneDeep_js_1 = __importDefault(require("lodash-es/cloneDeep.js"));
 const mapValues_js_1 = __importDefault(require("lodash-es/mapValues.js"));
 const attributes_js_1 = require("./dimensional-model/attributes.js");
@@ -346,17 +346,17 @@ exports.getSortType = getSortType;
  * @returns attribute or level attribute
  * @internal
  */
-const createAttributeHelper = ({ expression, dataType, granularity, format, sort, title, panel, dataSource, }) => {
+const createAttributeHelper = ({ expression, dataType, granularity, format, sort, title, panel, dataSource, indexed, merged, }) => {
     const column = parseExpression(expression).column;
     const sortEnum = convertSort(sort);
     const isDataTypeDatetime = dataType !== undefined && (0, simple_column_types_js_1.isDatetime)(dataType);
     if (isDataTypeDatetime) {
         const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : column, expression, granularity || types_js_1.DateLevels.Years, format ||
-            attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(granularity || types_js_1.DateLevels.Years), undefined, sortEnum, dataSource, undefined, panel);
+            attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(granularity || types_js_1.DateLevels.Years), undefined, sortEnum, dataSource, undefined, panel, indexed, merged);
         return levelAttribute;
     }
     const attributeType = !dataType || (0, simple_column_types_js_1.isNumber)(dataType) ? types_js_1.MetadataTypes.NumericAttribute : types_js_1.MetadataTypes.TextAttribute;
-    const attribute = new attributes_js_1.DimensionalAttribute(title !== null && title !== void 0 ? title : column, expression, attributeType, undefined, sortEnum, dataSource, undefined, panel);
+    const attribute = new attributes_js_1.DimensionalAttribute(title !== null && title !== void 0 ? title : column, expression, attributeType, undefined, sortEnum, dataSource, undefined, panel, indexed, merged);
     return attribute;
 };
 exports.createAttributeHelper = createAttributeHelper;
@@ -366,7 +366,7 @@ exports.createAttributeHelper = createAttributeHelper;
  * @returns measure
  * @internal
  */
-const createMeasureHelper = ({ expression, dataType, agg, granularity, format, sort, title, dataSource, }) => {
+const createMeasureHelper = ({ expression, dataType, agg, granularity, format, sort, title, dataSource, indexed, merged, }) => {
     const attribute = (0, exports.createAttributeHelper)({
         expression,
         dataType,
@@ -375,11 +375,21 @@ const createMeasureHelper = ({ expression, dataType, agg, granularity, format, s
         sort,
         title,
         dataSource,
+        indexed,
+        merged,
     });
     const tranformedAgg = measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg);
     const column = parseExpression(expression).column;
     const updatedTitle = title !== null && title !== void 0 ? title : `${tranformedAgg} ${column}`;
-    switch (tranformedAgg) {
+    return createMeasureByAggType(tranformedAgg, attribute, updatedTitle, format);
+};
+exports.createMeasureHelper = createMeasureHelper;
+/**
+ * @returns measure
+ * @internal
+ */
+function createMeasureByAggType(agg, attribute, updatedTitle, format) {
+    switch (agg) {
         case types_js_1.AggregationTypes.Sum:
             return measureFactory.sum(attribute, updatedTitle, format);
         case types_js_1.AggregationTypes.Average:
@@ -401,8 +411,8 @@ const createMeasureHelper = ({ expression, dataType, agg, granularity, format, s
         default:
             return measureFactory.sum(attribute, updatedTitle, format);
     }
-};
-exports.createMeasureHelper = createMeasureHelper;
+}
+exports.createMeasureByAggType = createMeasureByAggType;
 /**
  * Creates a measure from the provided parameters
  *
@@ -466,6 +476,8 @@ function createDimensionalElementFromJaql(jaql, datetimeFormat, panel) {
         title: jaql.title,
         panel: panel,
         dataSource,
+        indexed: jaql.indexed,
+        merged: jaql.merged,
     });
 }
 exports.createDimensionalElementFromJaql = createDimensionalElementFromJaql;

package/dist/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/dimensional-model/attributes.js

@@ -17,7 +17,7 @@ export const jaqlSimpleColumnType = (datatype) => simpleColumnType(datatype).rep
  * @internal
  */
 export class DimensionalAttribute extends DimensionalElement {
-    constructor(name, expression, type, desc, sort, dataSource, composeCode, panel) {
+    constructor(name, expression, type, desc, sort, dataSource, composeCode, panel, indexed, merged) {
         super(name, type || MetadataTypes.Attribute, desc, dataSource, composeCode);
         /**
          * @internal
@@ -36,6 +36,8 @@ export class DimensionalAttribute extends DimensionalElement {
             this.panel = panel;
         }
         this._sort = sort || Sort.None;
+        this.merged = merged;
+        this.indexed = indexed;
     }
     /**
      * gets the element's ID
@@ -58,7 +60,7 @@ export class DimensionalAttribute extends 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
@@ -103,8 +105,8 @@ export const isDimensionalAttribute = (v) => {
  * @internal
  */
 export class DimensionalLevelAttribute extends DimensionalAttribute {
-    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
-        super(name, expression, MetadataTypes.DateLevel, desc, sort, dataSource, composeCode);
+    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel, indexed, merged) {
+        super(name, expression, MetadataTypes.DateLevel, desc, sort, dataSource, composeCode, undefined, indexed, merged);
         /**
          * @internal
          */
@@ -150,7 +152,7 @@ export 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
@@ -167,7 +169,7 @@ export 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
@@ -176,7 +178,7 @@ export 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
@@ -384,7 +386,7 @@ export 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);
 }
 /**
  * Creates a LevelAttribute instance from the given JSON object.
@@ -393,7 +395,7 @@ export function createAttribute(json) {
  * @internal
  */
 export 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);
 }
 /**
  * Normalize attribute name

package/dist/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/dimensional-model/dimensions/dimensions.js

@@ -172,27 +172,28 @@ export const isDimensionalDimension = (v) => {
  * @internal
  */
 export class DimensionalDateDimension extends DimensionalDimension {
-    constructor(name, expression, desc, sort, dataSource, composeCode) {
+    constructor(name, expression, desc, sort, dataSource, composeCode, indexed, merged) {
         super(name, expression, [], [], MetadataTypes.DateDimension, desc, sort, dataSource, composeCode);
         /**
          * @internal
          */
         this.__serializable = 'DimensionalDateDimension';
+        const commonProps = [desc, sort, dataSource, undefined, undefined, indexed, merged];
         this.defaultLevel = DateLevels.Years;
-        this.Years = new DimensionalLevelAttribute(DateLevels.Years, expression, DateLevels.Years, 'yyyy', desc, sort, dataSource);
-        this.Quarters = new DimensionalLevelAttribute(DateLevels.Quarters, expression, DateLevels.Quarters, 'Q yyyy', desc, sort, dataSource);
-        this.Months = new DimensionalLevelAttribute(DateLevels.Months, expression, DateLevels.Months, 'yyyy-MM', desc, sort, dataSource);
-        this.Weeks = new DimensionalLevelAttribute(DateLevels.Weeks, expression, DateLevels.Weeks, 'ww yyyy', desc, sort, dataSource);
-        this.Days = new DimensionalLevelAttribute(DateLevels.Days, expression, DateLevels.Days, 'yyyy-MM-dd', desc, sort, dataSource);
-        this.Hours = new DimensionalLevelAttribute(DateLevels.Hours, expression, DateLevels.Hours, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Years = new DimensionalLevelAttribute(DateLevels.Years, expression, DateLevels.Years, 'yyyy', ...commonProps);
+        this.Quarters = new DimensionalLevelAttribute(DateLevels.Quarters, expression, DateLevels.Quarters, 'Q yyyy', ...commonProps);
+        this.Months = new DimensionalLevelAttribute(DateLevels.Months, expression, DateLevels.Months, 'yyyy-MM', ...commonProps);
+        this.Weeks = new DimensionalLevelAttribute(DateLevels.Weeks, expression, DateLevels.Weeks, 'ww yyyy', ...commonProps);
+        this.Days = new DimensionalLevelAttribute(DateLevels.Days, expression, DateLevels.Days, 'yyyy-MM-dd', ...commonProps);
+        this.Hours = new DimensionalLevelAttribute(DateLevels.Hours, expression, DateLevels.Hours, 'yyyy-MM-dd HH:mm', ...commonProps);
         this.MinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo30, expression, DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
-        this.MinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo15, expression, DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
-        this.Minutes = new DimensionalLevelAttribute(DateLevels.Minutes, expression, DateLevels.Minutes, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo15, expression, DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', ...commonProps);
+        this.Minutes = new DimensionalLevelAttribute(DateLevels.Minutes, expression, DateLevels.Minutes, 'yyyy-MM-dd HH:mm', ...commonProps);
         this.Seconds = new DimensionalLevelAttribute(DateLevels.Seconds, expression, DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss', desc, sort, dataSource);
-        this.AggHours = new DimensionalLevelAttribute(DateLevels.AggHours, expression, DateLevels.AggHours, 'HH:mm', desc, sort, dataSource);
+        this.AggHours = new DimensionalLevelAttribute(DateLevels.AggHours, expression, DateLevels.AggHours, 'HH:mm', ...commonProps);
         this.AggMinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo30, expression, DateLevels.AggMinutesRoundTo30, 'HH:mm', desc, sort, dataSource);
-        this.AggMinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo15, expression, DateLevels.AggMinutesRoundTo15, 'HH:mm', desc, sort, dataSource);
-        this.AggMinutesRoundTo1 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo1, expression, DateLevels.AggMinutesRoundTo1, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo15, expression, DateLevels.AggMinutesRoundTo15, 'HH:mm', ...commonProps);
+        this.AggMinutesRoundTo1 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo1, expression, DateLevels.AggMinutesRoundTo1, 'HH:mm', ...commonProps);
         this.setAttributes([
             this.Years,
             this.Quarters,
@@ -237,7 +238,7 @@ export 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
@@ -280,9 +281,11 @@ export 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 == 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)
@@ -293,12 +296,12 @@ export function createDimension(json) {
             let att;
             for (let i = 0; i < json.attributes.length; i++) {
                 att = json.attributes[i];
-                atts.push(new DimensionalAttribute(att.name, att.expression, att.type, att.description, att.sort, att.dataSource));
+                atts.push(new 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 DimensionalAttribute(name, expression, type, description, sort, dataSource));
+            atts.push(new DimensionalAttribute(name, expression, type, description, sort, dataSource, undefined, undefined, indexed, merged));
         }
     }
     // nested dimensions
@@ -333,5 +336,5 @@ export 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);
 }

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

@@ -33,6 +33,8 @@ const createAttributeEntry = (field, dataSource) => {
             expression: attributeId,
             dataSource: dataSourceConfig,
             description: field.description,
+            indexed: field.indexed,
+            merged: field.merged,
         })
         : createAttribute({
             name: attributeName,
@@ -40,6 +42,8 @@ const createAttributeEntry = (field, dataSource) => {
             expression: attributeId,
             dataSource: dataSourceConfig,
             description: field.description,
+            indexed: field.indexed,
+            merged: field.merged,
         });
     return {
         dimension: {

package/dist/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/dimensional-model/filters/factory.js

@@ -563,6 +563,29 @@ export const thisQuarter = withComposeCodeForFilter((dimension, config) => dateR
  */
 export const today = withComposeCodeForFilter((dimension, config) => 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.
  *
@@ -595,7 +618,7 @@ export function measureBase(attribute, measure, operatorA, valueA, operatorB, va
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureEquals = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.Equals, value, undefined, undefined, config), 'measureEquals');
+export const measureEquals = withComposeCodeForFilter((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.Equals, value, undefined, undefined, config), 'measureEquals');
 /**
  * Creates a filter to isolate a measure value greater than to a given number.
  *
@@ -613,7 +636,7 @@ export const measureEquals = withComposeCodeForFilter((measure, value, config) =
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureGreaterThan = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.FromNotEqual, value, undefined, undefined, config), 'measureGreaterThan');
+export const measureGreaterThan = withComposeCodeForFilter((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.FromNotEqual, value, undefined, undefined, config), 'measureGreaterThan');
 /**
  * Creates a filter to isolate a measure value greater than or equal to a given number.
  *
@@ -631,7 +654,7 @@ export const measureGreaterThan = withComposeCodeForFilter((measure, value, conf
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureGreaterThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.From, value, undefined, undefined, config), 'measureGreaterThanOrEqual');
+export const measureGreaterThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.From, value, undefined, undefined, config), 'measureGreaterThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than or equal to a given number.
  *
@@ -649,7 +672,7 @@ export const measureGreaterThanOrEqual = withComposeCodeForFilter((measure, valu
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureLessThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.To, value, undefined, undefined, config), 'measureLessThanOrEqual');
+export const measureLessThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.To, value, undefined, undefined, config), 'measureLessThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than a given number.
  *
@@ -666,7 +689,7 @@ export const measureLessThanOrEqual = withComposeCodeForFilter((measure, value,
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureLessThan = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.ToNotEqual, value, undefined, undefined, config), 'measureLessThan');
+export const measureLessThan = withComposeCodeForFilter((measure, value, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.ToNotEqual, value, undefined, undefined, config), 'measureLessThan');
 /**
  * Creates a filter to isolate a measure value between or equal to two given numbers.
  *
@@ -686,7 +709,7 @@ export const measureLessThan = withComposeCodeForFilter((measure, value, config)
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureBetween = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(measure.attribute, measure, NumericOperators.From, valueA, NumericOperators.To, valueB, config), 'measureBetween');
+export const measureBetween = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.From, valueA, NumericOperators.To, valueB, config), 'measureBetween');
 /**
  * Creates a filter to isolate a measure value between but not equal to two given numbers.
  *
@@ -706,7 +729,7 @@ export const measureBetween = withComposeCodeForFilter((measure, valueA, valueB,
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export const measureBetweenNotEqual = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(measure.attribute, measure, NumericOperators.FromNotEqual, valueA, NumericOperators.ToNotEqual, valueB, config), 'measureBetweenNotEqual');
+export const measureBetweenNotEqual = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(getMeasureAttribute(measure), measure, NumericOperators.FromNotEqual, valueA, NumericOperators.ToNotEqual, valueB, config), 'measureBetweenNotEqual');
 // RANKING FILTERS
 /**
  * Creates a filter to isolate items that rank towards the top for a given measure.

package/dist/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.
  *