@sisense/sdk-data 1.34.0 → 2.1.0

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

@@ -41,13 +41,12 @@ const m = __importStar(require("./factory.js"));
  * @internal
  */
 class AbstractMeasure extends base_js_1.DimensionalElement {
-    constructor(name, type, format, desc, sort, composeCode) {
-        super(name, type, desc);
+    constructor(name, type, format, desc, sort, dataSource, composeCode) {
+        super(name, type, desc, dataSource, composeCode);
         this._sort = types_js_1.Sort.None;
         this._format = '#,#.00';
         this._format = format;
         this._sort = sort || types_js_1.Sort.None;
-        this.composeCode = composeCode;
     }
     /**
      * Gets the sort definition of this instance
@@ -68,8 +67,8 @@ class AbstractMeasure extends base_js_1.DimensionalElement {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
         if (this.getFormat() !== undefined) {
             result.format = this.getFormat();
         }
@@ -86,8 +85,8 @@ exports.AbstractMeasure = AbstractMeasure;
  * @internal
  */
 class DimensionalBaseMeasure extends AbstractMeasure {
-    constructor(name, attribute, agg, format, desc, sort, composeCode) {
-        super(name, types_js_1.MetadataTypes.BaseMeasure, format, desc, sort, composeCode);
+    constructor(name, attribute, agg, format, desc, sort, dataSource, composeCode) {
+        super(name, types_js_1.MetadataTypes.BaseMeasure, format, desc, sort, dataSource, composeCode);
         this.attribute = attribute;
         this.aggregation = agg;
     }
@@ -144,7 +143,7 @@ class DimensionalBaseMeasure extends AbstractMeasure {
      * @returns An instance representing the sorted {@link Measure} of this instance
      */
     sort(sort) {
-        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, this._format, this.description, sort, this.composeCode);
+        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, this._format, this.description, sort, this.dataSource, this.composeCode);
     }
     /**
      * Gets a formatted {@link Measure} with the given definition
@@ -155,7 +154,7 @@ class DimensionalBaseMeasure extends AbstractMeasure {
      * @returns An instance representing the formatted {@link Measure} of this instance
      */
     format(format) {
-        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, format, this.description, this._sort, this.composeCode);
+        return new DimensionalBaseMeasure(this.name, this.attribute, this.aggregation, format, this.description, this._sort, this.dataSource, this.composeCode);
     }
     /**
      * gets the element's ID
@@ -166,10 +165,11 @@ class DimensionalBaseMeasure extends AbstractMeasure {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalBaseMeasure';
         result.aggregation = this.aggregation;
-        result.attribute = this.attribute.serializable();
+        result.attribute = this.attribute.serialize();
         return result;
     }
     jaql(nested) {
@@ -194,8 +194,8 @@ exports.DimensionalBaseMeasure = DimensionalBaseMeasure;
  * @internal
  */
 class DimensionalCalculatedMeasure extends AbstractMeasure {
-    constructor(name, expression, context, format, desc, sort, composeCode) {
-        super(name, types_js_1.MetadataTypes.CalculatedMeasure, format, desc, sort, composeCode);
+    constructor(name, expression, context, format, desc, sort, dataSource, composeCode) {
+        super(name, types_js_1.MetadataTypes.CalculatedMeasure, format, desc, sort, dataSource, composeCode);
         this.expression = expression;
         this.context = context;
     }
@@ -206,7 +206,7 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
      * @returns An instance representing the sorted {@link Measure} of this instance
      */
     sort(sort) {
-        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, this._format, this.description, sort, this.composeCode);
+        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, this._format, this.description, sort, this.dataSource, this.composeCode);
     }
     /**
      * Gets a formatted {@link Measure} with the given definition
@@ -217,7 +217,7 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
      * @returns An instance representing the formatted {@link Measure} of this instance
      */
     format(format) {
-        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, format, this.description, this._sort, this.composeCode);
+        return new DimensionalCalculatedMeasure(this.name, this.expression, this.context, format, this.description, this._sort, this.dataSource, this.composeCode);
     }
     /**
      * gets the element's ID
@@ -228,13 +228,14 @@ class DimensionalCalculatedMeasure extends AbstractMeasure {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalCalculatedMeasure';
         result.expression = this.expression;
-        result.context = {};
-        Object.getOwnPropertyNames(this.context).forEach((p) => {
-            result.context[p] = this.context[p].serializable();
-        });
+        result.context = Object.fromEntries(Object.entries(this.context).map(([key, value]) => [
+            key,
+            value.serialize ? value.serialize(value) : value,
+        ]));
         return result;
     }
     jaql(nested) {
@@ -264,8 +265,8 @@ exports.DimensionalCalculatedMeasure = DimensionalCalculatedMeasure;
  * @internal
  */
 class DimensionalMeasureTemplate extends AbstractMeasure {
-    constructor(name, attribute, format, desc, sort) {
-        super(name, types_js_1.MetadataTypes.MeasureTemplate, format, desc, sort);
+    constructor(name, attribute, format, desc, sort, dataSource, composeCode) {
+        super(name, types_js_1.MetadataTypes.MeasureTemplate, format, desc, sort, dataSource, composeCode);
         this.attribute = attribute;
     }
     /**
@@ -277,9 +278,10 @@ class DimensionalMeasureTemplate extends AbstractMeasure {
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
-        result.attribute = this.attribute.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalMeasureTemplate';
+        result.attribute = this.attribute.serialize();
         return result;
     }
     /**
@@ -289,7 +291,7 @@ class DimensionalMeasureTemplate extends AbstractMeasure {
      * @returns An instance representing the sorted {@link MeasureTemplate} of this instance
      */
     sort(sort) {
-        return new DimensionalMeasureTemplate(this.name, this.attribute, this._format, this.description, sort);
+        return new DimensionalMeasureTemplate(this.name, this.attribute, this._format, this.description, sort, this.dataSource, this.composeCode);
     }
     /**
      * Gets a formatted {@link Measure} with the given definition
@@ -298,7 +300,7 @@ class DimensionalMeasureTemplate extends AbstractMeasure {
      * @returns An instance representing the formatted {@link Measure} of this instance
      */
     format(format) {
-        return new DimensionalMeasureTemplate(this.name, this.attribute, format, this.description, this._sort);
+        return new DimensionalMeasureTemplate(this.name, this.attribute, format, this.description, this._sort, this.dataSource, this.composeCode);
     }
     /**
      * Gets the JAQL representation of this instance

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

@@ -1,9 +1,9 @@
-import { type ConditionFilterJaql, JaqlDataSource } from './filters/utils/types.js';
+import type { ConditionFilterJaql, JaqlDataSource, JaqlDataSourceForDto } from './filters/utils/types.js';
 import { Attribute } from './interfaces.js';
 /**
  * @internal
  */
-export type { JaqlDataSource };
+export type { JaqlDataSource, JaqlDataSourceForDto };
 /**
  * Different aggregation types
  */
@@ -212,6 +212,7 @@ export declare type FormulaJaql = {
     title: string;
     formula: string;
     context?: Record<FormulaID, FormulaContext>;
+    datasource?: JaqlDataSource;
 };
 /** @internal */
 export declare type BaseFilterJaql = IncludeAllFilterJaql | IncludeMembersFilterJaql | ExcludeMembersFilterJaql | NumericFilterJaql | ConditionFilterJaql | AndFilterJaql<NumericFilterJaql | ConditionFilterJaql> | OrFilterJaql<NumericFilterJaql | ConditionFilterJaql>;
@@ -271,6 +272,27 @@ export declare type OrFilterJaql<FilterItem> = {
  * Abstract object with any unknown values
  */
 export declare type AnyObject = Record<string, any>;
+/**
+ * JSON Value
+ *
+ * @internal
+ */
+export declare type JSONValue = string | number | boolean | undefined | null | JSONArray | JSONObject;
+/**
+ * JSON Array
+ *
+ * @internal
+ */
+export interface JSONArray extends Array<JSONValue> {
+}
+/**
+ * JSON Object
+ *
+ * @internal
+ */
+export interface JSONObject {
+    [key: string]: JSONValue;
+}
 /**
  * @internal
  */
@@ -395,6 +417,7 @@ export declare type MetadataItemJaql = {
         sortingLastDimension?: boolean;
         initialized?: boolean;
     };
+    datasource?: JaqlDataSource;
 };
 /**
  * @internal

package/dist/cjs/utils.d.ts

@@ -1,4 +1,4 @@
-import { FilterJaqlInternal, JaqlDataSource, RankingFilterJaql } from './dimensional-model/filters/utils/types.js';
+import { FilterJaqlInternal, JaqlDataSource, JaqlDataSourceForDto, RankingFilterJaql } from './dimensional-model/filters/utils/types.js';
 import { Attribute, BaseMeasure, CalculatedMeasure, Filter, FilterRelations, FilterRelationsJaql, LevelAttribute, SortDirection } from './dimensional-model/interfaces.js';
 import { BaseJaql, FilterJaql, FormulaJaql, Jaql, JaqlSortDirection, Sort } from './dimensional-model/types.js';
 import { DataSource, DataSourceInfo } from './interfaces.js';
@@ -41,6 +41,12 @@ export declare function convertDataSource(jaqlDataSource: JaqlDataSource): DataS
  * @internal
  */
 export declare function convertJaqlDataSource(dataSource: DataSource): JaqlDataSource;
+/**
+ * Converts a DataSource to JaqlDataSourceForDto.
+ *
+ * @internal
+ */
+export declare function convertJaqlDataSourceForDto(dataSource: DataSource): JaqlDataSourceForDto;
 /**
  * Converts a string to a Sort enum
  *
@@ -68,6 +74,15 @@ export declare function convertSortDirectionToSort(sortDirection: SortDirection)
  * @internal
  */
 export declare const createFilterFromJaql: (jaql: FilterJaql, instanceid?: string, disabled?: boolean, locked?: boolean) => Filter;
+/**
+ * Extracts the table and column names from the given expression string.
+ *
+ * @internal
+ */
+export declare function parseExpression(expression: string): {
+    table: string;
+    column: string;
+};
 /**
  * Retrieves the table value from the attribute.
  *
@@ -94,21 +109,17 @@ export declare function getSortType(jaqlSort: `${JaqlSortDirection}` | undefined
  * @returns attribute or level attribute
  * @internal
  */
-export declare const createAttributeHelper: ({ dim, table, column, dataType, granularity, format, sort, title, panel, dataSource, }: {
+export declare const createAttributeHelper: ({ expression, dataType, granularity, format, sort, title, panel, dataSource, }: {
     /** Dimension expression */
-    dim: string;
-    /** Table name */
-    table: string | undefined;
-    /** Column name */
-    column: string | undefined;
+    expression: string;
     /** Data type */
     dataType: string;
     /** Date granularity */
-    granularity: string | undefined;
+    granularity?: string | undefined;
     /** Format */
-    format: string | undefined;
+    format?: string | undefined;
     /** Sort */
-    sort: string | undefined;
+    sort?: string | undefined;
     /** Attribute title */
     title?: string | undefined;
     /** Panel */
@@ -122,23 +133,19 @@ export declare const createAttributeHelper: ({ dim, table, column, dataType, gra
  * @returns measure
  * @internal
  */
-export declare const createMeasureHelper: ({ dim, table, column, dataType, agg, granularity, format, sort, title, dataSource, }: {
+export declare const createMeasureHelper: ({ expression, dataType, agg, granularity, format, sort, title, dataSource, }: {
     /** Dimension expression */
-    dim: string;
-    /** Table name */
-    table: string | undefined;
-    /** Column name */
-    column: string;
+    expression: string;
     /** Data type */
     dataType: string;
     /** Aggregation function */
     agg: string;
     /** Date granularity */
-    granularity: string | undefined;
+    granularity?: string | undefined;
     /** Format */
-    format: string | undefined;
+    format?: string | undefined;
     /** Sort */
-    sort: string | undefined;
+    sort?: string | undefined;
     /** Measure title */
     title?: string | undefined;
     /** Jaql data source */

package/dist/cjs/utils.js

@@ -1,15 +1,38 @@
 "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.getGranularityFromJaql = exports.createDimensionalElementFromJaql = exports.createCalculatedMeasureHelper = exports.createMeasureHelper = exports.createAttributeHelper = exports.getSortType = exports.getColumnNameFromAttribute = exports.getTableNameFromAttribute = exports.createFilterFromJaql = exports.convertSortDirectionToSort = exports.convertSort = exports.convertJaqlDataSource = exports.convertDataSource = exports.isDataSourceInfo = exports.getDataSourceName = exports.getFilterListAndRelationsJaql = exports.guidFast = void 0;
-const sdk_common_1 = require("@sisense/sdk-common");
+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 measureFactory = __importStar(require("./dimensional-model/measures/factory.js"));
 const measures_js_1 = require("./dimensional-model/measures/measures.js");
 const simple_column_types_js_1 = require("./dimensional-model/simple-column-types.js");
 const types_js_1 = require("./dimensional-model/types.js");
@@ -81,6 +104,9 @@ const getFilterListAndRelationsJaql = (filterRelations) => {
             if ('right' in node) {
                 node.right = traverse(node.right);
             }
+            if ('composeCode' in node) {
+                delete node.composeCode;
+            }
             return node;
         }
     }
@@ -142,6 +168,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
  *
@@ -219,6 +268,7 @@ function parseExpression(expression) {
             : '',
     };
 }
+exports.parseExpression = parseExpression;
 /**
  * Retrieves the table value from the attribute.
  *
@@ -255,29 +305,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, granularity, 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 composeCode = (0, attributes_js_1.normalizeAttributeName)(dimTable, dimColumn, granularity, DATA_MODEL_MODULE_NAME);
-        const levelAttribute = new attributes_js_1.DimensionalLevelAttribute(title !== null && title !== void 0 ? title : dimColumn, dim, granularity || types_js_1.DateLevels.Years, format ||
-            attributes_js_1.DimensionalLevelAttribute.getDefaultFormatForGranularity(granularity || types_js_1.DateLevels.Years), 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;
@@ -287,12 +331,9 @@ exports.createAttributeHelper = createAttributeHelper;
  * @returns measure
  * @internal
  */
-const createMeasureHelper = ({ dim, table, column, dataType, agg, granularity, 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,
         granularity,
         format,
@@ -301,23 +342,32 @@ const createMeasureHelper = ({ dim, table, column, dataType, agg, granularity, f
         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
  *
@@ -326,15 +376,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;
 /**
@@ -358,9 +406,7 @@ 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 || '',
             granularity: getGranularityFromJaql(jaql),
@@ -371,9 +417,7 @@ function createDimensionalElementFromJaql(jaql, datetimeFormat, panel) {
         });
     }
     return (0, exports.createAttributeHelper)({
-        dim: jaql.dim,
-        table: jaql.table,
-        column: jaql.column,
+        expression: jaql.dim,
         dataType: jaql.datatype,
         granularity: getGranularityFromJaql(jaql),
         format: datetimeFormat,

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');