@sisense/sdk-data 1.34.0 → 2.1.0

package/dist/cjs/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/cjs/dimensional-model/analytics/factory.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.boxWhiskerStdDevOutliers = exports.boxWhiskerIqrOutliers = exports.boxWhiskerStdDevValues = exports.boxWhiskerExtremumsValues = exports.boxWhiskerIqrValues = exports.BOX_WHISKER = void 0;
 const cloneDeep_js_1 = __importDefault(require("lodash-es/cloneDeep.js"));
+const compose_code_utils_js_1 = require("../compose-code-utils.js");
 const factory_js_1 = require("../measures/factory.js");
 /** @internal */
 exports.BOX_WHISKER = {
@@ -33,8 +34,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.
  */
 function boxWhiskerIqrValues(target) {
     return [
@@ -54,8 +55,8 @@ exports.boxWhiskerIqrValues = boxWhiskerIqrValues;
 /**
  * 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.
  */
 function boxWhiskerExtremumsValues(target) {
     return [
@@ -72,8 +73,8 @@ exports.boxWhiskerExtremumsValues = boxWhiskerExtremumsValues;
 /**
  * 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.
  */
 function boxWhiskerStdDevValues(target) {
     return [
@@ -93,10 +94,10 @@ exports.boxWhiskerStdDevValues = boxWhiskerStdDevValues;
 /**
  * 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.
  */
-const boxWhiskerIqrOutliers = (target) => {
+exports.boxWhiskerIqrOutliers = (0, compose_code_utils_js_1.withComposeCodeForAnalytics)((target) => {
     const outliersAttrWithInnerFilter = (0, cloneDeep_js_1.default)(target);
     const outliersMax = (0, factory_js_1.customFormula)(exports.BOX_WHISKER.OUTLIER_MAX_VALUE_NAME, '(UPPERWHISKERMIN_IQR([Attr]), all([Attr]))', {
         Attr: target,
@@ -119,15 +120,14 @@ const boxWhiskerIqrOutliers = (target) => {
         return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
-};
-exports.boxWhiskerIqrOutliers = boxWhiskerIqrOutliers;
+}, '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.
  */
-const boxWhiskerStdDevOutliers = (target) => {
+exports.boxWhiskerStdDevOutliers = (0, compose_code_utils_js_1.withComposeCodeForAnalytics)((target) => {
     const outliersAttrWithInnerFilter = (0, cloneDeep_js_1.default)(target);
     const outliersMax = (0, factory_js_1.customFormula)(exports.BOX_WHISKER.OUTLIER_MAX_VALUE_NAME, '(UPPERWHISKERMIN_STDEVP([Attr]), all([Attr]))', {
         Attr: target,
@@ -149,5 +149,4 @@ const boxWhiskerStdDevOutliers = (target) => {
         return nested ? jaql : { jaql };
     };
     return outliersAttrWithInnerFilter;
-};
-exports.boxWhiskerStdDevOutliers = boxWhiskerStdDevOutliers;
+}, 'boxWhiskerStdDevOutliers');

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

@@ -1,6 +1,6 @@
 import { DimensionalElement } from './base.js';
 import { Attribute, LevelAttribute } from './interfaces.js';
-import { DateLevel, JaqlDataSource, Sort } from './types.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
      */
@@ -89,7 +89,7 @@ export declare class DimensionalLevelAttribute extends DimensionalAttribute impl
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
+    serialize(): JSONObject;
     /**
      * Gets the JAQL representation of this instance
      *

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

@@ -7,7 +7,9 @@ exports.normalizeAttributeName = exports.createLevel = exports.createAttribute =
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable sonarjs/no-nested-switch */
+const utils_js_1 = require("../utils.js");
 const base_js_1 = require("./base.js");
+const consts_js_1 = require("./consts.js");
 const simple_column_types_js_1 = require("./simple-column-types.js");
 const types_js_1 = require("./types.js");
 /**
@@ -23,6 +25,11 @@ class DimensionalAttribute extends base_js_1.DimensionalElement {
         super(name, type || types_js_1.MetadataTypes.Attribute, desc, dataSource, composeCode);
         this._sort = types_js_1.Sort.None;
         this.expression = expression;
+        // if composeCode is not explicitly set by the caller, extract it from expression
+        if (!composeCode && expression) {
+            const { table, column } = (0, utils_js_1.parseExpression)(expression);
+            this.composeCode = normalizeAttributeName(table, column, '', consts_js_1.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;
@@ -76,11 +83,12 @@ class DimensionalAttribute extends base_js_1.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() !== types_js_1.Sort.None) {
-            result.sort = this.getSort().toString();
+            result.sort = this.getSort();
         }
         return result;
     }
@@ -90,10 +98,15 @@ exports.DimensionalAttribute = DimensionalAttribute;
  * @internal
  */
 class DimensionalLevelAttribute extends DimensionalAttribute {
-    constructor(l, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
-        super(l, expression, types_js_1.MetadataTypes.DateLevel, desc, sort, dataSource, composeCode);
+    constructor(name, expression, granularity, format, desc, sort, dataSource, composeCode, panel) {
+        super(name, expression, types_js_1.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 } = (0, utils_js_1.parseExpression)(expression);
+            this.composeCode = normalizeAttributeName(table, column, granularity, consts_js_1.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;
@@ -157,8 +170,9 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
     /**
      * 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();

package/dist/cjs/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/cjs/dimensional-model/base.js

@@ -12,7 +12,9 @@ class DimensionalElement {
         if (dataSource) {
             this._dataSource = dataSource;
         }
-        this.composeCode = composeCode;
+        if (composeCode) {
+            this.composeCode = composeCode;
+        }
     }
     /**
      * Defines the element's name
@@ -32,17 +34,18 @@ 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/cjs/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;

package/dist/cjs/dimensional-model/compose-code-utils.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withComposeCodeForMeasure = exports.withComposeCodeForAnalytics = exports.withComposeCodeForFilterRelations = exports.withComposeCodeForFilter = exports.stringifyHelper = void 0;
+const sdk_common_1 = require("@sisense/sdk-common");
+/**
+ * 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.
+ */
+function stringifyHelper(arg, excludeProps = []) {
+    try {
+        if (arg === null || arg === undefined) {
+            return String(arg);
+        }
+        if (typeof arg === 'string') {
+            return `'${(0, sdk_common_1.escapeSingleQuotes)(arg)}'`;
+        }
+        if (typeof arg === 'number' || typeof arg === 'boolean') {
+            return String(arg);
+        }
+        if (arg instanceof Date) {
+            return `new Date('${arg.toISOString()}')`;
+        }
+        if (Array.isArray(arg)) {
+            return `[${arg.map((item) => stringifyHelper(item, excludeProps)).join(', ')}]`;
+        }
+        if (typeof arg === 'object' && arg !== null) {
+            if ('composeCode' in arg) {
+                return arg.composeCode;
+            }
+            const entries = Object.entries(arg)
+                .filter(([key]) => !excludeProps.includes(key))
+                .map(([key, value]) => {
+                const formattedKey = /[^a-zA-Z0-9_$]/.test(key) ? `'${key}'` : key;
+                return `${formattedKey}: ${stringifyHelper(value, excludeProps)}`;
+            });
+            return `{ ${entries.join(', ')} }`;
+        }
+        // Fallback for anything else
+        return JSON.stringify(arg);
+    }
+    catch (e) {
+        console.error(e, JSON.stringify(arg, null, 2));
+        return JSON.stringify(arg);
+    }
+}
+exports.stringifyHelper = stringifyHelper;
+function trimTrailingUndefined(args) {
+    let i = args.length;
+    while (i > 0 && args[i - 1] === undefined) {
+        i--;
+    }
+    return args.slice(0, i);
+}
+/**
+ * Generic high order function to construct compose code for factory functions
+ *
+ * @param func - factory function
+ * @param factoryName - name of the factory (e.g. 'filterFactory', 'measureFactory')
+ * @param funcName - name of the factory function. Needed if the function name is minified.
+ * @returns factory function with composeCode property added
+ */
+function withComposeCode(factoryName, funcName) {
+    return function (func) {
+        return function (...args) {
+            const trimmedArgs = trimTrailingUndefined(args);
+            const length = trimmedArgs.length;
+            const argValues = trimmedArgs
+                .map((arg) => stringifyHelper(arg, ['guid']))
+                // Remove trivial arg values from the end of the array
+                .filter((str, index) => !(['', '{  }', '[]', 'undefined', 'null'].includes(str) && index === length - 1))
+                .join(', ');
+            const signature = `${factoryName}.${funcName !== null && funcName !== void 0 ? funcName : func.name}(${argValues})`;
+            // Call the original function and get the result
+            const result = func(...args);
+            result.composeCode = signature; // Type assertion needed here
+            return result;
+        };
+    };
+}
+/**
+ * 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
+ */
+function withComposeCodeForFilter(func, funcName) {
+    return withComposeCode('filterFactory', funcName)(func);
+}
+exports.withComposeCodeForFilter = withComposeCodeForFilter;
+/**
+ * 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
+ */
+function withComposeCodeForFilterRelations(func, funcName) {
+    return withComposeCode('filterFactory.logic', funcName)(func);
+}
+exports.withComposeCodeForFilterRelations = withComposeCodeForFilterRelations;
+/**
+ * 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
+ */
+function withComposeCodeForAnalytics(func, funcName) {
+    return withComposeCode('analyticsFactory', funcName)(func);
+}
+exports.withComposeCodeForAnalytics = withComposeCodeForAnalytics;
+/**
+ * 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
+ */
+function withComposeCodeForMeasure(func, funcName) {
+    return withComposeCode('measureFactory', funcName)(func);
+}
+exports.withComposeCodeForMeasure = withComposeCodeForMeasure;

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

@@ -0,0 +1 @@
+export declare const DATA_MODEL_MODULE_NAME = "DM";

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DATA_MODEL_MODULE_NAME = void 0;
+exports.DATA_MODEL_MODULE_NAME = 'DM';

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

@@ -1,6 +1,6 @@
 import { DimensionalElement } from '../base.js';
 import { Attribute, DateDimension, Dimension, LevelAttribute } from '../interfaces.js';
-import { JaqlDataSource, Sort } from '../types.js';
+import { JaqlDataSource, JSONObject, Sort } from '../types.js';
 /**
  * Represents a Dimension in a Dimensional Model
  *
@@ -14,7 +14,7 @@ export declare class DimensionalDimension extends DimensionalElement implements
     protected _attributes: Attribute[];
     private _expression;
     protected _sort: Sort;
-    constructor(name: string, expression: string, attributes: Attribute[], dimensions?: Dimension[], type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
+    constructor(name: string, expression: string, attributes: Attribute[], dimensions?: Dimension[], type?: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string, defaultAttribute?: Attribute);
     private getAttachedName;
     protected setDimensions(dimensions: Dimension[]): void;
     protected setAttributes(attributes: Attribute[]): void;
@@ -47,7 +47,7 @@ export declare class DimensionalDimension extends DimensionalElement implements
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
+    serialize(): JSONObject;
     /**
      * Gets the JAQL representation of this instance
      *
@@ -61,7 +61,7 @@ export declare class DimensionalDimension extends DimensionalElement implements
  * @internal
  */
 export declare class DimensionalDateDimension extends DimensionalDimension implements DateDimension {
-    constructor(name: string, expression: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource);
+    constructor(name: string, expression: string, desc?: string, sort?: Sort, dataSource?: JaqlDataSource, composeCode?: string);
     /**
      * Years level
      */
@@ -141,7 +141,7 @@ export declare class DimensionalDateDimension extends DimensionalDimension imple
     /**
      * Gets a serializable representation of the element
      */
-    serializable(): any;
+    serialize(): JSONObject;
     /**
      * Gets the JAQL representation of this instance
      *

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

@@ -9,8 +9,10 @@ exports.createDateDimension = exports.createDimension = exports.DimensionalDateD
 /* eslint-disable sonarjs/no-duplicate-string */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
+const utils_js_1 = require("../../utils.js");
 const attributes_js_1 = require("../attributes.js");
 const base_js_1 = require("../base.js");
+const consts_js_1 = require("../consts.js");
 const types_js_1 = require("../types.js");
 /**
  * Represents a Dimension in a Dimensional Model
@@ -18,15 +20,23 @@ const types_js_1 = require("../types.js");
  * @internal
  */
 class DimensionalDimension extends base_js_1.DimensionalElement {
-    constructor(name, expression, attributes, dimensions, type, desc, sort, dataSource) {
-        super(name, type || types_js_1.MetadataTypes.Dimension, desc, dataSource);
+    constructor(name, expression, attributes, dimensions, type, desc, sort, dataSource, composeCode, defaultAttribute) {
+        super(name, type || types_js_1.MetadataTypes.Dimension, desc, dataSource, composeCode);
         this._dimensions = [];
         this._attributes = [];
         this._sort = types_js_1.Sort.None;
+        // if composeCode is not explicitly set by the caller, extract it from expression
+        if (!composeCode && expression) {
+            const { table, column } = (0, utils_js_1.parseExpression)(expression);
+            this.composeCode = (0, attributes_js_1.normalizeAttributeName)(table, column, '', consts_js_1.DATA_MODEL_MODULE_NAME);
+        }
         this._sort = sort || types_js_1.Sort.None;
         this._expression = expression;
         this.setDimensions(dimensions || []);
         this.setAttributes(attributes);
+        if (defaultAttribute) {
+            this.defaultAttribute = defaultAttribute;
+        }
     }
     static parseType(type) {
         switch (type) {
@@ -112,21 +122,22 @@ class DimensionalDimension extends base_js_1.DimensionalElement {
      * @returns An instance representing the sorted {@link Dimension} of this instance
      */
     sort(sort) {
-        return new DimensionalDimension(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, sort, this.dataSource);
+        return new DimensionalDimension(this.name, this.expression, this.attributes, this.dimensions, this.type, this.description, sort, this.dataSource, this.composeCode, this.defaultAttribute);
     }
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalDimension';
         result.expression = this.expression;
         if (this.getSort() !== undefined) {
             result.sort = this.getSort();
         }
-        result.attributes = this._attributes.map((att) => att.serializable());
-        result.diemsnions = this._dimensions.map((dim) => dim.serializable());
+        result.attributes = this._attributes.map((att) => att.serialize());
+        result.dimensions = this._dimensions.map((dim) => dim.serialize());
         if (this.defaultAttribute) {
-            result.defaultAttribute = this.defaultAttribute.serializable();
+            result.defaultAttribute = this.defaultAttribute.serialize();
         }
         return result;
     }
@@ -162,8 +173,8 @@ exports.DimensionalDimension = DimensionalDimension;
  * @internal
  */
 class DimensionalDateDimension extends DimensionalDimension {
-    constructor(name, expression, desc, sort, dataSource) {
-        super(name, expression, [], [], types_js_1.MetadataTypes.DateDimension, desc, sort, dataSource);
+    constructor(name, expression, desc, sort, dataSource, composeCode) {
+        super(name, expression, [], [], types_js_1.MetadataTypes.DateDimension, desc, sort, dataSource, composeCode);
         this.defaultLevel = types_js_1.DateLevels.Years;
         this.Years = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Years, expression, types_js_1.DateLevels.Years, 'yyyy', desc, sort, dataSource);
         this.Quarters = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Quarters, expression, types_js_1.DateLevels.Quarters, 'Q yyyy', desc, sort, dataSource);
@@ -223,16 +234,14 @@ class DimensionalDateDimension extends DimensionalDimension {
      * @returns An instance representing the sorted {@link Dimension} of this instance
      */
     sort(sort) {
-        return new DimensionalDateDimension(this.name, this.expression, this.description, sort, this.dataSource);
+        return new DimensionalDateDimension(this.name, this.expression, this.description, sort, this.dataSource, this.composeCode);
     }
     /**
      * Gets a serializable representation of the element
      */
-    serializable() {
-        const result = super.serializable();
-        if (this.defaultLevel) {
-            result.defaultLevel = this.defaultLevel;
-        }
+    serialize() {
+        const result = super.serialize();
+        result.__serializable = 'DimensionalDateDimension';
         return result;
     }
     /**