@finos/legend-query-builder 0.4.1 → 0.4.3

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),
     ]);
   }

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOlapGroupByValueSpecificationBuilder.ts → QueryBuilderOLAPGroupByValueSpecificationBuilder_.ts}

@@ -21,38 +21,35 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PrimitiveInstanceValue,
-  PRIMITIVE_TYPE,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   VariableExpression,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { getFunctionNameFromTDSSortColumn } from '../QueryBuilderTDSHelper.js';
 import {
-  type QueryBuilderOlapGroupByColumnState,
-  type QueryBuilderOlapGroupByState,
-  QueryBuilderTDSOlapAggreationOperatorState,
-} from './QueryBuilderOlapGroupByState.js';
+  type QueryBuilderOLAPGroupByColumnState,
+  type QueryBuilderOLAPGroupByState,
+  QueryBuilderTDS_OLAPAggreationOperatorState,
+} from './QueryBuilderOLAPGroupByState_.js';
 
-const appendOlapGroupByColumnState = (
-  olapGroupByColumnState: QueryBuilderOlapGroupByColumnState,
+const appendOLAPGroupByColumnState = (
+  olapGroupByColumnState: QueryBuilderOLAPGroupByColumnState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
   const graph =
     olapGroupByColumnState.olapState.tdsState.queryBuilderState
       .graphManagerState.graph;
-  const multiplicityOne = graph.getTypicalMultiplicity(
-    TYPICAL_MULTIPLICITY_TYPE.ONE,
-  );
-  const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
 
   // create window cols expression
   const windowColumns = olapGroupByColumnState.windowColumns.map((column) => {
     const stringInstance = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     stringInstance.values = [column.columnName];
     return stringInstance;
@@ -69,11 +66,11 @@ const appendOlapGroupByColumnState = (
     const sortByState = olapGroupByColumnState.sortByState;
     sortByFunction = new SimpleFunctionExpression(
       getFunctionNameFromTDSSortColumn(sortByState.sortType),
-      multiplicityOne,
     );
     const sortColInstance = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     sortColInstance.values = [sortByState.columnState.columnName];
     sortByFunction.parametersValues[0] = sortColInstance;
@@ -82,12 +79,12 @@ const appendOlapGroupByColumnState = (
   // create olap operation expression
   const operationState = olapGroupByColumnState.operationState;
   const olapFunc = extractElementNameFromPath(operationState.operator.pureFunc);
-  const olapFuncExpression = new SimpleFunctionExpression(
-    olapFunc,
-    multiplicityOne,
-  );
+  const olapFuncExpression = new SimpleFunctionExpression(olapFunc);
   olapFuncExpression.parametersValues = [
-    new VariableExpression(operationState.lambdaParameterName, multiplicityOne),
+    new VariableExpression(
+      operationState.lambdaParameterName,
+      Multiplicity.ONE,
+    ),
   ];
   const olapLambdaFuncInstance = buildGenericLambdaFunctionInstanceValue(
     operationState.lambdaParameterName,
@@ -95,17 +92,17 @@ const appendOlapGroupByColumnState = (
     graph,
   );
   let olapAggregationExpression: SimpleFunctionExpression | undefined;
-  if (operationState instanceof QueryBuilderTDSOlapAggreationOperatorState) {
+  if (operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState) {
     // column param
     const olapAggregateColumn = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     olapAggregateColumn.values = [operationState.columnState.columnName];
     // build `meta::pure::tds::func`
     olapAggregationExpression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FUNC),
-      multiplicityOne,
     );
     olapAggregationExpression.parametersValues = [
       olapAggregateColumn,
@@ -115,17 +112,15 @@ const appendOlapGroupByColumnState = (
   const olapOperationExpression =
     olapAggregationExpression ?? olapLambdaFuncInstance;
 
-  // OLAP column nam expression
+  // OLAP column name expression
   const olapColumn = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(typeString)),
-    multiplicityOne,
+    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
   );
   olapColumn.values = [olapGroupByColumnState.columnName];
 
   // create main expression
   const olapExpression = new SimpleFunctionExpression(
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY),
-    multiplicityOne,
   );
   const currentExpression = guaranteeNonNullable(lambda.expressionSequence[0]);
   olapExpression.parametersValues = [
@@ -137,12 +132,12 @@ const appendOlapGroupByColumnState = (
   return lambda;
 };
 
-export const appendOlapGroupByState = (
-  olapGroupByState: QueryBuilderOlapGroupByState,
+export const appendOLAPGroupByState = (
+  olapGroupByState: QueryBuilderOLAPGroupByState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
   olapGroupByState.olapColumns.forEach((c) =>
-    appendOlapGroupByColumnState(c, lambda),
+    appendOLAPGroupByColumnState(c, lambda),
   );
   return lambda;
 };

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_.ts → QueryBuilderTDS_OLAPOperator.ts}

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { PRIMITIVE_TYPE, type PureModel, type Type } from '@finos/legend-graph';
+import { PrimitiveType, type PureModel, type Type } from '@finos/legend-graph';
 import { type Hashable, uuid } from '@finos/legend-shared';
-import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
 
-export abstract class QueryBuilderTDSOlapOperator implements Hashable {
+export abstract class QueryBuilderTDS_OLAPOperator implements Hashable {
   readonly uuid = uuid();
 
   abstract getLabel(): string;
@@ -34,7 +34,7 @@ export abstract class QueryBuilderTDSOlapOperator implements Hashable {
   }
 
   getOperatorReturnType(graph: PureModel): Type {
-    return graph.getPrimitiveType(PRIMITIVE_TYPE.NUMBER);
+    return PrimitiveType.NUMBER;
   }
 
   isCompatibleWithColumn(column: QueryBuilderTDSColumnState): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Average.ts → QueryBuilderTDS_OLAPOperator_Average.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Average extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Average extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Average extends QueryBuilderTDSOlapOper
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_AVERAGE]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_AVERAGE]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Count.ts → QueryBuilderTDS_OLAPOperator_Count.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Count extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Count extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Count extends QueryBuilderTDSOlapOperat
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_COUNT]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_COUNT]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Max.ts → QueryBuilderTDS_OLAPOperator_Max.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Max extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Max extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Max extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_MAX]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_MAX]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Min.ts → QueryBuilderTDS_OLAPOperator_Min.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Min extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Min extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Min extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_MIN]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_MIN]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Sum.ts → QueryBuilderTDS_OLAPOperator_Sum.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Sum extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Sum extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Sum extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_SUM]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_SUM]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_AverageRank_.ts → QueryBuilderTDS_OLAPRankOperator_AverageRank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_AverageRank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_AverageRank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'average rank';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_AverageRank extends QueryBuilderTDS
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_DENSE_RANK]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_DENSE_RANK,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_DenseRank_.ts → QueryBuilderTDS_OLAPRankOperator_DenseRank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_DenseRank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_DenseRank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'dense rank';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_DenseRank extends QueryBuilderTDSOl
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_DENSE_RANK]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_DENSE_RANK,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_Rank_.ts → QueryBuilderTDS_OLAPRankOperator_Rank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_Rank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_Rank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'rank';
   }
@@ -30,7 +30,7 @@ export class QueryBuilderTDSOlapRankOperator_Rank extends QueryBuilderTDSOlapOpe
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_RANK]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_RANK]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_RowNumber_.ts → QueryBuilderTDS_OLAPRankOperator_RowNumber.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_RowNumber extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_RowNumber extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'row number';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_RowNumber extends QueryBuilderTDSOl
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_ROW_NUMBER]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_ROW_NUMBER,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {