@sisense/sdk-data 1.28.0 → 1.29.0

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

@@ -0,0 +1,178 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findFilter = exports.withReplacedFilter = exports.withoutFilters = exports.withoutFilter = exports.withAddedFilters = exports.withAddedFilter = void 0;
+const filter_relations_js_1 = require("./filter-relations.js");
+const index_js_1 = require("../../index.js");
+/**
+ * Returns a function that adds a filter to existing filters or filter relations.
+ *
+ * @param filter - The filter to add.
+ * @returns A function that takes existing filters or filter relations and returns updated filters or filter relations with the new filter added.
+ * @group Filter Utilities
+ * @example
+ * ```ts
+ * // Using with an array of filters
+ * const originalFilters = [filterByAgeRange];
+ * const updatedFilters = withAddedFilter(filterByCost)(originalFilters);
+ * // [filterByAgeRange, filterByCost]
+ *
+ * // Using with filter relations
+ * const originalFilterRelations = filterFactory.logic.or(filterByAgeRange, filterByRevenue);
+ * const updatedFilterRelations = withAddedFilter(filterByCost)(originalFilterRelations);
+ * // (filterByAgeRange OR filterByRevenue) AND filterByCost
+ * ```
+ */
+function withAddedFilter(filter) {
+    return (filters) => {
+        if ((0, index_js_1.isFilterRelations)(filters)) {
+            const { filters: existingFilters, relations } = (0, filter_relations_js_1.splitFiltersAndRelations)(filters);
+            const newFilters = [...existingFilters, filter];
+            const newRelations = (0, filter_relations_js_1.calculateNewRelations)(existingFilters, relations, newFilters);
+            return (0, filter_relations_js_1.combineFiltersAndRelations)(newFilters, newRelations);
+        }
+        return [...(filters || []), filter];
+    };
+}
+exports.withAddedFilter = withAddedFilter;
+/**
+ * Returns a function that adds multiple filters to existing filters or filter relations.
+ *
+ * @param filtersToAdd - An array of filters to add.
+ * @returns A function that takes existing filters or filter relations and returns updated filters or filter relations with the new filters added.
+ * @group Filter Utilities
+ * @example
+ * ```ts
+ * // Using with an array of filters
+ * const originalFilters = [filterByAgeRange];
+ * const updatedFilters = withAddedFilters([filterByCost, filterByRevenue])(originalFilters);
+ * // [filterByAgeRange, filterByCost, filterByRevenue]
+ *
+ * // Using with filter relations
+ * const originalFilterRelations = filterFactory.logic.or(filterByAgeRange, filterByRevenue);
+ * const updatedFilterRelations = withAddedFilters([filterByCost, filterByRevenue])(originalFilterRelations);
+ * // (filterByAgeRange OR filterByRevenue) AND filterByCost AND filterByRevenue
+ * ```
+ */
+function withAddedFilters(filtersToAdd) {
+    return (filters) => {
+        if ((0, index_js_1.isFilterRelations)(filters)) {
+            const { filters: existingFilters, relations } = (0, filter_relations_js_1.splitFiltersAndRelations)(filters);
+            const newFilters = [...existingFilters, ...filtersToAdd];
+            const newRelations = (0, filter_relations_js_1.calculateNewRelations)(existingFilters, relations, newFilters);
+            return (0, filter_relations_js_1.combineFiltersAndRelations)(newFilters, newRelations);
+        }
+        return [...(filters || []), ...filtersToAdd];
+    };
+}
+exports.withAddedFilters = withAddedFilters;
+/**
+ * Returns a function that removes a filter from existing filters or filter relations.
+ *
+ * @param filterToRemove - The filter to remove.
+ * @returns A function that takes existing filters or filter relations and returns updated filters or filter relations without the specified filter.
+ * @group Filter Utilities
+ * @example
+ * ```ts
+ * // Using with an array of filters
+ * const originalFilters = [filterByAgeRange, filterByRevenue, filterByCost];
+ * const updatedFilters = withoutFilter(filterByCost)(originalFilters);
+ * // [filterByAgeRange, filterByRevenue]
+ *
+ * // Using with filter relations
+ * const originalFilterRelations = filterFactory.logic.or(filterByAgeRange, filterByRevenue);
+ * const updatedFiltersRelations = withoutFilter(filterByRevenue)(originalFilterRelations);
+ * // filterByAgeRange
+ * ```
+ */
+function withoutFilter(filterToRemove) {
+    return (filters) => {
+        if ((0, index_js_1.isFilterRelations)(filters)) {
+            const { filters: existingFilters, relations } = (0, filter_relations_js_1.splitFiltersAndRelations)(filters);
+            const newFilters = existingFilters.filter((filter) => filter.config.guid !== filterToRemove.config.guid);
+            const newRelations = (0, filter_relations_js_1.calculateNewRelations)(existingFilters, relations, newFilters);
+            return (0, filter_relations_js_1.combineFiltersAndRelations)(newFilters, newRelations);
+        }
+        return (filters || []).filter((filter) => filter.config.guid !== filterToRemove.config.guid);
+    };
+}
+exports.withoutFilter = withoutFilter;
+/**
+ * Returns a function that removes multiple filters from existing filters or filter relations.
+ *
+ * @param filtersToRemove - An array of filters to remove.
+ * @returns A function that takes existing filters or filter relations and returns updated filters or filter relations without the specified filters.
+ * @group Filter Utilities
+ * @example
+ * ```ts
+ * // Using with an array of filters
+ * const originalFilters = [filterByAgeRange, filterByRevenue, filterByCost];
+ * const updatedFilters = withRemovedFilters([filterByRevenue, filterByCost])(originalFilters);
+ * // [filterByAgeRange]
+ *
+ * // Using with filter relations
+ * const originalFilterRelations = filterFactory.logic.or(filterByAgeRange, filterByRevenue);
+ * const updatedFiltersRelations = withRemovedFilters([filterByRevenue])(originalFilterRelations);
+ * // filterByAgeRange
+ * ```
+ */
+function withoutFilters(filtersToRemove) {
+    return (filters) => {
+        if ((0, index_js_1.isFilterRelations)(filters)) {
+            const { filters: existingFilters, relations } = (0, filter_relations_js_1.splitFiltersAndRelations)(filters);
+            const newFilters = existingFilters.filter((filter) => !filtersToRemove.some((filterToRemove) => filter.config.guid === filterToRemove.config.guid));
+            const newRelations = (0, filter_relations_js_1.calculateNewRelations)(existingFilters, relations, newFilters);
+            return (0, filter_relations_js_1.combineFiltersAndRelations)(newFilters, newRelations);
+        }
+        return (filters || []).filter((filter) => !filtersToRemove.some((filterToRemove) => filter.config.guid === filterToRemove.config.guid));
+    };
+}
+exports.withoutFilters = withoutFilters;
+/**
+ * Returns a function that replaces a filter with a new filter in existing filters or filter relations.
+ *
+ * @param filterToReplace - The filter to replace.
+ * @param newFilter - The new filter to use as a replacement.
+ * @returns A function that takes existing filters or filter relations and returns updated filters or filter relations with the filter replaced.
+ * @group Filter Utilities
+ * @example
+ * ```ts
+ * // Using with an array of filters
+ * const originalFilters = [filterByAgeRange, filterByRevenue];
+ * const updatedFilters = withReplacedFilter(filterByRevenue, filterByCost)(originalFilters);
+ * // [filterByAgeRange, filterByCost]
+ *
+ * // Using with filter relations
+ * const originalFilterRelations = filterFactory.logic.or(filterByAgeRange, filterByRevenue);
+ * const updatedFilterRelations = withReplacedFilter(filterByRevenue, filterByCost)(originalFilterRelations);
+ * // (filterByAgeRange OR filterByCost)
+ * ```
+ */
+function withReplacedFilter(filterToReplace, newFilter) {
+    return (filters) => {
+        if ((0, index_js_1.isFilterRelations)(filters)) {
+            const { filters: existingFilters, relations } = (0, filter_relations_js_1.splitFiltersAndRelations)(filters);
+            const newFilters = existingFilters.map((filter) => filter.config.guid === filterToReplace.config.guid ? newFilter : filter);
+            const newRelations = (0, filter_relations_js_1.getRelationsWithReplacedFilter)(relations, filterToReplace, newFilter);
+            return (0, filter_relations_js_1.combineFiltersAndRelations)(newFilters, newRelations);
+        }
+        return (filters || []).map((filter) => filter.config.guid === filterToReplace.config.guid ? newFilter : filter);
+    };
+}
+exports.withReplacedFilter = withReplacedFilter;
+/**
+ * Finds a filter in an array of filters or filter relations.
+ * Returns the first filter that satisfies the provided search function.
+ * @group Filter Utilities
+ * @param filters - An array of filters or filter relations to search.
+ * @param searchFn - A function that takes a filter and returns a boolean indicating whether the filter satisfies the search criteria.
+ * @returns The first filter that satisfies the search function, or `undefined` if no filter is found.
+ *
+ */
+function findFilter(filters, searchFn) {
+    if (!filters) {
+        return undefined;
+    }
+    const filtersArray = (0, index_js_1.isFilterRelations)(filters) ? (0, filter_relations_js_1.getFiltersArray)(filters) : filters;
+    return filtersArray.find(searchFn);
+}
+exports.findFilter = findFilter;

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

@@ -0,0 +1,2 @@
+export * from './filter-relations.js';
+export * from './helpers.js';

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

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./filter-relations.js"), exports);
+__exportStar(require("./helpers.js"), exports);

package/dist/cjs/dimensional-model/filters/utils/attribute-measure-util.d.ts

@@ -1,19 +1,6 @@
 import { Attribute, BaseMeasure, CalculatedMeasure, LevelAttribute } from '../../interfaces.js';
 import { FilterJaql } from '../../types.js';
-import { CustomFormulaJaql, FilterJaqlInternal, JaqlDataSource, RankingFilterJaql } from './types.js';
-/**
- * Creates an attribute or level attribute from the provided parameters
- *
- * @param dim - Dimension expression
- * @param table - Table name
- * @param column - Column name
- * @param level - Date level
- * @param dataType - Data type
- * @param title - Attribute title
- * @param dataSource - Jaql data source
- * @returns attribute or level attribute
- */
-export declare const createAttributeHelper: (dim: string, table: string | undefined, column: string | undefined, level: string | undefined, dataType: string, title?: string, dataSource?: JaqlDataSource) => Attribute | LevelAttribute;
+import { CustomFormulaJaql, FilterJaqlInternal, RankingFilterJaql } from './types.js';
 /**
  * Creates an attribute or level attribute from the provided filter JAQL object
  *
@@ -21,27 +8,6 @@ export declare const createAttributeHelper: (dim: string, table: string | undefi
  * @returns attribute or level attribute
  */
 export declare const createAttributeFromFilterJaql: (jaql: FilterJaql | FilterJaqlInternal) => Attribute | LevelAttribute;
-/**
- * Creates a measure from the provided parameters
- *
- * @param dim - Dimension expression
- * @param table - Table name
- * @param column - Column name
- * @param level - Date level
- * @param dataType - Data type
- * @param agg - Aggregation function
- * @param title - Measure title
- * @param dataSource - data source provided in JAQL
- * @returns measure
- */
-export declare const createMeasureHelper: (dim: string, table: string | undefined, column: string, level: string | undefined, dataType: string, agg: string, title?: string, dataSource?: JaqlDataSource) => BaseMeasure;
-/**
- * Creates a calculated measure from the provided filter JAQL object
- *
- * @param jaql - custom formula jaql
- * @returns calculated measure
- */
-export declare const createCalculatedMeasureFromJaql: (jaql: CustomFormulaJaql) => CalculatedMeasure;
 /**
  * Creates a measure from the provided filter JAQL object
  *

package/dist/cjs/dimensional-model/filters/utils/attribute-measure-util.js

@@ -1,68 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMeasureFromRankingFilterJaql = exports.createMeasureFromFilterJaql = exports.createCalculatedMeasureFromJaql = exports.createMeasureHelper = exports.createAttributeFromFilterJaql = exports.createAttributeHelper = void 0;
-const attributes_js_1 = require("../../attributes.js");
-const simple_column_types_js_1 = require("../../simple-column-types.js");
-const types_js_1 = require("../../types.js");
-const measureFactory = __importStar(require("../../measures/factory.js"));
-const factory_js_1 = require("../../measures/factory.js");
-const measures_js_1 = require("../../measures/measures.js");
-const DATA_MODEL_MODULE_NAME = 'DM';
-/**
- * Creates an attribute or level attribute from the provided parameters
- *
- * @param dim - Dimension expression
- * @param table - Table name
- * @param column - Column name
- * @param level - Date level
- * @param dataType - Data type
- * @param title - Attribute title
- * @param dataSource - Jaql data source
- * @returns attribute or level attribute
- */
-const createAttributeHelper = (dim, table, column, level, dataType, title, dataSource) => {
-    // if table is undefined, extract it from dim
-    const dimTable = table !== null && table !== void 0 ? table : dim.slice(1, -1).split('.')[0];
-    // if column is undefined, extract it from dim
-    const dimColumn = column !== null && column !== void 0 ? column : dim.slice(1, -1).split('.')[1];
-    if (level) {
-        const dateLevel = attributes_js_1.DimensionalLevelAttribute.translateJaqlToGranularity({ level });
-        const format = attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(dateLevel);
-        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : dimColumn, dim, dateLevel, format, undefined, undefined, dataSource);
-        levelAttribute.composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, dimColumn, level, DATA_MODEL_MODULE_NAME);
-        return levelAttribute;
-    }
-    const attributeType = (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 : dimColumn, dim, attributeType, undefined, undefined, dataSource);
-    attribute.composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, dimColumn, undefined, DATA_MODEL_MODULE_NAME);
-    return attribute;
-};
-exports.createAttributeHelper = createAttributeHelper;
+exports.createMeasureFromRankingFilterJaql = exports.createMeasureFromFilterJaql = exports.createAttributeFromFilterJaql = void 0;
+const utils_js_1 = require("../../../utils.js");
 /**
  * Creates an attribute or level attribute from the provided filter JAQL object
  *
@@ -71,43 +10,19 @@ exports.createAttributeHelper = createAttributeHelper;
  */
 const createAttributeFromFilterJaql = (jaql) => {
     const { dim, table, column, level, datatype, title, datasource: dataSource } = jaql;
-    return (0, exports.createAttributeHelper)(dim, table, column, level, datatype, title, dataSource);
+    return (0, utils_js_1.createAttributeHelper)({
+        dim,
+        table,
+        column,
+        dataType: datatype,
+        level,
+        format: undefined,
+        sort: undefined,
+        title,
+        dataSource,
+    });
 };
 exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
-/**
- * Creates a measure from the provided parameters
- *
- * @param dim - Dimension expression
- * @param table - Table name
- * @param column - Column name
- * @param level - Date level
- * @param dataType - Data type
- * @param agg - Aggregation function
- * @param title - Measure title
- * @param dataSource - data source provided in JAQL
- * @returns measure
- */
-const createMeasureHelper = (dim, table, column, level, dataType, agg, title, dataSource) => {
-    const attribute = (0, exports.createAttributeHelper)(dim, table, column, level, dataType, title, dataSource);
-    const measure = measureFactory.aggregate(attribute, agg, title);
-    measure.composeCode = `measureFactory.${agg}(${attribute.composeCode})`;
-    return measure;
-};
-exports.createMeasureHelper = createMeasureHelper;
-/**
- * Creates a calculated measure from the provided filter JAQL object
- *
- * @param jaql - custom formula jaql
- * @returns calculated measure
- */
-const createCalculatedMeasureFromJaql = (jaql) => {
-    const measure = (0, factory_js_1.transformCustomFormulaJaql)(jaql);
-    // TBD (SNS-108945)
-    // Handle preparation of 'composeCode' for formula
-    measure.composeCode = `'Formula code to be implemented'`;
-    return measure;
-};
-exports.createCalculatedMeasureFromJaql = createCalculatedMeasureFromJaql;
 /**
  * Creates a measure from the provided filter JAQL object
  *
@@ -118,7 +33,18 @@ const createMeasureFromFilterJaql = (jaql) => {
     const { dim, table, column, title, level, datatype: dataType, agg, datasource: dataSource, } = jaql;
     if (!agg)
         return undefined;
-    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg), title, dataSource);
+    return (0, utils_js_1.createMeasureHelper)({
+        dim,
+        table,
+        column,
+        dataType,
+        agg,
+        level,
+        format: undefined,
+        sort: undefined,
+        title,
+        dataSource,
+    });
 };
 exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
 /**
@@ -129,8 +55,18 @@ exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
  */
 const createMeasureFromRankingFilterJaql = (jaql, rankingMessage) => {
     if ('formula' in jaql)
-        return (0, exports.createCalculatedMeasureFromJaql)(jaql);
+        return (0, utils_js_1.createCalculatedMeasureHelper)(jaql);
     const { dim, table, column, level, datatype: dataType, agg } = jaql;
-    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg), rankingMessage);
+    return (0, utils_js_1.createMeasureHelper)({
+        dim,
+        table,
+        column,
+        level,
+        dataType,
+        agg,
+        format: undefined,
+        sort: undefined,
+        title: rankingMessage,
+    });
 };
 exports.createMeasureFromRankingFilterJaql = createMeasureFromRankingFilterJaql;

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

@@ -438,6 +438,7 @@ export declare type FilterConfig = CompleteBaseFilterConfig | CompleteMembersFil
 export interface Filter extends Element {
     /**
      * Attribute this filter instance is filtering
+     *
      * @internal
      */
     readonly attribute: Attribute;
@@ -448,6 +449,7 @@ export interface Filter extends Element {
     /**
      * Boolean flag whether the filter is a scope filter
      * which is on a dimension that isn’t used in the query
+     *
      * @internal
      */
     isScope: boolean;

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

@@ -1,15 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rank = exports.forecast = exports.trend = exports.contribution = exports.pastYear = exports.pastQuarter = exports.pastMonth = exports.pastWeek = exports.pastDay = exports.diffPastYear = exports.diffPastQuarter = exports.diffPastMonth = exports.diffPastWeek = exports.difference = exports.growthPastYear = exports.growthPastQuarter = exports.growthPastMonth = exports.growthPastWeek = exports.growthRate = exports.growth = exports.runningSum = exports.weekToDateSum = exports.monthToDateSum = exports.quarterToDateSum = exports.yearToDateSum = exports.divide = exports.multiply = exports.subtract = exports.add = exports.measuredValue = exports.countDistinct = exports.count = exports.median = exports.max = exports.min = exports.avg = exports.average = exports.sum = exports.constant = exports.aggregate = exports.customFormula = exports.transformCustomFormulaJaql = exports.RankingSortTypes = exports.RankingTypes = void 0;
 const measures_js_1 = require("./measures.js");
 const types_js_1 = require("../types.js");
 const base_js_1 = require("../base.js");
-const mapValues_js_1 = __importDefault(require("lodash-es/mapValues.js"));
-const attributes_js_1 = require("../attributes.js");
-const simple_column_types_js_1 = require("./../simple-column-types.js");
 const utils_js_1 = require("../../utils.js");
 const translatable_error_js_1 = require("../../translation/translatable-error.js");
 /**
@@ -81,28 +75,6 @@ function measureFunction(measure, name, func, options) {
     builder.push(')');
     return new measures_js_1.DimensionalCalculatedMeasure(name, builder.join(''), context);
 }
-function transformFormulaJaqlHelper(jaql) {
-    const isFormulaJaql = 'formula' in jaql;
-    if (isFormulaJaql) {
-        return transformCustomFormulaJaql(jaql);
-    }
-    const sort = (0, utils_js_1.convertSort)(jaql.sort);
-    const hasAggregation = !!jaql.agg;
-    const isDatatypeDatetime = (0, simple_column_types_js_1.isDatetime)(jaql.datatype);
-    const attributeType = (0, simple_column_types_js_1.isNumber)(jaql.datatype)
-        ? types_js_1.MetadataTypes.NumericAttribute
-        : types_js_1.MetadataTypes.TextAttribute;
-    const attribute = isDatatypeDatetime
-        ? new attributes_js_1.DimensionalLevelAttribute(jaql.title, jaql.dim, attributes_js_1.DimensionalLevelAttribute.translateJaqlToGranularity(jaql), undefined, undefined, sort)
-        : new attributes_js_1.DimensionalAttribute(jaql.title, jaql.dim, attributeType, undefined, sort);
-    if (hasAggregation) {
-        return new measures_js_1.DimensionalBaseMeasure(jaql.title, attribute, measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(jaql.agg || ''), undefined, undefined, sort);
-    }
-    if ('filter' in jaql) {
-        return (0, utils_js_1.createFilterFromJaql)(jaql);
-    }
-    return attribute;
-}
 /**
  * Transforms a custom formula jaql into a calculated measure instance.
  *
@@ -113,14 +85,11 @@ function transformFormulaJaqlHelper(jaql) {
  * @internal
  */
 function transformCustomFormulaJaql(jaql) {
-    var _a;
     const isFormulaJaql = 'formula' in jaql;
     if (!isFormulaJaql) {
         throw new translatable_error_js_1.TranslatableError('errors.measure.notAFormula');
     }
-    const sort = (0, utils_js_1.convertSort)(jaql.sort);
-    const context = (0, mapValues_js_1.default)((_a = jaql.context) !== null && _a !== void 0 ? _a : {}, (jaqlContextValue) => jaqlContextValue ? transformFormulaJaqlHelper(jaqlContextValue) : {});
-    return new measures_js_1.DimensionalCalculatedMeasure(jaql.title, jaql.formula, context, undefined, undefined, sort);
+    return (0, utils_js_1.createCalculatedMeasureHelper)(jaql);
 }
 exports.transformCustomFormulaJaql = transformCustomFormulaJaql;
 /**

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

@@ -7,7 +7,7 @@ import { DimensionalElement } from '../base.js';
 export declare abstract class AbstractMeasure extends DimensionalElement {
     protected _sort: Sort;
     protected _format: string | undefined;
-    constructor(name: string, type: string, format?: string, desc?: string, sort?: Sort);
+    constructor(name: string, type: string, format?: string, desc?: string, sort?: Sort, composeCode?: string);
     /**
      * gets the element's ID
      */
@@ -51,7 +51,7 @@ export declare abstract class AbstractMeasure extends DimensionalElement {
 export declare class DimensionalBaseMeasure extends AbstractMeasure implements BaseMeasure {
     static aggregationFromJAQL(agg: string): string;
     static aggregationToJAQL(agg: string): string;
-    constructor(name: string, attribute: Attribute, agg: string, format?: string, desc?: string, sort?: Sort);
+    constructor(name: string, attribute: Attribute, agg: string, format?: string, desc?: string, sort?: Sort, composeCode?: string);
     /**
      * Aggregating attribute
      */
@@ -93,7 +93,7 @@ export declare class DimensionalBaseMeasure extends AbstractMeasure implements B
  * @internal
  */
 export declare class DimensionalCalculatedMeasure extends AbstractMeasure implements CalculatedMeasure {
-    constructor(name: string, expression: string, context: MeasureContext, format?: string, desc?: string, sort?: Sort);
+    constructor(name: string, expression: string, context: MeasureContext, format?: string, desc?: string, sort?: Sort, composeCode?: string);
     /**
      * Defines the Calculated measure's expression
      */

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

@@ -41,12 +41,13 @@ const translatable_error_js_1 = require("../../translation/translatable-error.js
  * @internal
  */
 class AbstractMeasure extends base_js_1.DimensionalElement {
-    constructor(name, type, format, desc, sort) {
+    constructor(name, type, format, desc, sort, composeCode) {
         super(name, type, desc);
         this._sort = types_js_1.Sort.None;
         this._format = '#,#.00';
         this._format = format;
         this._sort = sort || types_js_1.Sort.None;
+        this.composeCode = composeCode;
     }
     /**
      * Gets the sort definition of this instance
@@ -85,8 +86,8 @@ exports.AbstractMeasure = AbstractMeasure;
  * @internal
  */
 class DimensionalBaseMeasure extends AbstractMeasure {
-    constructor(name, attribute, agg, format, desc, sort) {
-        super(name, types_js_1.MetadataTypes.BaseMeasure, format, desc, sort);
+    constructor(name, attribute, agg, format, desc, sort, composeCode) {
+        super(name, types_js_1.MetadataTypes.BaseMeasure, format, desc, sort, composeCode);
         this.attribute = attribute;
         this.aggregation = agg;
     }
@@ -143,7 +144,7 @@ class DimensionalBaseMeasure extends AbstractMeasure {
      * @returns An instance representing the sorted {@link Measure} of this instance
      */
     sort(sort) {
-        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, this._format, this.description, sort);
+        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, this._format, this.description, sort, this.composeCode);
     }
     /**
      * Gets a formatted {@link Measure} with the given definition
@@ -154,7 +155,7 @@ class DimensionalBaseMeasure extends AbstractMeasure {
      * @returns An instance representing the formatted {@link Measure} of this instance
      */
     format(format) {
-        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, format, this.description, this._sort);
+        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, format, this.description, this._sort, this.composeCode);
     }
     /**
      * gets the element's ID
@@ -193,8 +194,8 @@ exports.DimensionalBaseMeasure = DimensionalBaseMeasure;
  * @internal
  */
 class DimensionalCalculatedMeasure extends AbstractMeasure {
-    constructor(name, expression, context, format, desc, sort) {
-        super(name, types_js_1.MetadataTypes.CalculatedMeasure, format, desc, sort);
+    constructor(name, expression, context, format, desc, sort, composeCode) {
+        super(name, types_js_1.MetadataTypes.CalculatedMeasure, format, desc, sort, composeCode);
         this.expression = expression;
         this.context = context;
     }
@@ -205,7 +206,7 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
      * @returns An instance representing the sorted {@link Measure} of this instance
      */
     sort(sort) {
-        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, this._format, this.description, sort);
+        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, this._format, this.description, sort, this.composeCode);
     }
     /**
      * Gets a formatted {@link Measure} with the given definition
@@ -216,7 +217,7 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
      * @returns An instance representing the formatted {@link Measure} of this instance
      */
     format(format) {
-        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, format, this.description, this._sort);
+        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, format, this.description, this._sort, this.composeCode);
     }
     /**
      * gets the element's ID

package/dist/cjs/index.d.ts

@@ -86,7 +86,6 @@ export * from './dimensional-model/measures/measures.js';
  */
 export * as measureFactory from './dimensional-model/measures/factory.js';
 export * from './dimensional-model/simple-column-types.js';
-export * from './dimensional-model/filter-relations.js';
 /**
  * Functions to create elements for advanced analytics – for example, attributes and measures for constructing a custom Boxplot chart
  *
@@ -94,4 +93,5 @@ export * from './dimensional-model/filter-relations.js';
  */
 export * as analyticsFactory from './dimensional-model/analytics/factory.js';
 export * from './utils.js';
+export * from './dimensional-model/filters/index.js';
 export { type TranslationDictionary, PACKAGE_NAMESPACE as translationNamespace, } from './translation/resources/index.js';

package/dist/cjs/index.js

@@ -116,7 +116,6 @@ __exportStar(require("./dimensional-model/measures/measures.js"), exports);
  */
 exports.measureFactory = __importStar(require("./dimensional-model/measures/factory.js"));
 __exportStar(require("./dimensional-model/simple-column-types.js"), exports);
-__exportStar(require("./dimensional-model/filter-relations.js"), exports);
 /**
  * Functions to create elements for advanced analytics – for example, attributes and measures for constructing a custom Boxplot chart
  *
@@ -124,5 +123,6 @@ __exportStar(require("./dimensional-model/filter-relations.js"), exports);
  */
 exports.analyticsFactory = __importStar(require("./dimensional-model/analytics/factory.js"));
 __exportStar(require("./utils.js"), exports);
+__exportStar(require("./dimensional-model/filters/index.js"), exports);
 var index_js_1 = require("./translation/resources/index.js");
 Object.defineProperty(exports, "translationNamespace", { enumerable: true, get: function () { return index_js_1.PACKAGE_NAMESPACE; } });

package/dist/cjs/interfaces.d.ts

@@ -134,11 +134,11 @@ export interface CalculatedMeasureColumn {
 export declare type DataSourceInfo = {
     /**
      * @internal
-     **/
+     */
     id?: string;
     /**
      * @internal
-     **/
+     */
     address?: string;
     title: string;
     type: 'live' | 'elasticube';