@finos/legend-data-cube 0.0.7 → 0.0.9

package/src/stores/{engine → core}/DataCubeEngine.ts

@@ -20,6 +20,7 @@ import {
   type TDSExecutionResult,
   V1_deserializeValueSpecification,
   V1_serializeValueSpecification,
+  V1_CString,
 } from '@finos/legend-graph';
 import { getFilterOperation } from '../core/filter/DataCubeQueryFilterOperation.js';
 import { getAggregateOperation } from '../core/aggregation/DataCubeQueryAggregateOperation.js';
@@ -63,7 +64,6 @@ import { DataCubeQueryFilterOperation__EndWithCaseInsensitive } from '../core/fi
 import { DataCubeQueryFilterOperation__NotEndWith } from '../core/filter/DataCubeQueryFilterOperation__NotEndWith.js';
 import { DataCubeQueryFilterOperation__IsNull } from '../core/filter/DataCubeQueryFilterOperation__IsNull.js';
 import { DataCubeQueryFilterOperation__IsNotNull } from '../core/filter/DataCubeQueryFilterOperation__IsNotNull.js';
-import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { LicenseManager } from '@ag-grid-enterprise/core';
 import {
   configureCodeEditor,
@@ -73,6 +73,10 @@ import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
 import { createModelSchema, custom, primitive } from 'serializr';
 import { type DataCubeQueryColumn, DataCubeQuery } from './DataCubeQuery.js';
 import { DataCubeFont } from '../core/DataCubeQueryEngine.js';
+import { action, makeObservable, observable } from 'mobx';
+import type { GridApi } from '@ag-grid-community/core';
+import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+import { buildExecutableQuery } from './DataCubeQueryBuilder.js';
 
 export type CompletionItem = {
   completion: string;
@@ -92,6 +96,8 @@ export type DataCubeQueryBuilderError = {
 
 export type DataCubeInfrastructureInfo = {
   gridClientLicense?: string | undefined;
+  simpleSampleDataTableName: string;
+  complexSampleDataTableName: string;
 };
 
 export type RelationType = {
@@ -121,16 +127,14 @@ export class DataCubeGetBaseQueryResult {
 }
 
 export const DEFAULT_ENABLE_DEBUG_MODE = false;
-export const DEFAULT_ENABLE_ENGINE_DEBUG_MODE = false;
-
 export const DEFAULT_GRID_CLIENT_ROW_BUFFER = 50;
 export const DEFAULT_GRID_CLIENT_PURGE_CLOSED_ROW_NODES = false;
 export const DEFAULT_GRID_CLIENT_SUPPRESS_LARGE_DATASET_WARNING = false;
 
 export abstract class DataCubeEngine {
   gridClientLicense?: string | undefined;
-  viewTaskRunner?:
-    | ((task: (view: DataCubeViewState) => void) => void)
+  gridClientTaskRunner?:
+    | ((task: (gridClient: GridApi) => void) => void)
     | undefined;
 
   readonly filterOperations = [
@@ -182,13 +186,28 @@ export abstract class DataCubeEngine {
   ];
 
   enableDebugMode = DEFAULT_ENABLE_DEBUG_MODE;
-  enableEngineDebugMode = DEFAULT_ENABLE_ENGINE_DEBUG_MODE;
 
   gridClientRowBuffer = DEFAULT_GRID_CLIENT_ROW_BUFFER;
   gridClientPurgeClosedRowNodes = DEFAULT_GRID_CLIENT_PURGE_CLOSED_ROW_NODES;
   gridClientSuppressLargeDatasetWarning =
     DEFAULT_GRID_CLIENT_SUPPRESS_LARGE_DATASET_WARNING;
 
+  constructor() {
+    makeObservable(this, {
+      enableDebugMode: observable,
+      setEnableDebugMode: action,
+
+      gridClientRowBuffer: observable,
+      setGridClientRowBuffer: action,
+
+      gridClientPurgeClosedRowNodes: observable,
+      setGridClientPurgeClosedRowNodes: action,
+
+      gridClientSuppressLargeDatasetWarning: observable,
+      setGridClientSuppressLargeDatasetWarning: action,
+    });
+  }
+
   getFilterOperation(value: string) {
     return getFilterOperation(value, this.filterOperations);
   }
@@ -201,9 +220,6 @@ export abstract class DataCubeEngine {
     this.enableDebugMode = value;
   }
 
-  setEnableEngineDebugMode(value: boolean) {
-    this.enableEngineDebugMode = value;
-  }
   setGridClientRowBuffer(value: number) {
     this.gridClientRowBuffer = value;
     this.propagateGridOptionUpdates();
@@ -232,8 +248,8 @@ export abstract class DataCubeEngine {
   }
 
   private propagateGridOptionUpdates() {
-    this.viewTaskRunner?.((view) => {
-      view.grid.client.updateGridOptions({
+    this.gridClientTaskRunner?.((client) => {
+      client.updateGridOptions({
         rowBuffer: this.gridClientRowBuffer,
         purgeClosedRowNodes: this.gridClientPurgeClosedRowNodes,
       });
@@ -241,12 +257,13 @@ export abstract class DataCubeEngine {
   }
 
   refreshFailedDataFetches() {
-    this.viewTaskRunner?.((view) => {
-      view.grid.client.retryServerSideLoads();
+    this.gridClientTaskRunner?.((client) => {
+      client.retryServerSideLoads();
     });
   }
 
   abstract getInfrastructureInfo(): Promise<DataCubeInfrastructureInfo>;
+
   abstract getQueryTypeahead(
     code: string,
     query: V1_ValueSpecification,
@@ -254,9 +271,14 @@ export abstract class DataCubeEngine {
 
   abstract parseQuery(
     code: string,
-    returnSourceInformation?: boolean,
+    returnSourceInformation?: boolean | undefined,
   ): Promise<V1_ValueSpecification>;
 
+  abstract getQueryCode(
+    query: V1_ValueSpecification,
+    pretty?: boolean | undefined,
+  ): Promise<string>;
+
   abstract getBaseQuery(): Promise<DataCubeGetBaseQueryResult>;
 
   abstract getQueryRelationType(
@@ -273,4 +295,33 @@ export abstract class DataCubeEngine {
     executedQuery: string;
     executedSQL: string;
   }>;
+
+  /**
+   * By default, for a function chain, Pure grammar composer will extract the first parameter of the first function
+   * and render it as the caller of that function rather than a parameter
+   * e.g. fx(fy(p1, p2), p3) will be rendered as p1->fy(p2)->fx(p3) instead of fy(p1, p2)-> fx(p3)
+   *
+   * We do a hack to get around this by setting a dummy value as the first parameter of the first function in the chain.
+   * Then remove this dummy value from the final code.
+   */
+  async getPartialQueryCode(
+    snapshot: DataCubeQuerySnapshot,
+    pretty?: boolean | undefined,
+  ) {
+    const dummySourceQuery = new V1_CString();
+    dummySourceQuery.value = '';
+    return (
+      await this.getQueryCode(
+        buildExecutableQuery(
+          snapshot,
+          this.filterOperations,
+          this.aggregateOperations,
+          {
+            sourceQuery: dummySourceQuery,
+          },
+        ),
+        true,
+      )
+    ).substring(`''->`.length);
+  }
 }

package/src/stores/core/DataCubeQueryBuilder.ts

@@ -24,19 +24,12 @@
 import {
   PRIMITIVE_TYPE,
   type V1_AppliedFunction,
+  type V1_ValueSpecification,
   V1_deserializeValueSpecification,
 } from '@finos/legend-graph';
+import { type DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+import { guaranteeNonNullable, isNonNullable } from '@finos/legend-shared';
 import {
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotSimpleExtendedColumn,
-} from './DataCubeQuerySnapshot.js';
-import {
-  guaranteeNonNullable,
-  isNonNullable,
-  UnsupportedOperationError,
-} from '@finos/legend-shared';
-import {
-  DataCubeExtendedColumnType,
   DataCubeFunction,
   DataCubeQuerySortDirection,
   type DataCubeQueryFunctionMap,
@@ -48,7 +41,7 @@ import {
   _collection,
   _cols,
   _colSpec,
-  _deserializeToLambda,
+  _deserializeLambda,
   _elementPtr,
   _filter,
   _function,
@@ -67,6 +60,7 @@ export function buildExecutableQuery(
   filterOperations: DataCubeQueryFilterOperation[],
   aggregateOperations: DataCubeQueryAggregateOperation[],
   options?: {
+    sourceQuery?: V1_ValueSpecification | null | undefined;
     postProcessor?: (
       snapshot: DataCubeQuerySnapshot,
       sequence: V1_AppliedFunction[],
@@ -95,22 +89,15 @@ export function buildExecutableQuery(
   // --------------------------------- LEAF-LEVEL EXTEND ---------------------------------
 
   if (data.leafExtendedColumns.length) {
-    _process(
-      'leafExtend',
+    const leafExtendedFuncs = data.leafExtendedColumns.map((col) =>
       _function(DataCubeFunction.EXTEND, [
-        _cols(
-          data.leafExtendedColumns.map((col) => {
-            if (col._type === DataCubeExtendedColumnType.SIMPLE) {
-              const column = col as DataCubeQuerySnapshotSimpleExtendedColumn;
-              return _colSpec(column.name, _deserializeToLambda(column.lambda));
-            }
-            throw new UnsupportedOperationError(
-              `Can't build extended column of type '${col._type}'`,
-            );
-          }),
-        ),
+        _col(col.name, _deserializeLambda(col.mapFn)),
       ]),
     );
+    _process('leafExtend', guaranteeNonNullable(leafExtendedFuncs[0]));
+    leafExtendedFuncs.slice(1).forEach((func) => {
+      sequence.push(func);
+    });
   }
 
   // --------------------------------- FILTER ---------------------------------
@@ -146,7 +133,7 @@ export function buildExecutableQuery(
       _function(DataCubeFunction.SORT, [
         _collection(
           data.pivot.columns.map((col) =>
-            _function(DataCubeFunction.ASC, [_col(col.name)]),
+            _function(DataCubeFunction.ASCENDING, [_col(col.name)]),
           ),
         ),
       ]),
@@ -201,8 +188,8 @@ export function buildExecutableQuery(
             _function(
               configuration.treeColumnSortDirection ===
                 DataCubeQuerySortDirection.ASCENDING
-                ? DataCubeFunction.ASC
-                : DataCubeFunction.DESC,
+                ? DataCubeFunction.ASCENDING
+                : DataCubeFunction.DESCENDING,
               [_col(col.name)],
             ),
           ),
@@ -214,22 +201,15 @@ export function buildExecutableQuery(
   // --------------------------------- GROUP-LEVEL EXTEND ---------------------------------
 
   if (data.groupExtendedColumns.length) {
-    _process(
-      'groupExtend',
+    const groupExtendedFuncs = data.groupExtendedColumns.map((col) =>
       _function(DataCubeFunction.EXTEND, [
-        _cols(
-          data.groupExtendedColumns.map((col) => {
-            if (col._type === DataCubeExtendedColumnType.SIMPLE) {
-              const column = col as DataCubeQuerySnapshotSimpleExtendedColumn;
-              return _colSpec(column.name, _deserializeToLambda(column.lambda));
-            }
-            throw new UnsupportedOperationError(
-              `Can't build extended column of type '${col._type}'`,
-            );
-          }),
-        ),
+        _col(col.name, _deserializeLambda(col.mapFn)),
       ]),
     );
+    _process('groupExtend', guaranteeNonNullable(groupExtendedFuncs[0]));
+    groupExtendedFuncs.slice(1).forEach((func) => {
+      sequence.push(func);
+    });
   }
 
   // --------------------------------- SORT ---------------------------------
@@ -242,8 +222,8 @@ export function buildExecutableQuery(
           data.sortColumns.map((col) =>
             _function(
               col.direction === DataCubeQuerySortDirection.ASCENDING
-                ? DataCubeFunction.ASC
-                : DataCubeFunction.DESC,
+                ? DataCubeFunction.ASCENDING
+                : DataCubeFunction.DESCENDING,
               [_col(col.name)],
             ),
           ),
@@ -300,9 +280,13 @@ export function buildExecutableQuery(
   if (!sequence.length) {
     return sourceQuery;
   }
-  for (let i = 0; i < sequence.length; i++) {
+
+  const omitSourceQuery = options?.sourceQuery === null;
+  for (let i = omitSourceQuery ? 1 : 0; i < sequence.length; i++) {
     guaranteeNonNullable(sequence[i]).parameters.unshift(
-      i === 0 ? sourceQuery : guaranteeNonNullable(sequence[i - 1]),
+      i === 0
+        ? (options?.sourceQuery ?? sourceQuery)
+        : guaranteeNonNullable(sequence[i - 1]),
     );
   }
   return guaranteeNonNullable(sequence[sequence.length - 1]);

package/src/stores/core/DataCubeQueryBuilderUtils.ts

@@ -108,10 +108,17 @@ export function _functionCompositionUnProcessor(
   };
 }
 
-export function _deserializeToLambda(json: PlainObject<V1_Lambda>) {
+export function _deserializeLambda(json: PlainObject<V1_Lambda>) {
   return guaranteeType(V1_deserializeValueSpecification(json, []), V1_Lambda);
 }
 
+export function _deserializeFunction(json: PlainObject<V1_Lambda>) {
+  return guaranteeType(
+    V1_deserializeValueSpecification(json, []),
+    V1_AppliedFunction,
+  );
+}
+
 export function _var(name?: string | undefined) {
   const variable = new V1_Variable();
   variable.name = name ?? DEFAULT_LAMBDA_VARIABLE_NAME;
@@ -247,11 +254,13 @@ export function _colSpec(
   name: string,
   function1?: V1_Lambda | undefined,
   function2?: V1_Lambda | undefined,
+  type?: string | undefined,
 ) {
   const colSpec = new V1_ColSpec();
   colSpec.name = name;
   colSpec.function1 = function1;
   colSpec.function2 = function2;
+  colSpec.type = type;
   return colSpec;
 }
 
@@ -376,7 +385,11 @@ export function _pivotAggCols(
 export function _castCols(columns: DataCubeQuerySnapshotColumn[]) {
   const genericType = new V1_GenericTypeInstance();
   genericType.fullPath = CORE_PURE_PATH.RELATION;
-  genericType.typeArguments = [_cols(columns)];
+  genericType.typeArguments = [
+    _cols(
+      columns.map((col) => _colSpec(col.name, undefined, undefined, col.type)),
+    ),
+  ];
   return genericType;
 }
 
@@ -437,9 +450,9 @@ export function _groupByAggCols(
       .map((column) => {
         const columnConfiguration =
           DataCubeColumnConfiguration.serialization.fromJson(
-            DataCubeColumnConfiguration.serialization.toJson(
-              guaranteeNonNullable(column.matchingColumnConfiguration),
-            ),
+            guaranteeNonNullable(
+              column.matchingColumnConfiguration,
+            ).serialize(),
           );
         columnConfiguration.name = column.name;
         const operation = aggregateOperations.find(
@@ -501,12 +514,12 @@ export function _filter(
   } else {
     const filterCondition = filter;
     const operation = filterOperations.find(
-      (op) => op.operator === filterCondition.operation,
+      (op) => op.operator === filterCondition.operator,
     );
     const condition = operation?.buildConditionExpression(filterCondition);
     if (!condition) {
       throw new UnsupportedOperationError(
-        `Unsupported filter operation '${filterCondition.operation}'`,
+        `Unsupported filter operation '${filterCondition.operator}'`,
       );
     }
     return filterCondition.not ? _not(condition) : condition;

package/src/stores/core/DataCubeQueryEngine.ts

@@ -35,8 +35,9 @@ export enum DataCubeFunction {
   FROM = 'meta::pure::mapping::from',
 
   // sort
-  ASC = 'meta::pure::functions::relation::ascending',
-  DESC = 'meta::pure::functions::relation::descending',
+  ASCENDING = 'meta::pure::functions::relation::ascending',
+  DESCENDING = 'meta::pure::functions::relation::descending',
+  ABS = 'meta::pure::functions::math::abs',
 
   // filter
   AND = 'meta::pure::functions::boolean::and',
@@ -149,7 +150,7 @@ export type DataCubeOperationValue = {
   type: string;
 };
 
-export enum DataCubeAggregateOperator {
+export enum DataCubeQueryAggregateOperator {
   SUM = 'sum',
   AVERAGE = 'avg',
   COUNT = 'count',
@@ -183,7 +184,7 @@ export enum DataCubeAggregateOperator {
   // custom
 }
 
-export enum DataCubeClientSideAggregateOperator {
+export enum DataCubeQueryClientSideAggregateOperator {
   SUM = 'sum',
   AVERAGE = 'avg',
   MEDIAN = 'median',
@@ -248,12 +249,6 @@ export enum DataCubeColumnPinPlacement {
   RIGHT = 'Right',
 }
 
-// TODO: support more classifications of this column, it can also be aggregation with map/reduce or
-// OLAP window aggregation, or custom groupings, etc.
-export enum DataCubeExtendedColumnType {
-  SIMPLE = 'simple',
-}
-
 export enum DataCubeColumnDataType {
   NUMBER = 'Numeric',
   TEXT = 'Text',

package/src/stores/core/DataCubeQuerySnapshot.ts

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import type { V1_Lambda, V1_ValueSpecification } from '@finos/legend-graph';
+import type {
+  V1_AppliedFunction,
+  V1_Lambda,
+  V1_ValueSpecification,
+} from '@finos/legend-graph';
 import type { DataCubeConfiguration } from './DataCubeConfiguration.js';
 import {
   IllegalStateError,
@@ -24,12 +28,15 @@ import {
   type PlainObject,
   type Writable,
 } from '@finos/legend-shared';
-import type { DataCubeOperationValue } from './DataCubeQueryEngine.js';
+import type {
+  DataCubeOperationValue,
+  DataCubeQuerySortDirection,
+} from './DataCubeQueryEngine.js';
 
 export type DataCubeQuerySnapshotFilterCondition =
   DataCubeQuerySnapshotColumn & {
     value: DataCubeOperationValue | undefined;
-    operation: string;
+    operator: string;
     not?: boolean | undefined;
   };
 
@@ -49,16 +56,13 @@ export type DataCubeQuerySnapshotColumn = {
 
 export type DataCubeQuerySnapshotExtendedColumn =
   DataCubeQuerySnapshotColumn & {
-    _type: string;
-  };
-
-export type DataCubeQuerySnapshotSimpleExtendedColumn =
-  DataCubeQuerySnapshotExtendedColumn & {
-    lambda: PlainObject<V1_Lambda>;
+    windowFn?: PlainObject<V1_AppliedFunction> | undefined;
+    mapFn: PlainObject<V1_Lambda>;
+    reduceFn?: PlainObject<V1_Lambda> | undefined;
   };
 
 export type DataCubeQuerySnapshotSortColumn = DataCubeQuerySnapshotColumn & {
-  direction: string;
+  direction: DataCubeQuerySortDirection;
 };
 
 export type DataCubeQuerySnapshotGroupBy = {
@@ -89,9 +93,10 @@ export type DataCubeQuerySnapshotData = {
 
 export class DataCubeQuerySnapshot {
   readonly uuid = uuid();
-  timestamp = Date.now();
+  readonly timestamp = Date.now();
   readonly data: DataCubeQuerySnapshotData;
 
+  private _isPatchChange = false;
   private _finalized = false;
   private _hashCode?: string | undefined;
 
@@ -136,12 +141,21 @@ export class DataCubeQuerySnapshot {
     );
   }
 
-  clone() {
-    const clone = new DataCubeQuerySnapshot('', '', '', {}, {});
-    (clone.data as Writable<DataCubeQuerySnapshotData>) = JSON.parse(
-      JSON.stringify(this.data),
-    ) as DataCubeQuerySnapshotData;
-    return clone;
+  /**
+   * When we support undo/redo, patch changes should be grouped
+   * together with the most recent non-patch change snapshot and treated
+   * as a single step.
+   *
+   * e.g. if we have a stack of snapshots [A, B, C, D] where D is the current
+   * snapshot and C is a patch change. When undo, we should go back to C.
+   * When undo again, we should go back to A instead of B.
+   */
+  markAsPatchChange() {
+    this._isPatchChange = true;
+  }
+
+  isPatchChange() {
+    return this._isPatchChange;
   }
 
   isFinalized() {
@@ -171,6 +185,40 @@ export class DataCubeQuerySnapshot {
     }
     return this._hashCode;
   }
+
+  clone() {
+    const clone = new DataCubeQuerySnapshot('', '', '', {}, {});
+    (clone.data as Writable<DataCubeQuerySnapshotData>) = JSON.parse(
+      JSON.stringify(this.data),
+    ) as DataCubeQuerySnapshotData;
+    return clone;
+  }
+
+  /**
+   * Only use this if an absolute identical clone is needed.
+   * This should rarely be used, and ideally by core engine only.
+   */
+  INTERNAL__fullClone() {
+    const clone = new DataCubeQuerySnapshot('', '', '', {}, {});
+    (clone as Writable<DataCubeQuerySnapshot>).uuid = this.uuid;
+    (clone as Writable<DataCubeQuerySnapshot>).timestamp = this.timestamp;
+    (clone as Writable<DataCubeQuerySnapshot>).data = JSON.parse(
+      JSON.stringify(this.data),
+    ) as DataCubeQuerySnapshotData;
+    clone._isPatchChange = this._isPatchChange;
+    clone._finalized = this._finalized;
+    clone._hashCode = this._hashCode;
+    return clone;
+  }
+
+  /**
+   * Only use this if programatic setting of timestamp is needed.
+   * e.g. for the first-ever snapshot where we want to sync the timestamp
+   * to the timestamp provided by the engine.
+   */
+  INTERNAL__setTimestamp(timestamp: number) {
+    (this as Writable<DataCubeQuerySnapshot>).timestamp = timestamp;
+  }
 }
 
 export function _findCol<T extends DataCubeQuerySnapshotColumn>(

package/src/stores/core/DataCubeQuerySnapshotBuilder.ts

@@ -32,7 +32,7 @@ import {
   matchFunctionName,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import type { DataCubeQuery } from '../engine/DataCubeQuery.js';
+import type { DataCubeQuery } from '../core/DataCubeQuery.js';
 import {
   _toCol,
   DataCubeQuerySnapshot,
@@ -59,7 +59,7 @@ const _SUPPORTED_TOP_LEVEL_FUNCTIONS: {
   func: string;
   parameters: number;
 }[] = [
-  { func: DataCubeFunction.EXTEND, parameters: 1 },
+  { func: DataCubeFunction.EXTEND, parameters: 2 }, // support both signatures of extend()
   { func: DataCubeFunction.FILTER, parameters: 1 },
   { func: DataCubeFunction.SELECT, parameters: 1 },
   { func: DataCubeFunction.GROUP_BY, parameters: 3 },
@@ -101,12 +101,12 @@ enum _FUNCTION_SEQUENCE_COMPOSITION_PART {
 
 // This corresponds to the function sequence that we currently support:
 //
-// -> extend()
+// ->extend()*
 // ->filter()
 // ->select()
 // ->sort()->pivot()->cast()
 // ->groupBy()->sort()
-// ->extend()
+// ->extend()*
 // ->sort()
 // ->limit()
 //
@@ -118,6 +118,7 @@ const _FUNCTION_SEQUENCE_COMPOSITION_PATTERN: (
     // leaf-level extend
     name: _FUNCTION_SEQUENCE_COMPOSITION_PART.LEAF_EXTEND,
     func: DataCubeFunction.EXTEND,
+    repeat: true,
   },
   {
     name: _FUNCTION_SEQUENCE_COMPOSITION_PART.FILTER,
@@ -169,6 +170,7 @@ const _FUNCTION_SEQUENCE_COMPOSITION_PATTERN: (
     // group-level extend
     name: _FUNCTION_SEQUENCE_COMPOSITION_PART.GROUP_EXTEND,
     func: DataCubeFunction.EXTEND,
+    repeat: true,
   },
   {
     name: _FUNCTION_SEQUENCE_COMPOSITION_PART.SORT,
@@ -318,11 +320,7 @@ export function validateAndBuildQuerySnapshot(
   /** TODO: @datacube roundtrip */
 
   // --------------------------------- FILTER ---------------------------------
-
-  if (funcMap.filter) {
-    /** TODO: @datacube roundtrip */
-    data.filter = undefined;
-  }
+  /** TODO: @datacube roundtrip */
 
   // --------------------------------- SELECT ---------------------------------
 
@@ -357,13 +355,13 @@ export function validateAndBuildQuerySnapshot(
     data.sortColumns = _param(funcMap.sort, 0, V1_Collection).values.map(
       (value) => {
         const sortColFunc = _funcMatch(value, [
-          DataCubeFunction.ASC,
-          DataCubeFunction.DESC,
+          DataCubeFunction.ASCENDING,
+          DataCubeFunction.DESCENDING,
         ]);
         return {
           ..._col(_colSpecParam(sortColFunc, 0)),
           direction:
-            _name(sortColFunc.function) === DataCubeFunction.ASC
+            _name(sortColFunc.function) === DataCubeFunction.ASCENDING
               ? DataCubeQuerySortDirection.ASCENDING
               : DataCubeQuerySortDirection.DESCENDING,
         };
@@ -404,8 +402,7 @@ export function validateAndBuildQuerySnapshot(
         ...data.leafExtendedColumns,
         ...data.groupExtendedColumns,
       ]);
-  data.configuration =
-    DataCubeConfiguration.serialization.toJson(configuration);
+  data.configuration = configuration.serialize();
   /**
    * TODO: @datacube roundtrip - implement the logic to reconcile the configuration with the query
    * - [ ] columns (missing/extra columns - remove or generate default column configuration)

package/src/stores/core/aggregation/DataCubeQueryAggregateOperation__Average.tsx

@@ -17,7 +17,7 @@
 import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
-  DataCubeAggregateOperator,
+  DataCubeQueryAggregateOperator,
   DataCubeColumnDataType,
   DataCubeFunction,
   ofDataType,
@@ -38,8 +38,8 @@ export class DataCubeQueryAggregateOperation__Average extends DataCubeQueryAggre
     return 'average';
   }
 
-  override get operator(): string {
-    return DataCubeAggregateOperator.AVERAGE;
+  override get operator() {
+    return DataCubeQueryAggregateOperator.AVERAGE;
   }
 
   isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {

package/src/stores/core/aggregation/DataCubeQueryAggregateOperation__Count.tsx

@@ -17,7 +17,7 @@
 import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
-  DataCubeAggregateOperator,
+  DataCubeQueryAggregateOperator,
   DataCubeColumnDataType,
   DataCubeFunction,
   ofDataType,
@@ -38,8 +38,8 @@ export class DataCubeQueryAggregateOperation__Count extends DataCubeQueryAggrega
     return 'count';
   }
 
-  override get operator(): string {
-    return DataCubeAggregateOperator.COUNT;
+  override get operator() {
+    return DataCubeQueryAggregateOperator.COUNT;
   }
 
   isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {