@sisense/sdk-data 1.33.0 → 2.0.0

package/dist/cjs/utils.js

@@ -1,18 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDimensionalElementFromJaql = exports.createCalculatedMeasureHelper = exports.createMeasureHelper = exports.createAttributeHelper = exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.createFilterFromJaql = exports.convertSort = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelationsJaql = exports.guidFast = void 0;
+exports.getGranularityFromJaql = exports.createDimensionalElementFromJaql = exports.createCalculatedMeasureHelper = exports.createMeasureHelper = exports.createAttributeHelper = exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.parseExpression = exports.createFilterFromJaql = exports.convertSortDirectionToSort = exports.convertSort = exports.convertJaqlDataSourceForDto = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelationsJaql = exports.guidFast = void 0;
 const cloneDeep_js_1 = __importDefault(require("lodash-es/cloneDeep.js"));
 const mapValues_js_1 = __importDefault(require("lodash-es/mapValues.js"));
+const attributes_js_1 = require("./dimensional-model/attributes.js");
+const filters_js_1 = require("./dimensional-model/filters/filters.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");
-const sdk_common_1 = require("@sisense/sdk-common");
+const measureFactory = __importStar(require("./dimensional-model/measures/factory.js"));
 const measures_js_1 = require("./dimensional-model/measures/measures.js");
-const filters_js_1 = require("./dimensional-model/filters/filters.js");
-const attributes_js_1 = require("./dimensional-model/attributes.js");
 const simple_column_types_js_1 = require("./dimensional-model/simple-column-types.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()
  *
@@ -142,6 +165,29 @@ function convertJaqlDataSource(dataSource) {
         };
 }
 exports.convertJaqlDataSource = convertJaqlDataSource;
+/**
+ * Converts a DataSource to JaqlDataSourceForDto.
+ *
+ * @internal
+ */
+function convertJaqlDataSourceForDto(dataSource) {
+    var _a;
+    if (isDataSourceInfo(dataSource)) {
+        return {
+            title: dataSource.title,
+            live: dataSource.type === 'live',
+            id: (_a = dataSource.id) !== null && _a !== void 0 ? _a : '',
+            address: dataSource.address,
+        };
+    }
+    else {
+        return {
+            title: dataSource,
+            id: '',
+        };
+    }
+}
+exports.convertJaqlDataSourceForDto = convertJaqlDataSourceForDto;
 /**
  * Converts a string to a Sort enum
  *
@@ -158,6 +204,24 @@ function convertSort(sort) {
     }
 }
 exports.convertSort = convertSort;
+/**
+ * Converts a SortDirection to a Sort enum
+ *
+ * @param sortDirection - The SortDirection to convert
+ * @returns The converted Sort enum
+ * @internal
+ */
+function convertSortDirectionToSort(sortDirection) {
+    switch (sortDirection) {
+        case 'sortAsc':
+            return types_js_1.Sort.Ascending;
+        case 'sortDesc':
+            return types_js_1.Sort.Descending;
+        default:
+            return types_js_1.Sort.None;
+    }
+}
+exports.convertSortDirectionToSort = convertSortDirectionToSort;
 /**
  * Creates a filter from a JAQL object.
  *
@@ -201,6 +265,7 @@ function parseExpression(expression) {
             : '',
     };
 }
+exports.parseExpression = parseExpression;
 /**
  * Retrieves the table value from the attribute.
  *
@@ -237,29 +302,23 @@ function getSortType(jaqlSort) {
     }
 }
 exports.getSortType = getSortType;
-const DATA_MODEL_MODULE_NAME = 'DM';
 /**
  * Creates an attribute or level attribute from the provided parameters
  *
  * @returns attribute or level attribute
  * @internal
  */
-const createAttributeHelper = ({ dim, table, column, dataType, level, format, sort, title, panel, dataSource, }) => {
-    // if table is undefined, extract it from dim
-    const dimTable = table !== null && table !== void 0 ? table : parseExpression(dim).table;
-    // if column is undefined, extract it from dim
-    const dimColumn = column !== null && column !== void 0 ? column : parseExpression(dim).column;
+const createAttributeHelper = ({ expression, dataType, granularity, format, sort, title, panel, dataSource, }) => {
+    const column = parseExpression(expression).column;
     const sortEnum = convertSort(sort);
     const isDataTypeDatetime = dataType === types_js_1.DataType.DATETIME;
     if (isDataTypeDatetime) {
-        const dateLevel = attributes_js_1.DimensionalLevelAttribute.translateJaqlToGranularity({ level });
-        const composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, dimColumn, level, DATA_MODEL_MODULE_NAME);
-        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : dimColumn, dim, dateLevel, format || attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(dateLevel), undefined, sortEnum, dataSource, composeCode, panel);
+        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : column, expression, granularity || types_js_1.DateLevels.Years, format ||
+            attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(granularity || types_js_1.DateLevels.Years), undefined, sortEnum, dataSource, undefined, panel);
         return levelAttribute;
     }
     const attributeType = !dataType || (0, simple_column_types_js_1.isNumber)(dataType) ? types_js_1.MetadataTypes.NumericAttribute : types_js_1.MetadataTypes.TextAttribute;
-    const composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, dimColumn, undefined, DATA_MODEL_MODULE_NAME);
-    const attribute = new attributes_js_1.DimensionalAttribute(title !== null && title !== void 0 ? title : dimColumn, dim, attributeType, undefined, sortEnum, dataSource, composeCode, panel);
+    const attribute = new attributes_js_1.DimensionalAttribute(title !== null && title !== void 0 ? title : column, expression, attributeType, undefined, sortEnum, dataSource, undefined, panel);
     return attribute;
 };
 exports.createAttributeHelper = createAttributeHelper;
@@ -269,37 +328,43 @@ exports.createAttributeHelper = createAttributeHelper;
  * @returns measure
  * @internal
  */
-const createMeasureHelper = ({ dim, table, column, dataType, agg, level, format, sort, title, dataSource, }) => {
-    const sortEnum = convertSort(sort);
+const createMeasureHelper = ({ expression, dataType, agg, granularity, format, sort, title, dataSource, }) => {
     const attribute = (0, exports.createAttributeHelper)({
-        dim,
-        table,
-        column,
+        expression,
         dataType,
-        level,
+        granularity,
         format,
         sort,
         title,
         dataSource,
     });
     const tranformedAgg = measures_js_1.DimensionalBaseMeasure.aggregationFromJAQL(agg);
+    const column = parseExpression(expression).column;
     const updatedTitle = title !== null && title !== void 0 ? title : `${tranformedAgg} ${column}`;
-    // currently, sort and format applied to attribute but not to measure
-    const composeCode = `measureFactory.${tranformedAgg}(${attribute.composeCode}, '${(0, sdk_common_1.escapeSingleQuotes)(updatedTitle)}')`;
-    const measure = new measures_js_1.DimensionalBaseMeasure(updatedTitle, attribute, tranformedAgg, undefined, undefined, sortEnum, composeCode);
-    return measure;
+    switch (tranformedAgg) {
+        case types_js_1.AggregationTypes.Sum:
+            return measureFactory.sum(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Average:
+            return measureFactory.avg(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Min:
+            return measureFactory.min(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Max:
+            return measureFactory.max(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Count:
+            return measureFactory.count(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.CountDistinct:
+            return measureFactory.countDistinct(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Median:
+            return measureFactory.median(attribute, updatedTitle, format);
+        case types_js_1.AggregationTypes.Variance:
+            return measureFactory.aggregate(attribute, types_js_1.AggregationTypes.Variance, updatedTitle, format);
+        case types_js_1.AggregationTypes.StandardDeviation:
+            return measureFactory.aggregate(attribute, types_js_1.AggregationTypes.StandardDeviation, updatedTitle, format);
+        default:
+            return measureFactory.sum(attribute, updatedTitle, format);
+    }
 };
 exports.createMeasureHelper = createMeasureHelper;
-const getContextComposeCode = (context) => {
-    return ('{' +
-        Object.entries(context).reduce((acc, [key, value]) => {
-            acc =
-                acc +
-                    `'${key.slice(1, -1)}': ${value && 'composeCode' in value ? value.composeCode : JSON.stringify(value)},`;
-            return acc;
-        }, '') +
-        '}');
-};
 /**
  * Creates a measure from the provided parameters
  *
@@ -308,15 +373,13 @@ const getContextComposeCode = (context) => {
  */
 const createCalculatedMeasureHelper = (jaql) => {
     var _a;
-    const sortEnum = convertSort(jaql.sort);
     const context = (0, mapValues_js_1.default)((_a = jaql.context) !== null && _a !== void 0 ? _a : {}, (jaqlContextValue) => {
         if (typeof jaqlContextValue === 'string') {
             return jaqlContextValue;
         }
         return jaqlContextValue && createDimensionalElementFromJaql(jaqlContextValue);
     });
-    const composeCode = `measureFactory.customFormula('${(0, sdk_common_1.escapeSingleQuotes)(jaql.title)}', '${jaql.formula}', ${getContextComposeCode(context)})`;
-    return new measures_js_1.DimensionalCalculatedMeasure(jaql.title, jaql.formula, context, undefined, undefined, sortEnum, composeCode);
+    return measureFactory.customFormula(jaql.title, jaql.formula, context);
 };
 exports.createCalculatedMeasureHelper = createCalculatedMeasureHelper;
 /**
@@ -340,12 +403,10 @@ function createDimensionalElementFromJaql(jaql, datetimeFormat, panel) {
     const hasAggregation = !!jaql.agg;
     if (hasAggregation) {
         return (0, exports.createMeasureHelper)({
-            dim: jaql.dim,
-            table: jaql.table,
-            column: jaql.column,
+            expression: jaql.dim,
             dataType: jaql.datatype,
             agg: jaql.agg || '',
-            level: jaql.level,
+            granularity: getGranularityFromJaql(jaql),
             format: datetimeFormat,
             sort: jaql.sort,
             title: jaql.title,
@@ -353,11 +414,9 @@ function createDimensionalElementFromJaql(jaql, datetimeFormat, panel) {
         });
     }
     return (0, exports.createAttributeHelper)({
-        dim: jaql.dim,
-        table: jaql.table,
-        column: jaql.column,
+        expression: jaql.dim,
         dataType: jaql.datatype,
-        level: jaql.level,
+        granularity: getGranularityFromJaql(jaql),
         format: datetimeFormat,
         sort: jaql.sort,
         title: jaql.title,
@@ -366,3 +425,16 @@ function createDimensionalElementFromJaql(jaql, datetimeFormat, panel) {
     });
 }
 exports.createDimensionalElementFromJaql = createDimensionalElementFromJaql;
+/**
+ * Returns the granularity from the provided JAQL object.
+ *
+ * @param jaql - The JAQL object.
+ * @returns string.
+ * @internal
+ */
+function getGranularityFromJaql(jaql) {
+    return (jaql === null || jaql === void 0 ? void 0 : jaql.datatype) && (0, simple_column_types_js_1.isDatetime)(jaql.datatype)
+        ? attributes_js_1.DimensionalLevelAttribute.translateJaqlToGranularity(jaql)
+        : undefined;
+}
+exports.getGranularityFromJaql = getGranularityFromJaql;

package/dist/dimensional-model/analytics/factory.d.ts

@@ -13,35 +13,35 @@ export declare const BOX_WHISKER: {
 /**
  * Returns an array of values for box whisker plot using interquartile range (IQR) calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing IQR values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing IQR values for box whisker plots.
  */
 export declare function boxWhiskerIqrValues(target: Attribute): Measure[];
 /**
  * Returns an array of extremum values for box whisker plot.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing extremum values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing extremum values for box whisker plots.
  */
 export declare function boxWhiskerExtremumsValues(target: Attribute): Measure[];
 /**
  * Returns an array of values for box whisker plot using standard deviation calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing standard deviation values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing standard deviation values for box whisker plots.
  */
 export declare function boxWhiskerStdDevValues(target: Attribute): Measure[];
 /**
  * Returns an attribute representing outlier points based on interquartile range (IQR) calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Attribute} An attribute representing outliers for box whisker plots using IQR.
+ * @param target - The target attribute for calculations.
+ * @returns An attribute representing outliers for box whisker plots using IQR.
  */
 export declare const boxWhiskerIqrOutliers: (target: Attribute) => Attribute;
 /**
  * Returns an attribute representing outlier points based on standard deviation calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Attribute} An attribute representing outliers for box whisker plots using standard deviation.
+ * @param target - The target attribute for calculations.
+ * @returns An attribute representing outliers for box whisker plots using standard deviation.
  */
 export declare const boxWhiskerStdDevOutliers: (target: Attribute) => Attribute;

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

@@ -1,4 +1,5 @@
 import cloneDeep from 'lodash-es/cloneDeep.js';
+import { withComposeCodeForAnalytics } from '../compose-code-utils.js';
 import { customFormula } from '../measures/factory.js';
 /** @internal */
 export const BOX_WHISKER = {
@@ -27,8 +28,8 @@ function boxWhiskerCommonValues(target) {
 /**
  * Returns an array of values for box whisker plot using interquartile range (IQR) calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing IQR values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing IQR values for box whisker plots.
  */
 export function boxWhiskerIqrValues(target) {
     return [
@@ -47,8 +48,8 @@ export function boxWhiskerIqrValues(target) {
 /**
  * Returns an array of extremum values for box whisker plot.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing extremum values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing extremum values for box whisker plots.
  */
 export function boxWhiskerExtremumsValues(target) {
     return [
@@ -64,8 +65,8 @@ export function boxWhiskerExtremumsValues(target) {
 /**
  * Returns an array of values for box whisker plot using standard deviation calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Measure[]} An array of measures representing standard deviation values for box whisker plots.
+ * @param target - The target attribute for calculations.
+ * @returns An array of measures representing standard deviation values for box whisker plots.
  */
 export function boxWhiskerStdDevValues(target) {
     return [
@@ -84,10 +85,10 @@ export function boxWhiskerStdDevValues(target) {
 /**
  * Returns an attribute representing outlier points based on interquartile range (IQR) calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Attribute} An attribute representing outliers for box whisker plots using IQR.
+ * @param target - The target attribute for calculations.
+ * @returns An attribute representing outliers for box whisker plots using IQR.
  */
-export const boxWhiskerIqrOutliers = (target) => {
+export const boxWhiskerIqrOutliers = withComposeCodeForAnalytics((target) => {
     const outliersAttrWithInnerFilter = cloneDeep(target);
     const outliersMax = customFormula(BOX_WHISKER.OUTLIER_MAX_VALUE_NAME, '(UPPERWHISKERMIN_IQR([Attr]), all([Attr]))', {
         Attr: target,
@@ -110,14 +111,14 @@ export const boxWhiskerIqrOutliers = (target) => {
         return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
-};
+}, 'boxWhiskerIqrOutliers');
 /**
  * Returns an attribute representing outlier points based on standard deviation calculations.
  *
- * @param {Attribute} target - The target attribute for calculations.
- * @returns {Attribute} An attribute representing outliers for box whisker plots using standard deviation.
+ * @param target - The target attribute for calculations.
+ * @returns An attribute representing outliers for box whisker plots using standard deviation.
  */
-export const boxWhiskerStdDevOutliers = (target) => {
+export const boxWhiskerStdDevOutliers = withComposeCodeForAnalytics((target) => {
     const outliersAttrWithInnerFilter = cloneDeep(target);
     const outliersMax = customFormula(BOX_WHISKER.OUTLIER_MAX_VALUE_NAME, '(UPPERWHISKERMIN_STDEVP([Attr]), all([Attr]))', {
         Attr: target,
@@ -139,4 +140,4 @@ export const boxWhiskerStdDevOutliers = (target) => {
         return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
-};
+}, 'boxWhiskerStdDevOutliers');

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

@@ -1,6 +1,6 @@
-import { Attribute, LevelAttribute } from './interfaces.js';
-import { Sort, JaqlDataSource } from './types.js';
 import { DimensionalElement } from './base.js';
+import { Attribute, LevelAttribute } from './interfaces.js';
+import { DateLevel, JaqlDataSource, JSONObject, Sort } from './types.js';
 /**
  * @internal
  */
@@ -39,7 +39,7 @@ export declare class DimensionalAttribute extends DimensionalElement implements
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
+    serialize(): JSONObject;
 }
 /**
  * @internal
@@ -48,7 +48,7 @@ export declare class DimensionalLevelAttribute extends DimensionalAttribute impl
     private _format;
     readonly granularity: string;
     readonly panel: string;
-    constructor(l: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string);
+    constructor(name: string, expression: string, granularity: string, format?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, panel?: string);
     /**
      * gets the element's ID
      */
@@ -79,10 +79,17 @@ export declare class DimensionalLevelAttribute extends DimensionalAttribute impl
      * @returns An instance representing the formatted {@link LevelAttribute} of this instance
      */
     format(format: string): LevelAttribute;
+    /**
+     * Gets a {@link LevelAttribute} with the given granularity
+     *
+     * @param granularity - Date granularity
+     * @returns New instance representing {@link LevelAttribute} with provided granularity
+     */
+    setGranularity(granularity: DateLevel): LevelAttribute;
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
+    serialize(): JSONObject;
     /**
      * Gets the JAQL representation of this instance
      *
@@ -138,4 +145,4 @@ export declare function createLevel(json: any): LevelAttribute;
  * @return full normalized attribute name (e.g., DM.CommerceSales.OrderDate.Years)
  * @internal
  */
-export declare function normalizeAttributeName(tableName: string, columnName: string, dateLevel?: string, modelName?: string): string;
+export declare function normalizeAttributeName(tableName: string, columnName: string, granularity?: string, modelName?: string): string;

package/dist/dimensional-model/attributes.js

@@ -1,6 +1,14 @@
-import { Sort, MetadataTypes, DateLevels } from './types.js';
+/* eslint-disable max-params */
+/* eslint-disable no-underscore-dangle */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable sonarjs/no-nested-switch */
+import { parseExpression } from '../utils.js';
 import { DimensionalElement, normalizeName } from './base.js';
+import { DATA_MODEL_MODULE_NAME } from './consts.js';
 import { simpleColumnType } from './simple-column-types.js';
+import { DateLevels, MetadataTypes, Sort } from './types.js';
 /**
  * @internal
  */
@@ -13,6 +21,11 @@ export class DimensionalAttribute extends DimensionalElement {
         super(name, type || MetadataTypes.Attribute, desc, dataSource, composeCode);
         this._sort = Sort.None;
         this.expression = expression;
+        // if composeCode is not explicitly set by the caller, extract it from expression
+        if (!composeCode && expression) {
+            const { table, column } = parseExpression(expression);
+            this.composeCode = normalizeAttributeName(table, column, '', DATA_MODEL_MODULE_NAME);
+        }
         // panel is not needed in most cases, this is to support break by columns functionality
         if (panel === 'columns') {
             this.panel = panel;
@@ -66,11 +79,12 @@ export class DimensionalAttribute extends DimensionalElement {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalAttribute';
         result.expression = this.expression;
         if (this.getSort() !== Sort.None) {
-            result.sort = this.getSort().toString();
+            result.sort = this.getSort();
         }
         return result;
     }
@@ -79,10 +93,15 @@ export class DimensionalAttribute extends DimensionalElement {
  * @internal
  */
 export class DimensionalLevelAttribute extends DimensionalAttribute {
-    constructor(l, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
-        super(l, expression, MetadataTypes.DateLevel, desc, sort, dataSource, composeCode);
+    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
+        super(name, expression, MetadataTypes.DateLevel, desc, sort, dataSource, composeCode);
         this._format = format;
         this.granularity = granularity;
+        // if composeCode is not explicitly set by the caller, extract it from expression and granularity
+        if (!composeCode && expression) {
+            const { table, column } = parseExpression(expression);
+            this.composeCode = normalizeAttributeName(table, column, granularity, DATA_MODEL_MODULE_NAME);
+        }
         // panel is not needed in most cases, this is to support break by columns functionality
         if (panel === 'columns') {
             this.panel = panel;
@@ -134,11 +153,21 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
     format(format) {
         return new DimensionalLevelAttribute(this.name, this.expression, this.granularity, format, this.description, this._sort, this.dataSource, this.composeCode);
     }
+    /**
+     * Gets a {@link LevelAttribute} with the given granularity
+     *
+     * @param granularity - Date granularity
+     * @returns New instance representing {@link LevelAttribute} with provided granularity
+     */
+    setGranularity(granularity) {
+        return new DimensionalLevelAttribute(this.name, this.expression, granularity, this._format, this.description, this._sort, this.dataSource, this.composeCode);
+    }
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalLevelAttribute';
         result.granularity = this.granularity;
         if (this.getFormat() !== undefined) {
             result.format = this.getFormat();
@@ -355,12 +384,10 @@ export function createLevel(json) {
  * @return full normalized attribute name (e.g., DM.CommerceSales.OrderDate.Years)
  * @internal
  */
-export function normalizeAttributeName(tableName, columnName, dateLevel, modelName) {
+export function normalizeAttributeName(tableName, columnName, granularity, modelName) {
     return ((modelName && modelName.length > 0 ? modelName + '.' : '') +
         normalizeName(tableName) +
         '.' +
         normalizeName(columnName) +
-        (dateLevel && dateLevel.length > 0
-            ? '.' + DimensionalLevelAttribute.translateJaqlToGranularity({ level: dateLevel })
-            : ''));
+        (granularity && granularity.length > 0 ? '.' + granularity : ''));
 }

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

@@ -1,5 +1,5 @@
 import { Element } from './interfaces.js';
-import { JaqlDataSource } from './types.js';
+import { JaqlDataSource, JSONObject } from './types.js';
 /**
  * @internal
  */
@@ -43,8 +43,8 @@ export declare abstract class DimensionalElement implements Element {
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
-    toJSON(): any;
+    serialize(): JSONObject;
+    toJSON(): JSONObject;
     abstract jaql(nested?: boolean): any;
     /**
      * Gets a string representation of the element

package/dist/dimensional-model/base.js

@@ -9,7 +9,9 @@ export class DimensionalElement {
         if (dataSource) {
             this._dataSource = dataSource;
         }
-        this.composeCode = composeCode;
+        if (composeCode) {
+            this.composeCode = composeCode;
+        }
     }
     /**
      * Defines the element's name
@@ -29,17 +31,18 @@ export class DimensionalElement {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
+    serialize() {
         return {
             name: this.name,
             type: this.type,
-            desc: this.description,
+            description: this.description,
             dataSource: this.dataSource,
+            composeCode: this.composeCode,
             __serializable: 'DimensionalElement',
         };
     }
     toJSON() {
-        return this.serializable();
+        return this.serialize();
     }
     /**
      * Gets a string representation of the element

package/dist/dimensional-model/compose-code-utils.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Stringifies the argument, with an option to exclude specific properties from objects without a 'composeCode'.
+ * Keys with spaces in objects will be enclosed in single quotes.
+ *
+ * @param arg - The argument to stringify.
+ * @param excludeProps - Optional array of property names to exclude when stringifying objects (that don't have 'composeCode').
+ * @returns The stringified representation of the argument.
+ */
+export declare function stringifyHelper(arg: any, excludeProps?: string[]): string;
+/**
+ * High order function to construct compose code for filter factory functions
+ *
+ * @param func - filter factory function
+ * @param funcName - name of the filter factory function. Needed if the function name is minified.
+ * @returns filter factory function with composeCode property added to the filter
+ */
+export declare function withComposeCodeForFilter<T extends (...args: any[]) => any>(func: T, funcName?: string): T;
+/**
+ * High order function to construct compose code for filter relations factory functions
+ *
+ * @param func - filter factory function
+ * @param funcName - name of the filter factory function. Needed if the function name is minified.
+ * @returns filter factory function with composeCode property added to the filter
+ */
+export declare function withComposeCodeForFilterRelations<T extends (...args: any[]) => any>(func: T, funcName?: string): T;
+/**
+ * High order function to construct compose code for analytics factory functions
+ *
+ * @param func - analytics factory function
+ * @param funcName - name of the analytics factory function. Needed if the function name is minified.
+ * @returns analytics factory function with composeCode property added to the analytics
+ */
+export declare function withComposeCodeForAnalytics<T extends (...args: any[]) => any>(func: T, funcName?: string): T;
+/**
+ * High order function to construct compose code for measure factory functions
+ *
+ * @param func - measure factory function
+ * @param funcName - name of the measure factory function. Needed if the function name is minified.
+ * @returns measure factory function with composeCode property added to the measure
+ */
+export declare function withComposeCodeForMeasure<T extends (...args: any[]) => any>(func: T, funcName?: string): T;