@sisense/sdk-data 1.18.1 → 1.20.0

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

@@ -23,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMeasureFromRankingFilterJaql = exports.createMeasureFromFilterJaql = exports.createMeasureHelper = exports.createAttributeFromFilterJaql = exports.createAttributeHelper = void 0;
+exports.createMeasureFromRankingFilterJaql = exports.createMeasureFromFilterJaql = exports.createCalculatedMeasureFromJaql = exports.createMeasureHelper = exports.createAttributeFromFilterJaql = exports.createAttributeHelper = void 0;
 const attributes_js_1 = require("../../attributes.js");
 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 DATA_MODEL_MODULE_NAME = 'DM';
 /**
  * Creates an attribute or level attribute from the provided parameters
@@ -37,22 +38,24 @@ const DATA_MODEL_MODULE_NAME = 'DM';
  * @param column - Column name
  * @param level - Date level
  * @param dataType - Data type
+ * @param title - Attribute title
+ * @param dataSource - Jaql data source
  * @returns attribute or level attribute
  */
-const createAttributeHelper = (dim, table, column, level, dataType) => {
+const createAttributeHelper = (dim, table, column, level, dataType, title, dataSource) => {
     // if table is undefined, extract it from dim
     const dimTable = table !== null && table !== void 0 ? table : dim.slice(1, -1).split('.')[0];
     if (level) {
         const dateLevel = attributes_js_1.DimensionalLevelAttribute.translateJaqlToGranularity({ level });
         const format = attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(dateLevel);
-        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(column, dim, dateLevel, format);
+        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : column, dim, dateLevel, format, undefined, undefined, dataSource);
         levelAttribute.composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, column, level, DATA_MODEL_MODULE_NAME);
         return levelAttribute;
     }
     const attributeType = (0, simple_column_types_js_1.isNumber)(dataType)
         ? types_js_1.MetadataTypes.NumericAttribute
         : types_js_1.MetadataTypes.TextAttribute;
-    const attribute = new attributes_js_1.DimensionalAttribute(column, dim, attributeType);
+    const attribute = new attributes_js_1.DimensionalAttribute(title !== null && title !== void 0 ? title : column, dim, attributeType, undefined, undefined, dataSource);
     attribute.composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, column, undefined, DATA_MODEL_MODULE_NAME);
     return attribute;
 };
@@ -64,7 +67,8 @@ exports.createAttributeHelper = createAttributeHelper;
  * @returns attribute or level attribute
  */
 const createAttributeFromFilterJaql = (jaql) => {
-    return (0, exports.createAttributeHelper)(jaql.dim, jaql.table, jaql.column, jaql.level, jaql.datatype);
+    const { dim, table, column, level, datatype, title, datasource: dataSource } = jaql;
+    return (0, exports.createAttributeHelper)(dim, table, column, level, datatype, title, dataSource);
 };
 exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
 /**
@@ -76,15 +80,31 @@ exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
  * @param level - Date level
  * @param dataType - Data type
  * @param agg - Aggregation function
+ * @param title - Measure title
+ * @param dataSource - data source provided in JAQL
  * @returns measure
  */
-const createMeasureHelper = (dim, table, column, level, dataType, agg) => {
-    const attribute = (0, exports.createAttributeHelper)(dim, table, column, level, dataType);
+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);
     measure.composeCode = `measureFactory.${agg}(${attribute.composeCode})`;
     return measure;
 };
 exports.createMeasureHelper = createMeasureHelper;
+/**
+ * Creates a calculated measure from the provided filter JAQL object
+ *
+ * @param jaql - custom formula jaql
+ * @returns calculated measure
+ */
+const createCalculatedMeasureFromJaql = (jaql) => {
+    const measure = (0, factory_js_1.transformCustomFormulaJaql)(jaql);
+    // TBD (SNS-108945)
+    // Handle preparation of 'composeCode' for formula
+    measure.composeCode = `'Formula code to be implemented'`;
+    return measure;
+};
+exports.createCalculatedMeasureFromJaql = createCalculatedMeasureFromJaql;
 /**
  * Creates a measure from the provided filter JAQL object
  *
@@ -92,10 +112,10 @@ exports.createMeasureHelper = createMeasureHelper;
  * @returns Measure
  */
 const createMeasureFromFilterJaql = (jaql) => {
-    const { dim, table, column, level, datatype: dataType, agg } = 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);
+    return (0, exports.createMeasureHelper)(dim, table, column, level, dataType, agg, title, dataSource);
 };
 exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
 /**
@@ -105,6 +125,8 @@ exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
  * @returns Measure
  */
 const createMeasureFromRankingFilterJaql = (jaql) => {
+    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);
 };

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

@@ -112,12 +112,14 @@ const createAttributeFilterFromConditionFilterJaql = (attribute, conditionFilter
     const conditionType = (0, exports.getSelectedConditionOption)(conditionFilterJaql);
     switch (conditionType) {
         case types_js_1.ConditionFilterType.BOTTOM:
-            if (conditionFilterJaql.by && 'agg' in conditionFilterJaql.by) {
+            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);
             }
             break;
         case types_js_1.ConditionFilterType.EQUALS:
             return (0, filter_code_util_js_1.withComposeCode)(filterFactory.equals)(attribute, conditionFilterJaql[types_js_1.ConditionFilterType.EQUALS], guid);
+        case types_js_1.ConditionFilterType.DOESNT_EQUAL:
+            return (0, filter_code_util_js_1.withComposeCode)(filterFactory.doesntEqual)(attribute, conditionFilterJaql[types_js_1.ConditionFilterType.DOESNT_EQUAL], guid);
         case types_js_1.ConditionFilterType.GREATER_THAN:
             return (0, filter_code_util_js_1.withComposeCode)(filterFactory.greaterThan)(attribute, conditionFilterJaql[types_js_1.ConditionFilterType.GREATER_THAN], guid);
         case types_js_1.ConditionFilterType.GREATER_THAN_OR_EQUAL:

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

@@ -211,7 +211,7 @@ const createFilterFromJaqlInternal = (jaql, guid) => {
     }
     catch (e) {
         // if a filter type is untranslatable, fall back to the generic pass-through JAQL filter
-        // console.error(e);
+        console.debug('Fall back to generic pass-through JAQL filter due to filter translation error:', e);
     }
     return (0, exports.createGenericFilter)(jaql, guid);
 };

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

@@ -1,15 +1,21 @@
+import { FormulaContext, FormulaJaql } from '../../types.js';
 declare type RequireOnlyOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
     [K in Keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<Keys, K>, undefined>>;
 }[Keys];
 export declare type JaqlContext = Record<string, Partial<FilterJaqlInternal>>;
 export declare type Id = string;
-export declare type Datasource = {
-    address: Id;
-    database: string;
-    id: string;
+/**
+ * Data source as specified in the jaql
+ *
+ * @internal
+ */
+export declare type JaqlDataSource = {
+    address?: Id;
+    database?: string;
+    id?: string;
     title: string;
     live?: boolean;
-    fullname: string;
+    fullname?: string;
     lastBuildTime?: string;
     revisionId?: string;
 };
@@ -56,6 +62,9 @@ export interface RangeFilterJaql extends BaseFilterJaql {
     to?: string | number;
     multiSelection?: boolean;
 }
+export declare type CustomFormulaJaql = (FormulaJaql & {
+    context?: FormulaJaql | FormulaContext;
+}) | FormulaContext;
 export declare type RankingFilterJaql = {
     agg: string;
     column: string;
@@ -120,7 +129,7 @@ export declare enum DatetimeLevel {
 export declare type FilterJaqlInternal = {
     title: string;
     column: string;
-    datasource?: Datasource;
+    datasource?: JaqlDataSource;
     datatype: string;
     dim: string;
     dimension?: string;

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

@@ -1,5 +1,5 @@
 import { DataSource } from '../interfaces.js';
-import { Sort } from './types.js';
+import { JaqlDataSource, Sort } from './types.js';
 /**
  * @internal
  */
@@ -35,6 +35,12 @@ export interface Element {
      * @internal
      */
     readonly id: string;
+    /**
+     * Data Source
+     *
+     * @internal
+     */
+    readonly dataSource?: JaqlDataSource;
     /**
      * Gets a serializable representation of the element.
      *
@@ -344,6 +350,10 @@ export interface Filter extends Element {
      * Attribute this filter instance is filtering
      */
     readonly attribute: Attribute;
+    /**
+     * Filter type
+     */
+    readonly filterType: string;
     /**
      * Boolean flag whether the filter is a scope filter
      */

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

@@ -1,5 +1,6 @@
 import { Attribute, Measure, Filter, CalculatedMeasure, BaseMeasure, CustomFormulaContext } from '../interfaces.js';
 import { ForecastFormulaOptions, TrendFormulaOptions } from '../../interfaces.js';
+import { CustomFormulaJaql } from '../filters/utils/types.js';
 /**
  * Defines the different numeric operators that can be used with numeric filters
  *
@@ -32,6 +33,16 @@ export declare const RankingSortTypes: {
     Ascending: string;
     Descending: string;
 };
+/**
+ * Transforms a custom formula jaql into a calculated measure instance.
+ *
+ * As custom formulas can be nested, the function performs a recursive transformation via a helper function.
+ *
+ * @param jaql - Custom formula jaql
+ * @returns Calculated measure instance
+ * @internal
+ */
+export declare function transformCustomFormulaJaql(jaql: CustomFormulaJaql): CalculatedMeasure;
 /**
  * Creates a calculated measure for a valid custom formula built from [base functions](/guides/sdk/reference/functions.html#measured-value-functions).
  *
@@ -78,7 +89,6 @@ export declare const RankingSortTypes: {
  *   },
  * );
  * ```
- *
  * @param title - Title of the measure to be displayed in legend
  * @param formula - Formula to be used for the measure
  * @param context - Formula context as a map of strings to attributes, measures, or filters
@@ -258,7 +268,7 @@ export declare function countDistinct(attribute: Attribute, name?: string, forma
  * ```ts
  * measureFactory.measuredValue(
  *   measureFactory.sum(DM.Commerce.Cost),
- *   [filters.greaterThan(DM.Commerce.Cost, 100)],
+ *   [filterFactory.greaterThan(DM.Commerce.Cost, 100)],
  *   'Cost Greater Than 100'
  * ),
  * ```

package/dist/cjs/dimensional-model/measures/factory.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.rank = exports.forecast = exports.trend = exports.contribution = exports.pastYear = exports.pastQuarter = exports.pastMonth = exports.pastWeek = exports.pastDay = exports.diffPastYear = exports.diffPastQuarter = exports.diffPastMonth = exports.diffPastWeek = exports.difference = exports.growthPastYear = exports.growthPastQuarter = exports.growthPastMonth = exports.growthPastWeek = exports.growthRate = exports.growth = exports.runningSum = exports.weekToDateSum = exports.monthToDateSum = exports.quarterToDateSum = exports.yearToDateSum = exports.divide = exports.multiply = exports.subtract = exports.add = exports.measuredValue = exports.countDistinct = exports.count = exports.median = exports.max = exports.min = exports.avg = exports.average = exports.sum = exports.constant = exports.aggregate = exports.customFormula = exports.RankingSortTypes = exports.RankingTypes = void 0;
+exports.rank = exports.forecast = exports.trend = exports.contribution = exports.pastYear = exports.pastQuarter = exports.pastMonth = exports.pastWeek = exports.pastDay = exports.diffPastYear = exports.diffPastQuarter = exports.diffPastMonth = exports.diffPastWeek = exports.difference = exports.growthPastYear = exports.growthPastQuarter = exports.growthPastMonth = exports.growthPastWeek = exports.growthRate = exports.growth = exports.runningSum = exports.weekToDateSum = exports.monthToDateSum = exports.quarterToDateSum = exports.yearToDateSum = exports.divide = exports.multiply = exports.subtract = exports.add = exports.measuredValue = exports.countDistinct = exports.count = exports.median = exports.max = exports.min = exports.avg = exports.average = exports.sum = exports.constant = exports.aggregate = exports.customFormula = exports.transformCustomFormulaJaql = exports.RankingSortTypes = exports.RankingTypes = void 0;
 const measures_js_1 = require("./measures.js");
 const types_js_1 = require("../types.js");
 const base_js_1 = require("../base.js");
@@ -109,6 +109,7 @@ function transformFormulaJaqlHelper(jaql) {
  *
  * @param jaql - Custom formula jaql
  * @returns Calculated measure instance
+ * @internal
  */
 function transformCustomFormulaJaql(jaql) {
     var _a;
@@ -120,6 +121,7 @@ function transformCustomFormulaJaql(jaql) {
     const context = (0, mapValues_js_1.default)((_a = jaql.context) !== null && _a !== void 0 ? _a : {}, (jaqlContextValue) => jaqlContextValue ? transformFormulaJaqlHelper(jaqlContextValue) : {});
     return new measures_js_1.DimensionalCalculatedMeasure(jaql.title, jaql.formula, context, undefined, undefined, sort);
 }
+exports.transformCustomFormulaJaql = transformCustomFormulaJaql;
 /**
  * Creates a calculated measure for a valid custom formula built from [base functions](/guides/sdk/reference/functions.html#measured-value-functions).
  *
@@ -166,7 +168,6 @@ function transformCustomFormulaJaql(jaql) {
  *   },
  * );
  * ```
- *
  * @param title - Title of the measure to be displayed in legend
  * @param formula - Formula to be used for the measure
  * @param context - Formula context as a map of strings to attributes, measures, or filters
@@ -398,7 +399,7 @@ exports.countDistinct = countDistinct;
  * ```ts
  * measureFactory.measuredValue(
  *   measureFactory.sum(DM.Commerce.Cost),
- *   [filters.greaterThan(DM.Commerce.Cost, 100)],
+ *   [filterFactory.greaterThan(DM.Commerce.Cost, 100)],
  *   'Cost Greater Than 100'
  * ),
  * ```

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

@@ -1,4 +1,9 @@
-import { type ConditionFilterJaql } from './filters/utils/types.js';
+import { JaqlDataSource, type ConditionFilterJaql } from './filters/utils/types.js';
+import { Attribute } from './interfaces.js';
+/**
+ * @internal
+ */
+export type { JaqlDataSource };
 /**
  * Different aggregation types
  */
@@ -123,7 +128,7 @@ export declare const MetadataTypes: {
      * @param o - object to check
      * @returns true if the object or type is an attribute - of any type
      */
-    isAttribute(o: any): boolean;
+    isAttribute(o: any): o is Attribute;
     /**
      * Checks whether the given object or type is a filter
      *
@@ -182,6 +187,7 @@ export declare type BaseJaql = {
     dim: string;
     table: string;
     column: string;
+    datasource?: JaqlDataSource;
     title: string;
     level?: 'years' | 'quarters' | 'months' | 'weeks' | 'minutes' | 'days';
     sort?: `${JaqlSortDirection}`;
@@ -190,6 +196,7 @@ export declare type BaseJaql = {
             jaql: FilterJaql;
         };
     };
+    merged?: boolean;
 };
 /** @internal */
 export declare type FormulaID = string;
@@ -255,4 +262,7 @@ declare type AndFilter<FilterItem> = {
 export declare type OrFilter<FilterItem> = {
     or: FilterItem[];
 };
-export {};
+/**
+ * Abstract object with any unknown values
+ */
+export declare type AnyObject = Record<string, any>;

package/dist/cjs/utils.d.ts

@@ -1,4 +1,5 @@
-import { Filter, FilterRelations, FilterRelationsJaql, DataSource, DataSourceInfo, FilterJaql, Sort } from './index.js';
+import { Filter, FilterRelations, FilterRelationsJaql, DataSource, DataSourceInfo, FilterJaql, Sort, Attribute } from './index.js';
+import { JaqlDataSource } from './dimensional-model/filters/utils/types.js';
 /**
  * A more performant, but slightly bulkier, RFC4122v4 implementation. Performance is improved by minimizing calls to random()
  *
@@ -26,11 +27,23 @@ export declare function getDataSourceName(dataSource: DataSource): string;
  * @internal
  */
 export declare function isDataSourceInfo(dataSource: DataSource): dataSource is DataSourceInfo;
+/**
+ * Converts a JaqlDataSource to DataSource.
+ *
+ * @internal
+ */
+export declare function convertDataSource(jaqlDataSource: JaqlDataSource): DataSource;
+/**
+ * Converts a DataSource to a description of data source used in JAQL.
+ *
+ * @internal
+ */
+export declare function convertJaqlDataSource(dataSource: DataSource): JaqlDataSource;
 /**
  * Converts a string to a Sort enum
+ *
  * @param sort - The string to convert
  * @returns The converted Sort enum
- *
  * @internal
  */
 export declare function convertSort(sort?: string): Sort;
@@ -43,3 +56,15 @@ export declare function convertSort(sort?: string): Sort;
  * @internal
  */
 export declare const createFilterFromJaql: (jaql: FilterJaql, instanceid?: string) => Filter;
+/**
+ * Retrieves the table value from the attribute.
+ *
+ * @internal
+ */
+export declare function getTableNameFromAttribute(attribute: Attribute): string;
+/**
+ * Retrieves the column value from the attribute.
+ *
+ * @internal
+ */
+export declare function getColumnNameFromAttribute(attribute: Attribute): string;

package/dist/cjs/utils.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.createFilterFromJaql = exports.convertSort = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelations = exports.guidFast = void 0;
+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");
@@ -89,11 +89,40 @@ function isDataSourceInfo(dataSource) {
     return typeof dataSource === 'object' && 'type' in dataSource && 'title' in dataSource;
 }
 exports.isDataSourceInfo = isDataSourceInfo;
+/**
+ * Converts a JaqlDataSource to DataSource.
+ *
+ * @internal
+ */
+function convertDataSource(jaqlDataSource) {
+    return {
+        title: jaqlDataSource.title,
+        type: jaqlDataSource.live ? 'live' : 'elasticube',
+    };
+}
+exports.convertDataSource = convertDataSource;
+/**
+ * Converts a DataSource to a description of data source used in JAQL.
+ *
+ * @internal
+ */
+function convertJaqlDataSource(dataSource) {
+    return isDataSourceInfo(dataSource)
+        ? {
+            title: dataSource.title,
+            live: dataSource.type === 'live',
+        }
+        : {
+            title: dataSource,
+            live: false,
+        };
+}
+exports.convertJaqlDataSource = convertJaqlDataSource;
 /**
  * Converts a string to a Sort enum
+ *
  * @param sort - The string to convert
  * @returns The converted Sort enum
- *
  * @internal
  */
 function convertSort(sort) {
@@ -124,3 +153,33 @@ const createFilterFromJaql = (jaql, instanceid) => {
     return filter;
 };
 exports.createFilterFromJaql = createFilterFromJaql;
+/**
+ * Extracts the table and column names from the given expression string.
+ *
+ * @internal
+ */
+function parseExpression(expression) {
+    const [table, column] = expression.slice(1, -1).split('.');
+    return {
+        table,
+        column,
+    };
+}
+/**
+ * Retrieves the table value from the attribute.
+ *
+ * @internal
+ */
+function getTableNameFromAttribute(attribute) {
+    return parseExpression(attribute.expression).table;
+}
+exports.getTableNameFromAttribute = getTableNameFromAttribute;
+/**
+ * Retrieves the column value from the attribute.
+ *
+ * @internal
+ */
+function getColumnNameFromAttribute(attribute) {
+    return parseExpression(attribute.expression).column;
+}
+exports.getColumnNameFromAttribute = getColumnNameFromAttribute;

package/dist/dimensional-model/attributes.d.ts

@@ -1,5 +1,5 @@
 import { Attribute, LevelAttribute } from './interfaces.js';
-import { Sort } from './types.js';
+import { Sort, JaqlDataSource } from './types.js';
 import { DimensionalElement } from './base.js';
 /**
  * @internal
@@ -11,7 +11,7 @@ export declare const jaqlSimpleColumnType: (datatype: string) => string;
 export declare class DimensionalAttribute extends DimensionalElement implements Attribute {
     readonly expression: string;
     protected _sort: Sort;
-    constructor(name: string, expression: string, type?: string, desc?: string, sort?: Sort);
+    constructor(name: string, expression: string, type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
     /**
      * gets the element's ID
      */
@@ -46,7 +46,7 @@ export declare class DimensionalAttribute extends DimensionalElement implements
 export declare class DimensionalLevelAttribute extends DimensionalAttribute implements LevelAttribute {
     private _format;
     readonly granularity: string;
-    constructor(l: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort);
+    constructor(l: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
     /**
      * gets the element's ID
      */

package/dist/dimensional-model/attributes.js

@@ -9,8 +9,8 @@ export const jaqlSimpleColumnType = (datatype) => simpleColumnType(datatype).rep
  * @internal
  */
 export class DimensionalAttribute extends DimensionalElement {
-    constructor(name, expression, type, desc, sort) {
-        super(normalizeName(name), type || MetadataTypes.Attribute, desc);
+    constructor(name, expression, type, desc, sort, dataSource) {
+        super(name, type || MetadataTypes.Attribute, desc, dataSource);
         this._sort = Sort.None;
         this.expression = expression;
         this._sort = sort || Sort.None;
@@ -72,8 +72,8 @@ export class DimensionalAttribute extends DimensionalElement {
  * @internal
  */
 export class DimensionalLevelAttribute extends DimensionalAttribute {
-    constructor(l, expression, granularity, format, desc, sort) {
-        super(l, expression, MetadataTypes.DateLevel, desc, sort);
+    constructor(l, expression, granularity, format, desc, sort, dataSource) {
+        super(l, expression, MetadataTypes.DateLevel, desc, sort, dataSource);
         this._format = format;
         this.granularity = granularity;
     }

package/dist/dimensional-model/base.d.ts

@@ -1,4 +1,5 @@
 import { Element } from './interfaces.js';
+import { JaqlDataSource } from './types.js';
 /**
  * @internal
  */
@@ -7,12 +8,20 @@ export declare abstract class DimensionalElement implements Element {
      * @internal
      */
     private _name;
+    /**
+     * @internal
+     */
+    private readonly _dataSource;
     /**
      * Defines the element's name
      */
     get name(): string;
     set name(value: string);
-    constructor(name: string, type: string, desc?: string);
+    /**
+     * Defines the element's data source
+     */
+    get dataSource(): JaqlDataSource;
+    constructor(name: string, type: string, desc?: string, dataSource?: JaqlDataSource);
     /**
      * gets the element's description
      */

package/dist/dimensional-model/base.js

@@ -2,10 +2,13 @@
  * @internal
  */
 export class DimensionalElement {
-    constructor(name, type, desc) {
+    constructor(name, type, desc, dataSource) {
         this._name = name;
         this.type = type;
         this.description = desc || '';
+        if (dataSource) {
+            this._dataSource = dataSource;
+        }
     }
     /**
      * Defines the element's name
@@ -16,6 +19,12 @@ export class DimensionalElement {
     set name(value) {
         this._name = value;
     }
+    /**
+     * Defines the element's data source
+     */
+    get dataSource() {
+        return this._dataSource;
+    }
     /**
      * Gets a serializable representation of the element
      */
@@ -24,6 +33,7 @@ export class DimensionalElement {
             name: this.name,
             type: this.type,
             desc: this.description,
+            dataSource: this.dataSource,
             __serializable: 'DimensionalElement',
         };
     }

package/dist/dimensional-model/dimensions.js

@@ -32,13 +32,14 @@ export class DimensionalDimension extends DimensionalElement {
         return MetadataTypes.TextDimension;
     }
     getAttachedName(name, expression) {
-        let result = normalizeName(name);
+        let result = name;
         // if exists fallback to expression
-        if (result === 'id' ||
-            result === 'name' ||
-            Object.getOwnPropertyDescriptor(this, result) !== undefined ||
-            this[result] !== undefined) {
-            result = normalizeName(expression.replace('.', '_').replace('[', '').replace(']', ''));
+        const normalizedName = normalizeName(name);
+        if (normalizedName === 'id' ||
+            normalizedName === 'name' ||
+            Object.getOwnPropertyDescriptor(this, normalizedName) !== undefined ||
+            this[normalizedName] !== undefined) {
+            result = expression;
         }
         return result;
     }
@@ -46,7 +47,7 @@ export class DimensionalDimension extends DimensionalElement {
         this._dimensions = dimensions;
         for (let i = 0; i < dimensions.length; i++) {
             const n = this.getAttachedName(dimensions[i].name, dimensions[i].attributes[0].expression);
-            this[n] = dimensions[i];
+            this[normalizeName(n)] = dimensions[i];
             if (n != dimensions[i].name) {
                 dimensions[i].name = n;
             }
@@ -56,7 +57,7 @@ export class DimensionalDimension extends DimensionalElement {
         this._attributes = attributes || [];
         for (let i = 0; i < attributes.length; i++) {
             const n = this.getAttachedName(attributes[i].name, attributes[i].expression);
-            this[n] = attributes[i];
+            this[normalizeName(n)] = attributes[i];
             if (attributes[i].name != n) {
                 attributes[i].name = n;
             }