@finos/legend-query-builder 0.4.0 → 0.4.2

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -91,10 +91,10 @@ import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecifi
 import { appendProjection } from './projection/QueryBuilderProjectionValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-import { QueryBuilderOlapGroupByState } from './olapGroupBy/QueryBuilderOlapGroupByState.js';
-import type { QueryBuilderTDSOlapOperator } from './olapGroupBy/operators/QueryBuilderTDSOlapOperator_.js';
-import { getQueryBuilderCoreOlapGroupByOperators } from './olapGroupBy/QueryBuilderOlapGroupByOperatorLoader.js';
-import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState_.js';
+import { QueryBuilderOLAPGroupByState } from './olapGroupBy/QueryBuilderOLAPGroupByState_.js';
+import type { QueryBuilderTDS_OLAPOperator } from './olapGroupBy/operators/QueryBuilderTDS_OLAPOperator.js';
+import { getQueryBuilderCoreOLAPGroupByOperators } from './olapGroupBy/QueryBuilderOLAPGroupByOperatorLoader_.js';
+import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 
 export class QueryBuilderTDSState
   extends QueryBuilderFetchStructureImplementationState
@@ -102,7 +102,7 @@ export class QueryBuilderTDSState
 {
   readonly aggregationState: QueryBuilderAggregationState;
   readonly postFilterState: QueryBuilderPostFilterState;
-  readonly olapGroupByState: QueryBuilderOlapGroupByState;
+  readonly olapGroupByState: QueryBuilderOLAPGroupByState;
   readonly resultSetModifierState: QueryResultSetModifierState;
   projectionColumns: QueryBuilderProjectionColumnState[] = [];
   isConvertDerivationProjectionObjects = false;
@@ -113,8 +113,8 @@ export class QueryBuilderTDSState
     getQueryBuilderCorePostFilterOperators();
   aggregationOperators: QueryBuilderAggregateOperator[] =
     getQueryBuilderCoreAggregrationOperators();
-  olapGroupByOperators: QueryBuilderTDSOlapOperator[] =
-    getQueryBuilderCoreOlapGroupByOperators();
+  olapGroupByOperators: QueryBuilderTDS_OLAPOperator[] =
+    getQueryBuilderCoreOLAPGroupByOperators();
 
   constructor(
     queryBuilderState: QueryBuilderState,
@@ -147,7 +147,7 @@ export class QueryBuilderTDSState
       this,
       this.aggregationOperators,
     );
-    this.olapGroupByState = new QueryBuilderOlapGroupByState(
+    this.olapGroupByState = new QueryBuilderOLAPGroupByState(
       this,
       this.olapGroupByOperators,
     );

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts

@@ -27,7 +27,7 @@ import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
 import type { QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
-import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 
 export class QueryBuilderAggregateColumnState
   extends QueryBuilderTDSColumnState

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts

@@ -21,7 +21,7 @@ import {
   extractElementNameFromPath,
   matchFunctionName,
   VariableExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
+  Multiplicity,
 } from '@finos/legend-graph';
 import { guaranteeType, assertTrue } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
@@ -33,15 +33,11 @@ export const buildAggregateExpression = (
   variableName: string,
   graph: PureModel,
 ): ValueSpecification => {
-  const multiplicityOne = graph.getTypicalMultiplicity(
-    TYPICAL_MULTIPLICITY_TYPE.ONE,
-  );
   const expression = new SimpleFunctionExpression(
     extractElementNameFromPath(operatorFunctionFullPath),
-    multiplicityOne,
   );
   expression.parametersValues.push(
-    new VariableExpression(variableName, multiplicityOne),
+    new VariableExpression(variableName, Multiplicity.ONE),
   );
   return expression;
 };

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.ts

@@ -22,6 +22,7 @@ import {
   type PureModel,
   type AbstractPropertyExpression,
   type Type,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -95,10 +96,7 @@ export class QueryBuilderAggregateOperator_Average
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.aggregationState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.FLOAT);
+    return PrimitiveType.FLOAT;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.ts

@@ -23,6 +23,7 @@ import {
   type PureModel,
   type AbstractPropertyExpression,
   Enumeration,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -103,10 +104,7 @@ export class QueryBuilderAggregateOperator_Count
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.aggregationState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.INTEGER);
+    return PrimitiveType.INTEGER;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts

@@ -20,12 +20,12 @@ import {
   type ValueSpecification,
   SimpleFunctionExpression,
   VariableExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   extractElementNameFromPath,
   matchFunctionName,
   PRIMITIVE_TYPE,
   type Type,
   Enumeration,
+  Multiplicity,
 } from '@finos/legend-graph';
 import {
   assertTrue,
@@ -83,19 +83,14 @@ export class QueryBuilderAggregateOperator_DistinctCount
     variableName: string,
     graph: PureModel,
   ): ValueSpecification {
-    const multiplicityOne = graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
     const distinctExpression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.DISTINCT),
-      multiplicityOne,
     );
     distinctExpression.parametersValues.push(
-      new VariableExpression(variableName, multiplicityOne),
+      new VariableExpression(variableName, Multiplicity.ONE),
     );
     const distinctCountExpression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.COUNT),
-      multiplicityOne,
     );
     distinctCountExpression.parametersValues.push(distinctExpression);
     return distinctCountExpression;

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts

@@ -22,12 +22,12 @@ import {
   matchFunctionName,
   SimpleFunctionExpression,
   VariableExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   extractElementNameFromPath,
   PrimitiveInstanceValue,
   GenericTypeExplicitReference,
   GenericType,
-  PRIMITIVE_TYPE,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   assertTrue,
@@ -58,11 +58,12 @@ export class QueryBuilderAggregateOperator_JoinString
     if (
       projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState
     ) {
-      const propertyType =
-        projectionColumnState.propertyExpressionState.propertyExpression.func
-          .value.genericType.value.rawType;
       // NOTE: Engine does not support Enumerations at the moment.
-      return PRIMITIVE_TYPE.STRING === propertyType.path;
+      return (
+        PrimitiveType.STRING ===
+        projectionColumnState.propertyExpressionState.propertyExpression.func
+          .value.genericType.value.rawType
+      );
     }
     return true;
   }
@@ -72,24 +73,19 @@ export class QueryBuilderAggregateOperator_JoinString
     variableName: string,
     graph: PureModel,
   ): ValueSpecification {
-    const multiplicityOne = graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
     const expression = new SimpleFunctionExpression(
       extractElementNameFromPath(
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.JOIN_STRINGS,
       ),
-      multiplicityOne,
     );
     const delimiter = new PrimitiveInstanceValue(
       GenericTypeExplicitReference.create(
-        new GenericType(graph.getPrimitiveType(PRIMITIVE_TYPE.STRING)),
+        new GenericType(PrimitiveType.STRING),
       ),
-      multiplicityOne,
     );
     delimiter.values = [';'];
     expression.parametersValues.push(
-      new VariableExpression(variableName, multiplicityOne),
+      new VariableExpression(variableName, Multiplicity.ONE),
       delimiter,
     );
     return expression;
@@ -156,10 +152,7 @@ export class QueryBuilderAggregateOperator_JoinString
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.aggregationState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.STRING);
+    return PrimitiveType.STRING;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts

@@ -22,6 +22,7 @@ import {
   type VariableExpression,
   type AbstractPropertyExpression,
   type PureModel,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -95,10 +96,7 @@ export class QueryBuilderAggregateOperator_StdDev_Population
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.projectionColumnState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.NUMBER);
+    return PrimitiveType.NUMBER;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.ts

@@ -22,6 +22,7 @@ import {
   type VariableExpression,
   type AbstractPropertyExpression,
   type PureModel,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -95,10 +96,7 @@ export class QueryBuilderAggregateOperator_StdDev_Sample
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.projectionColumnState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.NUMBER);
+    return PrimitiveType.NUMBER;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/tds/olapGroupBy/QueryBuilderOLAPGroupByOperatorLoader_.ts

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { QueryBuilderTDS_OLAPOperator } from './operators/QueryBuilderTDS_OLAPOperator.js';
+import { QueryBuilderTDS_OLAPRankOperator_AverageRank } from './operators/QueryBuilderTDS_OLAPRankOperator_AverageRank.js';
+import { QueryBuilderTDS_OLAPRankOperator_DenseRank } from './operators/QueryBuilderTDS_OLAPRankOperator_DenseRank.js';
+import { QueryBuilderTDS_OLAPRankOperator_Rank } from './operators/QueryBuilderTDS_OLAPRankOperator_Rank.js';
+import { QueryBuilderTDS_OLAPRankOperator_RowNumber } from './operators/QueryBuilderTDS_OLAPRankOperator_RowNumber.js';
+import { QueryBuilderTDS_OLAPOperator_Sum } from './operators/QueryBuilderTDS_OLAPOperator_Sum.js';
+import { QueryBuilderTDS_OLAPOperator_Count } from './operators/QueryBuilderTDS_OLAPOperator_Count.js';
+import { QueryBuilderTDS_OLAPOperator_Max } from './operators/QueryBuilderTDS_OLAPOperator_Max.js';
+import { QueryBuilderTDS_OLAPOperator_Min } from './operators/QueryBuilderTDS_OLAPOperator_Min.js';
+import { QueryBuilderTDS_OLAPOperator_Average } from './operators/QueryBuilderTDS_OLAPOperator_Average.js';
+
+export const getQueryBuilderCoreOLAPGroupByOperators =
+  (): QueryBuilderTDS_OLAPOperator[] => [
+    new QueryBuilderTDS_OLAPOperator_Sum(),
+    new QueryBuilderTDS_OLAPOperator_Count(),
+    new QueryBuilderTDS_OLAPOperator_Max(),
+    new QueryBuilderTDS_OLAPOperator_Min(),
+    new QueryBuilderTDS_OLAPOperator_Average(),
+    new QueryBuilderTDS_OLAPRankOperator_AverageRank(),
+    new QueryBuilderTDS_OLAPRankOperator_DenseRank(),
+    new QueryBuilderTDS_OLAPRankOperator_Rank(),
+    new QueryBuilderTDS_OLAPRankOperator_RowNumber(),
+  ];

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOlapGroupByStateBuilder.ts → QueryBuilderOLAPGroupByStateBuilder_.ts}

@@ -39,14 +39,14 @@ import {
 } from '../QueryBuilderTDSHelper.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
-  type QueryBuilderTDSOlapOperatorState,
-  OlapGroupByColumnSortByState,
-  QueryBuilderOlapGroupByColumnState,
-  QueryBuilderTDSOlapAggreationOperatorState,
-  QueryBuilderTDSOlapRankOperatorState,
-} from './QueryBuilderOlapGroupByState.js';
+  type QueryBuilderTDS_OLAPOperatorState,
+  OLAPGroupByColumnSortByState,
+  QueryBuilderOLAPGroupByColumnState,
+  QueryBuilderTDS_OLAPAggreationOperatorState,
+  QueryBuilderTDS_OLAPRankOperatorState,
+} from './QueryBuilderOLAPGroupByState_.js';
 
-export const processTDSOlapGroupByExpression = (
+export const processTDS_OLAPGroupByExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
 ): void => {
@@ -116,7 +116,7 @@ export const processTDSOlapGroupByExpression = (
   });
 
   // process sortBy
-  let sortByState: OlapGroupByColumnSortByState | undefined;
+  let sortByState: OLAPGroupByColumnSortByState | undefined;
   if (containsSortByExpression) {
     const sortByExpression = guaranteeType(
       sortByValueSpec,
@@ -134,10 +134,10 @@ export const processTDSOlapGroupByExpression = (
       'Can`t process OLAP sort column: OLAP sort column should be a string primitive instance value',
     );
     const sortColState = getTDSColumnState(tdsState, colSortVal);
-    sortByState = new OlapGroupByColumnSortByState(sortColState, colSortType);
+    sortByState = new OLAPGroupByColumnSortByState(sortColState, colSortType);
   }
   // process olap operation
-  let operatorState: QueryBuilderTDSOlapOperatorState;
+  let operatorState: QueryBuilderTDS_OLAPOperatorState;
   if (olapOperationExpression instanceof SimpleFunctionExpression) {
     assertTrue(
       matchFunctionName(olapOperationExpression.functionName, [
@@ -172,7 +172,7 @@ export const processTDSOlapGroupByExpression = (
       tdsState.olapGroupByState.findOperator(operationFunctionExp.functionName),
       `olapGroupBy() operator '${operationFunctionExp.functionName}' not supported`,
     );
-    operatorState = new QueryBuilderTDSOlapAggreationOperatorState(
+    operatorState = new QueryBuilderTDS_OLAPAggreationOperatorState(
       tdsState.olapGroupByState,
       operation,
       oppColumnState,
@@ -203,7 +203,7 @@ export const processTDSOlapGroupByExpression = (
       !operation.isColumnAggregator(),
       `Operator '${operation.getLabel()}' expects a TDS column to aggregate against`,
     );
-    operatorState = new QueryBuilderTDSOlapRankOperatorState(
+    operatorState = new QueryBuilderTDS_OLAPRankOperatorState(
       tdsState.olapGroupByState,
       operation,
     );
@@ -225,13 +225,13 @@ export const processTDSOlapGroupByExpression = (
     ).values[0],
     'Can`t process OLAP column: OLAP column should be a string primitive instance value',
   );
-  const olapGroupByColumnState = new QueryBuilderOlapGroupByColumnState(
+  const olapGroupByColumnState = new QueryBuilderOLAPGroupByColumnState(
     tdsState.olapGroupByState,
     windowColumns,
     sortByState,
     operatorState,
     olapColumnValue,
   );
-  tdsState.olapGroupByState.addOlapColumn(olapGroupByColumnState);
+  tdsState.olapGroupByState.addOLAPColumn(olapGroupByColumnState);
   tdsState.setShowOlapGroupByPanel(true);
 };

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOlapGroupByState.ts → QueryBuilderOLAPGroupByState_.ts}

@@ -27,22 +27,22 @@ import { action, makeObservable, observable } from 'mobx';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderProjectionColumnDragSource } from '../projection/QueryBuilderProjectionColumnState.js';
-import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { COLUMN_SORT_TYPE } from '../QueryResultSetModifierState.js';
-import type { QueryBuilderTDSOlapOperator } from './operators/QueryBuilderTDSOlapOperator_.js';
+import type { QueryBuilderTDS_OLAPOperator } from './operators/QueryBuilderTDS_OLAPOperator.js';
 
 export const QUERY_BUILDER_OLAP_COLUMN_DND_TYPE = 'OLAP_COLUMN';
 
-export interface QueryBuilderOlapColumnDragSource {
-  columnState: QueryBuilderOlapGroupByColumnState;
+export interface QueryBuilderOLAPColumnDragSource {
+  columnState: QueryBuilderTDSColumnState;
 }
 
-export type QueryBuilderOlapDropTarget =
+export type QueryBuilderOLAPDropTarget =
   | QueryBuilderProjectionColumnDragSource
-  | QueryBuilderOlapColumnDragSource;
+  | QueryBuilderOLAPColumnDragSource;
 
-export class OlapGroupByColumnSortByState implements Hashable {
+export class OLAPGroupByColumnSortByState implements Hashable {
   columnState: QueryBuilderTDSColumnState;
   sortType: COLUMN_SORT_TYPE;
 
@@ -71,21 +71,21 @@ export class OlapGroupByColumnSortByState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.OLAP_GROUPBY_COLUMN_SORTBY_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_COLUMN_SORTBY_STATE,
       this.sortType,
       this.columnState.columnName,
     ]);
   }
 }
 
-export abstract class QueryBuilderTDSOlapOperatorState implements Hashable {
-  readonly olapState: QueryBuilderOlapGroupByState;
+export abstract class QueryBuilderTDS_OLAPOperatorState implements Hashable {
+  readonly olapState: QueryBuilderOLAPGroupByState;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
-  operator: QueryBuilderTDSOlapOperator;
+  operator: QueryBuilderTDS_OLAPOperator;
 
   constructor(
-    olapState: QueryBuilderOlapGroupByState,
-    operator: QueryBuilderTDSOlapOperator,
+    olapState: QueryBuilderOLAPGroupByState,
+    operator: QueryBuilderTDS_OLAPOperator,
   ) {
     this.olapState = olapState;
     this.operator = operator;
@@ -95,23 +95,23 @@ export abstract class QueryBuilderTDSOlapOperatorState implements Hashable {
     this.lambdaParameterName = paramName;
   }
 
-  setOperator(val: QueryBuilderTDSOlapOperator): void {
+  setOperator(val: QueryBuilderTDS_OLAPOperator): void {
     this.operator = val;
   }
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.OLAP_GROUPBY_OPERATION_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_OPERATION_STATE,
       this.lambdaParameterName,
       this.operator,
     ]);
   }
 }
 
-export class QueryBuilderTDSOlapRankOperatorState extends QueryBuilderTDSOlapOperatorState {
+export class QueryBuilderTDS_OLAPRankOperatorState extends QueryBuilderTDS_OLAPOperatorState {
   constructor(
-    olapState: QueryBuilderOlapGroupByState,
-    operator: QueryBuilderTDSOlapOperator,
+    olapState: QueryBuilderOLAPGroupByState,
+    operator: QueryBuilderTDS_OLAPOperator,
   ) {
     super(olapState, operator);
     makeObservable(this, {
@@ -120,11 +120,11 @@ export class QueryBuilderTDSOlapRankOperatorState extends QueryBuilderTDSOlapOpe
   }
 }
 
-export class QueryBuilderTDSOlapAggreationOperatorState extends QueryBuilderTDSOlapOperatorState {
+export class QueryBuilderTDS_OLAPAggreationOperatorState extends QueryBuilderTDS_OLAPOperatorState {
   columnState: QueryBuilderTDSColumnState;
   constructor(
-    olapState: QueryBuilderOlapGroupByState,
-    operator: QueryBuilderTDSOlapOperator,
+    olapState: QueryBuilderOLAPGroupByState,
+    operator: QueryBuilderTDS_OLAPOperator,
     columnState: QueryBuilderTDSColumnState,
   ) {
     super(olapState, operator);
@@ -142,7 +142,7 @@ export class QueryBuilderTDSOlapAggreationOperatorState extends QueryBuilderTDSO
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.OLAP_GROUPBY_AGG_OPERATION_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_AGG_OPERATION_STATE,
       this.lambdaParameterName,
       this.operator,
       this.columnState.columnName,
@@ -150,21 +150,21 @@ export class QueryBuilderTDSOlapAggreationOperatorState extends QueryBuilderTDSO
   }
 }
 
-export class QueryBuilderOlapGroupByColumnState
+export class QueryBuilderOLAPGroupByColumnState
   extends QueryBuilderTDSColumnState
   implements Hashable
 {
-  readonly olapState: QueryBuilderOlapGroupByState;
+  readonly olapState: QueryBuilderOLAPGroupByState;
   windowColumns: QueryBuilderTDSColumnState[] = [];
-  sortByState: OlapGroupByColumnSortByState | undefined;
-  operationState: QueryBuilderTDSOlapOperatorState;
+  sortByState: OLAPGroupByColumnSortByState | undefined;
+  operationState: QueryBuilderTDS_OLAPOperatorState;
   columnName: string;
 
   constructor(
-    olapState: QueryBuilderOlapGroupByState,
+    olapState: QueryBuilderOLAPGroupByState,
     windowColumns: QueryBuilderTDSColumnState[],
-    sortType: OlapGroupByColumnSortByState | undefined,
-    operationState: QueryBuilderTDSOlapOperatorState,
+    sortType: OLAPGroupByColumnSortByState | undefined,
+    operationState: QueryBuilderTDS_OLAPOperatorState,
     columnName: string,
   ) {
     super();
@@ -189,7 +189,7 @@ export class QueryBuilderOlapGroupByColumnState
     this.columnName = columnName;
   }
 
-  get columnOlapGroupIdx(): number {
+  get columnOLAPGroupIdx(): number {
     return this.olapState.olapColumns.findIndex((e) => e === this);
   }
 
@@ -204,7 +204,7 @@ export class QueryBuilderOlapGroupByColumnState
 
   get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
     const operatorReference =
-      this.operationState instanceof QueryBuilderTDSOlapAggreationOperatorState
+      this.operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState
         ? [this.operationState.columnState]
         : [];
     const soryByReference = this.sortByState
@@ -223,11 +223,11 @@ export class QueryBuilderOlapGroupByColumnState
     this.columnName = val;
   }
 
-  setOperatorState(op: QueryBuilderTDSOlapOperatorState): void {
+  setOperatorState(op: QueryBuilderTDS_OLAPOperatorState): void {
     this.operationState = op;
   }
 
-  setSortBy(val: OlapGroupByColumnSortByState | undefined): void {
+  setSortBy(val: OLAPGroupByColumnSortByState | undefined): void {
     this.sortByState = val;
   }
 
@@ -244,7 +244,7 @@ export class QueryBuilderOlapGroupByColumnState
   }
 
   possibleAggregatedColumns(
-    op: QueryBuilderTDSOlapOperator,
+    op: QueryBuilderTDS_OLAPOperator,
   ): QueryBuilderTDSColumnState[] {
     if (op.isColumnAggregator()) {
       return this.possibleReferencedColumns.filter((col) =>
@@ -254,10 +254,10 @@ export class QueryBuilderOlapGroupByColumnState
     return [];
   }
 
-  changeOperator(olapOp: QueryBuilderTDSOlapOperator): void {
+  changeOperator(olapOp: QueryBuilderTDS_OLAPOperator): void {
     const currentOperator = this.operationState.operator;
     const currentAggregateColumn =
-      this.operationState instanceof QueryBuilderTDSOlapAggreationOperatorState
+      this.operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState
         ? this.operationState.columnState
         : undefined;
     if (currentOperator !== olapOp) {
@@ -269,7 +269,7 @@ export class QueryBuilderOlapGroupByColumnState
             : this.possibleAggregatedColumns(olapOp)[0];
         if (compatibleAggCol) {
           this.setOperatorState(
-            new QueryBuilderTDSOlapAggreationOperatorState(
+            new QueryBuilderTDS_OLAPAggreationOperatorState(
               this.olapState,
               olapOp,
               compatibleAggCol,
@@ -278,7 +278,7 @@ export class QueryBuilderOlapGroupByColumnState
         }
       } else {
         this.setOperatorState(
-          new QueryBuilderTDSOlapRankOperatorState(this.olapState, olapOp),
+          new QueryBuilderTDS_OLAPRankOperatorState(this.olapState, olapOp),
         );
       }
     }
@@ -290,7 +290,7 @@ export class QueryBuilderOlapGroupByColumnState
       if (sortOp) {
         const sortInfoOpState =
           sortByState ??
-          new OlapGroupByColumnSortByState(
+          new OLAPGroupByColumnSortByState(
             guaranteeNonNullable(this.possibleReferencedColumns[0]),
             sortOp,
           );
@@ -304,7 +304,7 @@ export class QueryBuilderOlapGroupByColumnState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.OLAP_GROUPBY_COLUMN_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_COLUMN_STATE,
       hashArray(this.windowColumns),
       this.sortByState ?? '',
       this.operationState,
@@ -313,20 +313,20 @@ export class QueryBuilderOlapGroupByColumnState
   }
 }
 
-export class QueryBuilderOlapGroupByState implements Hashable {
+export class QueryBuilderOLAPGroupByState implements Hashable {
   readonly tdsState: QueryBuilderTDSState;
-  olapColumns: QueryBuilderOlapGroupByColumnState[] = [];
-  operators: QueryBuilderTDSOlapOperator[];
-  editColumn: QueryBuilderOlapGroupByColumnState | undefined;
+  olapColumns: QueryBuilderOLAPGroupByColumnState[] = [];
+  operators: QueryBuilderTDS_OLAPOperator[];
+  editColumn: QueryBuilderOLAPGroupByColumnState | undefined;
 
   constructor(
     tdsState: QueryBuilderTDSState,
-    operators: QueryBuilderTDSOlapOperator[],
+    operators: QueryBuilderTDS_OLAPOperator[],
   ) {
     makeObservable(this, {
       olapColumns: observable,
       editColumn: observable,
-      addOlapColumn: action,
+      addOLAPColumn: action,
       removeColumn: action,
       moveColumn: action,
       setEditColumn: action,
@@ -343,19 +343,19 @@ export class QueryBuilderOlapGroupByState implements Hashable {
     return uniq(this.olapColumns.map((c) => c.referencedTDSColumns).flat());
   }
 
-  setEditColumn(col: QueryBuilderOlapGroupByColumnState | undefined): void {
+  setEditColumn(col: QueryBuilderOLAPGroupByColumnState | undefined): void {
     this.editColumn = col;
   }
 
-  findOperator(func: string): QueryBuilderTDSOlapOperator | undefined {
+  findOperator(func: string): QueryBuilderTDS_OLAPOperator | undefined {
     return this.operators.find((o) => matchFunctionName(func, o.pureFunc));
   }
 
-  addOlapColumn(olapGroupByCol: QueryBuilderOlapGroupByColumnState): void {
+  addOLAPColumn(olapGroupByCol: QueryBuilderOLAPGroupByColumnState): void {
     addUniqueEntry(this.olapColumns, olapGroupByCol);
   }
 
-  removeColumn(column: QueryBuilderOlapGroupByColumnState): void {
+  removeColumn(column: QueryBuilderOLAPGroupByColumnState): void {
     deleteEntry(this.olapColumns, column);
   }
 
@@ -370,7 +370,7 @@ export class QueryBuilderOlapGroupByState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.OLAP_GROUPBY_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_STATE,
       hashArray(this.olapColumns),
     ]);
   }