@sisense/sdk-data 1.12.0 → 1.14.0

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

@@ -105,8 +105,8 @@ const boxWhiskerIqrOutliers = (target) => {
         Attr: target,
     });
     outliersAttrWithInnerFilter.name = `${outliersAttrWithInnerFilter.name} (Outliers)`;
-    outliersAttrWithInnerFilter.jaql = () => {
-        return Object.assign(Object.assign({}, target.jaql(true)), { filter: {
+    outliersAttrWithInnerFilter.jaql = (nested) => {
+        const jaql = Object.assign(Object.assign({}, target.jaql(true)), { filter: {
                 or: [
                     {
                         fromNotEqual: outliersMax.jaql(true),
@@ -116,6 +116,7 @@ const boxWhiskerIqrOutliers = (target) => {
                     },
                 ],
             } });
+        return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
 };
@@ -134,8 +135,8 @@ const boxWhiskerStdDevOutliers = (target) => {
     const outliersMin = (0, factory_js_1.customFormula)(exports.BOX_WHISKER.OUTLIER_MIN_VALUE_NAME, '(LOWERWHISKERMAX_STDEVP([Attr]), all([Attr]))', {
         Attr: target,
     });
-    outliersAttrWithInnerFilter.jaql = () => {
-        return Object.assign(Object.assign({}, target.jaql(true)), { filter: {
+    outliersAttrWithInnerFilter.jaql = (nested) => {
+        const jaql = Object.assign(Object.assign({}, target.jaql(true)), { filter: {
                 or: [
                     {
                         fromNotEqual: outliersMax.jaql(true),
@@ -145,6 +146,7 @@ const boxWhiskerStdDevOutliers = (target) => {
                     },
                 ],
             } });
+        return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
 };

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

@@ -163,6 +163,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      */
     translateGranularityToJaql() {
         const MINUTES_LEVEL = 'minutes';
+        const SECONDS_LEVEL = 'seconds';
         switch (this.granularity) {
             case types_js_1.DateLevels.Years:
             case types_js_1.DateLevels.Quarters:
@@ -185,6 +186,16 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                     dateTimeLevel: MINUTES_LEVEL,
                     bucket: '15',
                 };
+            case types_js_1.DateLevels.Minutes:
+                return {
+                    dateTimeLevel: MINUTES_LEVEL,
+                    bucket: '1',
+                };
+            case types_js_1.DateLevels.Seconds:
+                return {
+                    dateTimeLevel: SECONDS_LEVEL,
+                    bucket: '0',
+                };
             case types_js_1.DateLevels.AggHours:
                 return {
                     level: MINUTES_LEVEL,
@@ -216,7 +227,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
             return lvl;
         };
         if (json.dateTimeLevel) {
-            if (json.dateTimeLevel !== 'minutes') {
+            if (json.dateTimeLevel !== 'minutes' && json.dateTimeLevel !== 'seconds') {
                 return returnUnsupported(json.dateTimeLevel);
             }
             switch (json.bucket) {
@@ -226,6 +237,10 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                     return types_js_1.DateLevels.MinutesRoundTo30;
                 case '15':
                     return types_js_1.DateLevels.MinutesRoundTo15;
+                case '1':
+                    return types_js_1.DateLevels.Minutes;
+                case '0':
+                    return types_js_1.DateLevels.Seconds;
                 default:
                     return returnUnsupported(json.dateTimeLevel);
             }
@@ -277,6 +292,10 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                 return 'yyyy-MM-dd HH:mm';
             case types_js_1.DateLevels.MinutesRoundTo15:
                 return 'yyyy-MM-dd HH:mm';
+            case types_js_1.DateLevels.Minutes:
+                return 'yyyy-MM-dd HH:mm';
+            case types_js_1.DateLevels.Seconds:
+                return 'yyyy-MM-dd HH:mm:ss';
             case types_js_1.DateLevels.AggHours:
                 return 'HH:mm';
             case types_js_1.DateLevels.AggMinutesRoundTo30:

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

@@ -94,6 +94,14 @@ export declare class DimensionalDateDimension extends DimensionalDimension imple
      * Minutes (round to 15) level
      */
     readonly MinutesRoundTo15: LevelAttribute;
+    /**
+     * Minutes level (for Live Models)
+     */
+    readonly Minutes: LevelAttribute;
+    /**
+     * Seconds level (for Live Models)
+     */
+    readonly Seconds: LevelAttribute;
     /**
      * Aggregated Hours  level
      */

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

@@ -164,6 +164,8 @@ class DimensionalDateDimension extends DimensionalDimension {
         this.Hours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Hours, expression, types_js_1.DateLevels.Hours, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo30, expression, types_js_1.DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo15, expression, types_js_1.DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm');
+        this.Minutes = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Minutes, expression, types_js_1.DateLevels.Minutes, 'yyyy-MM-dd HH:mm');
+        this.Seconds = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Seconds, expression, types_js_1.DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss');
         this.AggHours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggHours, expression, types_js_1.DateLevels.AggHours, 'HH:mm');
         this.AggMinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo30, expression, types_js_1.DateLevels.AggMinutesRoundTo30, 'HH:mm');
         this.AggMinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo15, expression, types_js_1.DateLevels.AggMinutesRoundTo15, 'HH:mm');
@@ -177,6 +179,8 @@ class DimensionalDateDimension extends DimensionalDimension {
             this.Hours,
             this.MinutesRoundTo30,
             this.MinutesRoundTo15,
+            this.Minutes,
+            this.Seconds,
             this.AggHours,
             this.AggMinutesRoundTo30,
             this.AggMinutesRoundTo15,

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

@@ -43,6 +43,36 @@ describe('Dimension jaql preparations', () => {
         const jaql = dimension.jaql();
         expect(jaql).toStrictEqual(result);
     });
+    it('must prepare jaql for date dimension with "seconds" level', () => {
+        const result = {
+            jaql: {
+                title: 'Seconds',
+                dim: '[Commerce.Date (Calendar)]',
+                bucket: '0',
+                dateTimeLevel: 'seconds',
+                datatype: 'datetime',
+            },
+            format: { mask: { seconds: 'yyyy-MM-dd HH:mm:ss' } },
+        };
+        const dimension = new dimensions_js_1.DimensionalDateDimension('Date', '[Commerce.Date (Calendar)]');
+        const jaql = dimension.Seconds.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
+    it('must prepare jaql for date dimension with "minutes" level', () => {
+        const result = {
+            jaql: {
+                title: 'Minutes',
+                dim: '[Commerce.Date (Calendar)]',
+                bucket: '1',
+                dateTimeLevel: 'minutes',
+                datatype: 'datetime',
+            },
+            format: { mask: { minutes: 'yyyy-MM-dd HH:mm' } },
+        };
+        const dimension = new dimensions_js_1.DimensionalDateDimension('Date', '[Commerce.Date (Calendar)]');
+        const jaql = dimension.Minutes.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
     it('must handle sort', () => {
         const dimensionAscSort = new dimensions_js_1.DimensionalDimension('Brand', '[Brand.Brand]', [new attributes_js_1.DimensionalAttribute('Brand', '[Brand.Brand]')], [], 'textdimension', '', types_js_1.Sort.Ascending);
         const dimensionDescSort = new dimensions_js_1.DimensionalDimension('Brand', '[Brand.Brand]', [new attributes_js_1.DimensionalAttribute('Brand', '[Brand.Brand]')], [], 'textdimension', '', types_js_1.Sort.Descending);

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

@@ -373,10 +373,11 @@ export declare function numeric(attribute: Attribute, operatorA?: string, valueA
  * ```
  * @param attribute - Attribute to filter on
  * @param members - Array of member values to filter by
+ * @param _deactivatedMembers - [internal] Array of deactivated member values
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-export declare function members(attribute: Attribute, members: string[], guid?: string): Filter;
+export declare function members(attribute: Attribute, members: string[], _deactivatedMembers?: string[], guid?: string, backgroundFilter?: Filter): Filter;
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
  *
@@ -793,4 +794,4 @@ export declare namespace logic {
  * @returns A filter instance
  * @internal
  */
-export declare function customFilter(jaql: any, guid?: string): Filter;
+export declare function customFilter(attribute: Attribute, jaql: any, guid?: string): Filter;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFilter = exports.logic = 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;
 const filters_js_1 = require("./filters.js");
-const filter_from_jaql_util_js_1 = require("./utils/filter-from-jaql-util.js");
 // LOGICAL FILTERS
 /**
  * Creates a filter representing the union of multiple filters on the same attribute. The resulting
@@ -446,11 +445,12 @@ exports.numeric = numeric;
  * ```
  * @param attribute - Attribute to filter on
  * @param members - Array of member values to filter by
+ * @param _deactivatedMembers - [internal] Array of deactivated member values
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-function members(attribute, members, guid) {
-    return new filters_js_1.MembersFilter(attribute, members, guid);
+function members(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
+    return new filters_js_1.MembersFilter(attribute, members, _deactivatedMembers, guid, backgroundFilter);
 }
 exports.members = members;
 // DATE FILTERS
@@ -956,7 +956,7 @@ var logic;
  * @returns A filter instance
  * @internal
  */
-function customFilter(jaql, guid) {
-    return (0, filter_from_jaql_util_js_1.createGenericFilter)(jaql, guid);
+function customFilter(attribute, jaql, guid) {
+    return new filters_js_1.CustomFilter(attribute, jaql, guid);
 }
 exports.customFilter = customFilter;

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

@@ -195,7 +195,7 @@ describe('filterFactory', () => {
         expect(f).toHaveProperty('operatorA', filters_js_1.NumericOperators.Equals);
         expect(f).toHaveProperty('valueA', 5);
     });
-    test('filterFactory.member()', () => {
+    test('filterFactory.members()', () => {
         const f = filterFactory.members(TextDim, ['mem1', 'mem2']);
         expect(f).toBeInstanceOf(filters_js_1.MembersFilter);
         expect(f).toHaveProperty('attribute', TextDim);

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

@@ -74,6 +74,7 @@ export declare const FilterTypes: {
     date: string;
     relativeDate: string;
     cascading: string;
+    advanced: string;
 };
 /**
  * base implementation for filter classes
@@ -93,12 +94,22 @@ declare abstract class AbstractFilter extends DimensionalElement implements Filt
      * Global filter identifier
      */
     readonly guid: string;
+    private _disabled;
+    private _locked;
     /**
      * Boolean flag whether the filter is disabled
      *
      * @internal
      */
-    disabled: boolean;
+    get disabled(): boolean;
+    set disabled(value: boolean);
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked(): boolean;
+    set locked(value: boolean);
     constructor(att: Attribute, filterType: string, guid?: string);
     get name(): string;
     /**
@@ -151,7 +162,11 @@ export declare class LogicalAttributeFilter extends AbstractFilter {
  */
 export declare class MembersFilter extends AbstractFilter {
     readonly members: any[];
-    constructor(attribute: Attribute, members?: any[], guid?: string);
+    /** @internal */
+    _deactivatedMembers: any[];
+    /** @internal */
+    backgroundFilter?: Filter;
+    constructor(attribute: Attribute, members?: any[], _deactivatedMembers?: any[], guid?: string, backgroundFilter?: Filter);
     /**
      * gets the element's ID
      */
@@ -175,6 +190,10 @@ export declare class CascadingFilter extends AbstractFilter {
      * gets the element's ID
      */
     get id(): string;
+    get disabled(): boolean;
+    set disabled(value: boolean);
+    get locked(): boolean;
+    set locked(value: boolean);
     /**
      * Gets a serializable representation of the element
      */
@@ -313,6 +332,22 @@ export declare class RelativeDateFilter extends AbstractFilter {
      */
     filterJaql(): any;
 }
+/**
+ * @internal
+ */
+export declare class CustomFilter extends AbstractFilter {
+    readonly jaqlExpression: any;
+    constructor(att: Attribute, jaql: any, guid?: string);
+    /**
+     * gets the element's ID
+     */
+    get id(): string;
+    /**
+     * Gets JAQL representing this Filter instance
+     *
+     */
+    filterJaql(): any;
+}
 /**
  * @param json - Filter JSON representation
  * @internal

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFilter = exports.RelativeDateFilter = exports.DateRangeFilter = exports.TextFilter = exports.NumericFilter = exports.RankingFilter = exports.MeasureFilter = exports.DoubleOperatorFilter = exports.ExcludeFilter = exports.CascadingFilter = exports.MembersFilter = exports.LogicalAttributeFilter = exports.FilterTypes = exports.RankingOperators = exports.LogicalOperators = exports.DateOperators = exports.NumericOperators = exports.TextOperators = void 0;
+exports.createFilter = exports.CustomFilter = exports.RelativeDateFilter = exports.DateRangeFilter = exports.TextFilter = exports.NumericFilter = exports.RankingFilter = exports.MeasureFilter = exports.DoubleOperatorFilter = exports.ExcludeFilter = exports.CascadingFilter = exports.MembersFilter = exports.LogicalAttributeFilter = exports.FilterTypes = exports.RankingOperators = exports.LogicalOperators = exports.DateOperators = exports.NumericOperators = exports.TextOperators = void 0;
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -92,6 +92,7 @@ exports.FilterTypes = {
     date: 'date',
     relativeDate: 'relativeDate',
     cascading: 'cascading',
+    advanced: 'advanced',
 };
 // CLASSES
 /**
@@ -107,6 +108,29 @@ class AbstractFilter extends base_js_1.DimensionalElement {
         this.attribute = att;
         this.guid = guid || (0, utils_js_1.guidFast)(13);
         this.disabled = false;
+        this.locked = false;
+    }
+    /**
+     * Boolean flag whether the filter is disabled
+     *
+     * @internal
+     */
+    get disabled() {
+        return this._disabled;
+    }
+    set disabled(value) {
+        this._disabled = value;
+    }
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked() {
+        return this._locked;
+    }
+    set locked(value) {
+        this._locked = value;
     }
     get name() {
         return (0, object_hash_1.default)(this.jaql());
@@ -149,7 +173,9 @@ class AbstractFilter extends base_js_1.DimensionalElement {
         const { granularity } = attribute;
         if (granularity === types_js_1.DateLevels.Hours ||
             granularity === types_js_1.DateLevels.MinutesRoundTo30 ||
-            granularity === types_js_1.DateLevels.MinutesRoundTo15) {
+            granularity === types_js_1.DateLevels.MinutesRoundTo15 ||
+            granularity === types_js_1.DateLevels.Minutes ||
+            granularity === types_js_1.DateLevels.Seconds) {
             throw new translatable_error_js_1.TranslatableError('errors.filter.unsupportedDatetimeLevel');
         }
     }
@@ -195,9 +221,11 @@ exports.LogicalAttributeFilter = LogicalAttributeFilter;
  * @internal
  */
 class MembersFilter extends AbstractFilter {
-    constructor(attribute, members, guid) {
+    constructor(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
         super(attribute, exports.FilterTypes.members, guid);
         this.members = members !== null && members !== void 0 ? members : [];
+        this._deactivatedMembers = _deactivatedMembers !== null && _deactivatedMembers !== void 0 ? _deactivatedMembers : [];
+        this.backgroundFilter = backgroundFilter;
         if (this.members.filter((m) => m === null || m === undefined).length > 0) {
             throw new translatable_error_js_1.TranslatableError('errors.filter.membersFilterNullMember', {
                 attributeId: attribute.id,
@@ -216,15 +244,24 @@ class MembersFilter extends AbstractFilter {
     serializable() {
         const result = super.serializable();
         result.members = this.members;
+        if (this.backgroundFilter) {
+            result.backgroundFilter = this.backgroundFilter.serializable();
+        }
         return result;
     }
     /**
      * Gets JAQL representing this Filter instance
      */
     filterJaql() {
-        return {
+        const filterJaql = {
             members: this.members.map((m) => m.toString()),
         };
+        if (this.backgroundFilter) {
+            return {
+                and: [filterJaql, this.backgroundFilter.filterJaql()],
+            };
+        }
+        return filterJaql;
     }
 }
 exports.MembersFilter = MembersFilter;
@@ -242,6 +279,28 @@ class CascadingFilter extends AbstractFilter {
     get id() {
         return `${this.filterType}_${this.filters.map((f) => f.id).join()}`;
     }
+    get disabled() {
+        return super.disabled;
+    }
+    set disabled(value) {
+        super.disabled = value;
+        if (this.filters) {
+            this.filters.forEach((filter) => {
+                filter.disabled = value;
+            });
+        }
+    }
+    get locked() {
+        return super.locked;
+    }
+    set locked(value) {
+        super.locked = value;
+        if (this.filters) {
+            this.filters.forEach((filter) => {
+                filter.locked = value;
+            });
+        }
+    }
     /**
      * Gets a serializable representation of the element
      */
@@ -573,6 +632,31 @@ class RelativeDateFilter extends AbstractFilter {
     }
 }
 exports.RelativeDateFilter = RelativeDateFilter;
+/**
+ * @internal
+ */
+class CustomFilter extends AbstractFilter {
+    constructor(att, jaql, guid) {
+        super(att, exports.FilterTypes.advanced, guid);
+        // remove filterType from jaql as it is not needed
+        delete jaql.filterType;
+        this.jaqlExpression = jaql;
+    }
+    /**
+     * gets the element's ID
+     */
+    get id() {
+        return `custom_${this.attribute.id}_${this.guid}`;
+    }
+    /**
+     * Gets JAQL representing this Filter instance
+     *
+     */
+    filterJaql() {
+        return this.jaqlExpression;
+    }
+}
+exports.CustomFilter = CustomFilter;
 /**
  * @param json - Filter JSON representation
  * @internal

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

@@ -206,6 +206,22 @@ describe('Filters jaql preparations', () => {
         const jaql = filter.jaql();
         expect(jaql).toStrictEqual(result);
     });
+    it('must prepare members filter jaql with inner background filter', () => {
+        const result = {
+            jaql: {
+                title: 'CommerceGender',
+                dim: '[Commerce.Gender]',
+                datatype: 'text',
+                filter: { and: [{ members: ['Female'] }, { members: ['Female', 'Male'] }] },
+            },
+        };
+        const attribute = new attributes_js_1.DimensionalAttribute('[Commerce.Gender]', '[Commerce.Gender]');
+        const backgroundFilter = new filters_js_1.MembersFilter(attribute, ['Female', 'Male']);
+        const filter = new filters_js_1.MembersFilter(attribute, ['Female'], undefined, undefined, backgroundFilter);
+        expect(filter.backgroundFilter).toBe(backgroundFilter);
+        const jaql = filter.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
 });
 describe('Disabled Filter', () => {
     it('must prepare empty jaql for attribute filter', () => {

package/dist/cjs/dimensional-model/filters/utils/condition-filter-util.js

@@ -108,7 +108,7 @@ exports.getSelectedConditionOption = getSelectedConditionOption;
  * @returns attribute filter
  */
 const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilterJaql, guid) => {
-    var _a, _b;
+    var _a, _b, _c;
     const conditionType = (0, exports.getSelectedConditionOption)(conditionFilterJaql);
     switch (conditionType) {
         case types_js_1.ConditionFilterType.BOTTOM:
@@ -146,7 +146,7 @@ const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilter
         case types_js_1.ConditionFilterType.BETWEEN:
             return (0, filter_code_util_js_1.withComposeCode)(filterFactory.between)(attribute, conditionFilterJaql.from, conditionFilterJaql.to, guid);
         case types_js_1.ConditionFilterType.IS_NOT_BETWEEN:
-            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.exclude)((0, filter_code_util_js_1.withComposeCode)(filterFactory.between)(attribute, (_a = conditionFilterJaql.exclude) === null || _a === void 0 ? void 0 : _a.from, (_b = conditionFilterJaql.exclude) === null || _b === void 0 ? void 0 : _b.to, guid));
+            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.exclude)((0, filter_code_util_js_1.withComposeCode)(filterFactory.between)(attribute, (_a = conditionFilterJaql.exclude) === null || _a === void 0 ? void 0 : _a.from, (_b = conditionFilterJaql.exclude) === null || _b === void 0 ? void 0 : _b.to, guid), undefined, guid);
         case types_js_1.ConditionFilterType.MULTIPLE_CONDITION:
             if (conditionFilterJaql.and) {
                 return (0, filter_code_util_js_1.withComposeCode)(filterFactory.intersection)(conditionFilterJaql.and.map((c) => (0, exports.createAttributeFilterFromConditionFilterJaql)(attribute, c, guid)), guid);
@@ -155,6 +155,8 @@ const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilter
                 return (0, filter_code_util_js_1.withComposeCode)(filterFactory.union)(conditionFilterJaql.or.map((c) => (0, exports.createAttributeFilterFromConditionFilterJaql)(attribute, c, guid)), guid);
             }
             break;
+        case types_js_1.ConditionFilterType.IS_NOT:
+            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.exclude)((0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, ((_c = conditionFilterJaql.exclude) === null || _c === void 0 ? void 0 : _c.members) || [], undefined, guid), undefined, guid);
         case types_js_1.ConditionFilterType.AFTER:
         case types_js_1.ConditionFilterType.BEFORE:
         case types_js_1.ConditionFilterType.IS_EMPTY:

package/dist/cjs/dimensional-model/filters/utils/filter-code-util.js

@@ -44,7 +44,11 @@ exports.stringifyHelper = stringifyHelper;
  */
 function withComposeCode(func) {
     return function (...args) {
-        const argValues = args.map(stringifyHelper).join(', ').replace(/, $/, '');
+        const argValues = args
+            .map(stringifyHelper)
+            .join(', ')
+            // remove any number of trailing commas
+            .replace(/(,\s*)+$/, '');
         const signature = `filterFactory.${func.name}(${argValues})`;
         const filter = func(...args);
         filter.composeCode = signature;

package/dist/cjs/dimensional-model/filters/utils/filter-from-jaql-util.d.ts

@@ -1,4 +1,4 @@
-import { ConditionFilterJaql, FilterJaqlInternal, PeriodFilterJaql, RangeFilterJaql, SpecificItemsFilterJaql } from './types.js';
+import { BaseFilterJaql, ConditionFilterJaql, FilterJaqlInternal, PeriodFilterJaql, RangeFilterJaql, SpecificItemsFilterJaql } from './types.js';
 import { Attribute, BaseMeasure, Filter, LevelAttribute } from '../../interfaces.js';
 import { FilterJaql } from '../../types.js';
 /**
@@ -63,6 +63,15 @@ export declare const createFilterFromPeriodFilterJaql: (attribute: LevelAttribut
  * @returns Filter object
  */
 export declare const createFilterFromConditionFilterJaql: (attribute: Attribute, conditionFilterJaql: ConditionFilterJaql, measure?: BaseMeasure, guid?: string) => Filter;
+/**
+ * Creates a filter from a custom filter JAQL object.
+ *
+ * @param attribute - attribute
+ * @param customFilterJaql - Custom Filter Jaql
+ * @param guid - Optional GUID for the filter
+ * @returns Filter object
+ */
+export declare const createFilterFromCustomFilterJaql: (attribute: Attribute, customFilterJaql: BaseFilterJaql, guid?: string) => Filter;
 /**
  * Creates a filter from a filter JAQL object.
  *

package/dist/cjs/dimensional-model/filters/utils/filter-from-jaql-util.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFilterFromJaqlInternal = exports.createFilterFromConditionFilterJaql = exports.createFilterFromPeriodFilterJaql = exports.createFilterFromNumericRangeJaql = exports.createFilterFromDateRangeFilterJaql = exports.createFilterFromSpecificItemsFilterJaql = exports.createFilterIncludeAll = exports.createGenericFilter = void 0;
+exports.createFilterFromJaqlInternal = exports.createFilterFromCustomFilterJaql = exports.createFilterFromConditionFilterJaql = exports.createFilterFromPeriodFilterJaql = exports.createFilterFromNumericRangeJaql = exports.createFilterFromDateRangeFilterJaql = exports.createFilterFromSpecificItemsFilterJaql = exports.createFilterIncludeAll = exports.createGenericFilter = void 0;
 const types_js_1 = require("./types.js");
 const filterFactory = __importStar(require("../factory.js"));
 const condition_filter_util_js_1 = require("./condition-filter-util.js");
@@ -71,7 +71,7 @@ exports.createGenericFilter = createGenericFilter;
  * @returns The created Filter object.
  */
 const createFilterIncludeAll = (attribute, guid) => {
-    return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, [], guid);
+    return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, [], [], guid);
 };
 exports.createFilterIncludeAll = createFilterIncludeAll;
 /**
@@ -83,9 +83,21 @@ exports.createFilterIncludeAll = createFilterIncludeAll;
  * @returns Filter object
  */
 const createFilterFromSpecificItemsFilterJaql = (attribute, specificItemsFilterJaql, guid) => {
-    return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, specificItemsFilterJaql.members, guid);
+    const deactivatedMembers = getDeactivatedMembersFromFilterJaql(specificItemsFilterJaql);
+    const activeMembers = getActiveMembersFromFilterJaql(specificItemsFilterJaql, deactivatedMembers);
+    return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, activeMembers, deactivatedMembers, guid);
 };
 exports.createFilterFromSpecificItemsFilterJaql = createFilterFromSpecificItemsFilterJaql;
+function getDeactivatedMembersFromFilterJaql(filterJaql) {
+    var _a, _b, _c;
+    return ((_a = filterJaql.filter) === null || _a === void 0 ? void 0 : _a.turnedOff) ? (_c = (_b = filterJaql.filter) === null || _b === void 0 ? void 0 : _b.exclude) === null || _c === void 0 ? void 0 : _c.members : undefined;
+}
+function getActiveMembersFromFilterJaql(filterJaql, deactivatedMembers) {
+    const allMembers = filterJaql.members;
+    return deactivatedMembers
+        ? allMembers.filter((member) => !deactivatedMembers.includes(member))
+        : allMembers;
+}
 /**
  * Creates a filter from a date range filter JAQL object.
  *
@@ -145,6 +157,18 @@ const createFilterFromConditionFilterJaql = (attribute, conditionFilterJaql, mea
     }
 };
 exports.createFilterFromConditionFilterJaql = createFilterFromConditionFilterJaql;
+/**
+ * Creates a filter from a custom filter JAQL object.
+ *
+ * @param attribute - attribute
+ * @param customFilterJaql - Custom Filter Jaql
+ * @param guid - Optional GUID for the filter
+ * @returns Filter object
+ */
+const createFilterFromCustomFilterJaql = (attribute, customFilterJaql, guid) => {
+    return (0, filter_code_util_js_1.withComposeCode)(filterFactory.customFilter)(attribute, customFilterJaql, guid);
+};
+exports.createFilterFromCustomFilterJaql = createFilterFromCustomFilterJaql;
 /**
  * Creates a filter from a filter JAQL object.
  *
@@ -177,6 +201,7 @@ const createFilterFromJaqlInternal = (jaql, guid) => {
             case types_js_1.FILTER_TYPES.NUMERIC_RANGE:
                 return (0, exports.createFilterFromNumericRangeJaql)(attribute, filterJaqlWithType, guid);
             case types_js_1.FILTER_TYPES.ADVANCED:
+                return (0, exports.createFilterFromCustomFilterJaql)(attribute, filterJaqlWithType, guid);
             case types_js_1.FILTER_TYPES.INVALID:
                 return (0, exports.createGenericFilter)(jaql, guid);
         }