@finos/legend-data-cube 0.1.3 → 0.1.5

package/src/stores/core/DataCubeQueryBuilderUtils.ts

@@ -17,7 +17,7 @@
 /***************************************************************************************
  * [CORE]
  *
- * These are utilities used to build the executable query from the query snapshot.
+ * These are utilities used to build the executable query from the snapshot.
  * The executable query is then used to fetch data.
  ***************************************************************************************/
 
@@ -54,10 +54,10 @@ import {
   V1_createRelationTypeColumn,
 } from '@finos/legend-graph';
 import {
-  type DataCubeQuerySnapshotFilterCondition,
-  type DataCubeQuerySnapshotFilter,
-  type DataCubeQuerySnapshot,
-} from './DataCubeQuerySnapshot.js';
+  type DataCubeSnapshotFilterCondition,
+  type DataCubeSnapshotFilter,
+  type DataCubeSnapshot,
+} from './DataCubeSnapshot.js';
 import { _findCol, type DataCubeColumn } from './model/DataCubeColumn.js';
 import {
   guaranteeNonNullable,
@@ -402,7 +402,7 @@ export function _aggCol_base(
 
 export function _pivotAggCols(
   pivotColumns: DataCubeColumn[],
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
   aggregateOperations: DataCubeQueryAggregateOperation[],
 ) {
@@ -449,7 +449,7 @@ export function _castCols(columns: DataCubeColumn[]) {
 
 export function _groupByAggCols(
   groupByColumns: DataCubeColumn[],
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
   aggregateOperations: DataCubeQueryAggregateOperation[],
 ) {
@@ -544,7 +544,7 @@ export function _groupByAggCols(
 }
 
 export function _filter(
-  filter: DataCubeQuerySnapshotFilter | DataCubeQuerySnapshotFilterCondition,
+  filter: DataCubeSnapshotFilter | DataCubeSnapshotFilterCondition,
   filterOperations: DataCubeQueryFilterOperation[],
 ) {
   if ('groupOperator' in filter) {

package/src/stores/core/{DataCubeQuerySnapshot.ts → DataCubeSnapshot.ts}

@@ -30,69 +30,66 @@ import type {
 } from './DataCubeQueryEngine.js';
 import type { DataCubeColumn } from './model/DataCubeColumn.js';
 
-export type DataCubeQuerySnapshotFilterCondition = DataCubeColumn & {
+export type DataCubeSnapshotFilterCondition = DataCubeColumn & {
   value: DataCubeOperationValue;
   operator: string;
   not?: boolean | undefined;
 };
 
-export type DataCubeQuerySnapshotFilter = {
+export type DataCubeSnapshotFilter = {
   groupOperator: string;
-  conditions: (
-    | DataCubeQuerySnapshotFilterCondition
-    | DataCubeQuerySnapshotFilter
-  )[];
+  conditions: (DataCubeSnapshotFilterCondition | DataCubeSnapshotFilter)[];
   not?: boolean | undefined;
 };
 
-export type DataCubeQuerySnapshotExtendedColumn = DataCubeColumn & {
+export type DataCubeSnapshotExtendedColumn = DataCubeColumn & {
   windowFn?: PlainObject<V1_AppliedFunction> | undefined;
   mapFn: PlainObject<V1_Lambda>;
   reduceFn?: PlainObject<V1_Lambda> | undefined;
 };
 
-export type DataCubeQuerySnapshotAggregateColumn = DataCubeColumn & {
+export type DataCubeSnapshotAggregateColumn = DataCubeColumn & {
   parameterValues: DataCubeOperationValue[];
   operator: string;
 };
 
-export type DataCubeQuerySnapshotSortColumn = DataCubeColumn & {
+export type DataCubeSnapshotSortColumn = DataCubeColumn & {
   direction: DataCubeQuerySortDirection;
 };
 
-export type DataCubeQuerySnapshotGroupBy = {
+export type DataCubeSnapshotGroupBy = {
   columns: DataCubeColumn[];
 };
 
-export type DataCubeQuerySnapshotPivot = {
+export type DataCubeSnapshotPivot = {
   columns: DataCubeColumn[];
   castColumns: DataCubeColumn[];
 };
 
-export type DataCubeQuerySnapshotProcessingContext = {
-  snapshot: DataCubeQuerySnapshot;
-  pivotAggColumns?: DataCubeQuerySnapshotAggregateColumn[] | undefined;
-  pivotSortColumns?: DataCubeQuerySnapshotSortColumn[] | undefined;
-  groupByAggColumns?: DataCubeQuerySnapshotAggregateColumn[] | undefined;
-  groupBySortColumns?: DataCubeQuerySnapshotSortColumn[] | undefined;
+export type DataCubeSnapshotProcessingContext = {
+  snapshot: DataCubeSnapshot;
+  pivotAggColumns?: DataCubeSnapshotAggregateColumn[] | undefined;
+  pivotSortColumns?: DataCubeSnapshotSortColumn[] | undefined;
+  groupByAggColumns?: DataCubeSnapshotAggregateColumn[] | undefined;
+  groupBySortColumns?: DataCubeSnapshotSortColumn[] | undefined;
 };
 
-export type DataCubeQuerySnapshotData = {
+export type DataCubeSnapshotData = {
   configuration: PlainObject<DataCubeConfiguration>;
   sourceColumns: DataCubeColumn[];
-  leafExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
-  filter?: DataCubeQuerySnapshotFilter | undefined;
+  leafExtendedColumns: DataCubeSnapshotExtendedColumn[];
+  filter?: DataCubeSnapshotFilter | undefined;
   selectColumns: DataCubeColumn[];
-  groupBy?: DataCubeQuerySnapshotGroupBy | undefined;
-  pivot?: DataCubeQuerySnapshotPivot | undefined;
-  groupExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
-  sortColumns: DataCubeQuerySnapshotSortColumn[];
+  groupBy?: DataCubeSnapshotGroupBy | undefined;
+  pivot?: DataCubeSnapshotPivot | undefined;
+  groupExtendedColumns: DataCubeSnapshotExtendedColumn[];
+  sortColumns: DataCubeSnapshotSortColumn[];
   limit: number | undefined;
 };
 
-export class DataCubeQuerySnapshot {
+export class DataCubeSnapshot {
   readonly uuid = uuid();
-  readonly data: DataCubeQuerySnapshotData;
+  readonly data: DataCubeSnapshotData;
 
   private _isPatchChange = false;
   private _finalized = false;
@@ -114,7 +111,7 @@ export class DataCubeQuerySnapshot {
   }
 
   static create(configuration: PlainObject<DataCubeConfiguration>) {
-    return new DataCubeQuerySnapshot(configuration);
+    return new DataCubeSnapshot(configuration);
   }
 
   /**
@@ -163,10 +160,10 @@ export class DataCubeQuerySnapshot {
   }
 
   clone() {
-    const clone = new DataCubeQuerySnapshot({});
-    (clone.data as Writable<DataCubeQuerySnapshotData>) = JSON.parse(
+    const clone = new DataCubeSnapshot({});
+    (clone.data as Writable<DataCubeSnapshotData>) = JSON.parse(
       JSON.stringify(this.data),
-    ) as DataCubeQuerySnapshotData;
+    ) as DataCubeSnapshotData;
     return clone;
   }
 
@@ -175,11 +172,11 @@ export class DataCubeQuerySnapshot {
    * 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>).data = JSON.parse(
+    const clone = new DataCubeSnapshot({});
+    (clone as Writable<DataCubeSnapshot>).uuid = this.uuid;
+    (clone as Writable<DataCubeSnapshot>).data = JSON.parse(
       JSON.stringify(this.data),
-    ) as DataCubeQuerySnapshotData;
+    ) as DataCubeSnapshotData;
     clone._isPatchChange = this._isPatchChange;
     clone._finalized = this._finalized;
     clone._hashCode = this._hashCode;

package/src/stores/core/{DataCubeQuerySnapshotBuilder.ts → DataCubeSnapshotBuilder.ts}

@@ -17,9 +17,9 @@
 /***************************************************************************************
  * [CORE]
  *
- * This and its corresponding utilitites are used to build the query snapshot from the
- * executable query. This is needed when we initialize the engine by loading a
- * persisted query.
+ * This and its corresponding utilitites are used to build the snapshot from the
+ * executable query and configuration. This is needed when we initialize the engine by
+ * loading a specification.
  ***************************************************************************************/
 
 import {
@@ -30,13 +30,13 @@ import {
   type V1_ValueSpecification,
   V1_Lambda,
 } from '@finos/legend-graph';
-import type { DataCubeQuery } from './model/DataCubeQuery.js';
+import type { DataCubeSpecification } from './model/DataCubeSpecification.js';
 import {
-  DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotAggregateColumn,
-  type DataCubeQuerySnapshotProcessingContext,
-  type DataCubeQuerySnapshotSortColumn,
-} from './DataCubeQuerySnapshot.js';
+  DataCubeSnapshot,
+  type DataCubeSnapshotAggregateColumn,
+  type DataCubeSnapshotProcessingContext,
+  type DataCubeSnapshotSortColumn,
+} from './DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
@@ -70,7 +70,7 @@ import {
   _validatePivot,
   _checkDuplicateColumns,
   _validateGroupBy,
-} from './DataCubeQuerySnapshotBuilderUtils.js';
+} from './DataCubeSnapshotBuilderUtils.js';
 import type { DataCubeSource } from './model/DataCubeSource.js';
 import type { DataCubeEngine } from './DataCubeEngine.js';
 
@@ -345,15 +345,15 @@ function extractFunctionMap(
 // --------------------------------- MAIN ---------------------------------
 
 /**
- * Analyze the partial query to build a query snapshot.
+ * Analyze the partial query to build a snapshot.
  *
  * Implementation-wise, this extracts the function call sequence, then walk the
  * sequence in order to fill in the information for the snapshot.
  */
-export async function validateAndBuildQuerySnapshot(
+export async function validateAndBuildSnapshot(
   partialQuery: V1_ValueSpecification,
   source: DataCubeSource,
-  baseQuery: DataCubeQuery,
+  specification: DataCubeSpecification,
   engine: DataCubeEngine,
 ) {
   // --------------------------------- BASE ---------------------------------
@@ -365,7 +365,7 @@ export async function validateAndBuildQuerySnapshot(
     engine.serializeValueSpecification(partialQuery),
   );
   const funcMap = extractFunctionMap(query);
-  const snapshot = DataCubeQuerySnapshot.create({});
+  const snapshot = DataCubeSnapshot.create({});
   const data = snapshot.data;
   const registeredColumns = new Map<string, DataCubeColumn>();
   /**
@@ -476,8 +476,8 @@ export async function validateAndBuildQuerySnapshot(
 
   // --------------------------------- PIVOT ---------------------------------
 
-  let pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[] = [];
-  let pivotSortColumns: DataCubeQuerySnapshotSortColumn[] = [];
+  let pivotAggColumns: DataCubeSnapshotAggregateColumn[] = [];
+  let pivotSortColumns: DataCubeSnapshotSortColumn[] = [];
   if (funcMap.pivot && funcMap.pivotCast && funcMap.pivotSort) {
     const pivotColumns = _colSpecArrayParam(funcMap.pivot, 0).colSpecs.map(
       (colSpec) => _getCol(colSpec.name),
@@ -510,8 +510,8 @@ export async function validateAndBuildQuerySnapshot(
 
   // --------------------------------- GROUP BY ---------------------------------
 
-  let groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[] = [];
-  let groupBySortColumns: DataCubeQuerySnapshotSortColumn[] = [];
+  let groupByAggColumns: DataCubeSnapshotAggregateColumn[] = [];
+  let groupBySortColumns: DataCubeSnapshotSortColumn[] = [];
   if (funcMap.groupBy && funcMap.groupBySort) {
     const groupByColumns = _colSpecArrayParam(funcMap.groupBy, 0).colSpecs.map(
       (colSpec) => _getCol(colSpec.name),
@@ -605,7 +605,7 @@ export async function validateAndBuildQuerySnapshot(
       pivotAggColumns,
       pivotSortColumns,
     },
-    baseQuery,
+    specification,
     engine,
   );
   data.configuration = configuration.serialize();
@@ -642,12 +642,12 @@ export async function validateAndBuildQuerySnapshot(
  * configuration is not specified.
  */
 function validateAndBuildConfiguration(
-  context: DataCubeQuerySnapshotProcessingContext,
-  baseQuery: DataCubeQuery,
+  context: DataCubeSnapshotProcessingContext,
+  specification: DataCubeSpecification,
   engine: DataCubeEngine,
 ) {
   const data = context.snapshot.data;
-  const config = baseQuery.configuration;
+  const config = specification.configuration;
   // generate a default configuration anyway to be used to compare with the
   // provided configuration for validation purpose
   const _config = newConfiguration(context);

package/src/stores/core/{DataCubeQuerySnapshotBuilderUtils.ts → DataCubeSnapshotBuilderUtils.ts}

@@ -66,12 +66,12 @@ import {
   type DataCubeOperationValue,
 } from './DataCubeQueryEngine.js';
 import type {
-  DataCubeQuerySnapshotAggregateColumn,
-  DataCubeQuerySnapshotFilter,
-  DataCubeQuerySnapshotFilterCondition,
-  DataCubeQuerySnapshotGroupBy,
-  DataCubeQuerySnapshotPivot,
-} from './DataCubeQuerySnapshot.js';
+  DataCubeSnapshotAggregateColumn,
+  DataCubeSnapshotFilter,
+  DataCubeSnapshotFilterCondition,
+  DataCubeSnapshotGroupBy,
+  DataCubeSnapshotPivot,
+} from './DataCubeSnapshot.js';
 import type { DataCubeQueryFilterOperation } from './filter/DataCubeQueryFilterOperation.js';
 import type { DataCubeEngine } from './DataCubeEngine.js';
 import {
@@ -375,14 +375,14 @@ export function _filter(
   value: V1_ValueSpecification,
   columnGetter: (name: string) => DataCubeColumn,
   filterOperations: DataCubeQueryFilterOperation[],
-): DataCubeQuerySnapshotFilter {
+): DataCubeSnapshotFilter {
   if (!(value instanceof V1_AppliedFunction)) {
     throw new Error(
       `Can't process filter() expression: expected a function expression`,
     );
   }
 
-  const group: DataCubeQuerySnapshotFilter = {
+  const group: DataCubeSnapshotFilter = {
     // default to AND group for case where there is only one condition
     groupOperator: DataCubeQueryFilterGroupOperator.AND,
     conditions: [],
@@ -426,7 +426,7 @@ function _filterCondition(
   value: V1_ValueSpecification,
   columnGetter: (name: string) => DataCubeColumn,
   filterOperations: DataCubeQueryFilterOperation[],
-): DataCubeQuerySnapshotFilterCondition | DataCubeQuerySnapshotFilter {
+): DataCubeSnapshotFilterCondition | DataCubeSnapshotFilter {
   if (!(value instanceof V1_AppliedFunction)) {
     throw new UnsupportedOperationError(
       `Can't process filter condition expression: expected a function expression`,
@@ -707,8 +707,8 @@ export function _pivotSort(
 }
 
 export function _validatePivot(
-  pivot: DataCubeQuerySnapshotPivot,
-  pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[],
+  pivot: DataCubeSnapshotPivot,
+  pivotAggColumns: DataCubeSnapshotAggregateColumn[],
   availableColumns: DataCubeColumn[],
 ) {
   // check for duplicate columns
@@ -834,10 +834,10 @@ export function _groupBySort(
 }
 
 export function _validateGroupBy(
-  groupBy: DataCubeQuerySnapshotGroupBy,
-  groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[],
-  pivot: DataCubeQuerySnapshotPivot | undefined,
-  pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[],
+  groupBy: DataCubeSnapshotGroupBy,
+  groupByAggColumns: DataCubeSnapshotAggregateColumn[],
+  pivot: DataCubeSnapshotPivot | undefined,
+  pivotAggColumns: DataCubeSnapshotAggregateColumn[],
   availableColumns: DataCubeColumn[],
 ) {
   // check for duplicate columns
@@ -862,7 +862,7 @@ export function _validateGroupBy(
     }
   });
 
-  // check all available columns are either grouped on or aggregatd on
+  // check all available columns are either grouped on or aggregated on
   availableColumns.forEach((col) => {
     if (
       !(
@@ -878,10 +878,12 @@ export function _validateGroupBy(
 
   // check against pivot if present
   if (pivot) {
-    const aggCols = new Map<string, DataCubeQuerySnapshotAggregateColumn>();
+    const aggCols = new Map<string, DataCubeSnapshotAggregateColumn>();
 
-    // check if aggregation specification is consistent (i.e. same type, operator, parameterValues)
+    // check if aggregation specification is consistent (i.e. same name, operator, parameterValues)
     // between groupBy aggregate columns
+    // NOTE: we should not check type here as it can change dynamically due to aggregation, e.g.
+    // an average aggregation on an integer-value column will result in a float-value column
     groupByAggColumns
       .filter((col) => isPivotResultColumnName(col.name))
       .forEach((col) => {
@@ -895,25 +897,37 @@ export function _validateGroupBy(
 
         if (!existingAggCol) {
           aggCols.set(aggColName, aggCol);
-        } else if (!deepEqual(existingAggCol, aggCol)) {
+        } else if (
+          // type should not be compared here as it can change dynamically due to aggregation
+          !deepEqual(
+            { ...existingAggCol, type: undefined },
+            { ...aggCol, type: undefined },
+          )
+        ) {
           throw new Error(
             `Can't process groupBy() expression: found conflicting aggregation specification for column '${aggColName}'`,
           );
         }
       });
 
-    // check if pivot() aggregate columns are consistent with groupBy() aggregate columns
-    pivotAggColumns.forEach((col) => {
-      const existingAggCol = aggCols.get(col.name);
+    // check if groupBy() aggregate columns are consistent with pivot() aggregate columns
+    pivotAggColumns.forEach((pivotAggCol) => {
+      const existingAggCol = aggCols.get(pivotAggCol.name);
       if (!existingAggCol) {
         throw new Error(
-          `Can't process groupBy() expression: column '${col.name}' is aggregated in pivot() expression but not in groupBy() expression`,
+          `Can't process groupBy() expression: column '${pivotAggCol.name}' is aggregated in pivot() expression but not in groupBy() expression`,
         );
       }
 
-      if (!deepEqual(existingAggCol, col)) {
+      if (
+        // type should not be compared here as it can change dynamically due to aggregation
+        !deepEqual(
+          { ...existingAggCol, type: undefined },
+          { ...pivotAggCol, type: undefined },
+        )
+      ) {
         throw new Error(
-          `Can't process groupBy() expression: found conflicting aggregation specification for column '${col.name}'`,
+          `Can't process groupBy() expression: found conflicting aggregation specification for column '${pivotAggCol.name}'`,
         );
       }
     });

package/src/stores/core/aggregation/DataCubeQueryAggregateOperation.ts

@@ -18,7 +18,7 @@ import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import { type V1_ColSpec } from '@finos/legend-graph';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { DataCubeOperationValue } from '../DataCubeQueryEngine.js';
-import type { DataCubeQuerySnapshotAggregateColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeSnapshotAggregateColumn } from '../DataCubeSnapshot.js';
 
 export abstract class DataCubeQueryAggregateOperation {
   abstract get label(): React.ReactNode;
@@ -37,7 +37,7 @@ export abstract class DataCubeQueryAggregateOperation {
   abstract buildAggregateColumnSnapshot(
     colSpec: V1_ColSpec,
     columnGetter: (name: string) => DataCubeColumn,
-  ): DataCubeQuerySnapshotAggregateColumn | undefined;
+  ): DataCubeSnapshotAggregateColumn | undefined;
 
   protected _finalizeAggregateColumnSnapshot(
     data:
@@ -46,7 +46,7 @@ export abstract class DataCubeQueryAggregateOperation {
           paramterValues: DataCubeOperationValue[];
         }
       | undefined,
-  ): DataCubeQuerySnapshotAggregateColumn | undefined {
+  ): DataCubeSnapshotAggregateColumn | undefined {
     if (!data) {
       return undefined;
     }

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Average extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Count extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__First extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 } from '../DataCubeQueryEngine.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryAggregateOperation__JoinStrings extends DataCubeQueryAggregateOperation {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Last extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Max extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Min extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__StdDevPopulation extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__StdDevSample extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import { type V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__Sum extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__UniqueValue extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -26,7 +26,7 @@ import {
 import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 import type { V1_ColSpec } from '@finos/legend-graph';
-import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _agg_base } from '../DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__VarianceSample extends DataCubeQueryAggregateOperation {
   override get label() {

package/src/stores/core/filter/DataCubeQueryFilterEditorState.ts

@@ -25,9 +25,9 @@ import {
   DataCubeQueryFilterGroupOperator,
 } from '../DataCubeQueryEngine.js';
 import type {
-  DataCubeQuerySnapshotFilter,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+  DataCubeSnapshotFilter,
+  DataCubeSnapshotFilterCondition,
+} from '../DataCubeSnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import type { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 
@@ -158,9 +158,9 @@ export class DataCubeFilterEditorConditionGroupTreeNode extends DataCubeFilterEd
   }
 }
 
-export function buildFilterQuerySnapshot(
+export function buildFilterSnapshot(
   node: DataCubeFilterEditorConditionGroupTreeNode,
-): DataCubeQuerySnapshotFilter {
+): DataCubeSnapshotFilter {
   return {
     groupOperator: node.operation,
     not: node.not,
@@ -172,11 +172,11 @@ export function buildFilterQuerySnapshot(
           operator: childNode.operation.operator,
           value: deepClone(childNode.value),
           not: childNode.not,
-        } satisfies DataCubeQuerySnapshotFilterCondition;
+        } satisfies DataCubeSnapshotFilterCondition;
       } else if (
         childNode instanceof DataCubeFilterEditorConditionGroupTreeNode
       ) {
-        return buildFilterQuerySnapshot(childNode);
+        return buildFilterSnapshot(childNode);
       }
       throw new IllegalStateError('Unknown filter node');
     }),
@@ -184,7 +184,7 @@ export function buildFilterQuerySnapshot(
 }
 
 export function buildFilterEditorTree(
-  _node: DataCubeQuerySnapshotFilter,
+  _node: DataCubeSnapshotFilter,
   parent: DataCubeFilterEditorConditionGroupTreeNode | undefined,
   nodes: Map<string, DataCubeFilterEditorTreeNode>,
   operationGetter: (operation: string) => DataCubeQueryFilterOperation,