@sisense/sdk-data 1.21.0 → 1.23.0

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

@@ -40,7 +40,7 @@ class DimensionalAttribute extends base_js_1.DimensionalElement {
      * @returns An instance representing the sorted {@link Attribute} of this instance
      */
     sort(sort) {
-        return new DimensionalAttribute(this.name, this.expression, this.type, this.description, sort);
+        return new DimensionalAttribute(this.name, this.expression, this.type, this.description, sort, this.dataSource);
     }
     /**
      * Gets the JAQL representation of this instance
@@ -109,7 +109,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      * @returns An instance representing the sorted {@link LevelAttribute} of this instance
      */
     sort(sort) {
-        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, this._format, this.description, sort);
+        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, this._format, this.description, sort, this.dataSource);
     }
     /**
      * The string formatting of this instance
@@ -126,7 +126,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      * @returns An instance representing the formatted {@link LevelAttribute} of this instance
      */
     format(format) {
-        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, format, this.description, this._sort);
+        return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, format, this.description, this._sort, this.dataSource);
     }
     /**
      * Gets a serializable representation of the element
@@ -326,7 +326,7 @@ function createAttribute(json) {
     if (json.granularity) {
         return createLevel(json);
     }
-    return new DimensionalAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.type, json.desc || json.description);
+    return new DimensionalAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.type, json.desc || json.description, json.sort, json.dataSource);
 }
 exports.createAttribute = createAttribute;
 /**
@@ -336,7 +336,7 @@ exports.createAttribute = createAttribute;
  * @internal
  */
 function createLevel(json) {
-    return new DimensionalLevelAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.granularity, json.format, json.desc || json.description);
+    return new DimensionalLevelAttribute(json.name || json.title, json.attribute || json.expression || json.dim, json.granularity, json.format, json.desc || json.description, json.sort, json.dataSource);
 }
 exports.createLevel = createLevel;
 /**

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

@@ -57,7 +57,7 @@ exports.DimensionalElement = DimensionalElement;
  */
 function normalizeName(name) {
     // Remove all invalid characters
-    let normalizedName = name.replace(/[^a-zA-Z0-9_]/g, '');
+    let normalizedName = name.replace(/[^a-zA-Z0-9_.]/g, '').replace('.', '_');
     // Prefix with '_' if it starts with a number
     const firstChar = normalizedName.charAt(0);
     if (firstChar.match(/[0-9]/)) {

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

@@ -1,5 +1,5 @@
 import { Attribute, LevelAttribute, Dimension, DateDimension } from './interfaces.js';
-import { Sort } from './types.js';
+import { Sort, JaqlDataSource } from './types.js';
 import { DimensionalElement } from './base.js';
 /**
  * Represents a Dimension in a Dimensional Model
@@ -14,7 +14,7 @@ export declare class DimensionalDimension extends DimensionalElement implements
     protected _attributes: Attribute[];
     private _expression;
     protected _sort: Sort;
-    constructor(name: string, expression: string, attributes: Attribute[], dimensions?: Dimension[], type?: string, desc?: string, sort?: Sort);
+    constructor(name: string, expression: string, attributes: Attribute[], dimensions?: Dimension[], type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
     private getAttachedName;
     protected setDimensions(dimensions: Dimension[]): void;
     protected setAttributes(attributes: Attribute[]): void;
@@ -61,7 +61,7 @@ export declare class DimensionalDimension extends DimensionalElement implements
  * @internal
  */
 export declare class DimensionalDateDimension extends DimensionalDimension implements DateDimension {
-    constructor(name: string, expression: string, desc?: string, sort?: Sort);
+    constructor(name: string, expression: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
     /**
      * Years level
      */

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

@@ -10,8 +10,8 @@ const base_js_1 = require("./base.js");
  * @internal
  */
 class DimensionalDimension extends base_js_1.DimensionalElement {
-    constructor(name, expression, attributes, dimensions, type, desc, sort) {
-        super(name, type || types_js_1.MetadataTypes.Dimension, desc);
+    constructor(name, expression, attributes, dimensions, type, desc, sort, dataSource) {
+        super(name, type || types_js_1.MetadataTypes.Dimension, desc, dataSource);
         this._dimensions = [];
         this._attributes = [];
         this._sort = types_js_1.Sort.None;
@@ -104,7 +104,7 @@ class DimensionalDimension extends base_js_1.DimensionalElement {
      * @returns An instance representing the sorted {@link Dimension} of this instance
      */
     sort(sort) {
-        return new DimensionalDimension(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, sort);
+        return new DimensionalDimension(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, sort, this.dataSource);
     }
     /**
      * Gets a serializable representation of the element
@@ -154,23 +154,23 @@ exports.DimensionalDimension = DimensionalDimension;
  * @internal
  */
 class DimensionalDateDimension extends DimensionalDimension {
-    constructor(name, expression, desc, sort) {
-        super(name, expression, [], [], types_js_1.MetadataTypes.DateDimension, desc, sort);
+    constructor(name, expression, desc, sort, dataSource) {
+        super(name, expression, [], [], types_js_1.MetadataTypes.DateDimension, desc, sort, dataSource);
         this.defaultLevel = types_js_1.DateLevels.Years;
-        this.Years = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Years, expression, types_js_1.DateLevels.Years, 'yyyy');
-        this.Quarters = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Quarters, expression, types_js_1.DateLevels.Quarters, 'Q yyyy');
-        this.Months = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Months, expression, types_js_1.DateLevels.Months, 'yyyy-MM');
-        this.Weeks = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Weeks, expression, types_js_1.DateLevels.Weeks, 'ww yyyy');
-        this.Days = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Days, expression, types_js_1.DateLevels.Days, 'yyyy-MM-dd');
-        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');
-        this.AggMinutesRoundTo1 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo1, expression, types_js_1.DateLevels.AggMinutesRoundTo1, 'HH:mm');
+        this.Years = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Years, expression, types_js_1.DateLevels.Years, 'yyyy', desc, sort, dataSource);
+        this.Quarters = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Quarters, expression, types_js_1.DateLevels.Quarters, 'Q yyyy', desc, sort, dataSource);
+        this.Months = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Months, expression, types_js_1.DateLevels.Months, 'yyyy-MM', desc, sort, dataSource);
+        this.Weeks = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Weeks, expression, types_js_1.DateLevels.Weeks, 'ww yyyy', desc, sort, dataSource);
+        this.Days = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Days, expression, types_js_1.DateLevels.Days, 'yyyy-MM-dd', desc, sort, dataSource);
+        this.Hours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Hours, expression, types_js_1.DateLevels.Hours, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo30, expression, types_js_1.DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo15, expression, types_js_1.DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Minutes = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Minutes, expression, types_js_1.DateLevels.Minutes, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Seconds = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Seconds, expression, types_js_1.DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss', desc, sort, dataSource);
+        this.AggHours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggHours, expression, types_js_1.DateLevels.AggHours, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo30, expression, types_js_1.DateLevels.AggMinutesRoundTo30, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo15, expression, types_js_1.DateLevels.AggMinutesRoundTo15, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo1 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo1, expression, types_js_1.DateLevels.AggMinutesRoundTo1, 'HH:mm', desc, sort, dataSource);
         this.setAttributes([
             this.Years,
             this.Quarters,
@@ -215,7 +215,7 @@ class DimensionalDateDimension extends DimensionalDimension {
      * @returns An instance representing the sorted {@link Dimension} of this instance
      */
     sort(sort) {
-        return new DimensionalDateDimension(this.name, this.expression, this.description, sort);
+        return new DimensionalDateDimension(this.name, this.expression, this.description, sort, this.dataSource);
     }
     /**
      * Gets a serializable representation of the element
@@ -255,9 +255,11 @@ function createDimension(json) {
     const description = json.desc || json.description;
     const expression = json.expression || json.dim;
     const type = DimensionalDimension.parseType(json.dimtype || json.type);
+    const sort = json.sort;
+    const dataSource = json.dataSource;
     // date dimension
     if (type == types_js_1.MetadataTypes.DateDimension) {
-        return new DimensionalDateDimension(name, expression, description);
+        return new DimensionalDateDimension(name, expression, description, sort, dataSource);
     }
     // attributes
     const atts = Object.getOwnPropertyNames(json)
@@ -268,12 +270,12 @@ function createDimension(json) {
             let att;
             for (let i = 0; i < json.attributes.length; i++) {
                 att = json.attributes[i];
-                atts.push(new attributes_js_1.DimensionalAttribute(att.name, att.expression, att.type, att.description));
+                atts.push(new attributes_js_1.DimensionalAttribute(att.name, att.expression, att.type, att.description, att.sort, att.dataSource));
             }
         }
         // default attribute
         else if (expression) {
-            atts.push(new attributes_js_1.DimensionalAttribute(name, expression, type, description));
+            atts.push(new attributes_js_1.DimensionalAttribute(name, expression, type, description, sort, dataSource));
         }
     }
     // nested dimensions
@@ -285,7 +287,7 @@ function createDimension(json) {
             dims.push(createDimension(json.dimensions[i]));
         }
     }
-    const d = new DimensionalDimension(name, expression, atts, dims, type, description);
+    const d = new DimensionalDimension(name, expression, atts, dims, type, description, sort, dataSource);
     if (json.defaultAttribute) {
         d.defaultAttribute = atts.find((a) => a.name === json.defaultAttribute);
     }
@@ -307,6 +309,8 @@ function createDateDimension(json) {
     const name = json.name || json.title;
     const expression = json.expression || json.dim;
     const description = json.desc || json.description;
-    return new DimensionalDateDimension(name, expression, description);
+    const sort = json.sort;
+    const dataSource = json.dataSource;
+    return new DimensionalDateDimension(name, expression, description, sort, dataSource);
 }
 exports.createDateDimension = createDateDimension;

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

@@ -377,9 +377,11 @@ export declare function numeric(attribute: Attribute, operatorA?: string, valueA
  * @param guid - Optional GUID for the filter
  * @param deactivatedMembers - Array of deactivated member values
  * @param backgroundFilter - Optional background filter
+ * @param multiSelection - Optional flag to disable multi-selection
  * @returns A filter instance
+ * @shortDescription Creates filter on attribute to match certain string values
  */
-export declare function members(attribute: Attribute, members: string[], excludeMembers?: boolean, guid?: string, deactivatedMembers?: string[], backgroundFilter?: Filter): Filter;
+export declare function members(attribute: Attribute, members: string[], excludeMembers?: boolean, guid?: string, deactivatedMembers?: string[], backgroundFilter?: Filter, multiSelection?: boolean): Filter;
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
  *

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

@@ -449,10 +449,12 @@ exports.numeric = numeric;
  * @param guid - Optional GUID for the filter
  * @param deactivatedMembers - Array of deactivated member values
  * @param backgroundFilter - Optional background filter
+ * @param multiSelection - Optional flag to disable multi-selection
  * @returns A filter instance
+ * @shortDescription Creates filter on attribute to match certain string values
  */
-function members(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter) {
-    return new filters_js_1.MembersFilter(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter);
+function members(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter, multiSelection) {
+    return new filters_js_1.MembersFilter(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter, multiSelection);
 }
 exports.members = members;
 // DATE FILTERS

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

@@ -166,10 +166,12 @@ export declare class MembersFilter extends AbstractFilter {
     /** @internal */
     excludeMembers: boolean;
     /** @internal */
+    multiSelection: boolean;
+    /** @internal */
     deactivatedMembers: any[];
     /** @internal */
     backgroundFilter?: Filter;
-    constructor(attribute: Attribute, members?: any[], excludeMembers?: boolean, guid?: string, deactivatedMembers?: any[], backgroundFilter?: Filter);
+    constructor(attribute: Attribute, members?: any[], excludeMembers?: boolean, guid?: string, deactivatedMembers?: any[], backgroundFilter?: Filter, multiSelection?: boolean);
     /**
      * gets the element's ID
      */

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

@@ -227,10 +227,11 @@ exports.LogicalAttributeFilter = LogicalAttributeFilter;
  * @internal
  */
 class MembersFilter extends AbstractFilter {
-    constructor(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter) {
+    constructor(attribute, members, excludeMembers, guid, deactivatedMembers, backgroundFilter, multiSelection = true) {
         super(attribute, exports.FilterTypes.members, guid);
         this.members = members !== null && members !== void 0 ? members : [];
         this.excludeMembers = excludeMembers !== null && excludeMembers !== void 0 ? excludeMembers : false;
+        this.multiSelection = multiSelection;
         this.deactivatedMembers = deactivatedMembers !== null && deactivatedMembers !== void 0 ? deactivatedMembers : [];
         this.backgroundFilter = backgroundFilter;
         if (this.members.filter((m) => m === null || m === undefined).length > 0) {
@@ -263,10 +264,7 @@ class MembersFilter extends AbstractFilter {
         const membersFilterJaql = {
             members: this.members.map((m) => m.toString()),
         };
-        // if there's no members to exclude, do not add the exclude property
-        const filterJaql = this.excludeMembers && this.members.length
-            ? { exclude: membersFilterJaql }
-            : membersFilterJaql;
+        const filterJaql = this.excludeMembers ? { exclude: membersFilterJaql } : membersFilterJaql;
         if (this.backgroundFilter) {
             return {
                 and: [filterJaql, this.backgroundFilter.filterJaql()],

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

@@ -55,4 +55,4 @@ export declare const createMeasureFromFilterJaql: (jaql: FilterJaqlInternal) =>
  * @param jaql - Ranking filter Jaql object
  * @returns Measure
  */
-export declare const createMeasureFromRankingFilterJaql: (jaql: RankingFilterJaql | CustomFormulaJaql) => BaseMeasure | CalculatedMeasure;
+export declare const createMeasureFromRankingFilterJaql: (jaql: RankingFilterJaql | CustomFormulaJaql, rankingMessage?: string) => BaseMeasure | CalculatedMeasure;

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

@@ -29,6 +29,7 @@ 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
@@ -86,7 +87,7 @@ exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
  */
 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);
+    const measure = measureFactory.aggregate(attribute, agg, title);
     measure.composeCode = `measureFactory.${agg}(${attribute.composeCode})`;
     return measure;
 };
@@ -115,7 +116,7 @@ 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, agg, title, dataSource);
+    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg), title, dataSource);
 };
 exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
 /**
@@ -124,10 +125,10 @@ exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
  * @param jaql - Ranking filter Jaql object
  * @returns Measure
  */
-const createMeasureFromRankingFilterJaql = (jaql) => {
+const createMeasureFromRankingFilterJaql = (jaql, rankingMessage) => {
     if ('formula' in jaql)
         return (0, exports.createCalculatedMeasureFromJaql)(jaql);
     const { dim, table, column, level, datatype: dataType, agg } = jaql;
-    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, agg);
+    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg), rankingMessage);
 };
 exports.createMeasureFromRankingFilterJaql = createMeasureFromRankingFilterJaql;

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

@@ -28,6 +28,7 @@ const types_js_1 = require("./types.js");
 const filter_code_util_js_1 = require("./filter-code-util.js");
 const filterFactory = __importStar(require("../factory.js"));
 const attribute_measure_util_js_1 = require("./attribute-measure-util.js");
+const translatable_error_js_1 = require("../../../translation/translatable-error.js");
 const isTopCondition = (filter) => filter.top !== undefined;
 const isBottomCondition = (filter) => filter.bottom !== undefined;
 const isExcludeCondition = (filter) => { var _a; return !!((_a = filter.exclude) === null || _a === void 0 ? void 0 : _a.members); };
@@ -108,12 +109,12 @@ exports.getSelectedConditionOption = getSelectedConditionOption;
  * @returns attribute filter
  */
 const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilterJaql, guid) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const conditionType = (0, exports.getSelectedConditionOption)(conditionFilterJaql);
     switch (conditionType) {
         case types_js_1.ConditionFilterType.BOTTOM:
             if (conditionFilterJaql.by) {
-                return (0, filter_code_util_js_1.withComposeCode)(filterFactory.bottomRanking)(attribute, (0, attribute_measure_util_js_1.createMeasureFromRankingFilterJaql)(conditionFilterJaql.by), conditionFilterJaql[types_js_1.ConditionFilterType.BOTTOM], guid);
+                return (0, filter_code_util_js_1.withComposeCode)(filterFactory.bottomRanking)(attribute, (0, attribute_measure_util_js_1.createMeasureFromRankingFilterJaql)(conditionFilterJaql.by, conditionFilterJaql.rankingMessage), conditionFilterJaql[types_js_1.ConditionFilterType.BOTTOM], guid);
             }
             break;
         case types_js_1.ConditionFilterType.EQUALS:
@@ -126,7 +127,7 @@ const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilter
             return (0, filter_code_util_js_1.withComposeCode)(filterFactory.greaterThanOrEqual)(attribute, conditionFilterJaql[types_js_1.ConditionFilterType.GREATER_THAN_OR_EQUAL], guid);
         case types_js_1.ConditionFilterType.TOP:
             if (conditionFilterJaql.by) {
-                return (0, filter_code_util_js_1.withComposeCode)(filterFactory.topRanking)(attribute, (0, attribute_measure_util_js_1.createMeasureFromRankingFilterJaql)(conditionFilterJaql.by), conditionFilterJaql[types_js_1.ConditionFilterType.TOP], guid);
+                return (0, filter_code_util_js_1.withComposeCode)(filterFactory.topRanking)(attribute, (0, attribute_measure_util_js_1.createMeasureFromRankingFilterJaql)(conditionFilterJaql.by, conditionFilterJaql.rankingMessage), conditionFilterJaql[types_js_1.ConditionFilterType.TOP], guid);
             }
             break;
         case types_js_1.ConditionFilterType.STARTS_WITH:
@@ -157,9 +158,13 @@ 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:
+        case types_js_1.ConditionFilterType.IS_NOT: {
+            const deactivatedMembers = (((_c = conditionFilterJaql.filter) === null || _c === void 0 ? void 0 : _c.turnedOff) && ((_d = conditionFilterJaql.filter.exclude) === null || _d === void 0 ? void 0 : _d.members)) ||
+                [];
+            const selectedMembers = ((_f = (_e = conditionFilterJaql.exclude) === null || _e === void 0 ? void 0 : _e.members) === null || _f === void 0 ? void 0 : _f.filter((member) => !deactivatedMembers.includes(member))) || [];
             // use members filter with exclude instead of exclude filter
-            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, ((_c = conditionFilterJaql.exclude) === null || _c === void 0 ? void 0 : _c.members) || [], true, guid);
+            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, selectedMembers, true, guid, deactivatedMembers, undefined, conditionFilterJaql.multiSelection);
+        }
         case types_js_1.ConditionFilterType.AFTER:
         case types_js_1.ConditionFilterType.BEFORE:
         case types_js_1.ConditionFilterType.IS_EMPTY:
@@ -167,7 +172,9 @@ const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilter
             // TODO Handle these cases later; may need filterFactory function added first
             break;
     }
-    throw 'Jaql contains unsupported condition filter: ' + JSON.stringify(conditionFilterJaql);
+    throw new translatable_error_js_1.TranslatableError('errors.filter.unsupportedConditionFilter', {
+        filter: JSON.stringify(conditionFilterJaql),
+    });
 };
 exports.createAttributeFilterFromConditionFilterJaql = createAttributeFilterFromConditionFilterJaql;
 /**
@@ -194,6 +201,8 @@ const createMeasureFilterFromConditionFilterJaql = (measure, conditionFilterJaql
         case types_js_1.ConditionFilterType.BETWEEN:
             return (0, filter_code_util_js_1.withComposeCode)(filterFactory.measureBetween)(measure, conditionFilterJaql.from, conditionFilterJaql.to, guid);
     }
-    throw 'Jaql contains unsupported condition filter: ' + JSON.stringify(conditionFilterJaql);
+    throw new translatable_error_js_1.TranslatableError('errors.filter.unsupportedConditionFilter', {
+        filter: JSON.stringify(conditionFilterJaql),
+    });
 };
 exports.createMeasureFilterFromConditionFilterJaql = createMeasureFilterFromConditionFilterJaql;

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

@@ -25,7 +25,7 @@ export declare const createFilterIncludeAll: (attribute: Attribute, guid?: strin
  * @param guid - Optional GUID for the filter
  * @returns Filter object
  */
-export declare const createFilterFromSpecificItemsFilterJaql: (attribute: Attribute, specificItemsFilterJaql: SpecificItemsFilterJaql, guid?: string) => Filter;
+export declare const createFilterFromSpecificItemsFilterJaql: (attribute: Attribute, specificItemsFilterJaql: SpecificItemsFilterJaql, guid?: string, multiSelection?: boolean) => Filter;
 /**
  * Creates a filter from a date range filter JAQL object.
  *

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

@@ -31,6 +31,7 @@ const filter_types_util_js_1 = require("./filter-types-util.js");
 const filter_code_util_js_1 = require("./filter-code-util.js");
 const attribute_measure_util_js_1 = require("./attribute-measure-util.js");
 const utils_js_1 = require("../../../utils.js");
+const translatable_error_js_1 = require("../../../translation/translatable-error.js");
 /**
  * Creates a generic filter (aka pass-through JAQL filter) if the JAQL cannot be translated to a specific filter type.
  *
@@ -84,11 +85,11 @@ exports.createFilterIncludeAll = createFilterIncludeAll;
  * @param guid - Optional GUID for the filter
  * @returns Filter object
  */
-const createFilterFromSpecificItemsFilterJaql = (attribute, specificItemsFilterJaql, guid) => {
+const createFilterFromSpecificItemsFilterJaql = (attribute, specificItemsFilterJaql, guid, multiSelection) => {
     const deactivatedMembers = getDeactivatedMembersFromFilterJaql(specificItemsFilterJaql);
     const activeMembers = getActiveMembersFromFilterJaql(specificItemsFilterJaql, deactivatedMembers);
     return (0, filter_code_util_js_1.withComposeCode)(filterFactory.members)(attribute, activeMembers, undefined, // use undefined instead of false to avoid including the property in composeCode
-    guid, deactivatedMembers);
+    guid, deactivatedMembers, undefined, multiSelection);
 };
 exports.createFilterFromSpecificItemsFilterJaql = createFilterFromSpecificItemsFilterJaql;
 function getDeactivatedMembersFromFilterJaql(filterJaql) {
@@ -183,7 +184,9 @@ const createFilterFromJaqlInternal = (jaql, guid) => {
     try {
         if ('formula' in jaql) {
             // generic pass-through JAQL filter will be used instead
-            throw 'Formula-based filter not supported yet: ' + JSON.stringify(jaql);
+            throw new translatable_error_js_1.TranslatableError('errors.filter.formulaFiltersNotSupported', {
+                filter: JSON.stringify(jaql),
+            });
         }
         const filterJaqlWrapperWithType = (0, filter_types_util_js_1.extractFilterTypeFromFilterJaql)(jaql, jaql.datatype);
         const { filter: filterJaqlWithType } = filterJaqlWrapperWithType;
@@ -194,7 +197,7 @@ const createFilterFromJaqlInternal = (jaql, guid) => {
             case types_js_1.FILTER_TYPES.INCLUDE_ALL:
                 return (0, exports.createFilterIncludeAll)(attribute, guid);
             case types_js_1.FILTER_TYPES.SPECIFIC_ITEMS:
-                return (0, exports.createFilterFromSpecificItemsFilterJaql)(attribute, filterJaqlWithType, guid);
+                return (0, exports.createFilterFromSpecificItemsFilterJaql)(attribute, filterJaqlWithType, guid, filterJaqlWithType.multiSelection);
             case types_js_1.FILTER_TYPES.CONDITION:
                 return (0, exports.createFilterFromConditionFilterJaql)(attribute, filterJaqlWithType, measure, guid);
             case types_js_1.FILTER_TYPES.DATE_RANGE:

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

@@ -485,6 +485,7 @@ export declare type FilterRelationsJaqlIdNode = {
 };
 /**
  * A node of a {@link FilterRelationsModel} tree that represents a filter
+ *
  * @internal
  */
 export declare type FilterRelationsModelIdNode = {

package/dist/cjs/dimensional-model/jaql-element.d.ts

@@ -0,0 +1,36 @@
+import { DimensionalElement } from './base.js';
+import { SortDirection } from './interfaces.js';
+import { MetadataItem } from './types.js';
+/**
+ * This implementation wraps metadata for a JAQL query. The metadata could be
+ * for a dimension, measure, or filter. We do little to no interpretation of
+ * the JAQL as it is designed to be "passed through" to the query execution
+ * step.
+ *
+ * This will typically be used for JAQL metadata that is coming from a Sisense
+ * instance and is assumed to be correct (e.g. dashboard widget, NLQ
+ * suggestion).
+ *
+ * @param item - the metadata item in a JAQL query
+ * @param type - the data type of the dimension
+ * @internal
+ */
+export declare class JaqlElement extends DimensionalElement {
+    private readonly metadataItem;
+    expression: string;
+    skipValidation: boolean;
+    aggregation?: string;
+    formula?: string;
+    sortType?: SortDirection;
+    constructor(item: MetadataItem, type: string);
+    get id(): string;
+    jaql(): MetadataItem;
+}
+/**
+ * Create a JaqlElement from a MetadataItem
+ *
+ * @param item - the metadata item in a JAQL query
+ * @returns a JaqlElement
+ * @internal
+ */
+export declare function createJaqlElement(item: MetadataItem): JaqlElement;

package/dist/cjs/dimensional-model/jaql-element.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createJaqlElement = exports.JaqlElement = void 0;
+const base_js_1 = require("./base.js");
+const utils_js_1 = require("../utils.js");
+const types_js_1 = require("./types.js");
+/**
+ * This implementation wraps metadata for a JAQL query. The metadata could be
+ * for a dimension, measure, or filter. We do little to no interpretation of
+ * the JAQL as it is designed to be "passed through" to the query execution
+ * step.
+ *
+ * This will typically be used for JAQL metadata that is coming from a Sisense
+ * instance and is assumed to be correct (e.g. dashboard widget, NLQ
+ * suggestion).
+ *
+ * @param item - the metadata item in a JAQL query
+ * @param type - the data type of the dimension
+ * @internal
+ */
+class JaqlElement extends base_js_1.DimensionalElement {
+    constructor(item, type) {
+        var _a;
+        super((_a = item.jaql.title) !== null && _a !== void 0 ? _a : '', type);
+        this.expression = (item.jaql.dim || item.jaql.formula);
+        this.metadataItem = item;
+        if (item.jaql.agg) {
+            this.aggregation = item.jaql.agg;
+        }
+        else {
+            delete this.aggregation;
+        }
+        if (item.jaql.formula) {
+            this.formula = item.jaql.formula;
+        }
+        else {
+            delete this.formula;
+        }
+        if (item.jaql.sort) {
+            this.sortType = (0, utils_js_1.getSortType)(item.jaql.sort);
+        }
+        else {
+            delete this.sortType;
+        }
+        this.skipValidation = true;
+    }
+    get id() {
+        return this.expression;
+    }
+    jaql() {
+        return this.metadataItem;
+    }
+}
+exports.JaqlElement = JaqlElement;
+const toMetadataType = {
+    text: types_js_1.MetadataTypes.TextAttribute,
+    numeric: types_js_1.MetadataTypes.NumericAttribute,
+    datetime: types_js_1.MetadataTypes.DateLevel,
+};
+/**
+ * Create a JaqlElement from a MetadataItem
+ *
+ * @param item - the metadata item in a JAQL query
+ * @returns a JaqlElement
+ * @internal
+ */
+function createJaqlElement(item) {
+    var _a;
+    // TODO: measures with a "formula" may not have a datatype. force this to be numeric because aggregations
+    // will always be of type number. check if there is a more correct way to do this
+    return new JaqlElement(item, (_a = toMetadataType[item.jaql.datatype]) !== null && _a !== void 0 ? _a : 'numeric');
+}
+exports.createJaqlElement = createJaqlElement;

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

@@ -11,6 +11,7 @@ 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");
 /**
  * Defines the different numeric operators that can be used with numeric filters
  *
@@ -115,7 +116,7 @@ function transformCustomFormulaJaql(jaql) {
     var _a;
     const isFormulaJaql = 'formula' in jaql;
     if (!isFormulaJaql) {
-        throw new Error('Jaql is not a formula');
+        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) : {});