@sisense/sdk-data 1.34.0 → 2.1.0

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

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFilter = exports.logic = exports.cascading = exports.bottomRanking = exports.topRanking = exports.measureBetweenNotEqual = exports.measureBetween = exports.measureLessThan = exports.measureLessThanOrEqual = exports.measureGreaterThanOrEqual = exports.measureGreaterThan = exports.measureEquals = exports.measureBase = exports.today = exports.thisQuarter = exports.thisMonth = exports.thisYear = exports.dateRelativeTo = exports.dateRelativeFrom = exports.dateRelative = exports.dateRange = exports.dateTo = exports.dateFrom = exports.members = exports.numeric = exports.betweenNotEqual = exports.between = exports.lessThanOrEqual = exports.lessThan = exports.greaterThanOrEqual = exports.greaterThan = exports.equals = exports.doesntEqual = exports.like = exports.startsWith = exports.endsWith = exports.contains = exports.doesntStartWith = exports.doesntEndWith = exports.doesntContain = exports.exclude = exports.intersection = exports.union = void 0;
+/* eslint-disable max-lines */
+/* eslint-disable max-params */
+/* eslint-disable @typescript-eslint/no-shadow */
+const compose_code_utils_js_1 = require("../compose-code-utils.js");
 const filters_js_1 = require("./filters.js");
 // LOGICAL FILTERS
 /**
@@ -22,10 +26,7 @@ const filters_js_1 = require("./filters.js");
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function union(filters, config) {
-    return new filters_js_1.LogicalAttributeFilter(filters, filters_js_1.LogicalOperators.Union, config);
-}
-exports.union = union;
+exports.union = (0, compose_code_utils_js_1.withComposeCodeForFilter)((filters, config) => new filters_js_1.LogicalAttributeFilter(filters, filters_js_1.LogicalOperators.Union, config), 'union');
 /**
  * Creates a filter representing the intersection of multiple filters on the same attribute. The resulting
  * intersection filter filters on items that match all of the given filters.
@@ -45,10 +46,7 @@ exports.union = union;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function intersection(filters, config) {
-    return new filters_js_1.LogicalAttributeFilter(filters, filters_js_1.LogicalOperators.Intersection, config);
-}
-exports.intersection = intersection;
+exports.intersection = (0, compose_code_utils_js_1.withComposeCodeForFilter)((filters, config) => new filters_js_1.LogicalAttributeFilter(filters, filters_js_1.LogicalOperators.Intersection, config), 'intersection');
 /**
  * Creates a filter that excludes items matching the given filter
  * from all items or from items matching the optional input filter.
@@ -75,10 +73,7 @@ exports.intersection = intersection;
  * @returns A filter representing an exclusion of the given filter
  * from all attribute members or from the optional input filter
  */
-function exclude(filter, input, config) {
-    return new filters_js_1.ExcludeFilter(filter, input, config);
-}
-exports.exclude = exclude;
+exports.exclude = (0, compose_code_utils_js_1.withComposeCodeForFilter)((filter, input, config) => new filters_js_1.ExcludeFilter(filter, input, config), 'exclude');
 // TEXT / NUMERIC FILTERS
 /**
  * Creates a filter to isolate attribute values that do not contain a specified string.
@@ -99,10 +94,7 @@ exports.exclude = exclude;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function doesntContain(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntContain, value, config);
-}
-exports.doesntContain = doesntContain;
+exports.doesntContain = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntContain, value, config), 'doesntContain');
 /**
  * Creates a filter to isolate attribute values that do not end with a specified string.
  *
@@ -122,10 +114,7 @@ exports.doesntContain = doesntContain;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function doesntEndWith(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntEndWith, value, config);
-}
-exports.doesntEndWith = doesntEndWith;
+exports.doesntEndWith = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntEndWith, value, config), 'doesntEndWith');
 /**
  * Creates a filter to isolate attribute values that do not start with a specified string.
  *
@@ -145,10 +134,7 @@ exports.doesntEndWith = doesntEndWith;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function doesntStartWith(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntStartWith, value, config);
-}
-exports.doesntStartWith = doesntStartWith;
+exports.doesntStartWith = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntStartWith, value, config), 'doesntStartWith');
 /**
  * Creates a filter to isolate attribute values that contain a specified string.
  *
@@ -168,10 +154,7 @@ exports.doesntStartWith = doesntStartWith;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function contains(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.Contains, value, config);
-}
-exports.contains = contains;
+exports.contains = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.Contains, value, config), 'contains');
 /**
  * Creates a filter to isolate attribute values that end with a specified string.
  *
@@ -191,10 +174,7 @@ exports.contains = contains;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function endsWith(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.EndsWith, value, config);
-}
-exports.endsWith = endsWith;
+exports.endsWith = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.EndsWith, value, config), 'endsWith');
 /**
  * Creates a filter to isolate attribute values that start with a specified string.
  *
@@ -214,10 +194,7 @@ exports.endsWith = endsWith;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function startsWith(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.StartsWith, value, config);
-}
-exports.startsWith = startsWith;
+exports.startsWith = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.StartsWith, value, config), 'startsWith');
 /**
  * Creates a filter to isolate attribute values that match a specified string pattern.
  *
@@ -242,10 +219,7 @@ exports.startsWith = startsWith;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function like(attribute, value, config) {
-    return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.Like, value, config);
-}
-exports.like = like;
+exports.like = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.Like, value, config), 'like');
 /**
  * Creates a filter to isolate attribute values that do not equal a specified string or number.
  *
@@ -265,15 +239,14 @@ exports.like = like;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function doesntEqual(attribute, value, config) {
+exports.doesntEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => {
     if (typeof value === 'string') {
         return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.DoesntEqual, value, config);
     }
     else {
-        return numeric(attribute, filters_js_1.NumericOperators.DoesntEqual, value, undefined, undefined, config);
+        return (0, exports.numeric)(attribute, filters_js_1.NumericOperators.DoesntEqual, value, undefined, undefined, config);
     }
-}
-exports.doesntEqual = doesntEqual;
+}, 'doesntEqual');
 /**
  * Creates a filter to isolate attribute values that equal a specified string or number.
  *
@@ -293,15 +266,14 @@ exports.doesntEqual = doesntEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function equals(attribute, value, config) {
+exports.equals = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => {
     if (typeof value === 'string') {
         return new filters_js_1.TextFilter(attribute, filters_js_1.TextOperators.Equals, value, config);
     }
     else {
-        return numeric(attribute, filters_js_1.NumericOperators.Equals, value, undefined, undefined, config);
+        return (0, exports.numeric)(attribute, filters_js_1.NumericOperators.Equals, value, undefined, undefined, config);
     }
-}
-exports.equals = equals;
+}, 'equals');
 /**
  * Creates a filter to isolate attribute values strictly greater than a specified number.
  *
@@ -315,10 +287,7 @@ exports.equals = equals;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function greaterThan(attribute, value, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.FromNotEqual, value, undefined, undefined, config);
-}
-exports.greaterThan = greaterThan;
+exports.greaterThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.FromNotEqual, value, undefined, undefined, config), 'greaterThan');
 /**
  * Creates a filter to isolate attribute values greater than or equal to a specified number.
  *
@@ -332,10 +301,7 @@ exports.greaterThan = greaterThan;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function greaterThanOrEqual(attribute, value, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.From, value, undefined, undefined, config);
-}
-exports.greaterThanOrEqual = greaterThanOrEqual;
+exports.greaterThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.From, value, undefined, undefined, config), 'greaterThanOrEqual');
 /**
  * Creates a filter to isolate attribute values strictly less than a specified number.
  *
@@ -349,10 +315,7 @@ exports.greaterThanOrEqual = greaterThanOrEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function lessThan(attribute, value, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.ToNotEqual, value, undefined, undefined, config);
-}
-exports.lessThan = lessThan;
+exports.lessThan = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.ToNotEqual, value, undefined, undefined, config), 'lessThan');
 /**
  * Creates a filter to isolate attribute values less than or equal to a specified number.
  *
@@ -366,10 +329,7 @@ exports.lessThan = lessThan;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function lessThanOrEqual(attribute, value, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.To, value, undefined, undefined, config);
-}
-exports.lessThanOrEqual = lessThanOrEqual;
+exports.lessThanOrEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, value, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.To, value, undefined, undefined, config), 'lessThanOrEqual');
 /**
  * Creates a filter to isolate attribute values within or exactly matching two specified numerical boundaries.
  *
@@ -384,10 +344,7 @@ exports.lessThanOrEqual = lessThanOrEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function between(attribute, valueA, valueB, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.From, valueA, filters_js_1.NumericOperators.To, valueB, config);
-}
-exports.between = between;
+exports.between = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, valueA, valueB, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.From, valueA, filters_js_1.NumericOperators.To, valueB, config), 'between');
 /**
  * Creates a filter that isolates attribute values strictly within two specified numerical boundaries.
  *
@@ -402,10 +359,7 @@ exports.between = between;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function betweenNotEqual(attribute, valueA, valueB, config) {
-    return numeric(attribute, filters_js_1.NumericOperators.FromNotEqual, valueA, filters_js_1.NumericOperators.ToNotEqual, valueB, config);
-}
-exports.betweenNotEqual = betweenNotEqual;
+exports.betweenNotEqual = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, valueA, valueB, config) => (0, exports.numeric)(attribute, filters_js_1.NumericOperators.FromNotEqual, valueA, filters_js_1.NumericOperators.ToNotEqual, valueB, config), 'betweenNotEqual');
 /**
  * Creates a custom numeric filter that filters for given attribute values.
  *
@@ -429,10 +383,7 @@ exports.betweenNotEqual = betweenNotEqual;
  * @param config - Optional configuration for the filter
  * @returns A custom numeric filter of the given attribute
  */
-function numeric(attribute, operatorA, valueA, operatorB, valueB, config) {
-    return new filters_js_1.NumericFilter(attribute, operatorA, valueA, operatorB, valueB, config);
-}
-exports.numeric = numeric;
+exports.numeric = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, operatorA, valueA, operatorB, valueB, config) => new filters_js_1.NumericFilter(attribute, operatorA, valueA, operatorB, valueB, config), 'numeric');
 /**
  * Creates a filter to isolate attribute values that match any of the specified strings.
  *
@@ -450,10 +401,7 @@ exports.numeric = numeric;
  * @returns A filter instance
  * @shortDescription Creates filter on attribute to match certain string values
  */
-function members(attribute, members, config) {
-    return new filters_js_1.MembersFilter(attribute, members, config);
-}
-exports.members = members;
+exports.members = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, members, config) => new filters_js_1.MembersFilter(attribute, members, config), 'members');
 // DATE FILTERS
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
@@ -468,10 +416,7 @@ exports.members = members;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateFrom(level, from, config) {
-    return dateRange(level, from, undefined, config);
-}
-exports.dateFrom = dateFrom;
+exports.dateFrom = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, from, config) => (0, exports.dateRange)(level, from, undefined, config), 'dateFrom');
 /**
  * Creates a filter to isolate items up until and including the given date and level.
  *
@@ -485,10 +430,7 @@ exports.dateFrom = dateFrom;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateTo(level, to, config) {
-    return dateRange(level, undefined, to, config);
-}
-exports.dateTo = dateTo;
+exports.dateTo = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, to, config) => (0, exports.dateRange)(level, undefined, to, config), 'dateTo');
 /**
  * Creates a filter to isolate items between and including the given dates and level.
  *
@@ -503,10 +445,7 @@ exports.dateTo = dateTo;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateRange(level, from, to, config) {
-    return new filters_js_1.DateRangeFilter(level, from, to, config);
-}
-exports.dateRange = dateRange;
+exports.dateRange = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, from, to, config) => new filters_js_1.DateRangeFilter(level, from, to, config), 'dateRange');
 /**
  * Creates a filter to isolate items with a date dimension value within a specified range after a
  * given date and level.
@@ -539,10 +478,7 @@ exports.dateRange = dateRange;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateRelative(level, offset, count, anchor, config) {
-    return new filters_js_1.RelativeDateFilter(level, offset, count, undefined, anchor, config);
-}
-exports.dateRelative = dateRelative;
+exports.dateRelative = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, offset, count, anchor, config) => new filters_js_1.RelativeDateFilter(level, offset, count, undefined, anchor, config), 'dateRelative');
 /**
  * Creates a filter to isolate items with a date dimension value within a specified range after a
  * given date and level.
@@ -559,10 +495,7 @@ exports.dateRelative = dateRelative;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateRelativeFrom(level, offset, count, anchor, config) {
-    return new filters_js_1.RelativeDateFilter(level, offset, count, filters_js_1.DateOperators.Next, anchor, config);
-}
-exports.dateRelativeFrom = dateRelativeFrom;
+exports.dateRelativeFrom = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, offset, count, anchor, config) => new filters_js_1.RelativeDateFilter(level, offset, count, filters_js_1.DateOperators.Next, anchor, config), 'dateRelativeFrom');
 /**
  * Creates a filter to isolate items with a date dimension value within a specified range before a
  * given date and level.
@@ -579,10 +512,7 @@ exports.dateRelativeFrom = dateRelativeFrom;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function dateRelativeTo(level, offset, count, anchor, config) {
-    return new filters_js_1.RelativeDateFilter(level, offset, count, filters_js_1.DateOperators.Last, anchor, config);
-}
-exports.dateRelativeTo = dateRelativeTo;
+exports.dateRelativeTo = (0, compose_code_utils_js_1.withComposeCodeForFilter)((level, offset, count, anchor, config) => new filters_js_1.RelativeDateFilter(level, offset, count, filters_js_1.DateOperators.Last, anchor, config), 'dateRelativeTo');
 /**
  * Creates a filter to isolate items with a date dimension value in the current calendar year.
  *
@@ -595,10 +525,7 @@ exports.dateRelativeTo = dateRelativeTo;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function thisYear(dimension, config) {
-    return dateRelativeTo(dimension.Years, 0, 1, undefined, config);
-}
-exports.thisYear = thisYear;
+exports.thisYear = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dimension, config) => (0, exports.dateRelativeTo)(dimension.Years, 0, 1, undefined, config), 'thisYear');
 /**
  * Creates a filter to isolate items with a date dimension value in the current calendar month.
  *
@@ -611,10 +538,7 @@ exports.thisYear = thisYear;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function thisMonth(dimension, config) {
-    return dateRelativeTo(dimension.Months, 0, 1, undefined, config);
-}
-exports.thisMonth = thisMonth;
+exports.thisMonth = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dimension, config) => (0, exports.dateRelativeTo)(dimension.Months, 0, 1, undefined, config), 'thisMonth');
 /**
  * Creates a filter to isolate items with a date dimension value in the current quarter.
  *
@@ -627,10 +551,7 @@ exports.thisMonth = thisMonth;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function thisQuarter(dimension, config) {
-    return dateRelativeTo(dimension.Quarters, 0, 1, undefined, config);
-}
-exports.thisQuarter = thisQuarter;
+exports.thisQuarter = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dimension, config) => (0, exports.dateRelativeTo)(dimension.Quarters, 0, 1, undefined, config), 'thisQuarter');
 /**
  * Creates a filter to isolate items with a date dimension value of the current date.
  *
@@ -643,10 +564,7 @@ exports.thisQuarter = thisQuarter;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function today(dimension, config) {
-    return dateRelativeTo(dimension.Days, 0, 1, undefined, config);
-}
-exports.today = today;
+exports.today = (0, compose_code_utils_js_1.withComposeCodeForFilter)((dimension, config) => (0, exports.dateRelativeTo)(dimension.Days, 0, 1, undefined, config), 'today');
 // MEASURE-RELATED FILTERS
 /**
  * Creates a filter on all measure values matching the provided criteria.
@@ -681,10 +599,7 @@ exports.measureBase = measureBase;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureEquals(measure, value, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.Equals, value, undefined, undefined, config);
-}
-exports.measureEquals = measureEquals;
+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');
 /**
  * Creates a filter to isolate a measure value greater than to a given number.
  *
@@ -702,10 +617,7 @@ exports.measureEquals = measureEquals;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureGreaterThan(measure, value, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.FromNotEqual, value, undefined, undefined, config);
-}
-exports.measureGreaterThan = measureGreaterThan;
+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');
 /**
  * Creates a filter to isolate a measure value greater than or equal to a given number.
  *
@@ -723,10 +635,7 @@ exports.measureGreaterThan = measureGreaterThan;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureGreaterThanOrEqual(measure, value, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.From, value, undefined, undefined, config);
-}
-exports.measureGreaterThanOrEqual = measureGreaterThanOrEqual;
+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');
 /**
  * Creates a filter to isolate a measure value less than or equal to a given number.
  *
@@ -744,10 +653,7 @@ exports.measureGreaterThanOrEqual = measureGreaterThanOrEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureLessThanOrEqual(measure, value, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.To, value, undefined, undefined, config);
-}
-exports.measureLessThanOrEqual = measureLessThanOrEqual;
+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');
 /**
  * Creates a filter to isolate a measure value less than a given number.
  *
@@ -764,10 +670,7 @@ exports.measureLessThanOrEqual = measureLessThanOrEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureLessThan(measure, value, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.ToNotEqual, value, undefined, undefined, config);
-}
-exports.measureLessThan = measureLessThan;
+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');
 /**
  * Creates a filter to isolate a measure value between or equal to two given numbers.
  *
@@ -787,10 +690,7 @@ exports.measureLessThan = measureLessThan;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureBetween(measure, valueA, valueB, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.From, valueA, filters_js_1.NumericOperators.To, valueB, config);
-}
-exports.measureBetween = measureBetween;
+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');
 /**
  * Creates a filter to isolate a measure value between but not equal to two given numbers.
  *
@@ -810,10 +710,7 @@ exports.measureBetween = measureBetween;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function measureBetweenNotEqual(measure, valueA, valueB, config) {
-    return measureBase(measure.attribute, measure, filters_js_1.NumericOperators.FromNotEqual, valueA, filters_js_1.NumericOperators.ToNotEqual, valueB, config);
-}
-exports.measureBetweenNotEqual = measureBetweenNotEqual;
+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');
 // RANKING FILTERS
 /**
  * Creates a filter to isolate items that rank towards the top for a given measure.
@@ -833,10 +730,7 @@ exports.measureBetweenNotEqual = measureBetweenNotEqual;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function topRanking(attribute, measure, count, config) {
-    return new filters_js_1.RankingFilter(attribute, measure, filters_js_1.RankingOperators.Top, count, config);
-}
-exports.topRanking = topRanking;
+exports.topRanking = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, measure, count, config) => new filters_js_1.RankingFilter(attribute, measure, filters_js_1.RankingOperators.Top, count, config), 'topRanking');
 /**
  * Creates a filter to isolate items that rank towards the bottom for a given measure.
  *
@@ -855,10 +749,7 @@ exports.topRanking = topRanking;
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function bottomRanking(attribute, measure, count, config) {
-    return new filters_js_1.RankingFilter(attribute, measure, filters_js_1.RankingOperators.Bottom, count, config);
-}
-exports.bottomRanking = bottomRanking;
+exports.bottomRanking = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, measure, count, config) => new filters_js_1.RankingFilter(attribute, measure, filters_js_1.RankingOperators.Bottom, count, config), 'bottomRanking');
 const relate = (node) => {
     if (Array.isArray(node)) {
         const [first, ...rest] = node;
@@ -895,10 +786,7 @@ const relate = (node) => {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-function cascading(filters, config) {
-    return new filters_js_1.CascadingFilter(filters, config);
-}
-exports.cascading = cascading;
+exports.cascading = (0, compose_code_utils_js_1.withComposeCodeForFilter)((filters, config) => new filters_js_1.CascadingFilter(filters, config), 'cascading');
 /**
  * Set of logic operators for filter relations construction
  *
@@ -948,11 +836,11 @@ var logic;
      * @returns Filter relations
      * @beta
      */
-    logic.and = (left, right) => ({
+    logic.and = (0, compose_code_utils_js_1.withComposeCodeForFilterRelations)((left, right) => ({
         operator: 'AND',
         left: relate(left),
         right: relate(right),
-    });
+    }), 'and');
     /**
      * Creates an 'OR' filter relations
      *
@@ -970,11 +858,11 @@ var logic;
      * @returns Filter relations
      * @beta
      */
-    logic.or = (left, right) => ({
+    logic.or = (0, compose_code_utils_js_1.withComposeCodeForFilterRelations)((left, right) => ({
         operator: 'OR',
         left: relate(left),
         right: relate(right),
-    });
+    }), 'or');
 })(logic = exports.logic || (exports.logic = {}));
 // CUSTOM FILTER
 /**
@@ -986,7 +874,4 @@ var logic;
  * @returns A filter instance
  * @internal
  */
-function customFilter(attribute, jaql, config) {
-    return new filters_js_1.CustomFilter(attribute, jaql, config);
-}
-exports.customFilter = customFilter;
+exports.customFilter = (0, compose_code_utils_js_1.withComposeCodeForFilter)((attribute, jaql, config) => new filters_js_1.CustomFilter(attribute, jaql, config), 'customFilter');

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

@@ -104,11 +104,8 @@ function combineFiltersAndRelations(filters, relations) {
             return filters.find((filter) => filter.config.guid === node.instanceid);
         }
         if (isRelationsRule(node)) {
-            return {
-                left: traverse(node.left),
-                right: traverse(node.right),
-                operator: node.operator,
-            };
+            const func = node.operator === 'AND' ? index_js_1.filterFactory.logic.and : index_js_1.filterFactory.logic.or;
+            return func(traverse(node.left), traverse(node.right));
         }
         throw new UnknownRelationsNodeError();
     }