@finos/legend-query-builder 2.1.6 → 3.0.0

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -52,7 +52,7 @@ import {
 } from '../QueryBuilderTypeaheadHelper.js';
 import type { QueryBuilderFilterOperator } from './QueryBuilderFilterOperator.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../QueryBuilderGroupOperationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
 import { isValueExpressionReferencedInValue } from '../QueryBuilderValueSpecificationHelper.js';
 
 export enum QUERY_BUILDER_FILTER_DND_TYPE {
@@ -215,7 +215,7 @@ export class FilterConditionState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_CONDITION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_CONDITION_STATE,
       this.propertyExpressionState,
       this.value ?? '',
       this.operator,
@@ -308,7 +308,7 @@ export class QueryBuilderFilterTreeGroupNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_TREE_GROUP_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_TREE_GROUP_NODE_DATA,
       this.parentId ?? '',
       hashArray(this.childrenIds),
       this.groupOperation,
@@ -339,7 +339,7 @@ export class QueryBuilderFilterTreeConditionNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_TREE_CONDIITION_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_TREE_CONDIITION_NODE_DATA,
       this.parentId ?? '',
       this.condition,
     ]);
@@ -364,7 +364,7 @@ export class QueryBuilderFilterTreeBlankConditionNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_TREE_BLANK_CONDITION_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_TREE_BLANK_CONDITION_NODE_DATA,
       this.parentId ?? '',
     ]);
   }
@@ -810,7 +810,7 @@ export class QueryBuilderFilterState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_STATE,
       hashArray(this.rootIds),
       hashArray(Array.from(this.nodes.values())),
     ]);

package/src/stores/filter/QueryBuilderFilterStateBuilder.ts

@@ -29,7 +29,7 @@ import {
   returnUndefOnError,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { toGroupOperation } from '../QueryBuilderGroupOperationHelper.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { validatePropertyExpressionChain } from '../QueryBuilderValueSpecificationHelper.js';

package/src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts

@@ -29,7 +29,7 @@ import {
   QueryBuilderFilterTreeGroupNodeData,
   type QueryBuilderFilterTreeNodeData,
 } from './QueryBuilderFilterState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 
 const buildFilterConditionExpression = (
   filterState: QueryBuilderFilterState,

package/src/stores/filter/operators/QueryBuilderFilterOperatorValueSpecificationBuilder.ts

@@ -34,7 +34,7 @@ import {
   FilterConditionState,
   type QueryBuilderFilterState,
 } from '../QueryBuilderFilterState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildGenericLambdaFunctionInstanceValue,
   simplifyValueExpression,

package/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts

@@ -40,8 +40,8 @@ import {
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_Contain
@@ -118,7 +118,9 @@ export class QueryBuilderFilterOperator_Contain
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_CONTAIN]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_CONTAIN,
+    ]);
   }
 }
 
@@ -147,7 +149,7 @@ export class QueryBuilderFilterOperator_NotContain extends QueryBuilderFilterOpe
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_NOT_CONTAIN,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_NOT_CONTAIN,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts

@@ -40,8 +40,8 @@ import {
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_EndWith
@@ -118,7 +118,9 @@ export class QueryBuilderFilterOperator_EndWith
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_END_WITH]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_END_WITH,
+    ]);
   }
 }
 
@@ -147,7 +149,7 @@ export class QueryBuilderFilterOperator_NotEndWith extends QueryBuilderFilterOpe
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_NOT_END_WITH,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_NOT_END_WITH,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts

@@ -30,7 +30,6 @@ import {
   EnumValueExplicitReference,
   Enumeration,
   PRIMITIVE_TYPE,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -41,7 +40,7 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
   generateDefaultValueForPrimitiveType,
@@ -49,7 +48,7 @@ import {
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 import { instanceValue_setValues } from '../../shared/ValueSpecificationModifierHelper.js';
 
@@ -173,7 +172,7 @@ export class QueryBuilderFilterOperator_Equal
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL,
     );
   }
@@ -189,14 +188,16 @@ export class QueryBuilderFilterOperator_Equal
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL,
       this,
     );
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_EQUAL]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_EQUAL,
+    ]);
   }
 }
 
@@ -224,6 +225,8 @@ export class QueryBuilderFilterOperator_NotEqual extends QueryBuilderFilterOpera
   }
 
   override get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_NOT_EQUAL]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_NOT_EQUAL,
+    ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts

@@ -24,7 +24,6 @@ import {
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
   PRIMITIVE_TYPE,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -35,13 +34,13 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThan
@@ -131,7 +130,7 @@ export class QueryBuilderFilterOperator_GreaterThan
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_AFTER_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN,
     );
   }
@@ -147,7 +146,7 @@ export class QueryBuilderFilterOperator_GreaterThan
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_AFTER_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN,
       this,
     );
@@ -155,7 +154,7 @@ export class QueryBuilderFilterOperator_GreaterThan
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_GREATER_THAN,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_GREATER_THAN,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -35,13 +34,13 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThanEqual
@@ -131,7 +130,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
     );
   }
@@ -147,7 +146,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
       this,
     );
@@ -155,7 +154,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_GREATER_THAN_EQUAL,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_GREATER_THAN_EQUAL,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts

@@ -34,14 +34,14 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
   getCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 
 export class QueryBuilderFilterOperator_In
   extends QueryBuilderFilterOperator
@@ -155,7 +155,7 @@ export class QueryBuilderFilterOperator_In
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_IN]);
+    return hashArray([QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_IN]);
   }
 }
 
@@ -183,6 +183,8 @@ export class QueryBuilderFilterOperator_NotIn extends QueryBuilderFilterOperator
   }
 
   override get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_NOT_IN]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_NOT_IN,
+    ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts

@@ -29,14 +29,14 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
   isPropertyExpressionChainOptional,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 
 export class QueryBuilderFilterOperator_IsEmpty
   extends QueryBuilderFilterOperator
@@ -101,7 +101,9 @@ export class QueryBuilderFilterOperator_IsEmpty
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_IS_EMPTY]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_IS_EMPTY,
+    ]);
   }
 }
 
@@ -130,7 +132,7 @@ export class QueryBuilderFilterOperator_IsNotEmpty extends QueryBuilderFilterOpe
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_IS_NOT_EMPTY,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_IS_NOT_EMPTY,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -35,13 +34,13 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_LessThan
@@ -131,7 +130,7 @@ export class QueryBuilderFilterOperator_LessThan
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
     );
   }
@@ -147,13 +146,15 @@ export class QueryBuilderFilterOperator_LessThan
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
       this,
     );
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_LESS_THAN]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_LESS_THAN,
+    ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -35,13 +34,13 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_LessThanEqual
@@ -131,7 +130,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL,
     );
   }
@@ -147,7 +146,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
-        ? SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL,
       this,
     );
@@ -155,7 +154,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_LESS_THAN_EQUAL,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_LESS_THAN_EQUAL,
     ]);
   }
 }

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts

@@ -34,14 +34,14 @@ import {
   buildFilterConditionState,
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
   generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_StartWith
@@ -118,7 +118,9 @@ export class QueryBuilderFilterOperator_StartWith
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_START_WITH]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_START_WITH,
+    ]);
   }
 }
 
@@ -147,7 +149,7 @@ export class QueryBuilderFilterOperator_NotStartWith extends QueryBuilderFilterO
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.FILTER_OPERATOR_NOT_START_WITH,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_OPERATOR_NOT_START_WITH,
     ]);
   }
 }

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -31,7 +31,7 @@ import {
   guaranteeNonNullable,
 } from '@finos/legend-shared';
 import { action, computed, makeObservable, observable } from 'mobx';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { isValueExpressionReferencedInValue } from '../QueryBuilderValueSpecificationHelper.js';
 import { LambdaParameterState } from '../shared/LambdaParameterState.js';
@@ -180,7 +180,7 @@ export class QueryBuilderMilestoningState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.MILESTONING_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.MILESTONING_STATE,
       this.businessDate ?? '',
       this.processingDate ?? '',
     ]);

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -32,7 +32,6 @@ import {
   PRIMITIVE_TYPE,
   INTERNAL__PropagatedValue,
   SimpleFunctionExpression,
-  SUPPORTED_FUNCTIONS,
   type ObserverContext,
 } from '@finos/legend-graph';
 import { Randomizer, UnsupportedOperationError } from '@finos/legend-shared';
@@ -41,11 +40,12 @@ import {
   instanceValue_setValues,
   valueSpecification_setGenericType,
 } from './ValueSpecificationModifierHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 
 const VAR_DEFAULT_NAME = 'var';
 
 export const createSupportedFunctionExpression = (
-  supportedFuncName: SUPPORTED_FUNCTIONS,
+  supportedFuncName: string,
   expectedReturnType: Type,
 ): SimpleFunctionExpression => {
   const funcExpression = new SimpleFunctionExpression(supportedFuncName);
@@ -67,12 +67,12 @@ const createMockPrimitiveValueSpecification = (
     primitiveTypeName === PRIMITIVE_TYPE.DATETIME
   ) {
     return createSupportedFunctionExpression(
-      SUPPORTED_FUNCTIONS.NOW,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
       PrimitiveType.DATETIME,
     );
   } else if (primitiveTypeName === PRIMITIVE_TYPE.STRICTDATE) {
     return createSupportedFunctionExpression(
-      SUPPORTED_FUNCTIONS.TODAY,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
       PrimitiveType.STRICTDATE,
     );
   }

package/src/stores/watermark/QueryBuilderWatermarkState.ts

@@ -25,7 +25,7 @@ import {
 } from '@finos/legend-graph';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { makeObservable, observable, action, computed } from 'mobx';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { isValueExpressionReferencedInValue } from '../QueryBuilderValueSpecificationHelper.js';
 
@@ -85,7 +85,7 @@ export class QueryBuilderWatermarkState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.WATERMARK_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.WATERMARK_STATE,
       this.value ?? '',
     ]);
   }

package/src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts

@@ -20,7 +20,7 @@ import {
   matchFunctionName,
 } from '@finos/legend-graph';
 import { assertTrue, guaranteeType } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../QueryBuilderStateBuilder.js';
 

package/src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts

@@ -20,7 +20,7 @@ import {
   type LambdaFunction,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderWatermarkState } from './QueryBuilderWatermarkState.js';
 
 export const buildWatermarkExpression = (