@sisense/sdk-data 1.33.0 → 2.0.0

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

@@ -5,23 +5,22 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import * as m from './factory.js';
-import { Sort, AggregationTypes, MetadataTypes } from '../types.js';
+import { TranslatableError } from '../../translation/translatable-error.js';
+import { createAttribute, DimensionalAttribute } from '../attributes.js';
 import { DimensionalElement } from '../base.js';
-import { DimensionalAttribute, createAttribute } from '../attributes.js';
 import { create } from '../factory.js';
-import { TranslatableError } from '../../translation/translatable-error.js';
+import { AggregationTypes, MetadataTypes, Sort } from '../types.js';
+import * as m from './factory.js';
 /**
  * @internal
  */
 export class AbstractMeasure extends 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 = Sort.None;
         this._format = '#,#.00';
         this._format = format;
         this._sort = sort || Sort.None;
-        this.composeCode = composeCode;
     }
     /**
      * Gets the sort definition of this instance
@@ -42,8 +41,8 @@ export class AbstractMeasure extends 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();
         }
@@ -59,8 +58,8 @@ export class AbstractMeasure extends DimensionalElement {
  * @internal
  */
 export class DimensionalBaseMeasure extends AbstractMeasure {
-    constructor(name, attribute, agg, format, desc, sort, composeCode) {
-        super(name, MetadataTypes.BaseMeasure, format, desc, sort, composeCode);
+    constructor(name, attribute, agg, format, desc, sort, dataSource, composeCode) {
+        super(name, MetadataTypes.BaseMeasure, format, desc, sort, dataSource, composeCode);
         this.attribute = attribute;
         this.aggregation = agg;
     }
@@ -117,7 +116,7 @@ export 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
@@ -128,7 +127,7 @@ export 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
@@ -139,10 +138,11 @@ export 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) {
@@ -166,8 +166,8 @@ export class DimensionalBaseMeasure extends AbstractMeasure {
  * @internal
  */
 export class DimensionalCalculatedMeasure extends AbstractMeasure {
-    constructor(name, expression, context, format, desc, sort, composeCode) {
-        super(name, MetadataTypes.CalculatedMeasure, format, desc, sort, composeCode);
+    constructor(name, expression, context, format, desc, sort, dataSource, composeCode) {
+        super(name, MetadataTypes.CalculatedMeasure, format, desc, sort, dataSource, composeCode);
         this.expression = expression;
         this.context = context;
     }
@@ -178,7 +178,7 @@ export 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
@@ -189,7 +189,7 @@ export 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
@@ -200,13 +200,14 @@ export 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) {
@@ -235,8 +236,8 @@ export class DimensionalCalculatedMeasure extends AbstractMeasure {
  * @internal
  */
 export class DimensionalMeasureTemplate extends AbstractMeasure {
-    constructor(name, attribute, format, desc, sort) {
-        super(name, MetadataTypes.MeasureTemplate, format, desc, sort);
+    constructor(name, attribute, format, desc, sort, dataSource, composeCode) {
+        super(name, MetadataTypes.MeasureTemplate, format, desc, sort, dataSource, composeCode);
         this.attribute = attribute;
     }
     /**
@@ -248,9 +249,10 @@ export 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;
     }
     /**
@@ -260,7 +262,7 @@ export 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
@@ -269,7 +271,7 @@ export 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/dimensional-model/types.d.ts

@@ -1,9 +1,9 @@
-import { JaqlDataSource, type ConditionFilterJaql } 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
  */
@@ -141,24 +141,26 @@ export declare const MetadataTypes: {
  * Levels for {@link DateDimension}
  */
 export declare const DateLevels: {
-    Years: string;
-    Quarters: string;
-    Months: string;
-    Weeks: string;
-    Days: string;
-    Hours: string;
-    MinutesRoundTo30: string;
-    MinutesRoundTo15: string;
-    Minutes: string;
-    Seconds: string;
-    AggHours: string;
-    AggMinutesRoundTo30: string;
-    AggMinutesRoundTo15: string;
-    AggMinutesRoundTo1: string;
+    readonly Years: "Years";
+    readonly Quarters: "Quarters";
+    readonly Months: "Months";
+    readonly Weeks: "Weeks";
+    readonly Days: "Days";
+    readonly Hours: "Hours";
+    readonly MinutesRoundTo30: "MinutesRoundTo30";
+    readonly MinutesRoundTo15: "MinutesRoundTo15";
+    readonly Minutes: "Minutes";
+    readonly Seconds: "Seconds";
+    readonly AggHours: "AggHours";
+    readonly AggMinutesRoundTo30: "AggMinutesRoundTo30";
+    readonly AggMinutesRoundTo15: "AggMinutesRoundTo15";
+    readonly AggMinutesRoundTo1: "AggMinutesRoundTo1";
     /** @internal */
     readonly all: string[];
 };
 /** @internal */
+export declare type DateLevel = Exclude<(typeof DateLevels)[keyof typeof DateLevels], typeof DateLevels.all>;
+/** @internal */
 export declare enum DataType {
     TEXT = "text",
     NUMERIC = "numeric",
@@ -210,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>;
@@ -269,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
  */
@@ -393,6 +417,7 @@ export declare type MetadataItemJaql = {
         sortingLastDimension?: boolean;
         initialized?: boolean;
     };
+    datasource?: JaqlDataSource;
 };
 /**
  * @internal

package/dist/index.d.ts

@@ -6,18 +6,18 @@ import './translation/initialize-i18n.js';
  * @group Data Model Utilities
  * Utility functions for creating attributes and dimensions in code.
  */
-export * from './interfaces.js';
-export * from './dimensional-model/types.js';
-export * from './dimensional-model/interfaces.js';
+export * from './dimensional-model/attributes.js';
 export * from './dimensional-model/base.js';
 export * from './dimensional-model/data-model.js';
-export * from './dimensional-model/attributes.js';
 export * from './dimensional-model/dimensions/index.js';
 export * from './dimensional-model/factory.js';
-export * from './dimensional-model/jaql-element.js';
-export * from './dimensional-model/filters/filters.js';
 export * from './dimensional-model/filters/filter-config-utils.js';
+export * from './dimensional-model/filters/filters.js';
 export { createFilterMatcher } from './dimensional-model/filters/utils/filter-matcher-utils.js';
+export * from './dimensional-model/interfaces.js';
+export * from './dimensional-model/jaql-element.js';
+export * from './dimensional-model/types.js';
+export * from './interfaces.js';
 /**
  * Functions to create date, text, or numeric filters on specified data.
  *
@@ -92,6 +92,6 @@ export * from './dimensional-model/simple-column-types.js';
  * @group Factories
  */
 export * as analyticsFactory from './dimensional-model/analytics/factory.js';
-export * from './utils.js';
 export * from './dimensional-model/filters/index.js';
 export { type TranslationDictionary, PACKAGE_NAMESPACE as translationNamespace, } from './translation/resources/index.js';
+export * from './utils.js';

package/dist/index.js

@@ -6,18 +6,18 @@ import './translation/initialize-i18n.js';
  * @group Data Model Utilities
  * Utility functions for creating attributes and dimensions in code.
  */
-export * from './interfaces.js';
-export * from './dimensional-model/types.js';
-export * from './dimensional-model/interfaces.js';
+export * from './dimensional-model/attributes.js';
 export * from './dimensional-model/base.js';
 export * from './dimensional-model/data-model.js';
-export * from './dimensional-model/attributes.js';
 export * from './dimensional-model/dimensions/index.js';
 export * from './dimensional-model/factory.js';
-export * from './dimensional-model/jaql-element.js';
-export * from './dimensional-model/filters/filters.js';
 export * from './dimensional-model/filters/filter-config-utils.js';
+export * from './dimensional-model/filters/filters.js';
 export { createFilterMatcher } from './dimensional-model/filters/utils/filter-matcher-utils.js';
+export * from './dimensional-model/interfaces.js';
+export * from './dimensional-model/jaql-element.js';
+export * from './dimensional-model/types.js';
+export * from './interfaces.js';
 /**
  * Functions to create date, text, or numeric filters on specified data.
  *
@@ -92,6 +92,6 @@ export * from './dimensional-model/simple-column-types.js';
  * @group Factories
  */
 export * as analyticsFactory from './dimensional-model/analytics/factory.js';
-export * from './utils.js';
 export * from './dimensional-model/filters/index.js';
 export { PACKAGE_NAMESPACE as translationNamespace, } from './translation/resources/index.js';
+export * from './utils.js';

package/dist/translation/initialize-i18n.js

@@ -1,5 +1,5 @@
 import { initI18next } from '@sisense/sdk-common';
-import { resources, PACKAGE_NAMESPACE } from './resources/index.js';
+import { PACKAGE_NAMESPACE, resources } from './resources/index.js';
 export function initializeI18n() {
     return initI18next({
         resource: resources,