@finos/legend-data-cube 0.0.36 → 0.0.38

package/src/stores/core/DataCubeQueryBuilderUtils.ts

@@ -53,13 +53,14 @@ import {
   V1_createGenericTypeWithRawType,
   V1_createRelationType,
   V1_createRelationTypeColumn,
+  V1_serializeValueSpecification,
 } from '@finos/legend-graph';
 import {
   type DataCubeQuerySnapshotFilterCondition,
   type DataCubeQuerySnapshotFilter,
   type DataCubeQuerySnapshot,
 } from './DataCubeQuerySnapshot.js';
-import { type DataCubeColumn } from './models/DataCubeColumn.js';
+import { type DataCubeColumn } from './model/DataCubeColumn.js';
 import {
   guaranteeNonNullable,
   guaranteeIsString,
@@ -86,7 +87,7 @@ import type { DataCubeQueryAggregateOperation } from './aggregation/DataCubeQuer
 import {
   DataCubeColumnConfiguration,
   type DataCubeConfiguration,
-} from './models/DataCubeConfiguration.js';
+} from './model/DataCubeConfiguration.js';
 
 // --------------------------------- UTILITIES ---------------------------------
 
@@ -117,6 +118,16 @@ export function _deserializeLambda(json: PlainObject<V1_Lambda>) {
   return guaranteeType(V1_deserializeValueSpecification(json, []), V1_Lambda);
 }
 
+export function _deserializeValueSpecification(
+  json: PlainObject<V1_ValueSpecification>,
+) {
+  return V1_deserializeValueSpecification(json, []);
+}
+
+export function _serializeValueSpecification(protocol: V1_ValueSpecification) {
+  return V1_serializeValueSpecification(protocol, []);
+}
+
 export function _deserializeFunction(json: PlainObject<V1_Lambda>) {
   return guaranteeType(
     V1_deserializeValueSpecification(json, []),
@@ -304,6 +315,12 @@ export function _not(fn: V1_AppliedFunction) {
   return _function(_functionName(DataCubeFunction.NOT), [fn]);
 }
 
+export function _selectFunction(columns: DataCubeColumn[]) {
+  return _function(DataCubeFunction.SELECT, [
+    _cols(columns.map((col) => _colSpec(col.name))),
+  ]);
+}
+
 // --------------------------------- BUILDING BLOCKS ---------------------------------
 
 export function _col(

package/src/stores/core/DataCubeQueryEngine.ts

@@ -198,39 +198,39 @@ export enum DataCubeQueryClientSideAggregateOperator {
 }
 
 export enum DataCubeQueryFilterOperator {
-  LESS_THAN = '<', // DONE
-  LESS_THAN_OR_EQUAL = '<=', // DONE
-  EQUAL = '=', // DONE
-  NOT_EQUAL = '!=', // DONE
-  GREATER_THAN = '>', // DONE
-  GREATER_THAN_OR_EQUAL = '>=', // DONE
+  LESS_THAN = '<',
+  LESS_THAN_OR_EQUAL = '<=',
+  EQUAL = '=',
+  NOT_EQUAL = '!=',
+  GREATER_THAN = '>',
+  GREATER_THAN_OR_EQUAL = '>=',
   IN = 'in',
   NOT_IN = 'not in',
-  IS_NULL = 'is null', // DONE
-  IS_NOT_NULL = 'is not null', // DONE
+  IS_NULL = 'is null',
+  IS_NOT_NULL = 'is not null',
   // string ONLY
-  EQUAL_CASE_INSENSITIVE = '= (case-insensitive)', // DONE
-  NOT_EQUAL_CASE_INSENSITIVE = '!= (case-insensitive)', // DONE
+  EQUAL_CASE_INSENSITIVE = '= (case-insensitive)',
+  NOT_EQUAL_CASE_INSENSITIVE = '!= (case-insensitive)',
   IN_CASE_INSENSITIVE = 'in (case-insensitive)',
   NOT_IN_CASE_INSENSITIVE = 'not in (case-insensitive)',
-  CONTAIN = 'contains', // DONE
-  CONTAIN_CASE_INSENSITIVE = 'contains (case-insensitive)', // DONE
-  NOT_CONTAIN = 'does not contain', // DONE
-  START_WITH = 'starts with', // DONE
-  START_WITH_CASE_INSENSITIVE = 'starts with (case-insensitive)', // DONE
-  NOT_START_WITH = 'does not start with', // DONE
-  END_WITH = 'ends with', // DONE
-  END_WITH_CASE_INSENSITIVE = 'ends with (case-insensitive)', // DONE
-  NOT_END_WITH = 'does not end with', // DONE
+  CONTAIN = 'contains',
+  CONTAIN_CASE_INSENSITIVE = 'contains (case-insensitive)',
+  NOT_CONTAIN = 'does not contain',
+  START_WITH = 'starts with',
+  START_WITH_CASE_INSENSITIVE = 'starts with (case-insensitive)',
+  NOT_START_WITH = 'does not start with',
+  END_WITH = 'ends with',
+  END_WITH_CASE_INSENSITIVE = 'ends with (case-insensitive)',
+  NOT_END_WITH = 'does not end with',
   // column
-  LESS_THAN_COLUMN = '< value in column', // DONE
-  LESS_THAN_OR_EQUAL_COLUMN = '<= value in column', // DONE
-  EQUAL_COLUMN = '= value in column', // DONE
-  EQUAL_CASE_INSENSITIVE_COLUMN = '= (case-insensitive) value in column', // DONE
-  NOT_EQUAL_COLUMN = '!= value in column', // DONE
-  NOT_EQUAL_CASE_INSENSITIVE_COLUMN = '!= (case-insensitive) value in column', // DONE
-  GREATER_THAN_COLUMN = '> value in column', // DONE
-  GREATER_THAN_OR_EQUAL_COLUMN = '>= value in column', // DONE
+  LESS_THAN_COLUMN = '< value in column',
+  LESS_THAN_OR_EQUAL_COLUMN = '<= value in column',
+  EQUAL_COLUMN = '= value in column',
+  EQUAL_CASE_INSENSITIVE_COLUMN = '= (case-insensitive) value in column',
+  NOT_EQUAL_COLUMN = '!= value in column',
+  NOT_EQUAL_CASE_INSENSITIVE_COLUMN = '!= (case-insensitive) value in column',
+  GREATER_THAN_COLUMN = '> value in column',
+  GREATER_THAN_OR_EQUAL_COLUMN = '>= value in column',
   // TODO?: having, having in aggregate, between
 }
 

package/src/stores/core/DataCubeQuerySnapshot.ts

@@ -15,7 +15,7 @@
  */
 
 import type { V1_AppliedFunction, V1_Lambda } from '@finos/legend-graph';
-import type { DataCubeConfiguration } from './models/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from './model/DataCubeConfiguration.js';
 import {
   IllegalStateError,
   hashObject,
@@ -28,7 +28,7 @@ import type {
   DataCubeOperationValue,
   DataCubeQuerySortDirection,
 } from './DataCubeQueryEngine.js';
-import type { DataCubeColumn } from './models/DataCubeColumn.js';
+import type { DataCubeColumn } from './model/DataCubeColumn.js';
 
 export type DataCubeQuerySnapshotFilterCondition = DataCubeColumn & {
   value: DataCubeOperationValue | undefined;

package/src/stores/core/DataCubeQuerySnapshotBuilder.ts

@@ -31,10 +31,14 @@ import {
   matchFunctionName,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import type { DataCubeQuery } from './models/DataCubeQuery.js';
+import type { DataCubeQuery } from './model/DataCubeQuery.js';
 import { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
-import { _toCol, type DataCubeColumn } from './models/DataCubeColumn.js';
-import { assertType, guaranteeNonNullable } from '@finos/legend-shared';
+import { _toCol, type DataCubeColumn } from './model/DataCubeColumn.js';
+import {
+  assertType,
+  getNonNullableEntry,
+  guaranteeNonNullable,
+} from '@finos/legend-shared';
 import {
   DataCubeQuerySortDirection,
   DataCubeFunction,
@@ -47,7 +51,7 @@ import {
   _funcMatch,
   _param,
 } from './DataCubeQuerySnapshotBuilderUtils.js';
-import type { DataCubeSource } from './models/DataCubeSource.js';
+import type { DataCubeSource } from './model/DataCubeSource.js';
 
 // --------------------------------- BUILDING BLOCKS ---------------------------------
 
@@ -55,11 +59,11 @@ const _SUPPORTED_TOP_LEVEL_FUNCTIONS: {
   func: string;
   parameters: number;
 }[] = [
-  { func: DataCubeFunction.EXTEND, parameters: 2 }, // support both signatures of extend()
+  { func: DataCubeFunction.EXTEND, parameters: 2 }, // TODO: support both signatures of extend()
   { func: DataCubeFunction.FILTER, parameters: 1 },
   { func: DataCubeFunction.SELECT, parameters: 1 },
-  { func: DataCubeFunction.GROUP_BY, parameters: 3 },
-  { func: DataCubeFunction.PIVOT, parameters: 3 },
+  { func: DataCubeFunction.GROUP_BY, parameters: 2 },
+  { func: DataCubeFunction.PIVOT, parameters: 2 },
   { func: DataCubeFunction.CAST, parameters: 1 },
   { func: DataCubeFunction.SORT, parameters: 1 },
   { func: DataCubeFunction.LIMIT, parameters: 1 },
@@ -207,25 +211,26 @@ function extractFunctionMap(
   }
   const sequence: V1_AppliedFunction[] = [];
   let currentFunc = query;
+
   while (currentFunc instanceof V1_AppliedFunction) {
     const supportedFunc = _SUPPORTED_TOP_LEVEL_FUNCTIONS.find((spec) =>
       matchFunctionName(currentFunc.function, spec.func),
     );
 
-    // Check that all functions in sequence are supported
+    // Check that all functions in sequence are supported (matching name and number of parameters)
     if (!supportedFunc) {
       throw new Error(`Found unsupported function ${currentFunc.function}()`);
     }
     if (currentFunc.parameters.length > supportedFunc.parameters) {
-      const vs = currentFunc.parameters[0];
-      if (!(vs instanceof V1_AppliedFunction)) {
+      const valueSpecification = currentFunc.parameters[0];
+      if (!(valueSpecification instanceof V1_AppliedFunction)) {
         throw new Error(
           `Query must be a sequence of function calls (e.g. x()->y()->z())`,
         );
       }
       currentFunc.parameters = currentFunc.parameters.slice(1);
       sequence.unshift(currentFunc);
-      currentFunc = vs;
+      currentFunc = valueSpecification;
     } else {
       sequence.unshift(currentFunc);
       break;
@@ -254,7 +259,8 @@ function extractFunctionMap(
     if (isNaN(idx) || idx >= sequence.length) {
       return undefined;
     }
-    return sequence[idx];
+    const func = getNonNullableEntry(sequence, idx);
+    return func;
   };
 
   return {
@@ -301,12 +307,12 @@ export function validateAndBuildQuerySnapshot(
     return _toCol(column);
   };
 
-  // --------------------------------- SOURCE ---------------------------------
+  // -------------------------------- SOURCE --------------------------------
 
-  data.sourceColumns = source.sourceColumns;
+  data.sourceColumns = source.columns;
   data.sourceColumns.forEach((col) => colsMap.set(col.name, col));
 
-  // --------------------------------- LEAF-LEVEL EXTEND ---------------------------------
+  // --------------------------- LEAF-LEVEL EXTEND ---------------------------
   /** TODO: @datacube roundtrip */
 
   // --------------------------------- FILTER ---------------------------------
@@ -336,7 +342,7 @@ export function validateAndBuildQuerySnapshot(
     };
   }
 
-  // --------------------------------- GROUP-LEVEL EXTEND ---------------------------------
+  // --------------------------- GROUP-LEVEL EXTEND ---------------------------
   /** TODO: @datacube roundtrip */
 
   // --------------------------------- SORT ---------------------------------
@@ -368,41 +374,70 @@ export function validateAndBuildQuerySnapshot(
   }
 
   // --------------------------------- CONFIGURATION ---------------------------------
-  // NOTE: we aim to keep the data query a Pure query instead of a specification object
-  // so this configuration holds mostly layout and styling customization.
-  // But there are overlaps, i.e. certain data query configuration are stored in the
-  // configuration, e.g. column aggregation type, this is because a column
-  // aggregation's preference can be populated even when there's no aggregation specified
-  // in the data query.
   //
-  // Arguably, the query should be the single source for these information, but when
-  // the configuration for a particular data query function coming from multiple sources
-  // conflict, we need to do some reconciliation (or throw error). Some examples include:
-  // - missing/extra columns present in the configuration
+  // A data-cube conceptually consists of a data query, in form of a Pure query, instead
+  // of a particular specification object format, and this configuration, that holds mostly
+  // layout and styling customization. But there are overlaps, i.e. certain "meta" query
+  // configuration are stored in this configuration, e.g. column aggregation type, because
+  // a column aggregation's preference needs to be specified even when there's no aggregation
+  // specified over that column in the data query.
+  //
+  // But in the example above, if the column is part of an aggregation, we have to ensure
+  // the configuration is consistent with the query. Conflicts can happen, for example:
   // - column kind and type conflict with aggregation
   // - column kind and type conflict with the column configuration
   //
-  // In certain cases, configuration needs to be generated from default presets. This
-  // helps with use cases where the query might comes from a different source, such as
-  // Studio or Query, or another part of Engine.
+  // In those cases, we need to reconcile to make sure the query and the configuration to agree.
+  // The query will take precedence when conflicts happen, and if the conflict cannot be resolved
+  // somehow, we will throw a validation error. We decide so because in certain cases, configuration
+  // needs to be generated from default presets, such as for use cases where the query comes from a
+  // different source, such as Studio or Query, or another part of Engine, where the layout
+  // configuration is not specified.
+  //
+  // ----------------------------------------------------------------------------------
+
+  const configuration = validateAndBuildConfiguration(
+    snapshot,
+    funcMap,
+    baseQuery,
+  );
+  data.configuration = configuration.serialize();
+
+  return snapshot.finalize();
+}
+
+/**
+ * TODO: @datacube roundtrip - implement the logic to reconcile the configuration with the query
+ * - [ ] disallow naming an extended column the same as a source column/leaf-level extended column
+ *       even if the column is not selected
+ * - [ ] columns (missing/extra columns - remove or generate default column configuration)
+ * - [ ] column kind
+ * - [ ] column type
+ * - [ ] base off the type, check the settings
+ * - [ ] aggregation
+ * - [ ] verify groupBy agg columns, pivot agg columns and configuration agree
+ * - [ ] verify groupBy sort columns and tree column sort direction configuration agree
+ */
+function validateAndBuildConfiguration(
+  snapshot: DataCubeQuerySnapshot,
+  funcMap: DataCubeQueryFunctionMap,
+  baseQuery: DataCubeQuery,
+) {
+  const data = snapshot.data;
   const configuration =
     baseQuery.configuration?.clone() ??
     buildDefaultConfiguration([
-      ...source.sourceColumns,
+      ...data.sourceColumns,
       ...data.leafExtendedColumns,
       ...data.groupExtendedColumns,
     ]);
-  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)
-   * - [ ] column kind
-   * - [ ] column type
-   * - [ ] base off the type, check the settings
-   * - [ ] aggregation
-   * - [ ] verify groupBy agg columns, pivot agg columns and configuration agree
-   * - [ ] verify groupBy sort columns and tree column sort direction configuration agree
-   */
 
-  return snapshot.finalize();
+  // column selection
+  configuration.columns.forEach((column) => {
+    column.isSelected = Boolean(
+      data.groupExtendedColumns.find((col) => col.name === column.name) ??
+        data.selectColumns.find((col) => col.name === column.name),
+    );
+  });
+  return configuration;
 }

package/src/stores/core/DataCubeQuerySnapshotBuilderUtils.ts

@@ -23,7 +23,7 @@ import {
   matchFunctionName,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import { type DataCubeColumn } from './models/DataCubeColumn.js';
+import { type DataCubeColumn } from './model/DataCubeColumn.js';
 import {
   assertTrue,
   assertType,
@@ -42,12 +42,12 @@ export function _param<T extends V1_ValueSpecification>(
 ): T {
   assertTrue(
     func.parameters.length >= paramIdx + 1,
-    `Can't process ${_name(func.function)}: Expected at least ${paramIdx + 1} parameter(s)`,
+    `Can't process ${_name(func.function)}() expression: Expected at least ${paramIdx + 1} parameter(s)`,
   );
   return guaranteeType(
     func.parameters[paramIdx],
     clazz,
-    `Can't process ${_name(func.function)}: Found unexpected type for parameter at index ${paramIdx}`,
+    `Can't process ${_name(func.function)}() expression: Found unexpected type for parameter at index ${paramIdx}`,
   );
 }
 
@@ -55,7 +55,7 @@ export function _colSpecParam(func: V1_AppliedFunction, paramIdx: number) {
   return guaranteeType(
     _param(func, paramIdx, V1_ClassInstance).value,
     V1_ColSpec,
-    `Can't process ${_name(func.function)}: Expected parameter at index ${paramIdx} to be a column specification`,
+    `Can't process ${_name(func.function)}() expression: Expected parameter at index ${paramIdx} to be a column specification`,
   );
 }
 
@@ -63,7 +63,7 @@ export function _colSpecArrayParam(func: V1_AppliedFunction, paramIdx: number) {
   return guaranteeType(
     _param(func, paramIdx, V1_ClassInstance).value,
     V1_ColSpecArray,
-    `Can't process ${_name(func.function)}: Expected parameter at index ${paramIdx} to be a column specification list`,
+    `Can't process ${_name(func.function)}() expression: Expected parameter at index ${paramIdx} to be a column specification list`,
   );
 }
 

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

@@ -15,9 +15,9 @@
  */
 
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import { type V1_ColSpec } from '@finos/legend-graph';
-import type { DataCubeColumnConfiguration } from '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 // --------------------------------- UTILITIES ---------------------------------
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Average extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Count extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__First extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__JoinStrings extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Last extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Max extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Min extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__StdDevPopulation extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__StdDevSample extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__Sum extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__UniqueValue extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCubeQueryAggregateOperation {
   override get label() {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeColumn } from '../models/DataCubeColumn.js';
+import type { DataCubeColumn } from '../model/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 '../models/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
 
 export class DataCubeQueryAggregateOperation__VarianceSample extends DataCubeQueryAggregateOperation {
   override get label() {