@finos/legend-query-builder 2.1.7 → 3.0.0

package/src/stores/{QueryBuilderStateTestUtils.ts → __test-utils__/QueryBuilderStateTestUtils.ts}

@@ -15,24 +15,96 @@
  */
 
 import {
-  TEST__getGenericApplicationConfig,
-  TEST__getTestApplicationStore,
-  TEST__LegendApplicationPluginManager,
+  ApplicationStore,
+  LegendApplicationConfig,
+  type LegendApplicationPlugin,
+  LegendApplicationPluginManager,
 } from '@finos/legend-application';
+import { TEST__getApplicationVersionData } from '@finos/legend-application/test';
 import {
   type RawLambda,
   type RawMappingModelCoverageAnalysisResult,
+  type GraphManagerPluginManager,
+  type PureProtocolProcessorPlugin,
+  type PureGraphManagerPlugin,
+  type PureGraphPlugin,
+} from '@finos/legend-graph';
+import {
   TEST__buildGraphWithEntities,
   TEST__getTestGraphManagerState,
-} from '@finos/legend-graph';
-import { createSpy } from '@finos/legend-shared';
+} from '@finos/legend-graph/test';
+import { createSpy } from '@finos/legend-shared/test';
 import type { Entity } from '@finos/legend-storage';
 import { flowResult } from 'mobx';
-import { QueryBuilder_GraphManagerPreset } from '../graphManager/QueryBuilder_GraphManagerPreset.js';
+import { QueryBuilder_GraphManagerPreset } from '../../graph-manager/QueryBuilder_GraphManagerPreset.js';
 import {
   INTERNAL__BasicQueryBuilderState,
   type QueryBuilderState,
-} from './QueryBuilderState.js';
+} from '../QueryBuilderState.js';
+
+export class TEST__LegendApplicationPluginManager
+  extends LegendApplicationPluginManager<LegendApplicationPlugin>
+  implements GraphManagerPluginManager
+{
+  private pureProtocolProcessorPlugins: PureProtocolProcessorPlugin[] = [];
+  private pureGraphManagerPlugins: PureGraphManagerPlugin[] = [];
+  private pureGraphPlugins: PureGraphPlugin[] = [];
+
+  private constructor() {
+    super();
+  }
+
+  static create(): TEST__LegendApplicationPluginManager {
+    return new TEST__LegendApplicationPluginManager();
+  }
+
+  registerPureProtocolProcessorPlugin(
+    plugin: PureProtocolProcessorPlugin,
+  ): void {
+    this.pureProtocolProcessorPlugins.push(plugin);
+  }
+
+  registerPureGraphManagerPlugin(plugin: PureGraphManagerPlugin): void {
+    this.pureGraphManagerPlugins.push(plugin);
+  }
+
+  registerPureGraphPlugin(plugin: PureGraphPlugin): void {
+    this.pureGraphPlugins.push(plugin);
+  }
+
+  getPureGraphManagerPlugins(): PureGraphManagerPlugin[] {
+    return [...this.pureGraphManagerPlugins];
+  }
+
+  getPureProtocolProcessorPlugins(): PureProtocolProcessorPlugin[] {
+    return [...this.pureProtocolProcessorPlugins];
+  }
+
+  getPureGraphPlugins(): PureGraphPlugin[] {
+    return [...this.pureGraphPlugins];
+  }
+}
+
+class TEST__LegendApplicationConfig extends LegendApplicationConfig {
+  override getDefaultApplicationStorageKey(): string {
+    return 'test';
+  }
+}
+
+export const TEST__getGenericApplicationConfig = (
+  extraConfigData = {},
+): LegendApplicationConfig => {
+  const config = new TEST__LegendApplicationConfig({
+    configData: {
+      env: 'TEST',
+      appName: 'TEST',
+      ...extraConfigData,
+    },
+    versionData: TEST__getApplicationVersionData(),
+    baseAddress: '/',
+  });
+  return config;
+};
 
 export const TEST__setUpQueryBuilderState = async (
   entities: Entity[],
@@ -50,7 +122,7 @@ export const TEST__setUpQueryBuilderState = async (
 ): Promise<QueryBuilderState> => {
   const pluginManager = TEST__LegendApplicationPluginManager.create();
   pluginManager.usePresets([new QueryBuilder_GraphManagerPreset()]).install();
-  const applicationStore = TEST__getTestApplicationStore(
+  const applicationStore = new ApplicationStore(
     TEST__getGenericApplicationConfig(),
     pluginManager,
   );

package/src/stores/entitlements/QueryBuilderCheckEntitlementsState.ts

@@ -16,7 +16,7 @@
 
 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';
 
 export class QueryBuilderCheckEntitlementsState implements Hashable {
@@ -39,7 +39,7 @@ export class QueryBuilderCheckEntitlementsState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.CHECK_ENTITLEMENTS_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.CHECK_ENTITLEMENTS_STATE,
       this.isCheckingEntitlements,
     ]);
   }

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -67,7 +67,7 @@ import {
   type QueryBuilderPreviewData,
 } from '../QueryBuilderPreviewDataHelper.js';
 import { QueryBuilderPropertySearchState } from './QueryBuilderPropertySearchState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { propertyExpression_setFunc } from '../shared/ValueSpecificationModifierHelper.js';
 
 export enum QUERY_BUILDER_EXPLORER_TREE_DND_TYPE {

package/src/stores/explorer/QueryBuilderPropertySearchState.ts

@@ -30,6 +30,7 @@ import {
   addUniqueEntry,
   deleteEntry,
   guaranteeNonNullable,
+  FuzzySearchAdvancedConfigState,
 } from '@finos/legend-shared';
 import {
   observable,
@@ -52,7 +53,6 @@ import {
   QueryBuilderExplorerTreeSubTypeNodeData,
 } from './QueryBuilderExplorerState.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
-import { FuzzySearchAdvancedConfigState } from '@finos/legend-application/components';
 
 export class QueryBuilderPropertySearchState {
   queryBuilderState: QueryBuilderState;

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

@@ -55,7 +55,7 @@ import {
   UnsupportedOperationError,
   ContentType,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { isValueExpressionReferencedInValue } from '../../QueryBuilderValueSpecificationHelper.js';
 import type { ExportDataInfo } from '../../QueryBuilderResultState.js';
 
@@ -497,7 +497,7 @@ export class QueryBuilderGraphFetchTreeState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.GRAPH_FETCH_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.GRAPH_FETCH_STATE,
       this.isChecked.toString(),
       this.treeData?.tree ?? '',
     ]);

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

@@ -28,7 +28,6 @@ import {
   Binding,
   SUPPORTED_FUNCTIONS,
   Class,
-  PURE_SERIALIZE_CONFIG_CLASS,
   KeyExpressionInstanceValue,
   CollectionInstanceValue,
   getClassProperty,
@@ -42,7 +41,10 @@ import {
   guaranteeNonNullable,
   guaranteeType,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../QueryBuilderStateBuilder.js';
 import { FETCH_STRUCTURE_IMPLEMENTATION } from '../QueryBuilderFetchStructureImplementationState.js';
@@ -140,7 +142,7 @@ const processKeyExpressionValueOnSerializationConfig = (
   const _classType = guaranteeType(
     _classProperty.genericType.value.rawType,
     PrimitiveType,
-    `Only primitive types suppported for config. Property ${keyValue} for class ${PURE_SERIALIZE_CONFIG_CLASS} is of type ${_classProperty.genericType.value.rawType.path}`,
+    `Only primitive types suppported for config. Property ${keyValue} for class '${QUERY_BUILDER_PURE_PATH.SERIALIZE_CONFIG}' is of type '${_classProperty.genericType.value.rawType.path}'`,
   );
   const expressionValue = guaranteeNonNullable(
     guaranteeType(
@@ -255,8 +257,8 @@ export const processGraphFetchSerializeExpression = (
         `Can't process serialize() expression: serialization config expects first param to be a class`,
       );
       assertTrue(
-        configClass.path === PURE_SERIALIZE_CONFIG_CLASS,
-        `Can't process serialize() expression: serialiaztion config class expected to be ${PURE_SERIALIZE_CONFIG_CLASS}, got : ${configClass.path}`,
+        configClass.path === QUERY_BUILDER_PURE_PATH.SERIALIZE_CONFIG,
+        `Can't process serialize() expression: serialiaztion config class expected to be '${QUERY_BUILDER_PURE_PATH.SERIALIZE_CONFIG}', got : ${configClass.path}`,
       );
       // 2nd param: empty string
       // TODO: Investigate why `new` function as the second input as empty string

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

@@ -39,7 +39,7 @@ import {
   QueryBuilderExplorerTreeSubTypeNodeData,
 } from '../../explorer/QueryBuilderExplorerState.js';
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { computed, makeObservable } from 'mobx';
 import {
   graphFetchTree_addSubTree,
@@ -81,7 +81,7 @@ export class QueryBuilderGraphFetchTreeNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.GRAPH_FETCH_TREE_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.GRAPH_FETCH_TREE_NODE_DATA,
       this.id,
       this.label,
       this.tree,

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

@@ -30,7 +30,6 @@ import {
   Multiplicity,
   PackageableElementExplicitReference,
   SUPPORTED_FUNCTIONS,
-  PURE_SERIALIZE_CONFIG_CLASS,
   CollectionInstanceValue,
   KeyExpressionInstanceValue,
   KeyExpression,
@@ -40,7 +39,10 @@ import {
   guaranteeNonNullable,
   guaranteeType,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   GraphFetchExternalFormatSerializationState,
   GraphFetchPureSerializationState,
@@ -100,7 +102,7 @@ export const buildPureSerializationConfig = (
   config: Record<PropertyKey, boolean>,
   graph: PureModel,
 ): SimpleFunctionExpression => {
-  const configClass = graph.getClass(PURE_SERIALIZE_CONFIG_CLASS);
+  const configClass = graph.getClass(QUERY_BUILDER_PURE_PATH.SERIALIZE_CONFIG);
   const newFunction = new SimpleFunctionExpression(
     extractElementNameFromPath(SUPPORTED_FUNCTIONS.NEW),
   );

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

@@ -22,7 +22,7 @@ import {
   guaranteeNonNullable,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderTDSState } from './QueryBuilderTDSState.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 import { COLUMN_SORT_TYPE } from './QueryResultSetModifierState.js';

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

@@ -93,13 +93,13 @@ import {
 } from '@finos/legend-application';
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 import { appendProjection } from './projection/QueryBuilderProjectionValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { QueryBuilderWindowState } from './window/QueryBuilderWindowState.js';
 import type { QueryBuilderTDS_WindowOperator } from './window/operators/QueryBuilderTDS_WindowOperator.js';
 import { getQueryBuilderCoreWindowOperators } from './window/QueryBuilderWindowGroupByOperatorLoader.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
-import { QUERY_BUILDER_SETTING_KEY } from '../../../application/QueryBuilderSetting.js';
+import { QUERY_BUILDER_SETTING_KEY } from '../../../__lib__/QueryBuilderSetting.js';
 import type { ExportDataInfo } from '../../QueryBuilderResultState.js';
 
 // TODO: should we support raw once externalize() is supported on TDS ?
@@ -722,7 +722,7 @@ export class QueryBuilderTDSState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.PROJECTION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.PROJECTION_STATE,
       hashArray(this.projectionColumns),
       this.aggregationState,
       this.postFilterState,

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

@@ -22,7 +22,7 @@ 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';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 
 export enum COLUMN_SORT_TYPE {
@@ -56,7 +56,7 @@ export class SortColumnState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.SORT_COLUMN_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.SORT_COLUMN_STATE,
       this.sortType.toString(),
       this.columnState,
     ]);
@@ -116,7 +116,7 @@ export class QueryResultSetModifierState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.RESULT_SET_MODIFIER_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.RESULT_SET_MODIFIER_STATE,
       hashArray(this.sortColumns),
       this.limit?.toString() ?? '',
       this.distinct.toString(),

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

@@ -26,7 +26,7 @@ import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
 import type { QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../QueryBuilderStateHashUtils.js';
 import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 
 export class QueryBuilderAggregateColumnState
@@ -76,7 +76,7 @@ export class QueryBuilderAggregateColumnState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_COLUMN_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_COLUMN_STATE,
       this.operator,
     ]);
   }
@@ -165,7 +165,7 @@ export class QueryBuilderAggregationState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATION_STATE,
       hashArray(this.columns),
     ]);
   }

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

@@ -31,7 +31,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 type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
 import { extractNullableStringFromInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';

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

@@ -34,9 +34,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_Average
   extends QueryBuilderAggregateOperator
@@ -100,6 +100,8 @@ export class QueryBuilderAggregateOperator_Average
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_AVERAGE]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_AVERAGE,
+    ]);
   }
 }

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

@@ -35,9 +35,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_Count
   extends QueryBuilderAggregateOperator
@@ -108,6 +108,8 @@ export class QueryBuilderAggregateOperator_Count
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_COUNT]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_COUNT,
+    ]);
   }
 }

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

@@ -33,9 +33,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_Distinct
   extends QueryBuilderAggregateOperator
@@ -101,7 +101,7 @@ export class QueryBuilderAggregateOperator_Distinct
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT,
     ]);
   }
 }

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

@@ -39,8 +39,8 @@ import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
 } from '../../projection/QueryBuilderProjectionColumnState.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';
 
 export class QueryBuilderAggregateOperator_DistinctCount
   extends QueryBuilderAggregateOperator
@@ -177,7 +177,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT_COUNT,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_DISTINCT_COUNT,
     ]);
   }
 }

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

@@ -41,8 +41,8 @@ import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
 } from '../../projection/QueryBuilderProjectionColumnState.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';
 
 export class QueryBuilderAggregateOperator_JoinString
   extends QueryBuilderAggregateOperator
@@ -157,7 +157,7 @@ export class QueryBuilderAggregateOperator_JoinString
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_JOIN_STRING,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_JOIN_STRING,
     ]);
   }
 }

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

@@ -33,9 +33,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_Max
   extends QueryBuilderAggregateOperator
@@ -178,6 +178,8 @@ export class QueryBuilderAggregateOperator_Max
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_MAX]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_MAX,
+    ]);
   }
 }

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

@@ -33,9 +33,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_Min
   extends QueryBuilderAggregateOperator
@@ -178,6 +178,8 @@ export class QueryBuilderAggregateOperator_Min
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_MIN]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_MIN,
+    ]);
   }
 }

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

@@ -34,9 +34,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_StdDev_Population
   extends QueryBuilderAggregateOperator
@@ -101,7 +101,7 @@ export class QueryBuilderAggregateOperator_StdDev_Population
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_STD_DEV_POPULATION,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_STD_DEV_POPULATION,
     ]);
   }
 }

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

@@ -34,9 +34,9 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.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 QueryBuilderAggregateOperator_StdDev_Sample
   extends QueryBuilderAggregateOperator
@@ -101,7 +101,7 @@ export class QueryBuilderAggregateOperator_StdDev_Sample
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_STD_DEV_SAMPLE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_STD_DEV_SAMPLE,
     ]);
   }
 }

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

@@ -32,8 +32,8 @@ import {
   buildAggregateColumnState,
   buildAggregateExpression,
 } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.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 { type Hashable, hashArray } from '@finos/legend-shared';
 
 export class QueryBuilderAggregateOperator_Sum
@@ -92,6 +92,8 @@ export class QueryBuilderAggregateOperator_Sum
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_SUM]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_OPERATOR_SUM,
+    ]);
   }
 }

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts

@@ -68,7 +68,7 @@ import {
 } from '../../../QueryBuilderTypeaheadHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../../QueryBuilderGroupOperationHelper.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import { isValueExpressionReferencedInValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 
@@ -242,7 +242,7 @@ export class QueryBuilderPostFilterTreeGroupNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_TREE_GROUP_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_TREE_GROUP_NODE_DATA,
       this.parentId ?? '',
       hashArray(this.childrenIds),
       this.groupOperation,
@@ -276,7 +276,7 @@ export class QueryBuilderPostFilterTreeConditionNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_TREE_CONDIITION_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_TREE_CONDIITION_NODE_DATA,
       this.parentId ?? '',
       this.condition,
     ]);
@@ -301,7 +301,7 @@ export class QueryBuilderPostFilterTreeBlankConditionNodeData
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA,
       this.parentId ?? '',
     ]);
   }
@@ -460,7 +460,7 @@ export class PostFilterConditionState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_CONDITION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_CONDITION_STATE,
       this.columnState,
       this.value ?? '',
       this.operator,
@@ -891,7 +891,7 @@ export class QueryBuilderPostFilterState
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_STATE,
       hashArray(this.rootIds),
       hashArray(Array.from(this.nodes.values())),
     ]);