@finos/legend-data-cube 0.0.37 → 0.0.39

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,
@@ -42,12 +46,15 @@ import {
 } from './DataCubeQueryEngine.js';
 import { buildDefaultConfiguration } from './DataCubeConfigurationBuilder.js';
 import {
+  _buildFilterSnapshot,
   _colSpecArrayParam,
   _colSpecParam,
   _funcMatch,
+  _lambdaParam,
   _param,
 } from './DataCubeQuerySnapshotBuilderUtils.js';
-import type { DataCubeSource } from './models/DataCubeSource.js';
+import type { DataCubeSource } from './model/DataCubeSource.js';
+import type { DataCubeQueryFilterOperation } from './filter/DataCubeQueryFilterOperation.js';
 
 // --------------------------------- BUILDING BLOCKS ---------------------------------
 
@@ -55,11 +62,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 },
@@ -95,6 +102,14 @@ enum _FUNCTION_SEQUENCE_COMPOSITION_PART {
   LIMIT = 'limit',
 }
 
+function isFunctionInValidSequence(
+  value: string,
+): value is _FUNCTION_SEQUENCE_COMPOSITION_PART {
+  return Object.values(_FUNCTION_SEQUENCE_COMPOSITION_PART).includes(
+    value as _FUNCTION_SEQUENCE_COMPOSITION_PART,
+  );
+}
+
 // This corresponds to the function sequence that we currently support:
 //
 // ->extend()*
@@ -207,25 +222,42 @@ 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 ||
+          isFunctionInValidSequence(currentFunc.function)
+        )
+      ) {
         throw new Error(
           `Query must be a sequence of function calls (e.g. x()->y()->z())`,
         );
+      } else if (
+        currentFunc.function === _FUNCTION_SEQUENCE_COMPOSITION_PART.FILTER
+      ) {
+        currentFunc.parameters = currentFunc.parameters.slice(1);
+        sequence.unshift(currentFunc);
+        if (valueSpecification instanceof V1_AppliedFunction) {
+          currentFunc = valueSpecification;
+        } else {
+          break;
+        }
+      } else {
+        currentFunc.parameters = currentFunc.parameters.slice(1);
+        sequence.unshift(currentFunc);
+        currentFunc = valueSpecification as V1_AppliedFunction;
       }
-      currentFunc.parameters = currentFunc.parameters.slice(1);
-      sequence.unshift(currentFunc);
-      currentFunc = vs;
     } else {
       sequence.unshift(currentFunc);
       break;
@@ -254,7 +286,8 @@ function extractFunctionMap(
     if (isNaN(idx) || idx >= sequence.length) {
       return undefined;
     }
-    return sequence[idx];
+    const func = getNonNullableEntry(sequence, idx);
+    return func;
   };
 
   return {
@@ -284,6 +317,7 @@ export function validateAndBuildQuerySnapshot(
   partialQuery: V1_ValueSpecification,
   source: DataCubeSource,
   baseQuery: DataCubeQuery,
+  filterOperations?: DataCubeQueryFilterOperation[],
 ) {
   // --------------------------------- BASE ---------------------------------
   // Build the function call sequence and the function map to make the
@@ -310,7 +344,12 @@ export function validateAndBuildQuerySnapshot(
   /** TODO: @datacube roundtrip */
 
   // --------------------------------- FILTER ---------------------------------
-  /** TODO: @datacube roundtrip */
+  if (funcMap.filter) {
+    data.filter = _buildFilterSnapshot(
+      _lambdaParam(funcMap.filter, 0).body[0]!,
+      filterOperations!,
+    );
+  }
 
   // --------------------------------- SELECT ---------------------------------
 

package/src/stores/core/DataCubeQuerySnapshotBuilderUtils.ts

@@ -13,25 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import {
+  PRIMITIVE_TYPE,
   V1_AppliedFunction,
+  V1_AppliedProperty,
+  V1_CBoolean,
+  V1_CDateTime,
+  V1_CDecimal,
+  V1_CFloat,
+  V1_CInteger,
+  V1_CStrictDate,
+  V1_CStrictTime,
+  V1_CString,
   V1_ClassInstance,
   V1_ColSpec,
   V1_ColSpecArray,
+  V1_Lambda,
+  type V1_ValueSpecification,
+  type V1_PrimitiveValueSpecification,
   extractElementNameFromPath as _name,
   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,
   guaranteeNonNullable,
   guaranteeType,
+  UnsupportedOperationError,
   type Clazz,
 } from '@finos/legend-shared';
-import { TREE_COLUMN_VALUE_SEPARATOR } from './DataCubeQueryEngine.js';
+import {
+  DataCubeFunction,
+  DataCubeQueryFilterGroupOperator,
+  DataCubeQueryFilterOperator,
+  TREE_COLUMN_VALUE_SEPARATOR,
+  type DataCubeOperationValue,
+} from './DataCubeQueryEngine.js';
+import type {
+  DataCubeQuerySnapshotFilter,
+  DataCubeQuerySnapshotFilterCondition,
+} from './DataCubeQuerySnapshot.js';
+import { _functionName } from './DataCubeQueryBuilderUtils.js';
+import type { DataCubeQueryFilterOperation } from './filter/DataCubeQueryFilterOperation.js';
 
 // --------------------------------- UTILITIES ---------------------------------
 
@@ -42,12 +66,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 +79,15 @@ 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`,
+  );
+}
+
+export function _lambdaParam(func: V1_AppliedFunction, paramIdx: number) {
+  return guaranteeType(
+    _param(func, paramIdx, V1_Lambda),
+    V1_Lambda,
+    `Can't process ${_name(func.function)}: Expected parameter at index ${paramIdx} to be a lambda expression`,
   );
 }
 
@@ -63,7 +95,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`,
   );
 }
 
@@ -121,3 +153,284 @@ export function _pruneExpandedPaths(
     )
     .sort();
 }
+
+export function _buildFilterSnapshot(
+  vs: V1_ValueSpecification,
+  filterOperations: DataCubeQueryFilterOperation[],
+): DataCubeQuerySnapshotFilter {
+  const filterSnapshot = {} as DataCubeQuerySnapshotFilter;
+  const filterConditionSnapshot = [];
+
+  if (vs instanceof V1_AppliedFunction) {
+    switch (vs.function) {
+      case DataCubeQueryFilterGroupOperator.OR:
+      case DataCubeQueryFilterGroupOperator.AND:
+        filterSnapshot.groupOperator = vs.function;
+        break;
+      default:
+        filterSnapshot.groupOperator = DataCubeQueryFilterGroupOperator.AND;
+    }
+
+    if (
+      vs.function === DataCubeQueryFilterGroupOperator.AND ||
+      vs.function === DataCubeQueryFilterGroupOperator.OR
+    ) {
+      vs.parameters.forEach((param) => {
+        filterConditionSnapshot.push(_buildSubFilter(param, filterOperations)!);
+      });
+    } else {
+      filterConditionSnapshot.push(_buildSubFilter(vs, filterOperations)!);
+    }
+  }
+  filterSnapshot.conditions = filterConditionSnapshot;
+  return filterSnapshot;
+}
+
+function _buildSubFilter(
+  vs: V1_ValueSpecification,
+  filterOperations: DataCubeQueryFilterOperation[],
+):
+  | DataCubeQuerySnapshotFilterCondition
+  | DataCubeQuerySnapshotFilter
+  | undefined {
+  if (vs instanceof V1_AppliedFunction) {
+    if (
+      Object.values(DataCubeFunction)
+        .map((op) => _functionName(op))
+        .includes(vs.function) &&
+      vs.function !== _functionName(DataCubeFunction.NOT)
+    ) {
+      const condition = _buildFilterConditionSnapshot(vs)!;
+      return _buildDataCubeQueryFilter(
+        condition[0],
+        condition[1],
+        filterOperations,
+      );
+    } else if (vs.function === _functionName(DataCubeFunction.NOT)) {
+      const notCondition = _buildNotFilterConditionSnapshot(
+        vs.parameters[0] as V1_AppliedFunction,
+      );
+      if (notCondition) {
+        return _buildDataCubeQueryFilter(
+          notCondition[0],
+          notCondition[1],
+          filterOperations,
+        );
+      } else {
+        const filterSnapshot = _buildFilterSnapshot(
+          vs.parameters[0] as V1_ValueSpecification,
+          filterOperations,
+        );
+        filterSnapshot.not = true;
+        return filterSnapshot;
+      }
+    } else if (vs.parameters[0] instanceof V1_AppliedFunction) {
+      return _buildFilterSnapshot(vs, filterOperations);
+    }
+  }
+  return undefined;
+}
+
+function _buildFilterConditionSnapshot(
+  af: V1_AppliedFunction,
+): [V1_AppliedFunction, string] | undefined {
+  if (af.parameters[1] && af.parameters[1] instanceof V1_AppliedProperty) {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.EQUAL):
+        return [af, DataCubeQueryFilterOperator.EQUAL_COLUMN];
+      case _functionName(DataCubeFunction.GREATER_THAN):
+        return [af, DataCubeQueryFilterOperator.GREATER_THAN_COLUMN];
+      case _functionName(DataCubeFunction.GREATER_THAN_OR_EQUAL):
+        return [af, DataCubeQueryFilterOperator.GREATER_THAN_OR_EQUAL_COLUMN];
+      case _functionName(DataCubeFunction.LESS_THAN):
+        return [af, DataCubeQueryFilterOperator.GREATER_THAN_OR_EQUAL_COLUMN];
+      case _functionName(DataCubeFunction.LESS_THAN):
+        return [af, DataCubeQueryFilterOperator.LESS_THAN_COLUMN];
+      case _functionName(DataCubeFunction.LESS_THAN_OR_EQUAL):
+        return [af, DataCubeQueryFilterOperator.LESS_THAN_OR_EQUAL_COLUMN];
+      default:
+        return undefined;
+    }
+  } else if (
+    af.parameters[0] instanceof V1_AppliedFunction &&
+    af.parameters[0].function === _functionName(DataCubeFunction.TO_LOWERCASE)
+  ) {
+    return _buildCaseInsensitiveFilterConditionSnapshot(af);
+  } else {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.CONTAINS):
+        return [af, DataCubeQueryFilterOperator.CONTAIN];
+      case _functionName(DataCubeFunction.ENDS_WITH):
+        return [af, DataCubeQueryFilterOperator.END_WITH];
+      case _functionName(DataCubeFunction.EQUAL):
+        return [af, DataCubeQueryFilterOperator.EQUAL];
+      case _functionName(DataCubeFunction.GREATER_THAN):
+        return [af, DataCubeQueryFilterOperator.GREATER_THAN];
+      case _functionName(DataCubeFunction.GREATER_THAN_OR_EQUAL):
+        return [af, DataCubeQueryFilterOperator.GREATER_THAN_OR_EQUAL];
+      case _functionName(DataCubeFunction.IS_EMPTY):
+        return [af, DataCubeQueryFilterOperator.IS_NULL];
+      case _functionName(DataCubeFunction.LESS_THAN):
+        return [af, DataCubeQueryFilterOperator.LESS_THAN];
+      case _functionName(DataCubeFunction.LESS_THAN_OR_EQUAL):
+        return [af, DataCubeQueryFilterOperator.LESS_THAN_OR_EQUAL];
+      case _functionName(DataCubeFunction.STARTS_WITH):
+        return [af, DataCubeQueryFilterOperator.START_WITH];
+      default:
+        return undefined;
+    }
+  }
+}
+
+function _buildCaseInsensitiveFilterConditionSnapshot(
+  af: V1_AppliedFunction,
+): [V1_AppliedFunction, string] | undefined {
+  const func = af;
+  if (
+    af.parameters[0] instanceof V1_AppliedFunction &&
+    af.parameters[1] instanceof V1_AppliedFunction
+  ) {
+    func.parameters = [
+      af.parameters[0].parameters[0]!,
+      af.parameters[1].parameters[0]!,
+    ];
+  }
+  if (func.parameters[1] && func.parameters[1] instanceof V1_AppliedProperty) {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.EQUAL):
+        return [
+          func,
+          DataCubeQueryFilterOperator.EQUAL_CASE_INSENSITIVE_COLUMN,
+        ];
+      default:
+        return undefined;
+    }
+  } else {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.CONTAINS):
+        return [func, DataCubeQueryFilterOperator.CONTAIN_CASE_INSENSITIVE];
+      case _functionName(DataCubeFunction.ENDS_WITH):
+        return [func, DataCubeQueryFilterOperator.END_WITH_CASE_INSENSITIVE];
+      case _functionName(DataCubeFunction.EQUAL):
+        return [func, DataCubeQueryFilterOperator.EQUAL_CASE_INSENSITIVE];
+      case _functionName(DataCubeFunction.STARTS_WITH):
+        return [func, DataCubeQueryFilterOperator.START_WITH_CASE_INSENSITIVE];
+      default:
+        return undefined;
+    }
+  }
+}
+
+function _buildNotFilterConditionSnapshot(
+  af: V1_AppliedFunction,
+): [V1_AppliedFunction, string] | undefined {
+  if (af.parameters[1] && af.parameters[1] instanceof V1_AppliedProperty) {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.EQUAL):
+        return [af, DataCubeQueryFilterOperator.NOT_EQUAL_COLUMN];
+      default:
+        return undefined;
+    }
+  } else if (
+    af.parameters[0] instanceof V1_AppliedFunction &&
+    af.parameters[0].function === _functionName(DataCubeFunction.TO_LOWERCASE)
+  ) {
+    if (af.function === _functionName(DataCubeFunction.EQUAL)) {
+      const func = af;
+      if (
+        af.parameters[0] instanceof V1_AppliedFunction &&
+        af.parameters[1] instanceof V1_AppliedFunction
+      ) {
+        func.parameters = [
+          af.parameters[0].parameters[0]!,
+          af.parameters[1].parameters[0]!,
+        ];
+      }
+      if (
+        func.parameters[1] &&
+        func.parameters[1] instanceof V1_AppliedProperty
+      ) {
+        return [
+          func,
+          DataCubeQueryFilterOperator.NOT_EQUAL_CASE_INSENSITIVE_COLUMN,
+        ];
+      }
+      return [func, DataCubeQueryFilterOperator.NOT_EQUAL_CASE_INSENSITIVE];
+    }
+  } else {
+    switch (af.function) {
+      case _functionName(DataCubeFunction.CONTAINS):
+        return [af, DataCubeQueryFilterOperator.NOT_CONTAIN];
+      case _functionName(DataCubeFunction.ENDS_WITH):
+        return [af, DataCubeQueryFilterOperator.NOT_END_WITH];
+      case _functionName(DataCubeFunction.EQUAL):
+        return [af, DataCubeQueryFilterOperator.NOT_EQUAL];
+      case _functionName(DataCubeFunction.IS_EMPTY):
+        return [af, DataCubeQueryFilterOperator.IS_NOT_NULL];
+      case _functionName(DataCubeFunction.STARTS_WITH):
+        return [af, DataCubeQueryFilterOperator.NOT_START_WITH];
+      default:
+        return undefined;
+    }
+  }
+  return undefined;
+}
+
+export function _dataCubeOperationValue(
+  vs: V1_PrimitiveValueSpecification,
+): DataCubeOperationValue {
+  switch (true) {
+    case vs instanceof V1_CString:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.STRING, vs.value);
+    case vs instanceof V1_CBoolean:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.BOOLEAN, vs.value);
+    case vs instanceof V1_CDecimal:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.DECIMAL, vs.value);
+    case vs instanceof V1_CInteger:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.INTEGER, vs.value);
+    case vs instanceof V1_CFloat:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.FLOAT, vs.value);
+    case vs instanceof V1_CStrictDate:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.STRICTDATE, vs.value);
+    case vs instanceof V1_CDateTime:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.DATETIME, vs.value);
+    case vs instanceof V1_CStrictTime:
+      return _buildDataCubeOperationValue(PRIMITIVE_TYPE.STRICTTIME, vs.value);
+    default:
+      throw new UnsupportedOperationError(
+        `Unsupported primitive value '${vs}'`,
+      );
+  }
+}
+
+function _buildDataCubeQueryFilter(
+  af: V1_AppliedFunction,
+  operator: string,
+  filterOperations: DataCubeQueryFilterOperation[],
+): DataCubeQuerySnapshotFilterCondition | undefined {
+  const filterOperation = filterOperations.find(
+    (op) => op.operator === operator,
+  );
+  return filterOperation?.buildConditionSnapshot(af);
+}
+
+function _buildDataCubeOperationValue(
+  type: string,
+  value: unknown,
+): DataCubeOperationValue {
+  return {
+    value: value,
+    type: type,
+  } satisfies DataCubeOperationValue;
+}
+
+export function _buildConditionSnapshotProperty(
+  property: V1_AppliedProperty,
+  operator: DataCubeQueryFilterOperator,
+): DataCubeQuerySnapshotFilterCondition {
+  return {
+    name: property.property,
+    operator: operator,
+    type: property.class!, // TODO: fix this in engine (missing class in V1_AppliedProperty)
+  } as DataCubeQuerySnapshotFilterCondition;
+}

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() {