@sisense/sdk-data 1.34.0 → 2.1.0

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

@@ -1,3 +1,7 @@
+/* eslint-disable max-lines */
+/* eslint-disable max-params */
+/* eslint-disable @typescript-eslint/no-shadow */
+import { withComposeCodeForFilter, withComposeCodeForFilterRelations, } from '../compose-code-utils.js';
 import { CascadingFilter, CustomFilter, DateOperators, DateRangeFilter, ExcludeFilter, LogicalAttributeFilter, LogicalOperators, MeasureFilter, MembersFilter, NumericFilter, NumericOperators, RankingFilter, RankingOperators, RelativeDateFilter, TextFilter, TextOperators, } from './filters.js';
 // LOGICAL FILTERS
 /**
@@ -19,9 +23,7 @@ import { CascadingFilter, CustomFilter, DateOperators, DateRangeFilter, ExcludeF
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function union(filters, config) {
-    return new LogicalAttributeFilter(filters, LogicalOperators.Union, config);
-}
+export const union = withComposeCodeForFilter((filters, config) => new LogicalAttributeFilter(filters, 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.
@@ -41,9 +43,7 @@ export function union(filters, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function intersection(filters, config) {
-    return new LogicalAttributeFilter(filters, LogicalOperators.Intersection, config);
-}
+export const intersection = withComposeCodeForFilter((filters, config) => new LogicalAttributeFilter(filters, 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.
@@ -70,9 +70,7 @@ export function intersection(filters, config) {
  * @returns A filter representing an exclusion of the given filter
  * from all attribute members or from the optional input filter
  */
-export function exclude(filter, input, config) {
-    return new ExcludeFilter(filter, input, config);
-}
+export const exclude = withComposeCodeForFilter((filter, input, config) => new ExcludeFilter(filter, input, config), 'exclude');
 // TEXT / NUMERIC FILTERS
 /**
  * Creates a filter to isolate attribute values that do not contain a specified string.
@@ -93,9 +91,7 @@ export function exclude(filter, input, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function doesntContain(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.DoesntContain, value, config);
-}
+export const doesntContain = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.DoesntContain, value, config), 'doesntContain');
 /**
  * Creates a filter to isolate attribute values that do not end with a specified string.
  *
@@ -115,9 +111,7 @@ export function doesntContain(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function doesntEndWith(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.DoesntEndWith, value, config);
-}
+export const doesntEndWith = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.DoesntEndWith, value, config), 'doesntEndWith');
 /**
  * Creates a filter to isolate attribute values that do not start with a specified string.
  *
@@ -137,9 +131,7 @@ export function doesntEndWith(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function doesntStartWith(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.DoesntStartWith, value, config);
-}
+export const doesntStartWith = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.DoesntStartWith, value, config), 'doesntStartWith');
 /**
  * Creates a filter to isolate attribute values that contain a specified string.
  *
@@ -159,9 +151,7 @@ export function doesntStartWith(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function contains(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.Contains, value, config);
-}
+export const contains = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.Contains, value, config), 'contains');
 /**
  * Creates a filter to isolate attribute values that end with a specified string.
  *
@@ -181,9 +171,7 @@ export function contains(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function endsWith(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.EndsWith, value, config);
-}
+export const endsWith = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.EndsWith, value, config), 'endsWith');
 /**
  * Creates a filter to isolate attribute values that start with a specified string.
  *
@@ -203,9 +191,7 @@ export function endsWith(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function startsWith(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.StartsWith, value, config);
-}
+export const startsWith = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.StartsWith, value, config), 'startsWith');
 /**
  * Creates a filter to isolate attribute values that match a specified string pattern.
  *
@@ -230,9 +216,7 @@ export function startsWith(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function like(attribute, value, config) {
-    return new TextFilter(attribute, TextOperators.Like, value, config);
-}
+export const like = withComposeCodeForFilter((attribute, value, config) => new TextFilter(attribute, TextOperators.Like, value, config), 'like');
 /**
  * Creates a filter to isolate attribute values that do not equal a specified string or number.
  *
@@ -252,14 +236,14 @@ export function like(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function doesntEqual(attribute, value, config) {
+export const doesntEqual = withComposeCodeForFilter((attribute, value, config) => {
     if (typeof value === 'string') {
         return new TextFilter(attribute, TextOperators.DoesntEqual, value, config);
     }
     else {
         return numeric(attribute, NumericOperators.DoesntEqual, value, undefined, undefined, config);
     }
-}
+}, 'doesntEqual');
 /**
  * Creates a filter to isolate attribute values that equal a specified string or number.
  *
@@ -279,14 +263,14 @@ export function doesntEqual(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function equals(attribute, value, config) {
+export const equals = withComposeCodeForFilter((attribute, value, config) => {
     if (typeof value === 'string') {
         return new TextFilter(attribute, TextOperators.Equals, value, config);
     }
     else {
         return numeric(attribute, NumericOperators.Equals, value, undefined, undefined, config);
     }
-}
+}, 'equals');
 /**
  * Creates a filter to isolate attribute values strictly greater than a specified number.
  *
@@ -300,9 +284,7 @@ export function equals(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function greaterThan(attribute, value, config) {
-    return numeric(attribute, NumericOperators.FromNotEqual, value, undefined, undefined, config);
-}
+export const greaterThan = withComposeCodeForFilter((attribute, value, config) => numeric(attribute, NumericOperators.FromNotEqual, value, undefined, undefined, config), 'greaterThan');
 /**
  * Creates a filter to isolate attribute values greater than or equal to a specified number.
  *
@@ -316,9 +298,7 @@ export function greaterThan(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function greaterThanOrEqual(attribute, value, config) {
-    return numeric(attribute, NumericOperators.From, value, undefined, undefined, config);
-}
+export const greaterThanOrEqual = withComposeCodeForFilter((attribute, value, config) => numeric(attribute, NumericOperators.From, value, undefined, undefined, config), 'greaterThanOrEqual');
 /**
  * Creates a filter to isolate attribute values strictly less than a specified number.
  *
@@ -332,9 +312,7 @@ export function greaterThanOrEqual(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function lessThan(attribute, value, config) {
-    return numeric(attribute, NumericOperators.ToNotEqual, value, undefined, undefined, config);
-}
+export const lessThan = withComposeCodeForFilter((attribute, value, config) => numeric(attribute, NumericOperators.ToNotEqual, value, undefined, undefined, config), 'lessThan');
 /**
  * Creates a filter to isolate attribute values less than or equal to a specified number.
  *
@@ -348,9 +326,7 @@ export function lessThan(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function lessThanOrEqual(attribute, value, config) {
-    return numeric(attribute, NumericOperators.To, value, undefined, undefined, config);
-}
+export const lessThanOrEqual = withComposeCodeForFilter((attribute, value, config) => numeric(attribute, NumericOperators.To, value, undefined, undefined, config), 'lessThanOrEqual');
 /**
  * Creates a filter to isolate attribute values within or exactly matching two specified numerical boundaries.
  *
@@ -365,9 +341,7 @@ export function lessThanOrEqual(attribute, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function between(attribute, valueA, valueB, config) {
-    return numeric(attribute, NumericOperators.From, valueA, NumericOperators.To, valueB, config);
-}
+export const between = withComposeCodeForFilter((attribute, valueA, valueB, config) => numeric(attribute, NumericOperators.From, valueA, NumericOperators.To, valueB, config), 'between');
 /**
  * Creates a filter that isolates attribute values strictly within two specified numerical boundaries.
  *
@@ -382,9 +356,7 @@ export function between(attribute, valueA, valueB, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function betweenNotEqual(attribute, valueA, valueB, config) {
-    return numeric(attribute, NumericOperators.FromNotEqual, valueA, NumericOperators.ToNotEqual, valueB, config);
-}
+export const betweenNotEqual = withComposeCodeForFilter((attribute, valueA, valueB, config) => numeric(attribute, NumericOperators.FromNotEqual, valueA, NumericOperators.ToNotEqual, valueB, config), 'betweenNotEqual');
 /**
  * Creates a custom numeric filter that filters for given attribute values.
  *
@@ -408,9 +380,7 @@ export function betweenNotEqual(attribute, valueA, valueB, config) {
  * @param config - Optional configuration for the filter
  * @returns A custom numeric filter of the given attribute
  */
-export function numeric(attribute, operatorA, valueA, operatorB, valueB, config) {
-    return new NumericFilter(attribute, operatorA, valueA, operatorB, valueB, config);
-}
+export const numeric = withComposeCodeForFilter((attribute, operatorA, valueA, operatorB, valueB, config) => new NumericFilter(attribute, operatorA, valueA, operatorB, valueB, config), 'numeric');
 /**
  * Creates a filter to isolate attribute values that match any of the specified strings.
  *
@@ -428,9 +398,7 @@ export function numeric(attribute, operatorA, valueA, operatorB, valueB, config)
  * @returns A filter instance
  * @shortDescription Creates filter on attribute to match certain string values
  */
-export function members(attribute, members, config) {
-    return new MembersFilter(attribute, members, config);
-}
+export const members = withComposeCodeForFilter((attribute, members, config) => new MembersFilter(attribute, members, config), 'members');
 // DATE FILTERS
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
@@ -445,9 +413,7 @@ export function members(attribute, members, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateFrom(level, from, config) {
-    return dateRange(level, from, undefined, config);
-}
+export const dateFrom = withComposeCodeForFilter((level, from, config) => dateRange(level, from, undefined, config), 'dateFrom');
 /**
  * Creates a filter to isolate items up until and including the given date and level.
  *
@@ -461,9 +427,7 @@ export function dateFrom(level, from, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateTo(level, to, config) {
-    return dateRange(level, undefined, to, config);
-}
+export const dateTo = withComposeCodeForFilter((level, to, config) => dateRange(level, undefined, to, config), 'dateTo');
 /**
  * Creates a filter to isolate items between and including the given dates and level.
  *
@@ -478,9 +442,7 @@ export function dateTo(level, to, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateRange(level, from, to, config) {
-    return new DateRangeFilter(level, from, to, config);
-}
+export const dateRange = withComposeCodeForFilter((level, from, to, config) => new 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.
@@ -513,9 +475,7 @@ export function dateRange(level, from, to, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateRelative(level, offset, count, anchor, config) {
-    return new RelativeDateFilter(level, offset, count, undefined, anchor, config);
-}
+export const dateRelative = withComposeCodeForFilter((level, offset, count, anchor, config) => new 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.
@@ -532,9 +492,7 @@ export function dateRelative(level, offset, count, anchor, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateRelativeFrom(level, offset, count, anchor, config) {
-    return new RelativeDateFilter(level, offset, count, DateOperators.Next, anchor, config);
-}
+export const dateRelativeFrom = withComposeCodeForFilter((level, offset, count, anchor, config) => new RelativeDateFilter(level, offset, count, 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.
@@ -551,9 +509,7 @@ export function dateRelativeFrom(level, offset, count, anchor, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function dateRelativeTo(level, offset, count, anchor, config) {
-    return new RelativeDateFilter(level, offset, count, DateOperators.Last, anchor, config);
-}
+export const dateRelativeTo = withComposeCodeForFilter((level, offset, count, anchor, config) => new RelativeDateFilter(level, offset, count, DateOperators.Last, anchor, config), 'dateRelativeTo');
 /**
  * Creates a filter to isolate items with a date dimension value in the current calendar year.
  *
@@ -566,9 +522,7 @@ export function dateRelativeTo(level, offset, count, anchor, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function thisYear(dimension, config) {
-    return dateRelativeTo(dimension.Years, 0, 1, undefined, config);
-}
+export const thisYear = withComposeCodeForFilter((dimension, config) => dateRelativeTo(dimension.Years, 0, 1, undefined, config), 'thisYear');
 /**
  * Creates a filter to isolate items with a date dimension value in the current calendar month.
  *
@@ -581,9 +535,7 @@ export function thisYear(dimension, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function thisMonth(dimension, config) {
-    return dateRelativeTo(dimension.Months, 0, 1, undefined, config);
-}
+export const thisMonth = withComposeCodeForFilter((dimension, config) => dateRelativeTo(dimension.Months, 0, 1, undefined, config), 'thisMonth');
 /**
  * Creates a filter to isolate items with a date dimension value in the current quarter.
  *
@@ -596,9 +548,7 @@ export function thisMonth(dimension, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function thisQuarter(dimension, config) {
-    return dateRelativeTo(dimension.Quarters, 0, 1, undefined, config);
-}
+export const thisQuarter = withComposeCodeForFilter((dimension, config) => dateRelativeTo(dimension.Quarters, 0, 1, undefined, config), 'thisQuarter');
 /**
  * Creates a filter to isolate items with a date dimension value of the current date.
  *
@@ -611,9 +561,7 @@ export function thisQuarter(dimension, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function today(dimension, config) {
-    return dateRelativeTo(dimension.Days, 0, 1, undefined, config);
-}
+export const today = withComposeCodeForFilter((dimension, config) => dateRelativeTo(dimension.Days, 0, 1, undefined, config), 'today');
 // MEASURE-RELATED FILTERS
 /**
  * Creates a filter on all measure values matching the provided criteria.
@@ -647,9 +595,7 @@ export function measureBase(attribute, measure, operatorA, valueA, operatorB, va
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureEquals(measure, value, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.Equals, value, undefined, undefined, config);
-}
+export const measureEquals = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.Equals, value, undefined, undefined, config), 'measureEquals');
 /**
  * Creates a filter to isolate a measure value greater than to a given number.
  *
@@ -667,9 +613,7 @@ export function measureEquals(measure, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureGreaterThan(measure, value, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.FromNotEqual, value, undefined, undefined, config);
-}
+export const measureGreaterThan = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.FromNotEqual, value, undefined, undefined, config), 'measureGreaterThan');
 /**
  * Creates a filter to isolate a measure value greater than or equal to a given number.
  *
@@ -687,9 +631,7 @@ export function measureGreaterThan(measure, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureGreaterThanOrEqual(measure, value, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.From, value, undefined, undefined, config);
-}
+export const measureGreaterThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.From, value, undefined, undefined, config), 'measureGreaterThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than or equal to a given number.
  *
@@ -707,9 +649,7 @@ export function measureGreaterThanOrEqual(measure, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureLessThanOrEqual(measure, value, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.To, value, undefined, undefined, config);
-}
+export const measureLessThanOrEqual = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.To, value, undefined, undefined, config), 'measureLessThanOrEqual');
 /**
  * Creates a filter to isolate a measure value less than a given number.
  *
@@ -726,9 +666,7 @@ export function measureLessThanOrEqual(measure, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureLessThan(measure, value, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.ToNotEqual, value, undefined, undefined, config);
-}
+export const measureLessThan = withComposeCodeForFilter((measure, value, config) => measureBase(measure.attribute, measure, NumericOperators.ToNotEqual, value, undefined, undefined, config), 'measureLessThan');
 /**
  * Creates a filter to isolate a measure value between or equal to two given numbers.
  *
@@ -748,9 +686,7 @@ export function measureLessThan(measure, value, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureBetween(measure, valueA, valueB, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.From, valueA, NumericOperators.To, valueB, config);
-}
+export const measureBetween = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(measure.attribute, 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.
  *
@@ -770,9 +706,7 @@ export function measureBetween(measure, valueA, valueB, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function measureBetweenNotEqual(measure, valueA, valueB, config) {
-    return measureBase(measure.attribute, measure, NumericOperators.FromNotEqual, valueA, NumericOperators.ToNotEqual, valueB, config);
-}
+export const measureBetweenNotEqual = withComposeCodeForFilter((measure, valueA, valueB, config) => measureBase(measure.attribute, 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.
@@ -792,9 +726,7 @@ export function measureBetweenNotEqual(measure, valueA, valueB, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function topRanking(attribute, measure, count, config) {
-    return new RankingFilter(attribute, measure, RankingOperators.Top, count, config);
-}
+export const topRanking = withComposeCodeForFilter((attribute, measure, count, config) => new RankingFilter(attribute, measure, RankingOperators.Top, count, config), 'topRanking');
 /**
  * Creates a filter to isolate items that rank towards the bottom for a given measure.
  *
@@ -813,9 +745,7 @@ export function topRanking(attribute, measure, count, config) {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function bottomRanking(attribute, measure, count, config) {
-    return new RankingFilter(attribute, measure, RankingOperators.Bottom, count, config);
-}
+export const bottomRanking = withComposeCodeForFilter((attribute, measure, count, config) => new RankingFilter(attribute, measure, RankingOperators.Bottom, count, config), 'bottomRanking');
 const relate = (node) => {
     if (Array.isArray(node)) {
         const [first, ...rest] = node;
@@ -852,9 +782,7 @@ const relate = (node) => {
  * @param config - Optional configuration for the filter
  * @returns A filter instance
  */
-export function cascading(filters, config) {
-    return new CascadingFilter(filters, config);
-}
+export const cascading = withComposeCodeForFilter((filters, config) => new CascadingFilter(filters, config), 'cascading');
 /**
  * Set of logic operators for filter relations construction
  *
@@ -904,11 +832,11 @@ export var logic;
      * @returns Filter relations
      * @beta
      */
-    logic.and = (left, right) => ({
+    logic.and = withComposeCodeForFilterRelations((left, right) => ({
         operator: 'AND',
         left: relate(left),
         right: relate(right),
-    });
+    }), 'and');
     /**
      * Creates an 'OR' filter relations
      *
@@ -926,11 +854,11 @@ export var logic;
      * @returns Filter relations
      * @beta
      */
-    logic.or = (left, right) => ({
+    logic.or = withComposeCodeForFilterRelations((left, right) => ({
         operator: 'OR',
         left: relate(left),
         right: relate(right),
-    });
+    }), 'or');
 })(logic = logic || (logic = {}));
 // CUSTOM FILTER
 /**
@@ -942,6 +870,4 @@ export var logic;
  * @returns A filter instance
  * @internal
  */
-export function customFilter(attribute, jaql, config) {
-    return new CustomFilter(attribute, jaql, config);
-}
+export const customFilter = withComposeCodeForFilter((attribute, jaql, config) => new CustomFilter(attribute, jaql, config), 'customFilter');

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/default-param-last */
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import isArray from 'lodash-es/isArray.js';
-import { DimensionalLevelAttribute, isCascadingFilter, } from '../../index.js';
+import { DimensionalLevelAttribute, filterFactory, isCascadingFilter, } from '../../index.js';
 import { TranslatableError } from '../../translation/translatable-error.js';
 /**
  * Type guard for checking if the provided filters are FilterRelations.
@@ -94,11 +94,8 @@ export 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' ? filterFactory.logic.and : filterFactory.logic.or;
+            return func(traverse(node.left), traverse(node.right));
         }
         throw new UnknownRelationsNodeError();
     }