@finos/legend-query-builder 0.6.22 → 0.6.24

package/src/stores/fetch-structure/tds/{olapGroupBy/QueryBuilderOLAPGroupByState.ts → window/QueryBuilderWindowState.ts}

@@ -30,19 +30,19 @@ import type { QueryBuilderProjectionColumnDragSource } from '../projection/Query
 import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { COLUMN_SORT_TYPE } from '../QueryResultSetModifierState.js';
-import type { QueryBuilderTDS_OLAPOperator } from './operators/QueryBuilderTDS_OLAPOperator.js';
+import type { QueryBuilderTDS_WindowOperator } from './operators/QueryBuilderTDS_WindowOperator.js';
 
-export const QUERY_BUILDER_OLAP_COLUMN_DND_TYPE = 'OLAP_COLUMN';
+export const QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE = 'WINDOW_COLUMN';
 
-export interface QueryBuilderOLAPColumnDragSource {
+export interface QueryBuilderWindowColumnDragSource {
   columnState: QueryBuilderTDSColumnState;
 }
 
-export type QueryBuilderOLAPDropTarget =
+export type QueryBuilderWindowDropTarget =
   | QueryBuilderProjectionColumnDragSource
-  | QueryBuilderOLAPColumnDragSource;
+  | QueryBuilderWindowColumnDragSource;
 
-export class OLAPGroupByColumnSortByState implements Hashable {
+export class WindowGroupByColumnSortByState implements Hashable {
   columnState: QueryBuilderTDSColumnState;
   sortType: COLUMN_SORT_TYPE;
 
@@ -71,23 +71,23 @@ export class OLAPGroupByColumnSortByState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_COLUMN_SORTBY_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_COLUMN_SORTBY_STATE,
       this.sortType,
       this.columnState.columnName,
     ]);
   }
 }
 
-export abstract class QueryBuilderTDS_OLAPOperatorState implements Hashable {
-  readonly olapState: QueryBuilderOLAPGroupByState;
+export abstract class QueryBuilderTDS_WindowOperatorState implements Hashable {
+  readonly windowState: QueryBuilderWindowState;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
-  operator: QueryBuilderTDS_OLAPOperator;
+  operator: QueryBuilderTDS_WindowOperator;
 
   constructor(
-    olapState: QueryBuilderOLAPGroupByState,
-    operator: QueryBuilderTDS_OLAPOperator,
+    windowState: QueryBuilderWindowState,
+    operator: QueryBuilderTDS_WindowOperator,
   ) {
-    this.olapState = olapState;
+    this.windowState = windowState;
     this.operator = operator;
   }
 
@@ -95,39 +95,39 @@ export abstract class QueryBuilderTDS_OLAPOperatorState implements Hashable {
     this.lambdaParameterName = paramName;
   }
 
-  setOperator(val: QueryBuilderTDS_OLAPOperator): void {
+  setOperator(val: QueryBuilderTDS_WindowOperator): void {
     this.operator = val;
   }
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_OPERATION_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_OPERATION_STATE,
       this.lambdaParameterName,
       this.operator,
     ]);
   }
 }
 
-export class QueryBuilderTDS_OLAPRankOperatorState extends QueryBuilderTDS_OLAPOperatorState {
+export class QueryBuilderTDS_WindowRankOperatorState extends QueryBuilderTDS_WindowOperatorState {
   constructor(
-    olapState: QueryBuilderOLAPGroupByState,
-    operator: QueryBuilderTDS_OLAPOperator,
+    windowState: QueryBuilderWindowState,
+    operator: QueryBuilderTDS_WindowOperator,
   ) {
-    super(olapState, operator);
+    super(windowState, operator);
     makeObservable(this, {
       setLambdaParameterName: action,
     });
   }
 }
 
-export class QueryBuilderTDS_OLAPAggreationOperatorState extends QueryBuilderTDS_OLAPOperatorState {
+export class QueryBuilderTDS_WindowAggreationOperatorState extends QueryBuilderTDS_WindowOperatorState {
   columnState: QueryBuilderTDSColumnState;
   constructor(
-    olapState: QueryBuilderOLAPGroupByState,
-    operator: QueryBuilderTDS_OLAPOperator,
+    windowState: QueryBuilderWindowState,
+    operator: QueryBuilderTDS_WindowOperator,
     columnState: QueryBuilderTDSColumnState,
   ) {
-    super(olapState, operator);
+    super(windowState, operator);
     makeObservable(this, {
       columnState: observable,
       setColumnState: action,
@@ -142,7 +142,7 @@ export class QueryBuilderTDS_OLAPAggreationOperatorState extends QueryBuilderTDS
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_AGG_OPERATION_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_AGG_OPERATION_STATE,
       this.lambdaParameterName,
       this.operator,
       this.columnState.columnName,
@@ -150,21 +150,21 @@ export class QueryBuilderTDS_OLAPAggreationOperatorState extends QueryBuilderTDS
   }
 }
 
-export class QueryBuilderOLAPGroupByColumnState
+export class QueryBuilderWindowColumnState
   extends QueryBuilderTDSColumnState
   implements Hashable
 {
-  readonly olapState: QueryBuilderOLAPGroupByState;
+  readonly windowState: QueryBuilderWindowState;
   windowColumns: QueryBuilderTDSColumnState[] = [];
-  sortByState: OLAPGroupByColumnSortByState | undefined;
-  operationState: QueryBuilderTDS_OLAPOperatorState;
+  sortByState: WindowGroupByColumnSortByState | undefined;
+  operationState: QueryBuilderTDS_WindowOperatorState;
   columnName: string;
 
   constructor(
-    olapState: QueryBuilderOLAPGroupByState,
+    windowState: QueryBuilderWindowState,
     windowColumns: QueryBuilderTDSColumnState[],
-    sortType: OLAPGroupByColumnSortByState | undefined,
-    operationState: QueryBuilderTDS_OLAPOperatorState,
+    sortType: WindowGroupByColumnSortByState | undefined,
+    operationState: QueryBuilderTDS_WindowOperatorState,
     columnName: string,
   ) {
     super();
@@ -182,29 +182,32 @@ export class QueryBuilderOLAPGroupByColumnState
       changeOperator: action,
       changeSortBy: action,
     });
-    this.olapState = olapState;
+    this.windowState = windowState;
     this.windowColumns = windowColumns;
     this.sortByState = sortType;
     this.operationState = operationState;
     this.columnName = columnName;
   }
 
-  get columnOLAPGroupIdx(): number {
-    return this.olapState.olapColumns.findIndex((e) => e === this);
+  get columnWindowGroupIdx(): number {
+    return this.windowState.windowColumns.findIndex((e) => e === this);
   }
 
   get possibleReferencedColumns(): QueryBuilderTDSColumnState[] {
-    // column can only reference TDS columns already defined, i.e in an earlier index of the olap columns
-    const idx = this.olapState.tdsState.tdsColumns.findIndex((e) => e === this);
+    // column can only reference TDS columns already defined, i.e in an earlier index of the window columns
+    const idx = this.windowState.tdsState.tdsColumns.findIndex(
+      (e) => e === this,
+    );
     if (idx === -1) {
-      return this.olapState.tdsState.tdsColumns;
+      return this.windowState.tdsState.tdsColumns;
     }
-    return this.olapState.tdsState.tdsColumns.slice(0, idx);
+    return this.windowState.tdsState.tdsColumns.slice(0, idx);
   }
 
   get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
     const operatorReference =
-      this.operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState
+      this.operationState instanceof
+      QueryBuilderTDS_WindowAggreationOperatorState
         ? [this.operationState.columnState]
         : [];
     const soryByReference = this.sortByState
@@ -215,7 +218,7 @@ export class QueryBuilderOLAPGroupByColumnState
 
   getColumnType(): Type | undefined {
     return this.operationState.operator.getOperatorReturnType(
-      this.olapState.tdsState.queryBuilderState.graphManagerState.graph,
+      this.windowState.tdsState.queryBuilderState.graphManagerState.graph,
     );
   }
 
@@ -223,11 +226,11 @@ export class QueryBuilderOLAPGroupByColumnState
     this.columnName = val;
   }
 
-  setOperatorState(op: QueryBuilderTDS_OLAPOperatorState): void {
+  setOperatorState(op: QueryBuilderTDS_WindowOperatorState): void {
     this.operationState = op;
   }
 
-  setSortBy(val: OLAPGroupByColumnSortByState | undefined): void {
+  setSortBy(val: WindowGroupByColumnSortByState | undefined): void {
     this.sortByState = val;
   }
 
@@ -244,7 +247,7 @@ export class QueryBuilderOLAPGroupByColumnState
   }
 
   possibleAggregatedColumns(
-    op: QueryBuilderTDS_OLAPOperator,
+    op: QueryBuilderTDS_WindowOperator,
   ): QueryBuilderTDSColumnState[] {
     if (op.isColumnAggregator()) {
       return this.possibleReferencedColumns.filter((col) =>
@@ -254,31 +257,35 @@ export class QueryBuilderOLAPGroupByColumnState
     return [];
   }
 
-  changeOperator(olapOp: QueryBuilderTDS_OLAPOperator): void {
+  changeOperator(windowOp: QueryBuilderTDS_WindowOperator): void {
     const currentOperator = this.operationState.operator;
     const currentAggregateColumn =
-      this.operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState
+      this.operationState instanceof
+      QueryBuilderTDS_WindowAggreationOperatorState
         ? this.operationState.columnState
         : undefined;
-    if (currentOperator !== olapOp) {
-      if (olapOp.isColumnAggregator()) {
+    if (currentOperator !== windowOp) {
+      if (windowOp.isColumnAggregator()) {
         const compatibleAggCol =
           currentAggregateColumn &&
-          olapOp.isCompatibleWithColumn(currentAggregateColumn)
+          windowOp.isCompatibleWithColumn(currentAggregateColumn)
             ? currentAggregateColumn
-            : this.possibleAggregatedColumns(olapOp)[0];
+            : this.possibleAggregatedColumns(windowOp)[0];
         if (compatibleAggCol) {
           this.setOperatorState(
-            new QueryBuilderTDS_OLAPAggreationOperatorState(
-              this.olapState,
-              olapOp,
+            new QueryBuilderTDS_WindowAggreationOperatorState(
+              this.windowState,
+              windowOp,
               compatibleAggCol,
             ),
           );
         }
       } else {
         this.setOperatorState(
-          new QueryBuilderTDS_OLAPRankOperatorState(this.olapState, olapOp),
+          new QueryBuilderTDS_WindowRankOperatorState(
+            this.windowState,
+            windowOp,
+          ),
         );
       }
     }
@@ -290,7 +297,7 @@ export class QueryBuilderOLAPGroupByColumnState
       if (sortOp) {
         const sortInfoOpState =
           sortByState ??
-          new OLAPGroupByColumnSortByState(
+          new WindowGroupByColumnSortByState(
             guaranteeNonNullable(this.possibleReferencedColumns[0]),
             sortOp,
           );
@@ -304,7 +311,7 @@ export class QueryBuilderOLAPGroupByColumnState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_COLUMN_STATE,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_COLUMN_STATE,
       hashArray(this.windowColumns),
       this.sortByState ?? '',
       this.operationState,
@@ -313,20 +320,20 @@ export class QueryBuilderOLAPGroupByColumnState
   }
 }
 
-export class QueryBuilderOLAPGroupByState implements Hashable {
+export class QueryBuilderWindowState implements Hashable {
   readonly tdsState: QueryBuilderTDSState;
-  olapColumns: QueryBuilderOLAPGroupByColumnState[] = [];
-  operators: QueryBuilderTDS_OLAPOperator[];
-  editColumn: QueryBuilderOLAPGroupByColumnState | undefined;
+  windowColumns: QueryBuilderWindowColumnState[] = [];
+  operators: QueryBuilderTDS_WindowOperator[];
+  editColumn: QueryBuilderWindowColumnState | undefined;
 
   constructor(
     tdsState: QueryBuilderTDSState,
-    operators: QueryBuilderTDS_OLAPOperator[],
+    operators: QueryBuilderTDS_WindowOperator[],
   ) {
     makeObservable(this, {
-      olapColumns: observable,
+      windowColumns: observable,
       editColumn: observable,
-      addOLAPColumn: action,
+      addWindowColumn: action,
       removeColumn: action,
       moveColumn: action,
       setEditColumn: action,
@@ -336,42 +343,42 @@ export class QueryBuilderOLAPGroupByState implements Hashable {
   }
 
   get isEmpty(): boolean {
-    return !this.olapColumns.length;
+    return !this.windowColumns.length;
   }
 
   get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
-    return uniq(this.olapColumns.map((c) => c.referencedTDSColumns).flat());
+    return uniq(this.windowColumns.map((c) => c.referencedTDSColumns).flat());
   }
 
-  setEditColumn(col: QueryBuilderOLAPGroupByColumnState | undefined): void {
+  setEditColumn(col: QueryBuilderWindowColumnState | undefined): void {
     this.editColumn = col;
   }
 
-  findOperator(func: string): QueryBuilderTDS_OLAPOperator | undefined {
+  findOperator(func: string): QueryBuilderTDS_WindowOperator | undefined {
     return this.operators.find((o) => matchFunctionName(func, o.pureFunc));
   }
 
-  addOLAPColumn(olapGroupByCol: QueryBuilderOLAPGroupByColumnState): void {
-    addUniqueEntry(this.olapColumns, olapGroupByCol);
+  addWindowColumn(windowCol: QueryBuilderWindowColumnState): void {
+    addUniqueEntry(this.windowColumns, windowCol);
   }
 
-  removeColumn(column: QueryBuilderOLAPGroupByColumnState): void {
-    deleteEntry(this.olapColumns, column);
+  removeColumn(column: QueryBuilderWindowColumnState): void {
+    deleteEntry(this.windowColumns, column);
   }
 
   moveColumn(fromIndex: number, toIndex: number): void {
-    const fromCol = this.olapColumns[fromIndex];
-    const toCol = this.olapColumns[toIndex];
+    const fromCol = this.windowColumns[fromIndex];
+    const toCol = this.windowColumns[toIndex];
     if (fromCol && toCol) {
-      this.olapColumns[fromIndex] = toCol;
-      this.olapColumns[toIndex] = fromCol;
+      this.windowColumns[fromIndex] = toCol;
+      this.windowColumns[toIndex] = fromCol;
     }
   }
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_GROUPBY_STATE,
-      hashArray(this.olapColumns),
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_STATE,
+      hashArray(this.windowColumns),
     ]);
   }
 }

package/src/stores/fetch-structure/tds/{olapGroupBy/QueryBuilderOLAPGroupByStateBuilder.ts → window/QueryBuilderWindowStateBuilder.ts}

@@ -39,12 +39,12 @@ import {
 } from '../QueryBuilderTDSHelper.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
-  type QueryBuilderTDS_OLAPOperatorState,
-  OLAPGroupByColumnSortByState,
-  QueryBuilderOLAPGroupByColumnState,
-  QueryBuilderTDS_OLAPAggreationOperatorState,
-  QueryBuilderTDS_OLAPRankOperatorState,
-} from './QueryBuilderOLAPGroupByState.js';
+  type QueryBuilderTDS_WindowOperatorState,
+  WindowGroupByColumnSortByState,
+  QueryBuilderWindowColumnState,
+  QueryBuilderTDS_WindowAggreationOperatorState,
+  QueryBuilderTDS_WindowRankOperatorState,
+} from './QueryBuilderWindowState.js';
 
 export const processTDS_OLAPGroupByExpression = (
   expression: SimpleFunctionExpression,
@@ -118,7 +118,7 @@ export const processTDS_OLAPGroupByExpression = (
   });
 
   // process sortBy
-  let sortByState: OLAPGroupByColumnSortByState | undefined;
+  let sortByState: WindowGroupByColumnSortByState | undefined;
   if (containsSortByExpression) {
     const sortByExpression = guaranteeType(
       sortByValueSpec,
@@ -136,10 +136,10 @@ export const processTDS_OLAPGroupByExpression = (
       '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 WindowGroupByColumnSortByState(sortColState, colSortType);
   }
   // process olap operation
-  let operatorState: QueryBuilderTDS_OLAPOperatorState;
+  let operatorState: QueryBuilderTDS_WindowOperatorState;
   if (olapOperationExpression instanceof SimpleFunctionExpression) {
     assertTrue(
       matchFunctionName(olapOperationExpression.functionName, [
@@ -171,11 +171,11 @@ export const processTDS_OLAPGroupByExpression = (
       SimpleFunctionExpression,
     );
     const operation = guaranteeNonNullable(
-      tdsState.olapGroupByState.findOperator(operationFunctionExp.functionName),
+      tdsState.windowState.findOperator(operationFunctionExp.functionName),
       `olapGroupBy() operator '${operationFunctionExp.functionName}' not supported`,
     );
-    operatorState = new QueryBuilderTDS_OLAPAggreationOperatorState(
-      tdsState.olapGroupByState,
+    operatorState = new QueryBuilderTDS_WindowAggreationOperatorState(
+      tdsState.windowState,
       operation,
       oppColumnState,
     );
@@ -198,15 +198,15 @@ export const processTDS_OLAPGroupByExpression = (
       SimpleFunctionExpression,
     );
     const operation = guaranteeNonNullable(
-      tdsState.olapGroupByState.findOperator(operationFunctionExp.functionName),
+      tdsState.windowState.findOperator(operationFunctionExp.functionName),
       `olapGroupBy() operator '${operationFunctionExp.functionName}' not supported`,
     );
     assertTrue(
       !operation.isColumnAggregator(),
       `Operator '${operation.getLabel()}' expects a TDS column to aggregate against`,
     );
-    operatorState = new QueryBuilderTDS_OLAPRankOperatorState(
-      tdsState.olapGroupByState,
+    operatorState = new QueryBuilderTDS_WindowRankOperatorState(
+      tdsState.windowState,
       operation,
     );
     operatorState.setLambdaParameterName(
@@ -227,13 +227,13 @@ export const processTDS_OLAPGroupByExpression = (
     ).values[0],
     'Can`t process OLAP column: OLAP column should be a string primitive instance value',
   );
-  const olapGroupByColumnState = new QueryBuilderOLAPGroupByColumnState(
-    tdsState.olapGroupByState,
+  const olapGroupByColumnState = new QueryBuilderWindowColumnState(
+    tdsState.windowState,
     windowColumns,
     sortByState,
     operatorState,
     olapColumnValue,
   );
-  tdsState.olapGroupByState.addOLAPColumn(olapGroupByColumnState);
-  tdsState.setShowOlapGroupByPanel(true);
+  tdsState.windowState.addWindowColumn(olapGroupByColumnState);
+  tdsState.setShowWindowFuncPanel(true);
 };

package/src/stores/fetch-structure/tds/{olapGroupBy/QueryBuilderOLAPGroupByValueSpecificationBuilder.ts → window/QueryBuilderWindowValueSpecificationBuilder.ts}

@@ -31,17 +31,17 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/Quer
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { getFunctionNameFromTDSSortColumn } from '../QueryBuilderTDSHelper.js';
 import {
-  type QueryBuilderOLAPGroupByColumnState,
-  type QueryBuilderOLAPGroupByState,
-  QueryBuilderTDS_OLAPAggreationOperatorState,
-} from './QueryBuilderOLAPGroupByState.js';
+  type QueryBuilderWindowColumnState,
+  type QueryBuilderWindowState,
+  QueryBuilderTDS_WindowAggreationOperatorState,
+} from './QueryBuilderWindowState.js';
 
 const appendOLAPGroupByColumnState = (
-  olapGroupByColumnState: QueryBuilderOLAPGroupByColumnState,
+  olapGroupByColumnState: QueryBuilderWindowColumnState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
   const graph =
-    olapGroupByColumnState.olapState.tdsState.queryBuilderState
+    olapGroupByColumnState.windowState.tdsState.queryBuilderState
       .graphManagerState.graph;
 
   // create window cols expression
@@ -92,7 +92,7 @@ const appendOLAPGroupByColumnState = (
     graph,
   );
   let olapAggregationExpression: SimpleFunctionExpression | undefined;
-  if (operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState) {
+  if (operationState instanceof QueryBuilderTDS_WindowAggreationOperatorState) {
     // column param
     const olapAggregateColumn = new PrimitiveInstanceValue(
       GenericTypeExplicitReference.create(
@@ -133,10 +133,10 @@ const appendOLAPGroupByColumnState = (
 };
 
 export const appendOLAPGroupByState = (
-  olapGroupByState: QueryBuilderOLAPGroupByState,
+  olapGroupByState: QueryBuilderWindowState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
-  olapGroupByState.olapColumns.forEach((c) =>
+  olapGroupByState.windowColumns.forEach((c) =>
     appendOLAPGroupByColumnState(c, lambda),
   );
   return lambda;

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

@@ -18,7 +18,7 @@ import { PrimitiveType, type PureModel, type Type } from '@finos/legend-graph';
 import { type Hashable, uuid } from '@finos/legend-shared';
 import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
 
-export abstract class QueryBuilderTDS_OLAPOperator implements Hashable {
+export abstract class QueryBuilderTDS_WindowOperator implements Hashable {
   readonly uuid = uuid();
 
   abstract getLabel(): string;

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

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

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

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

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

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

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

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

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

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

package/src/stores/fetch-structure/tds/{olapGroupBy/operators/QueryBuilderTDS_OLAPRankOperator_AverageRank.ts → window/operators/QueryBuilderTDS_WindowRankOperator_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 { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
+import { QueryBuilderTDS_WindowOperator } from './QueryBuilderTDS_WindowOperator.js';
 
-export class QueryBuilderTDS_OLAPRankOperator_AverageRank extends QueryBuilderTDS_OLAPOperator {
+export class QueryBuilderTDS_WindowRankOperator_AverageRank extends QueryBuilderTDS_WindowOperator {
   getLabel(): string {
     return 'average rank';
   }
@@ -31,7 +31,7 @@ export class QueryBuilderTDS_OLAPRankOperator_AverageRank extends QueryBuilderTD
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_DENSE_RANK,
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_WINDOW_OPERATOR_DENSE_RANK,
     ]);
   }