@finos/legend-data-cube 0.0.9 → 0.0.11

package/src/stores/core/DataCubeQuerySnapshot.ts

@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-import type {
-  V1_AppliedFunction,
-  V1_Lambda,
-  V1_ValueSpecification,
-} from '@finos/legend-graph';
-import type { DataCubeConfiguration } from './DataCubeConfiguration.js';
+import type { V1_AppliedFunction, V1_Lambda } from '@finos/legend-graph';
+import type { DataCubeConfiguration } from './models/DataCubeConfiguration.js';
 import {
   IllegalStateError,
   hashObject,
@@ -32,13 +28,13 @@ import type {
   DataCubeOperationValue,
   DataCubeQuerySortDirection,
 } from './DataCubeQueryEngine.js';
+import type { DataCubeColumn } from './models/DataCubeColumn.js';
 
-export type DataCubeQuerySnapshotFilterCondition =
-  DataCubeQuerySnapshotColumn & {
-    value: DataCubeOperationValue | undefined;
-    operator: string;
-    not?: boolean | undefined;
-  };
+export type DataCubeQuerySnapshotFilterCondition = DataCubeColumn & {
+  value: DataCubeOperationValue | undefined;
+  operator: string;
+  not?: boolean | undefined;
+};
 
 export type DataCubeQuerySnapshotFilter = {
   groupOperator: string;
@@ -49,41 +45,31 @@ export type DataCubeQuerySnapshotFilter = {
   not?: boolean | undefined;
 };
 
-export type DataCubeQuerySnapshotColumn = {
-  name: string;
-  type: string;
+export type DataCubeQuerySnapshotExtendedColumn = DataCubeColumn & {
+  windowFn?: PlainObject<V1_AppliedFunction> | undefined;
+  mapFn: PlainObject<V1_Lambda>;
+  reduceFn?: PlainObject<V1_Lambda> | undefined;
 };
 
-export type DataCubeQuerySnapshotExtendedColumn =
-  DataCubeQuerySnapshotColumn & {
-    windowFn?: PlainObject<V1_AppliedFunction> | undefined;
-    mapFn: PlainObject<V1_Lambda>;
-    reduceFn?: PlainObject<V1_Lambda> | undefined;
-  };
-
-export type DataCubeQuerySnapshotSortColumn = DataCubeQuerySnapshotColumn & {
+export type DataCubeQuerySnapshotSortColumn = DataCubeColumn & {
   direction: DataCubeQuerySortDirection;
 };
 
 export type DataCubeQuerySnapshotGroupBy = {
-  columns: DataCubeQuerySnapshotColumn[];
+  columns: DataCubeColumn[];
 };
 
 export type DataCubeQuerySnapshotPivot = {
-  columns: DataCubeQuerySnapshotColumn[];
-  castColumns: DataCubeQuerySnapshotColumn[];
+  columns: DataCubeColumn[];
+  castColumns: DataCubeColumn[];
 };
 
 export type DataCubeQuerySnapshotData = {
-  name: string;
-  runtime: string;
-  mapping: string | undefined;
-  sourceQuery: PlainObject<V1_ValueSpecification>;
   configuration: PlainObject<DataCubeConfiguration>;
-  sourceColumns: DataCubeQuerySnapshotColumn[];
+  sourceColumns: DataCubeColumn[];
   leafExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
   filter?: DataCubeQuerySnapshotFilter | undefined;
-  selectColumns: DataCubeQuerySnapshotColumn[];
+  selectColumns: DataCubeColumn[];
   groupBy?: DataCubeQuerySnapshotGroupBy | undefined;
   pivot?: DataCubeQuerySnapshotPivot | undefined;
   groupExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
@@ -93,25 +79,14 @@ export type DataCubeQuerySnapshotData = {
 
 export class DataCubeQuerySnapshot {
   readonly uuid = uuid();
-  readonly timestamp = Date.now();
   readonly data: DataCubeQuerySnapshotData;
 
   private _isPatchChange = false;
   private _finalized = false;
   private _hashCode?: string | undefined;
 
-  private constructor(
-    name: string,
-    runtime: string,
-    mapping: string | undefined,
-    sourceQuery: PlainObject<V1_ValueSpecification>,
-    configuration: PlainObject<DataCubeConfiguration>,
-  ) {
+  private constructor(configuration: PlainObject<DataCubeConfiguration>) {
     this.data = {
-      name,
-      runtime,
-      mapping,
-      sourceQuery,
       configuration,
       sourceColumns: [],
       leafExtendedColumns: [],
@@ -125,20 +100,8 @@ export class DataCubeQuerySnapshot {
     };
   }
 
-  static create(
-    name: string,
-    runtime: string,
-    mapping: string | undefined,
-    sourceQuery: PlainObject<V1_ValueSpecification>,
-    configuration: PlainObject<DataCubeConfiguration>,
-  ) {
-    return new DataCubeQuerySnapshot(
-      name,
-      runtime,
-      mapping,
-      sourceQuery,
-      configuration,
-    );
+  static create(configuration: PlainObject<DataCubeConfiguration>) {
+    return new DataCubeQuerySnapshot(configuration);
   }
 
   /**
@@ -187,7 +150,7 @@ export class DataCubeQuerySnapshot {
   }
 
   clone() {
-    const clone = new DataCubeQuerySnapshot('', '', '', {}, {});
+    const clone = new DataCubeQuerySnapshot({});
     (clone.data as Writable<DataCubeQuerySnapshotData>) = JSON.parse(
       JSON.stringify(this.data),
     ) as DataCubeQuerySnapshotData;
@@ -199,9 +162,8 @@ export class DataCubeQuerySnapshot {
    * This should rarely be used, and ideally by core engine only.
    */
   INTERNAL__fullClone() {
-    const clone = new DataCubeQuerySnapshot('', '', '', {}, {});
+    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;
@@ -210,30 +172,4 @@ export class DataCubeQuerySnapshot {
     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>(
-  cols: T[] | undefined,
-  name: string,
-): T | undefined {
-  return cols?.find((c) => c.name === name);
 }
-
-export function _toCol(col: {
-  name: string;
-  type: string;
-}): DataCubeQuerySnapshotColumn {
-  return { name: col.name, type: col.type };
-}
-
-export const _sortByColName = (a: { name: string }, b: { name: string }) =>
-  a.name.localeCompare(b.name);

package/src/stores/core/DataCubeQuerySnapshotBuilder.ts

@@ -18,7 +18,7 @@
  * [CORE]
  *
  * This and its corresponding utilitites are used to build the query snapshot from the
- * executable query. This is needed when we initialize the application by loading a
+ * executable query. This is needed when we initialize the engine by loading a
  * persisted query.
  ***************************************************************************************/
 
@@ -27,24 +27,20 @@ import {
   V1_CInteger,
   type V1_ColSpec,
   V1_Collection,
-  V1_serializeValueSpecification,
   extractElementNameFromPath as _name,
   matchFunctionName,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import type { DataCubeQuery } from '../core/DataCubeQuery.js';
-import {
-  _toCol,
-  DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotColumn,
-} from './DataCubeQuerySnapshot.js';
+import type { DataCubeQuery } from './models/DataCubeQuery.js';
+import { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+import { _toCol, type DataCubeColumn } from './models/DataCubeColumn.js';
 import { assertType, guaranteeNonNullable } from '@finos/legend-shared';
 import {
   DataCubeQuerySortDirection,
   DataCubeFunction,
   type DataCubeQueryFunctionMap,
 } from './DataCubeQueryEngine.js';
-import { DataCubeConfiguration } from './DataCubeConfiguration.js';
+import { DataCubeConfiguration } from './models/DataCubeConfiguration.js';
 import { buildDefaultConfiguration } from './DataCubeConfigurationBuilder.js';
 import {
   _colSpecArrayParam,
@@ -52,6 +48,7 @@ import {
   _funcMatch,
   _param,
 } from './DataCubeQuerySnapshotBuilderUtils.js';
+import type { DataCubeSource } from './models/DataCubeSource.js';
 
 // --------------------------------- BUILDING BLOCKS ---------------------------------
 
@@ -286,7 +283,7 @@ function extractFunctionMap(
  */
 export function validateAndBuildQuerySnapshot(
   partialQuery: V1_ValueSpecification,
-  sourceQuery: V1_ValueSpecification,
+  source: DataCubeSource,
   baseQuery: DataCubeQuery,
 ) {
   // --------------------------------- BASE ---------------------------------
@@ -294,15 +291,9 @@ export function validateAndBuildQuerySnapshot(
   // analysis more ergonomic
 
   const funcMap = extractFunctionMap(partialQuery);
-  const snapshot = DataCubeQuerySnapshot.create(
-    baseQuery.name,
-    baseQuery.source.runtime,
-    baseQuery.source.mapping,
-    V1_serializeValueSpecification(sourceQuery, []),
-    {},
-  );
+  const snapshot = DataCubeQuerySnapshot.create({});
   const data = snapshot.data;
-  const colsMap = new Map<string, DataCubeQuerySnapshotColumn>();
+  const colsMap = new Map<string, DataCubeColumn>();
   const _col = (colSpec: V1_ColSpec) => {
     const column = guaranteeNonNullable(
       colsMap.get(colSpec.name),
@@ -313,7 +304,7 @@ export function validateAndBuildQuerySnapshot(
 
   // --------------------------------- SOURCE ---------------------------------
 
-  data.sourceColumns = baseQuery.source.columns.map(_toCol);
+  data.sourceColumns = source.sourceColumns;
   data.sourceColumns.map((col) => colsMap.set(col.name, col));
 
   // --------------------------------- LEAF-LEVEL EXTEND ---------------------------------
@@ -398,7 +389,7 @@ export function validateAndBuildQuerySnapshot(
   const configuration = baseQuery.configuration
     ? DataCubeConfiguration.serialization.fromJson(baseQuery.configuration)
     : buildDefaultConfiguration([
-        ...baseQuery.source.columns,
+        ...source.sourceColumns,
         ...data.leafExtendedColumns,
         ...data.groupExtendedColumns,
       ]);

package/src/stores/core/DataCubeQuerySnapshotBuilderUtils.ts

@@ -23,7 +23,7 @@ import {
   matchFunctionName,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import { type DataCubeQuerySnapshotColumn } from './DataCubeQuerySnapshot.js';
+import { type DataCubeColumn } from './models/DataCubeColumn.js';
 import {
   assertTrue,
   assertType,
@@ -94,8 +94,8 @@ export function _funcMatch(
  * prune the expanded paths beyond that point.
  */
 export function _pruneExpandedPaths(
-  prevGroupByCols: DataCubeQuerySnapshotColumn[],
-  currentGroupByCols: DataCubeQuerySnapshotColumn[],
+  prevGroupByCols: DataCubeColumn[],
+  currentGroupByCols: DataCubeColumn[],
   expandedPaths: string[],
 ) {
   const length = Math.min(prevGroupByCols.length, currentGroupByCols.length);

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

@@ -15,9 +15,9 @@
  */
 
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { type V1_ColSpec } from '@finos/legend-graph';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 // --------------------------------- UTILITIES ---------------------------------
 
@@ -39,7 +39,7 @@ export abstract class DataCubeQueryAggregateOperation {
   abstract get description(): string;
   abstract get operator(): string;
 
-  abstract isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn): boolean;
+  abstract isCompatibleWithColumn(column: DataCubeColumn): boolean;
 
   abstract buildAggregateColumn(
     column: DataCubeColumnConfiguration,

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Average extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Average extends DataCubeQueryAggre
     return DataCubeQueryAggregateOperator.AVERAGE;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Count extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Count extends DataCubeQueryAggrega
     return DataCubeQueryAggregateOperator.COUNT;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       // NOTE: technically all data types are suported,
       // but we can't because we must preserve the type

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__First extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__First extends DataCubeQueryAggrega
     return DataCubeQueryAggregateOperator.FIRST;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       DataCubeColumnDataType.TEXT,
       DataCubeColumnDataType.NUMBER,

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { PRIMITIVE_TYPE } from '@finos/legend-graph';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
@@ -32,7 +32,7 @@ import {
   _property,
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__JoinStrings extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -51,7 +51,7 @@ export class DataCubeQueryAggregateOperation__JoinStrings extends DataCubeQueryA
     return DataCubeQueryAggregateOperator.JOIN_STRINGS;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       // NOTE: technically all data types should be suported,
       // i.e. we can use meta::pure::functions::string::makeString

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Last extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Last extends DataCubeQueryAggregat
     return DataCubeQueryAggregateOperator.LAST;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       DataCubeColumnDataType.TEXT,
       DataCubeColumnDataType.NUMBER,

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Max extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Max extends DataCubeQueryAggregate
     return DataCubeQueryAggregateOperator.MAX;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Min extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Min extends DataCubeQueryAggregate
     return DataCubeQueryAggregateOperator.MIN;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__StdDevPopulation extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__StdDevPopulation extends DataCubeQ
     return DataCubeQueryAggregateOperator.STANDARD_DEVIATION_POPULATION;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__StdDevSample extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__StdDevSample extends DataCubeQuery
     return DataCubeQueryAggregateOperator.STANDARD_DEVIATION_SAMPLE;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Sum extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__Sum extends DataCubeQueryAggregate
     return DataCubeQueryAggregateOperator.SUM;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__UniqueValue extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__UniqueValue extends DataCubeQueryA
     return DataCubeQueryAggregateOperator.UNIQUE;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       DataCubeColumnDataType.TEXT,
       DataCubeColumnDataType.NUMBER,

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeQuerySnapshotColumn } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import { DataCubeQueryAggregateOperation } from './DataCubeQueryAggregateOperation.js';
 import {
   DataCubeQueryAggregateOperator,
@@ -23,7 +23,7 @@ import {
   ofDataType,
 } from '../DataCubeQueryEngine.js';
 import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
-import type { DataCubeColumnConfiguration } from '../DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,7 +42,7 @@ export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCub
     return DataCubeQueryAggregateOperator.VARIANCE_POPULATION;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }