@finos/legend-query-builder 0.0.2 → 0.1.1

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts

@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-import { assertType, addUniqueEntry, deleteEntry } from '@finos/legend-shared';
+import {
+  assertType,
+  addUniqueEntry,
+  deleteEntry,
+  hashArray,
+  type Hashable,
+} from '@finos/legend-shared';
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import {
   type AbstractProperty,
@@ -37,15 +43,19 @@ import {
   graphFetchTree_addSubTree,
   graphFetchTree_removeSubTree,
 } from '@finos/legend-application';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { computed, makeObservable } from 'mobx';
 
-export class QueryBuilderGraphFetchTreeNodeData implements TreeNodeData {
+export class QueryBuilderGraphFetchTreeNodeData
+  implements TreeNodeData, Hashable
+{
+  readonly id: string;
+  readonly label: string;
+  readonly tree: PropertyGraphFetchTree;
+  readonly parentId?: string | undefined;
   isSelected?: boolean | undefined;
   isOpen?: boolean | undefined;
-  id: string;
-  label: string;
   childrenIds: string[] = [];
-  parentId?: string | undefined;
-  tree: PropertyGraphFetchTree;
 
   constructor(
     id: string,
@@ -53,6 +63,10 @@ export class QueryBuilderGraphFetchTreeNodeData implements TreeNodeData {
     parentId: string | undefined,
     graphFetchTreeNode: PropertyGraphFetchTree,
   ) {
+    makeObservable(this, {
+      hashCode: computed,
+    });
+
     this.id = id;
     this.label = label;
     this.parentId = parentId;
@@ -64,6 +78,17 @@ export class QueryBuilderGraphFetchTreeNodeData implements TreeNodeData {
   get type(): Type {
     return this.tree.property.value.genericType.value.rawType;
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.GRAPH_FETCH_TREE_NODE_DATA,
+      this.id,
+      this.label,
+      this.tree,
+      this.parentId ?? '',
+      hashArray(this.childrenIds),
+    ]);
+  }
 }
 
 export interface QueryBuilderGraphFetchTreeData

package/src/stores/fetch-structure/projection/QueryBuilderProjectionColumnState.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { action, makeObservable, observable, flow } from 'mobx';
+import { action, makeObservable, observable, flow, computed } from 'mobx';
 import {
   type GeneratorFn,
   LogEvent,
@@ -23,6 +23,8 @@ import {
   guaranteeNonNullable,
   assertTrue,
   assertNonEmptyString,
+  type Hashable,
+  hashArray,
 } from '@finos/legend-shared';
 import {
   type QueryBuilderExplorerTreePropertyNodeData,
@@ -54,6 +56,7 @@ import {
 } from '../../QueryBuilderConfig.js';
 import { LambdaEditorState } from '@finos/legend-application';
 import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
 
 export const QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE = 'PROJECTION_COLUMN';
 
@@ -61,7 +64,7 @@ export interface QueryBuilderProjectionColumnDragSource {
   columnState: QueryBuilderProjectionColumnState;
 }
 
-export abstract class QueryBuilderProjectionColumnState {
+export abstract class QueryBuilderProjectionColumnState implements Hashable {
   readonly uuid = uuid();
   projectionState: QueryBuilderProjectionState;
   columnName: string;
@@ -75,6 +78,7 @@ export abstract class QueryBuilderProjectionColumnState {
       projectionState: false,
       columnName: observable,
       setColumnName: action,
+      hashCode: computed,
     });
 
     this.projectionState = projectionState;
@@ -86,9 +90,14 @@ export abstract class QueryBuilderProjectionColumnState {
   }
 
   abstract getReturnType(): Type | undefined;
+
+  abstract get hashCode(): string;
 }
 
-export class QueryBuilderSimpleProjectionColumnState extends QueryBuilderProjectionColumnState {
+export class QueryBuilderSimpleProjectionColumnState
+  extends QueryBuilderProjectionColumnState
+  implements Hashable
+{
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
   propertyExpressionState: QueryBuilderPropertyExpressionState;
 
@@ -127,12 +136,8 @@ export class QueryBuilderSimpleProjectionColumnState extends QueryBuilderProject
     this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
       this.projectionState.queryBuilderState,
       buildPropertyExpressionFromExplorerTreeNodeData(
-        this.projectionState.queryBuilderState.explorerState
-          .nonNullableTreeData,
         node,
-        this.projectionState.queryBuilderState.graphManagerState.graph,
-        this.projectionState.queryBuilderState.explorerState.propertySearchState
-          .allMappedPropertyNodes,
+        this.projectionState.queryBuilderState.explorerState,
       ),
     );
     this.columnName = getPropertyChainName(
@@ -145,6 +150,14 @@ export class QueryBuilderSimpleProjectionColumnState extends QueryBuilderProject
     return this.propertyExpressionState.propertyExpression.func.genericType
       .value.rawType;
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.SIMPLE_PROJECTION_COLUMN_STATE,
+      this.propertyExpressionState,
+      this.columnName,
+    ]);
+  }
 }
 
 class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
@@ -243,7 +256,10 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
   }
 }
 
-export class QueryBuilderDerivationProjectionColumnState extends QueryBuilderProjectionColumnState {
+export class QueryBuilderDerivationProjectionColumnState
+  extends QueryBuilderProjectionColumnState
+  implements Hashable
+{
   derivationLambdaEditorState: QueryBuilderDerivationProjectionLambdaState;
   lambda: RawLambda;
   returnType: Type | undefined;
@@ -324,4 +340,13 @@ export class QueryBuilderDerivationProjectionColumnState extends QueryBuilderPro
   override getReturnType(): Type | undefined {
     return this.returnType;
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.DERIVATION_PROJECTION_COLUMN_STATE,
+      this.returnType ?? '',
+      this.lambda,
+      this.columnName,
+    ]);
+  }
 }

package/src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts

@@ -33,6 +33,8 @@ import {
   guaranteeNonNullable,
   findLast,
   filterByType,
+  type Hashable,
+  hashArray,
 } from '@finos/legend-shared';
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
 import {
@@ -85,12 +87,16 @@ import {
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 import { appendProjection } from './QueryBuilderProjectionValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
-
-export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+
+export class QueryBuilderProjectionState
+  extends QueryBuilderFetchStructureImplementationState
+  implements Hashable
+{
+  readonly aggregationState: QueryBuilderAggregationState;
+  readonly postFilterState: QueryBuilderPostFilterState;
+  readonly resultSetModifierState: QueryResultSetModifierState;
   columns: QueryBuilderProjectionColumnState[] = [];
-  aggregationState: QueryBuilderAggregationState;
-  postFilterState: QueryBuilderPostFilterState;
-  resultSetModifierState: QueryResultSetModifierState;
   isConvertDerivationProjectionObjects = false;
   showPostFilterPanel = false;
 
@@ -107,9 +113,6 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
 
     makeObservable(this, {
       columns: observable,
-      aggregationState: observable,
-      postFilterState: observable,
-      resultSetModifierState: observable,
       isConvertDerivationProjectionObjects: observable,
       showPostFilterPanel: observable,
       derivations: computed,
@@ -504,11 +507,8 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
       new QueryBuilderSimpleProjectionColumnState(
         this,
         buildPropertyExpressionFromExplorerTreeNodeData(
-          this.queryBuilderState.explorerState.nonNullableTreeData,
           node,
-          this.queryBuilderState.graphManagerState.graph,
-          this.queryBuilderState.explorerState.propertySearchState
-            .allMappedPropertyNodes,
+          this.queryBuilderState.explorerState,
         ),
         this.queryBuilderState.explorerState.humanizePropertyName,
       ),
@@ -521,11 +521,8 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         new QueryBuilderSimpleProjectionColumnState(
           this,
           buildPropertyExpressionFromExplorerTreeNodeData(
-            this.queryBuilderState.explorerState.nonNullableTreeData,
             nodeToAdd,
-            this.queryBuilderState.graphManagerState.graph,
-            this.queryBuilderState.explorerState.propertySearchState
-              .allMappedPropertyNodes,
+            this.queryBuilderState.explorerState,
           ),
           this.queryBuilderState.explorerState.humanizePropertyName,
         ),
@@ -566,4 +563,14 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
       onChange();
     }
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.PROJECTION_STATE,
+      hashArray(this.columns),
+      this.aggregationState,
+      this.postFilterState,
+      this.resultSetModifierState,
+    ]);
+  }
 }

package/src/stores/fetch-structure/projection/QueryResultSetModifierState.ts

@@ -14,24 +14,33 @@
  * limitations under the License.
  */
 
-import { action, makeAutoObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
 import type { QueryBuilderProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
-import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
+import {
+  addUniqueEntry,
+  deleteEntry,
+  type Hashable,
+  hashArray,
+} from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
 
 export enum COLUMN_SORT_TYPE {
   ASC,
   DESC,
 }
 
-export class SortColumnState {
+export class SortColumnState implements Hashable {
   columnState: QueryBuilderProjectionColumnState;
   sortType = COLUMN_SORT_TYPE.ASC;
 
   constructor(columnState: QueryBuilderProjectionColumnState) {
-    makeAutoObservable(this, {
+    makeObservable(this, {
+      columnState: observable,
+      sortType: observable,
       setColumnState: action,
       setSortType: action,
+      hashCode: computed,
     });
 
     this.columnState = columnState;
@@ -44,24 +53,36 @@ export class SortColumnState {
   setSortType(val: COLUMN_SORT_TYPE): void {
     this.sortType = val;
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.SORT_COLUMN_STATE,
+      this.sortType.toString(),
+      this.columnState,
+    ]);
+  }
 }
 
-export class QueryResultSetModifierState {
-  projectionState: QueryBuilderProjectionState;
+export class QueryResultSetModifierState implements Hashable {
+  readonly projectionState: QueryBuilderProjectionState;
   showModal = false;
   limit?: number | undefined;
   distinct = false;
   sortColumns: SortColumnState[] = [];
 
   constructor(projectionState: QueryBuilderProjectionState) {
-    makeAutoObservable(this, {
-      projectionState: false,
+    makeObservable(this, {
+      showModal: observable,
+      limit: observable,
+      distinct: observable,
+      sortColumns: observable,
       setShowModal: action,
       setLimit: action,
       toggleDistinct: action,
       deleteSortColumn: action,
       addSortColumn: action,
       updateSortColumns: action,
+      hashCode: computed,
     });
 
     this.projectionState = projectionState;
@@ -92,4 +113,13 @@ export class QueryResultSetModifierState {
       this.projectionState.columns.includes(e.columnState),
     );
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.RESULT_SET_MODIFIER_STATE,
+      hashArray(this.sortColumns),
+      this.limit?.toString() ?? '',
+      this.distinct.toString(),
+    ]);
+  }
 }

package/src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.ts

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { uuid, guaranteeNonNullable } from '@finos/legend-shared';
+import {
+  uuid,
+  guaranteeNonNullable,
+  type Hashable,
+} from '@finos/legend-shared';
 import type {
   AbstractPropertyExpression,
   PureModel,
@@ -28,10 +32,17 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from '../QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
+import { computed, makeObservable } from 'mobx';
 
-export abstract class QueryBuilderAggregateOperator {
+export abstract class QueryBuilderAggregateOperator implements Hashable {
   readonly uuid = uuid();
 
+  constructor() {
+    makeObservable(this, {
+      hashCode: computed,
+    });
+  }
+
   abstract getLabel(
     projectionColumnState: QueryBuilderProjectionColumnState,
   ): string;
@@ -76,4 +87,6 @@ export abstract class QueryBuilderAggregateOperator {
       aggregateColumnState.projectionColumnState.getReturnType(),
     );
   }
+
+  abstract get hashCode(): string;
 }

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

@@ -14,17 +14,24 @@
  * limitations under the License.
  */
 
-import { action, makeAutoObservable } from 'mobx';
-import { uuid, deleteEntry, addUniqueEntry } from '@finos/legend-shared';
+import { action, computed, makeObservable, observable } from 'mobx';
+import {
+  uuid,
+  deleteEntry,
+  addUniqueEntry,
+  type Hashable,
+  hashArray,
+} from '@finos/legend-shared';
 import type { Type } from '@finos/legend-graph';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
 import type { QueryBuilderProjectionColumnState } from '../QueryBuilderProjectionColumnState.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateColumnState {
+export class QueryBuilderAggregateColumnState implements Hashable {
   readonly uuid = uuid();
-  aggregationState: QueryBuilderAggregationState;
+  readonly aggregationState: QueryBuilderAggregationState;
   projectionColumnState: QueryBuilderProjectionColumnState;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
   operator: QueryBuilderAggregateOperator;
@@ -34,12 +41,14 @@ export class QueryBuilderAggregateColumnState {
     projectionColumnState: QueryBuilderProjectionColumnState,
     operator: QueryBuilderAggregateOperator,
   ) {
-    makeAutoObservable(this, {
-      uuid: false,
-      aggregationState: false,
+    makeObservable(this, {
+      projectionColumnState: observable,
+      lambdaParameterName: observable,
+      operator: observable,
       setColumnState: action,
       setLambdaParameterName: action,
       setOperator: action,
+      hashCode: computed,
     });
 
     this.aggregationState = aggregationState;
@@ -66,21 +75,30 @@ export class QueryBuilderAggregateColumnState {
   getReturnType(): Type {
     return this.operator.getReturnType(this);
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_COLUMN_STATE,
+      this.operator,
+    ]);
+  }
 }
 
-export class QueryBuilderAggregationState {
-  projectionState: QueryBuilderProjectionState;
-  operators: QueryBuilderAggregateOperator[] = [];
+export class QueryBuilderAggregationState implements Hashable {
+  readonly projectionState: QueryBuilderProjectionState;
+  readonly operators: QueryBuilderAggregateOperator[] = [];
   columns: QueryBuilderAggregateColumnState[] = [];
 
   constructor(
     projectionState: QueryBuilderProjectionState,
     operators: QueryBuilderAggregateOperator[],
   ) {
-    makeAutoObservable(this, {
-      projectionState: false,
+    makeObservable(this, {
+      columns: observable,
       removeColumn: action,
       addColumn: action,
+      changeColumnAggregateOperator: action,
+      hashCode: computed,
     });
 
     this.projectionState = projectionState;
@@ -142,4 +160,11 @@ export class QueryBuilderAggregationState {
       }
     }
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATION_STATE,
+      hashArray(this.columns),
+    ]);
+  }
 }

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

@@ -34,8 +34,13 @@ import {
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_Average extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_Average
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'average';
   }
@@ -95,4 +100,8 @@ export class QueryBuilderAggregateOperator_Average extends QueryBuilderAggregate
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.FLOAT);
   }
+
+  get hashCode(): string {
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_AVERAGE]);
+  }
 }

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

@@ -35,8 +35,13 @@ import {
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_Count extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_Count
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'count';
   }
@@ -103,4 +108,8 @@ export class QueryBuilderAggregateOperator_Count extends QueryBuilderAggregateOp
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.INTEGER);
   }
+
+  get hashCode(): string {
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_COUNT]);
+  }
 }

package/src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Distinct.ts

@@ -34,8 +34,13 @@ import {
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_Distinct extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_Distinct
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'distinct';
   }
@@ -93,4 +98,10 @@ export class QueryBuilderAggregateOperator_Distinct extends QueryBuilderAggregat
       this,
     );
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT,
+    ]);
+  }
 }

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

@@ -27,7 +27,12 @@ import {
   type Type,
   Enumeration,
 } from '@finos/legend-graph';
-import { assertTrue, guaranteeType } from '@finos/legend-shared';
+import {
+  assertTrue,
+  guaranteeType,
+  type Hashable,
+  hashArray,
+} from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import {
@@ -35,8 +40,12 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from '../../QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_DistinctCount extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_DistinctCount
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'distinct count';
   }
@@ -170,4 +179,10 @@ export class QueryBuilderAggregateOperator_DistinctCount extends QueryBuilderAgg
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.INTEGER);
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT_COUNT,
+    ]);
+  }
 }

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

@@ -29,7 +29,12 @@ import {
   GenericType,
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
-import { assertTrue, guaranteeType } from '@finos/legend-shared';
+import {
+  assertTrue,
+  guaranteeType,
+  type Hashable,
+  hashArray,
+} from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import {
@@ -37,8 +42,12 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from '../../QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_JoinString extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_JoinString
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'join';
   }
@@ -152,4 +161,10 @@ export class QueryBuilderAggregateOperator_JoinString extends QueryBuilderAggreg
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.STRING);
   }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_JOIN_STRING,
+    ]);
+  }
 }

package/src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.ts

@@ -34,8 +34,13 @@ import {
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
-export class QueryBuilderAggregateOperator_Max extends QueryBuilderAggregateOperator {
+export class QueryBuilderAggregateOperator_Max
+  extends QueryBuilderAggregateOperator
+  implements Hashable
+{
   getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string {
     return 'max';
   }
@@ -171,4 +176,8 @@ export class QueryBuilderAggregateOperator_Max extends QueryBuilderAggregateOper
     }
     return undefined;
   }
+
+  get hashCode(): string {
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_MAX]);
+  }
 }