@sisense/sdk-data 1.21.0 → 1.23.0

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

@@ -223,12 +223,14 @@ export declare type IncludeAllFilter = {
 /** @internal */
 export declare type IncludeMembersFilter = {
     members: string[];
+    multiSelection?: boolean;
 };
 /** @internal */
 export declare type ExcludeMembersFilter = {
     exclude: {
         members: string[];
     };
+    multiSelection?: boolean;
 };
 /** @internal */
 export declare type TurnOffMembersFilter = ExcludeMembersFilter & {
@@ -266,3 +268,149 @@ export declare type OrFilter<FilterItem> = {
  * Abstract object with any unknown values
  */
 export declare type AnyObject = Record<string, any>;
+/**
+ * @internal
+ */
+interface DecimalAbbreviations {
+    k: boolean;
+    m: boolean;
+    b: boolean;
+    t: boolean;
+}
+/**
+ * @internal
+ */
+export declare enum CurrencyPosition {
+    PRE = "pre",
+    POST = "post"
+}
+/**
+ * @internal
+ */
+export declare type NumericMask = {
+    isdefault?: boolean;
+    abbreviations?: DecimalAbbreviations;
+    decimals?: 'auto' | number | string;
+    currency?: {
+        symbol: string;
+        position: CurrencyPosition;
+    };
+    percent?: boolean;
+    number?: {
+        separated: boolean;
+    };
+    separated?: boolean;
+    type?: string;
+};
+/**
+ * @internal
+ */
+export declare type DatetimeMask = {
+    isdefault?: boolean;
+    years: string;
+    quarters: string;
+    months: string;
+    weeks: string;
+    minutes: string;
+    days: string;
+    type: string;
+    dateAndTime?: string;
+};
+/**
+ * @internal
+ */
+export declare type MetadataItem = {
+    instanceid?: string;
+    measure?: MetadataItemJaql;
+    jaql: MetadataItemJaql;
+    panel?: string;
+    isScope?: boolean;
+    format?: {
+        mask?: Partial<DatetimeMask> | Partial<NumericMask>;
+        number?: string;
+        subtotal?: boolean;
+        width?: number;
+        databars?: boolean;
+        color?: {
+            type: string;
+            color?: string;
+            conditions?: Array<{
+                color: string;
+                operator: string;
+                expression: string | Record<string, any>;
+            }>;
+        };
+    };
+    field?: {
+        id?: string;
+        index?: number;
+    };
+    filter?: MetadataItem;
+    exclude?: MetadataItem;
+    by?: MetadataItemJaql;
+    level?: string;
+    anchor?: string;
+    from?: string;
+    to?: string;
+};
+/**
+ * @internal
+ */
+export declare type MetadataItemJaql = {
+    dim?: string;
+    agg?: string;
+    datatype?: string;
+    table?: string;
+    column?: string;
+    level?: string;
+    dateTimeLevel?: string;
+    bucket?: string;
+    sort?: string;
+    in?: {
+        selected: {
+            jaql: MetadataItemJaql;
+        };
+    };
+    title?: string;
+    type?: string;
+    formula?: string;
+    context?: {
+        [itemId: string]: MetadataItemJaql;
+    };
+    filter?: MetadataItem;
+    sortDetails?: {
+        dir: string;
+        field?: number;
+        measurePath?: Record<number, string | number>;
+        sortingLastDimension?: boolean;
+        initialized?: boolean;
+    };
+};
+/**
+ * @internal
+ */
+export declare type DataSourceField = {
+    column: string;
+    dimtype: string;
+    id: string;
+    indexed: boolean;
+    merged: boolean;
+    table: string;
+    title: string;
+    type: string;
+};
+/**
+ * @internal
+ */
+export declare type DataSourceSchema = {
+    title: string;
+    type: 'extract' | 'live';
+} & AnyObject;
+/**
+ * @internal
+ */
+export declare type DataSourceMetadata = {
+    title: string;
+    fullname: string;
+    live: boolean;
+};

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

@@ -6,7 +6,7 @@
  * Types
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JaqlSortDirection = exports.DataType = exports.DateLevels = exports.MetadataTypes = exports.Sort = exports.AggregationTypes = void 0;
+exports.CurrencyPosition = exports.JaqlSortDirection = exports.DataType = exports.DateLevels = exports.MetadataTypes = exports.Sort = exports.AggregationTypes = void 0;
 /**
  * Different aggregation types
  */
@@ -107,7 +107,8 @@ exports.MetadataTypes = {
             const type = o;
             return type.toLowerCase() === exports.MetadataTypes.BaseMeasure;
         }
-        return (o.agg || o.aggregation) && o.attribute && !this.isMeasureTemplate(o);
+        // JaqlElement doesn't have property attribute. Check for jaql instead
+        return (o.agg || o.aggregation) && (o.attribute || o.jaql) && !this.isMeasureTemplate(o);
     },
     /**
      * Checks whether the given object or type is a measure - of any type
@@ -300,3 +301,11 @@ var JaqlSortDirection;
     JaqlSortDirection["ASC"] = "asc";
     JaqlSortDirection["DESC"] = "desc";
 })(JaqlSortDirection = exports.JaqlSortDirection || (exports.JaqlSortDirection = {}));
+/**
+ * @internal
+ */
+var CurrencyPosition;
+(function (CurrencyPosition) {
+    CurrencyPosition["PRE"] = "pre";
+    CurrencyPosition["POST"] = "post";
+})(CurrencyPosition = exports.CurrencyPosition || (exports.CurrencyPosition = {}));

package/dist/cjs/index.d.ts

@@ -14,6 +14,7 @@ export * from './dimensional-model/data-model.js';
 export * from './dimensional-model/attributes.js';
 export * from './dimensional-model/dimensions.js';
 export * from './dimensional-model/factory.js';
+export * from './dimensional-model/jaql-element.js';
 export * from './dimensional-model/filters/filters.js';
 export { createFilterMatcher } from './dimensional-model/filters/utils/filter-matcher-utils.js';
 /**
@@ -91,3 +92,4 @@ export * from './dimensional-model/simple-column-types.js';
  */
 export * as analyticsFactory from './dimensional-model/analytics/factory.js';
 export * from './utils.js';
+export { type TranslationDictionary, PACKAGE_NAMESPACE as translationNamespace, } from './translation/resources/index.js';

package/dist/cjs/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyticsFactory = exports.measureFactory = exports.filterFactory = exports.createFilterMatcher = void 0;
+exports.translationNamespace = exports.analyticsFactory = exports.measureFactory = exports.filterFactory = exports.createFilterMatcher = void 0;
 require("./translation/initialize-i18n.js");
 /**
  * @packageDocumentation
@@ -43,6 +43,7 @@ __exportStar(require("./dimensional-model/data-model.js"), exports);
 __exportStar(require("./dimensional-model/attributes.js"), exports);
 __exportStar(require("./dimensional-model/dimensions.js"), exports);
 __exportStar(require("./dimensional-model/factory.js"), exports);
+__exportStar(require("./dimensional-model/jaql-element.js"), exports);
 __exportStar(require("./dimensional-model/filters/filters.js"), exports);
 var filter_matcher_utils_js_1 = require("./dimensional-model/filters/utils/filter-matcher-utils.js");
 Object.defineProperty(exports, "createFilterMatcher", { enumerable: true, get: function () { return filter_matcher_utils_js_1.createFilterMatcher; } });
@@ -121,3 +122,5 @@ __exportStar(require("./dimensional-model/simple-column-types.js"), exports);
  */
 exports.analyticsFactory = __importStar(require("./dimensional-model/analytics/factory.js"));
 __exportStar(require("./utils.js"), exports);
+var index_js_1 = require("./translation/resources/index.js");
+Object.defineProperty(exports, "translationNamespace", { enumerable: true, get: function () { return index_js_1.PACKAGE_NAMESPACE; } });

package/dist/cjs/translation/resources/en.d.ts

@@ -12,6 +12,7 @@ export declare const translation: {
                 noAttributeDimExpression: string;
                 noAggAggregation: string;
             };
+            notAFormula: string;
         };
         dataModelConfig: {
             noName: string;
@@ -21,8 +22,24 @@ export declare const translation: {
             unsupportedType: string;
             unsupportedDatetimeLevel: string;
             membersFilterNullMember: string;
+            unsupportedConditionFilter: string;
+            formulaFiltersNotSupported: string;
         };
         unsupportedDimensionalElement: string;
     };
 };
+/**
+ * A reference type containing all currently used translation keys.
+ * This type serves as a complete resource for creating custom translations,
+ * ensuring that all required keys are present and included.
+ * It can also be used as Partial to make sure custom translation does not contain any typos.
+ *
+ * @example
+ * ```typescript
+ * import { TranslationDictionary } from '@sisense/sdk-data';
+ *
+ * const customTranslationResources: Partial<TranslationDictionary> = {
+ * ```
+ * @internal
+ */
 export declare type TranslationDictionary = typeof translation;

package/dist/cjs/translation/resources/en.js

@@ -15,6 +15,7 @@ exports.translation = {
                 noAttributeDimExpression: "DimensionalBaseMeasure must have 'attribute'/'dim'/'expression' property",
                 noAggAggregation: "DimensionalBaseMeasure must have 'agg' or 'aggregation' property",
             },
+            notAFormula: 'Jaql is not a formula',
         },
         dataModelConfig: {
             noName: "'name' must be specified in config for DataModel",
@@ -24,6 +25,8 @@ exports.translation = {
             unsupportedType: 'Unsupported filter type: {{filterType}}',
             unsupportedDatetimeLevel: 'Filters do not support the next "datetime" levels: Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter of {{attributeId}} - member cannot be null',
+            unsupportedConditionFilter: 'Jaql contains unsupported condition filter: {{filter}}',
+            formulaFiltersNotSupported: 'Formula-based filter not supported yet: {{filter}}',
         },
         unsupportedDimensionalElement: 'Unsupported dimensional element type',
     },

package/dist/cjs/translation/resources/index.d.ts

@@ -1,5 +1,11 @@
 import { TranslationDictionary } from './en.js';
 export type { TranslationDictionary };
+/**
+ * A reference to the namespace of the translation resources.
+ * This namespace is used to access the translation resources in the i18next instance.
+ *
+ * @internal
+ */
 export declare const PACKAGE_NAMESPACE: "sdkData";
 export declare const resources: {
     en: {
@@ -13,6 +19,7 @@ export declare const resources: {
                     noAttributeDimExpression: string;
                     noAggAggregation: string;
                 };
+                notAFormula: string;
             };
             dataModelConfig: {
                 noName: string;
@@ -22,6 +29,8 @@ export declare const resources: {
                 unsupportedType: string;
                 unsupportedDatetimeLevel: string;
                 membersFilterNullMember: string;
+                unsupportedConditionFilter: string;
+                formulaFiltersNotSupported: string;
             };
             unsupportedDimensionalElement: string;
         };
@@ -37,6 +46,7 @@ export declare const resources: {
                     noAttributeDimExpression: string;
                     noAggAggregation: string;
                 };
+                notAFormula: string;
             };
             dataModelConfig: {
                 noName: string;
@@ -46,6 +56,8 @@ export declare const resources: {
                 unsupportedType: string;
                 unsupportedDatetimeLevel: string;
                 membersFilterNullMember: string;
+                unsupportedConditionFilter: string;
+                formulaFiltersNotSupported: string;
             };
             unsupportedDimensionalElement: string;
         };

package/dist/cjs/translation/resources/index.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resources = exports.PACKAGE_NAMESPACE = void 0;
 const en_js_1 = require("./en.js");
 const uk_js_1 = require("./uk.js");
+/**
+ * A reference to the namespace of the translation resources.
+ * This namespace is used to access the translation resources in the i18next instance.
+ *
+ * @internal
+ */
 exports.PACKAGE_NAMESPACE = 'sdkData';
 exports.resources = {
     en: en_js_1.translation,

package/dist/cjs/translation/resources/uk.js

@@ -15,6 +15,7 @@ exports.translation = {
                 noAttributeDimExpression: "DimensionalBaseMeasure має мати властивість 'attribute'/'dim'/'expression'",
                 noAggAggregation: "DimensionalBaseMeasure має мати властивість 'agg' або 'aggregation'",
             },
+            notAFormula: 'Jaql не формула',
         },
         dataModelConfig: {
             noName: "'name' має бути вказано в конфігурації для DataModel",
@@ -24,6 +25,8 @@ exports.translation = {
             unsupportedType: 'Непідтримуваний тип фільтра: {{filterType}}',
             unsupportedDatetimeLevel: 'Фільтри не підтримують наступні рівні "datetime": Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter у {{attributeId}} - member не може бути нульовим',
+            unsupportedConditionFilter: 'Jaql містить непідтримуваний condition фільтр: {{filter}}',
+            formulaFiltersNotSupported: 'Фільтри, що містять формули наразі не підтримуються: {{filter}}',
         },
         unsupportedDimensionalElement: 'Непідтримуваний тип елемента',
     },

package/dist/cjs/utils.d.ts

@@ -1,5 +1,7 @@
-import { Filter, FilterRelations, FilterRelationsJaql, DataSource, DataSourceInfo, FilterJaql, Sort, Attribute } from './index.js';
 import { JaqlDataSource } from './dimensional-model/filters/utils/types.js';
+import { Attribute, Filter, FilterRelations, FilterRelationsJaql, SortDirection } from './dimensional-model/interfaces.js';
+import { DataSource, DataSourceInfo } from './interfaces.js';
+import { FilterJaql, JaqlSortDirection, Sort } from './dimensional-model/types.js';
 /**
  * A more performant, but slightly bulkier, RFC4122v4 implementation. Performance is improved by minimizing calls to random()
  *
@@ -68,3 +70,11 @@ export declare function getTableNameFromAttribute(attribute: Attribute): string;
  * @internal
  */
 export declare function getColumnNameFromAttribute(attribute: Attribute): string;
+/**
+ * Gets the sort type based on the jaql sort direction.
+ *
+ * @param jaqlSort - The jaql sort direction.
+ * @returns  The sort direction.
+ * @internal
+ */
+export declare function getSortType(jaqlSort: `${JaqlSortDirection}` | undefined): SortDirection;

package/dist/cjs/utils.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.createFilterFromJaql = exports.convertSort = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelations = exports.guidFast = void 0;
+exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.createFilterFromJaql = exports.convertSort = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelations = exports.guidFast = void 0;
 const cloneDeep_js_1 = __importDefault(require("lodash-es/cloneDeep.js"));
-const index_js_1 = require("./index.js");
 const filter_from_jaql_util_js_1 = require("./dimensional-model/filters/utils/filter-from-jaql-util.js");
+const types_js_1 = require("./dimensional-model/types.js");
 /**
  * A more performant, but slightly bulkier, RFC4122v4 implementation. Performance is improved by minimizing calls to random()
  *
@@ -127,10 +127,10 @@ exports.convertJaqlDataSource = convertJaqlDataSource;
  */
 function convertSort(sort) {
     if (sort) {
-        return sort === 'asc' ? index_js_1.Sort.Ascending : index_js_1.Sort.Descending;
+        return sort === 'asc' ? types_js_1.Sort.Ascending : types_js_1.Sort.Descending;
     }
     else {
-        return index_js_1.Sort.None;
+        return types_js_1.Sort.None;
     }
 }
 exports.convertSort = convertSort;
@@ -162,7 +162,12 @@ function parseExpression(expression) {
     const [table, column] = expression.slice(1, -1).split('.');
     return {
         table,
-        column,
+        column: column
+            ? column
+                // in case of Date we have to remove the (Calendar) part
+                .replace('(Calendar)', '')
+                .trim()
+            : '',
     };
 }
 /**
@@ -183,3 +188,21 @@ function getColumnNameFromAttribute(attribute) {
     return parseExpression(attribute.expression).column;
 }
 exports.getColumnNameFromAttribute = getColumnNameFromAttribute;
+/**
+ * Gets the sort type based on the jaql sort direction.
+ *
+ * @param jaqlSort - The jaql sort direction.
+ * @returns  The sort direction.
+ * @internal
+ */
+function getSortType(jaqlSort) {
+    switch (jaqlSort) {
+        case types_js_1.JaqlSortDirection.ASC:
+            return 'sortAsc';
+        case types_js_1.JaqlSortDirection.DESC:
+            return 'sortDesc';
+        default:
+            return 'sortNone';
+    }
+}
+exports.getSortType = getSortType;

package/dist/dimensional-model/attributes.js

@@ -36,7 +36,7 @@ export class DimensionalAttribute extends 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
@@ -104,7 +104,7 @@ export 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
@@ -121,7 +121,7 @@ export 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
@@ -320,7 +320,7 @@ export 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);
 }
 /**
  * Creates a LevelAttribute instance from the given JSON object.
@@ -329,7 +329,7 @@ export function createAttribute(json) {
  * @internal
  */
 export 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);
 }
 /**
  * Normalize attribute name

package/dist/dimensional-model/base.js

@@ -53,7 +53,7 @@ export class DimensionalElement {
  */
 export 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/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/dimensional-model/dimensions.js

@@ -7,8 +7,8 @@ import { DimensionalElement, normalizeName } from './base.js';
  * @internal
  */
 export class DimensionalDimension extends DimensionalElement {
-    constructor(name, expression, attributes, dimensions, type, desc, sort) {
-        super(name, type || MetadataTypes.Dimension, desc);
+    constructor(name, expression, attributes, dimensions, type, desc, sort, dataSource) {
+        super(name, type || MetadataTypes.Dimension, desc, dataSource);
         this._dimensions = [];
         this._attributes = [];
         this._sort = Sort.None;
@@ -101,7 +101,7 @@ export class DimensionalDimension extends 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
@@ -150,23 +150,23 @@ export class DimensionalDimension extends DimensionalElement {
  * @internal
  */
 export class DimensionalDateDimension extends DimensionalDimension {
-    constructor(name, expression, desc, sort) {
-        super(name, expression, [], [], MetadataTypes.DateDimension, desc, sort);
+    constructor(name, expression, desc, sort, dataSource) {
+        super(name, expression, [], [], MetadataTypes.DateDimension, desc, sort, dataSource);
         this.defaultLevel = DateLevels.Years;
-        this.Years = new DimensionalLevelAttribute(DateLevels.Years, expression, DateLevels.Years, 'yyyy');
-        this.Quarters = new DimensionalLevelAttribute(DateLevels.Quarters, expression, DateLevels.Quarters, 'Q yyyy');
-        this.Months = new DimensionalLevelAttribute(DateLevels.Months, expression, DateLevels.Months, 'yyyy-MM');
-        this.Weeks = new DimensionalLevelAttribute(DateLevels.Weeks, expression, DateLevels.Weeks, 'ww yyyy');
-        this.Days = new DimensionalLevelAttribute(DateLevels.Days, expression, DateLevels.Days, 'yyyy-MM-dd');
-        this.Hours = new DimensionalLevelAttribute(DateLevels.Hours, expression, DateLevels.Hours, 'yyyy-MM-dd HH:mm');
-        this.MinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo30, expression, DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm');
-        this.MinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo15, expression, DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm');
-        this.Minutes = new DimensionalLevelAttribute(DateLevels.Minutes, expression, DateLevels.Minutes, 'yyyy-MM-dd HH:mm');
-        this.Seconds = new DimensionalLevelAttribute(DateLevels.Seconds, expression, DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss');
-        this.AggHours = new DimensionalLevelAttribute(DateLevels.AggHours, expression, DateLevels.AggHours, 'HH:mm');
-        this.AggMinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo30, expression, DateLevels.AggMinutesRoundTo30, 'HH:mm');
-        this.AggMinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo15, expression, DateLevels.AggMinutesRoundTo15, 'HH:mm');
-        this.AggMinutesRoundTo1 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo1, expression, DateLevels.AggMinutesRoundTo1, 'HH:mm');
+        this.Years = new DimensionalLevelAttribute(DateLevels.Years, expression, DateLevels.Years, 'yyyy', desc, sort, dataSource);
+        this.Quarters = new DimensionalLevelAttribute(DateLevels.Quarters, expression, DateLevels.Quarters, 'Q yyyy', desc, sort, dataSource);
+        this.Months = new DimensionalLevelAttribute(DateLevels.Months, expression, DateLevels.Months, 'yyyy-MM', desc, sort, dataSource);
+        this.Weeks = new DimensionalLevelAttribute(DateLevels.Weeks, expression, DateLevels.Weeks, 'ww yyyy', desc, sort, dataSource);
+        this.Days = new DimensionalLevelAttribute(DateLevels.Days, expression, DateLevels.Days, 'yyyy-MM-dd', desc, sort, dataSource);
+        this.Hours = new DimensionalLevelAttribute(DateLevels.Hours, expression, DateLevels.Hours, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo30, expression, DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.MinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo15, expression, DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Minutes = new DimensionalLevelAttribute(DateLevels.Minutes, expression, DateLevels.Minutes, 'yyyy-MM-dd HH:mm', desc, sort, dataSource);
+        this.Seconds = new DimensionalLevelAttribute(DateLevels.Seconds, expression, DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss', desc, sort, dataSource);
+        this.AggHours = new DimensionalLevelAttribute(DateLevels.AggHours, expression, DateLevels.AggHours, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo30, expression, DateLevels.AggMinutesRoundTo30, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo15, expression, DateLevels.AggMinutesRoundTo15, 'HH:mm', desc, sort, dataSource);
+        this.AggMinutesRoundTo1 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo1, expression, DateLevels.AggMinutesRoundTo1, 'HH:mm', desc, sort, dataSource);
         this.setAttributes([
             this.Years,
             this.Quarters,
@@ -211,7 +211,7 @@ export 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
@@ -250,9 +250,11 @@ export 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 == MetadataTypes.DateDimension) {
-        return new DimensionalDateDimension(name, expression, description);
+        return new DimensionalDateDimension(name, expression, description, sort, dataSource);
     }
     // attributes
     const atts = Object.getOwnPropertyNames(json)
@@ -263,12 +265,12 @@ export function createDimension(json) {
             let att;
             for (let i = 0; i < json.attributes.length; i++) {
                 att = json.attributes[i];
-                atts.push(new DimensionalAttribute(att.name, att.expression, att.type, att.description));
+                atts.push(new DimensionalAttribute(att.name, att.expression, att.type, att.description, att.sort, att.dataSource));
             }
         }
         // default attribute
         else if (expression) {
-            atts.push(new DimensionalAttribute(name, expression, type, description));
+            atts.push(new DimensionalAttribute(name, expression, type, description, sort, dataSource));
         }
     }
     // nested dimensions
@@ -280,7 +282,7 @@ export 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);
     }
@@ -301,5 +303,7 @@ export 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);
 }

package/dist/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.
  *