@sisense/sdk-data 1.18.1 → 1.19.0

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

@@ -14,7 +14,7 @@ exports.jaqlSimpleColumnType = jaqlSimpleColumnType;
  */
 class DimensionalAttribute extends base_js_1.DimensionalElement {
     constructor(name, expression, type, desc, sort) {
-        super((0, base_js_1.normalizeName)(name), type || types_js_1.MetadataTypes.Attribute, desc);
+        super(name, type || types_js_1.MetadataTypes.Attribute, desc);
         this._sort = types_js_1.Sort.None;
         this.expression = expression;
         this._sort = sort || types_js_1.Sort.None;

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

@@ -35,13 +35,14 @@ class DimensionalDimension extends base_js_1.DimensionalElement {
         return types_js_1.MetadataTypes.TextDimension;
     }
     getAttachedName(name, expression) {
-        let result = (0, base_js_1.normalizeName)(name);
+        let result = name;
         // if exists fallback to expression
-        if (result === 'id' ||
-            result === 'name' ||
-            Object.getOwnPropertyDescriptor(this, result) !== undefined ||
-            this[result] !== undefined) {
-            result = (0, base_js_1.normalizeName)(expression.replace('.', '_').replace('[', '').replace(']', ''));
+        const normalizedName = (0, base_js_1.normalizeName)(name);
+        if (normalizedName === 'id' ||
+            normalizedName === 'name' ||
+            Object.getOwnPropertyDescriptor(this, normalizedName) !== undefined ||
+            this[normalizedName] !== undefined) {
+            result = expression;
         }
         return result;
     }
@@ -49,7 +50,7 @@ class DimensionalDimension extends base_js_1.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[(0, base_js_1.normalizeName)(n)] = dimensions[i];
             if (n != dimensions[i].name) {
                 dimensions[i].name = n;
             }
@@ -59,7 +60,7 @@ class DimensionalDimension extends base_js_1.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[(0, base_js_1.normalizeName)(n)] = attributes[i];
             if (attributes[i].name != n) {
                 attributes[i].name = n;
             }

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

@@ -562,7 +562,7 @@ export declare function measureBase(attribute: Attribute, measure: Measure, oper
  * Filter for categories that have an average revenue equal 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureEquals(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -580,7 +580,7 @@ export declare function measureEquals(measure: BaseMeasure, value: number, guid?
  * to 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureGreaterThan(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -598,7 +598,7 @@ export declare function measureGreaterThan(measure: BaseMeasure, value: number,
  * or equal to 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureGreaterThanOrEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -616,7 +616,7 @@ export declare function measureGreaterThanOrEqual(measure: BaseMeasure, value: n
  * or equal to 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureLessThanOrEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   100
  * )
  * ```
@@ -633,7 +633,7 @@ export declare function measureLessThanOrEqual(measure: BaseMeasure, value: numb
  * Filter for categories that have an average revenue less than 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureLessThan(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   100
  * )
  * ```
@@ -651,7 +651,7 @@ export declare function measureLessThan(measure: BaseMeasure, value: number, gui
  * or equal to 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureBetween(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50,
  *   100
  * )
@@ -671,7 +671,7 @@ export declare function measureBetween(measure: BaseMeasure, valueA: number, val
  * 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureBetweenNotEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50,
  *   100
  * )
@@ -691,7 +691,7 @@ export declare function measureBetweenNotEqual(measure: BaseMeasure, valueA: num
  * ```ts
  * filterFactory.topRanking(
  *   DM.Commerce.AgeRange,
- *   measures.sum(DM.Commerce.Revenue),
+ *   measureFactory.sum(DM.Commerce.Revenue),
  *   3
  * )
  * ```
@@ -710,7 +710,7 @@ export declare function topRanking(attribute: Attribute, measure: Measure, count
  * ```ts
  * filterFactory.bottomRanking(
  *   DM.Commerce.AgeRange,
- *   measures.sum(DM.Commerce.Revenue),
+ *   measureFactory.sum(DM.Commerce.Revenue),
  *   3
  * )
  * ```

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

@@ -672,7 +672,7 @@ exports.measureBase = measureBase;
  * Filter for categories that have an average revenue equal 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureEquals(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -693,7 +693,7 @@ exports.measureEquals = measureEquals;
  * to 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureGreaterThan(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -714,7 +714,7 @@ exports.measureGreaterThan = measureGreaterThan;
  * or equal to 50 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureGreaterThanOrEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50
  * )
  * ```
@@ -735,7 +735,7 @@ exports.measureGreaterThanOrEqual = measureGreaterThanOrEqual;
  * or equal to 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureLessThanOrEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   100
  * )
  * ```
@@ -755,7 +755,7 @@ exports.measureLessThanOrEqual = measureLessThanOrEqual;
  * Filter for categories that have an average revenue less than 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureLessThan(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   100
  * )
  * ```
@@ -776,7 +776,7 @@ exports.measureLessThan = measureLessThan;
  * or equal to 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureBetween(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50,
  *   100
  * )
@@ -799,7 +799,7 @@ exports.measureBetween = measureBetween;
  * 100 in the Sample ECommerce data model.
  * ```ts
  * filterFactory.measureBetweenNotEqual(
- *   measures.average(DM.Commerce.Revenue),
+ *   measureFactory.average(DM.Commerce.Revenue),
  *   50,
  *   100
  * )
@@ -823,7 +823,7 @@ exports.measureBetweenNotEqual = measureBetweenNotEqual;
  * ```ts
  * filterFactory.topRanking(
  *   DM.Commerce.AgeRange,
- *   measures.sum(DM.Commerce.Revenue),
+ *   measureFactory.sum(DM.Commerce.Revenue),
  *   3
  * )
  * ```
@@ -845,7 +845,7 @@ exports.topRanking = topRanking;
  * ```ts
  * filterFactory.bottomRanking(
  *   DM.Commerce.AgeRange,
- *   measures.sum(DM.Commerce.Revenue),
+ *   measureFactory.sum(DM.Commerce.Revenue),
  *   3
  * )
  * ```

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

@@ -1,5 +1,6 @@
 import { LevelAttribute, Attribute, Measure, Filter } from '../interfaces.js';
 import { DimensionalElement } from '../base.js';
+import { AnyObject } from '../types.js';
 /**
  * Different text operators that can be used with text filters
  *
@@ -71,7 +72,7 @@ export declare const FilterTypes: {
     ranking: string;
     text: string;
     numeric: string;
-    date: string;
+    dateRange: string;
     relativeDate: string;
     cascading: string;
     advanced: string;
@@ -350,6 +351,83 @@ export declare class CustomFilter extends AbstractFilter {
      */
     filterJaql(): any;
 }
+/**
+ * Checks if a filter is a CustomFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isCustomFilter(filter: Filter & AnyObject): filter is CustomFilter;
+/**
+ * Checks if a filter is a MembersFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isMembersFilter(filter: Filter & AnyObject): filter is MembersFilter;
+/**
+ * Checks if a filter is a NumericFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isNumericFilter(filter: Filter & AnyObject): filter is NumericFilter;
+/**
+ * Checks if a filter is a TextFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isRankingFilter(filter: Filter & AnyObject): filter is RankingFilter;
+/**
+ * Checks if a filter is a MeasureFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isMeasureFilter(filter: Filter & AnyObject): filter is MeasureFilter;
+/**
+ * Checks if a filter is a ExcludeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isExcludeFilter(filter: Filter & AnyObject): filter is ExcludeFilter;
+/**
+ * Checks if a filter is a LogicalAttributeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isLogicalAttributeFilter(filter: Filter & AnyObject): filter is LogicalAttributeFilter;
+/**
+ * Checks if a filter is a CascadingFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isCascadingFilter(filter: Filter & AnyObject): filter is CascadingFilter;
+/**
+ * Checks if a filter is a RelativeDateFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isRelativeDateFilter(filter: Filter & AnyObject): filter is RelativeDateFilter;
+/**
+ * Checks if a filter is a TextFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isTextFilter(filter: Filter & AnyObject): filter is TextFilter;
+/**
+ * Checks if a filter is a DateRangeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+export declare function isDateRangeFilter(filter: Filter & AnyObject): filter is DateRangeFilter;
 /**
  * @param json - Filter JSON representation
  * @internal

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

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFilter = exports.CustomFilter = exports.RelativeDateFilter = exports.DateRangeFilter = exports.TextFilter = exports.NumericFilter = exports.RankingFilter = exports.MeasureFilter = exports.DoubleOperatorFilter = exports.ExcludeFilter = exports.CascadingFilter = exports.MembersFilter = exports.LogicalAttributeFilter = exports.FilterTypes = exports.RankingOperators = exports.LogicalOperators = exports.DateOperators = exports.NumericOperators = exports.TextOperators = void 0;
+exports.createFilter = exports.isDateRangeFilter = exports.isTextFilter = exports.isRelativeDateFilter = exports.isCascadingFilter = exports.isLogicalAttributeFilter = exports.isExcludeFilter = exports.isMeasureFilter = exports.isRankingFilter = exports.isNumericFilter = exports.isMembersFilter = exports.isCustomFilter = exports.CustomFilter = exports.RelativeDateFilter = exports.DateRangeFilter = exports.TextFilter = exports.NumericFilter = exports.RankingFilter = exports.MeasureFilter = exports.DoubleOperatorFilter = exports.ExcludeFilter = exports.CascadingFilter = exports.MembersFilter = exports.LogicalAttributeFilter = exports.FilterTypes = exports.RankingOperators = exports.LogicalOperators = exports.DateOperators = exports.NumericOperators = exports.TextOperators = void 0;
+/* eslint-disable max-lines */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -89,7 +90,7 @@ exports.FilterTypes = {
     ranking: 'ranking',
     text: 'text',
     numeric: 'numeric',
-    date: 'date',
+    dateRange: 'dateRange',
     relativeDate: 'relativeDate',
     cascading: 'cascading',
     advanced: 'advanced',
@@ -546,7 +547,7 @@ exports.TextFilter = TextFilter;
  */
 class DateRangeFilter extends DoubleOperatorFilter {
     constructor(l, valueFrom, valueTo, guid) {
-        super(l, exports.FilterTypes.date, exports.DateOperators.From, valueFrom, exports.DateOperators.To, valueTo, guid);
+        super(l, exports.FilterTypes.dateRange, exports.DateOperators.From, valueFrom, exports.DateOperators.To, valueTo, guid);
         if (typeof valueFrom === 'object') {
             this.valueA = valueFrom.toISOString();
         }
@@ -663,6 +664,116 @@ class CustomFilter extends AbstractFilter {
     }
 }
 exports.CustomFilter = CustomFilter;
+/**
+ * Checks if a filter is a CustomFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isCustomFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.advanced;
+}
+exports.isCustomFilter = isCustomFilter;
+/**
+ * Checks if a filter is a MembersFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isMembersFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.members;
+}
+exports.isMembersFilter = isMembersFilter;
+/**
+ * Checks if a filter is a NumericFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isNumericFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.numeric;
+}
+exports.isNumericFilter = isNumericFilter;
+/**
+ * Checks if a filter is a TextFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isRankingFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.ranking;
+}
+exports.isRankingFilter = isRankingFilter;
+/**
+ * Checks if a filter is a MeasureFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isMeasureFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.measure;
+}
+exports.isMeasureFilter = isMeasureFilter;
+/**
+ * Checks if a filter is a ExcludeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isExcludeFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.exclude;
+}
+exports.isExcludeFilter = isExcludeFilter;
+/**
+ * Checks if a filter is a LogicalAttributeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isLogicalAttributeFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.logicalAttribute;
+}
+exports.isLogicalAttributeFilter = isLogicalAttributeFilter;
+/**
+ * Checks if a filter is a CascadingFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isCascadingFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.cascading;
+}
+exports.isCascadingFilter = isCascadingFilter;
+/**
+ * Checks if a filter is a RelativeDateFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isRelativeDateFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.relativeDate;
+}
+exports.isRelativeDateFilter = isRelativeDateFilter;
+/**
+ * Checks if a filter is a TextFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isTextFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.text;
+}
+exports.isTextFilter = isTextFilter;
+/**
+ * Checks if a filter is a DateRangeFilter.
+ *
+ * @param filter - The filter to check.
+ * @internal
+ */
+function isDateRangeFilter(filter) {
+    return 'filterType' in filter && filter.filterType === exports.FilterTypes.dateRange;
+}
+exports.isDateRangeFilter = isDateRangeFilter;
 /**
  * @param json - Filter JSON representation
  * @internal
@@ -693,7 +804,7 @@ function createFilter(json) {
         case exports.FilterTypes.relativeDate:
             return new RelativeDateFilter((0, factory_js_1.create)(json.attribute), json.offset, json.count, json.operator, json.anchor);
             break;
-        case exports.FilterTypes.date:
+        case exports.FilterTypes.dateRange:
             return new DateRangeFilter((0, factory_js_1.create)(json.attribute), json.valueA, json.valueB);
             break;
     }

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

@@ -9,9 +9,10 @@ import { FilterJaqlInternal, RankingFilterJaql } from './types.js';
  * @param column - Column name
  * @param level - Date level
  * @param dataType - Data type
+ * @param title - Attribute title
  * @returns attribute or level attribute
  */
-export declare const createAttributeHelper: (dim: string, table: string | undefined, column: string, level: string | undefined, dataType: string) => Attribute | LevelAttribute;
+export declare const createAttributeHelper: (dim: string, table: string | undefined, column: string, level: string | undefined, dataType: string, title?: string) => Attribute | LevelAttribute;
 /**
  * Creates an attribute or level attribute from the provided filter JAQL object
  *
@@ -30,7 +31,7 @@ export declare const createAttributeFromFilterJaql: (jaql: FilterJaql | FilterJa
  * @param agg - Aggregation function
  * @returns measure
  */
-export declare const createMeasureHelper: (dim: string, table: string | undefined, column: string, level: string | undefined, dataType: string, agg: string) => BaseMeasure;
+export declare const createMeasureHelper: (dim: string, table: string | undefined, column: string, level: string | undefined, dataType: string, agg: string, title?: string) => BaseMeasure;
 /**
  * Creates a measure from the provided filter JAQL object
  *

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

@@ -37,22 +37,23 @@ const DATA_MODEL_MODULE_NAME = 'DM';
  * @param column - Column name
  * @param level - Date level
  * @param dataType - Data type
+ * @param title - Attribute title
  * @returns attribute or level attribute
  */
-const createAttributeHelper = (dim, table, column, level, dataType) => {
+const createAttributeHelper = (dim, table, column, level, dataType, title) => {
     // 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);
         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);
     attribute.composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, column, undefined, DATA_MODEL_MODULE_NAME);
     return attribute;
 };
@@ -64,7 +65,7 @@ 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);
+    return (0, exports.createAttributeHelper)(jaql.dim, jaql.table, jaql.column, jaql.level, jaql.datatype, jaql.title);
 };
 exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
 /**
@@ -78,8 +79,8 @@ exports.createAttributeFromFilterJaql = createAttributeFromFilterJaql;
  * @param agg - Aggregation function
  * @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) => {
+    const attribute = (0, exports.createAttributeHelper)(dim, table, column, level, dataType, title);
     const measure = measureFactory.aggregate(attribute, agg);
     measure.composeCode = `measureFactory.${agg}(${attribute.composeCode})`;
     return measure;
@@ -92,10 +93,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 } = 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);
 };
 exports.createMeasureFromFilterJaql = createMeasureFromFilterJaql;
 /**

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

@@ -344,6 +344,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

@@ -258,7 +258,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

@@ -398,7 +398,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

@@ -190,6 +190,7 @@ export declare type BaseJaql = {
             jaql: FilterJaql;
         };
     };
+    merged?: boolean;
 };
 /** @internal */
 export declare type FormulaID = string;
@@ -255,4 +256,8 @@ declare type AndFilter<FilterItem> = {
 export declare type OrFilter<FilterItem> = {
     or: FilterItem[];
 };
+/**
+ * Abstract object with any unknown values
+ */
+export declare type AnyObject = Record<string, any>;
 export {};

package/dist/dimensional-model/attributes.js

@@ -10,7 +10,7 @@ export const jaqlSimpleColumnType = (datatype) => simpleColumnType(datatype).rep
  */
 export class DimensionalAttribute extends DimensionalElement {
     constructor(name, expression, type, desc, sort) {
-        super(normalizeName(name), type || MetadataTypes.Attribute, desc);
+        super(name, type || MetadataTypes.Attribute, desc);
         this._sort = Sort.None;
         this.expression = expression;
         this._sort = sort || Sort.None;

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;
             }