@finos/legend-query-builder 2.1.6 → 3.0.0

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),
   );
@@ -175,8 +177,8 @@ export const appendGraphFetch = (
     `Can't build graph-fetch tree expression: preceding expression is not defined`,
   );
 
-  const seriaizationState = graphFetchTreeState.serializationState;
-  if (seriaizationState instanceof GraphFetchPureSerializationState) {
+  const serializationState = graphFetchTreeState.serializationState;
+  if (serializationState instanceof GraphFetchPureSerializationState) {
     // build graph-fetch tree
     if (
       graphFetchTreeState.treeData &&
@@ -201,9 +203,9 @@ export const appendGraphFetch = (
         graphFetchInstance,
       ];
       serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
-      if (seriaizationState.config) {
+      if (serializationState.config) {
         const configFunction = buildPureSerializationConfig(
-          seriaizationState.config as unknown as Record<PropertyKey, boolean>,
+          serializationState.config as unknown as Record<PropertyKey, boolean>,
           graphFetchTreeState.queryBuilderState.graphManagerState.graph,
         );
         serializeFunction.parametersValues.push(configFunction);
@@ -211,18 +213,18 @@ export const appendGraphFetch = (
       lambdaFunction.expressionSequence[0] = serializeFunction;
     }
   } else if (
-    seriaizationState instanceof GraphFetchExternalFormatSerializationState
+    serializationState instanceof GraphFetchExternalFormatSerializationState
   ) {
     const externalizeFunction = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXTERNALIZE),
     );
     const mainGraphTree = graphFetchTreeState.treeData;
-    const externalizeTree = seriaizationState.treeData;
+    const externalizeGraphFetchTreeData = serializationState.treeData;
     if (
       mainGraphTree &&
-      externalizeTree &&
+      externalizeGraphFetchTreeData &&
       !isGraphFetchTreeDataEmpty(mainGraphTree) &&
-      !isGraphFetchTreeDataEmpty(externalizeTree)
+      !isGraphFetchTreeDataEmpty(externalizeGraphFetchTreeData)
     ) {
       // 0th param
       const graphFetchInstance = new GraphFetchTreeInstanceValue();
@@ -244,12 +246,12 @@ export const appendGraphFetch = (
       const bindingInstance = new InstanceValue(Multiplicity.ONE, undefined);
       bindingInstance.values = [
         PackageableElementExplicitReference.create(
-          seriaizationState.targetBinding,
+          serializationState.targetBinding,
         ),
       ];
       // 2nd parameter
       const xtGraphFetchInstance = new GraphFetchTreeInstanceValue();
-      xtGraphFetchInstance.values = [externalizeTree.tree];
+      xtGraphFetchInstance.values = [externalizeGraphFetchTreeData.tree];
       // build externalize
       externalizeFunction.parametersValues = [
         graphFetchFunc,
@@ -260,7 +262,7 @@ export const appendGraphFetch = (
     }
   } else {
     throw new UnsupportedOperationError(
-      `Unsupported serialization state ${seriaizationState.getLabel()}`,
+      `Unsupported serialization state ${serializationState.getLabel()}`,
     );
   }
   // build result set modifier: i.e. preview limit

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

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

@@ -45,7 +45,7 @@ import {
   TDS_COLUMN_GETTER,
   getTypeFromDerivedProperty,
 } from './QueryBuilderPostFilterState.js';
-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 { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';

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

@@ -21,7 +21,7 @@ import {
   type ValueSpecification,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable, isNonNullable } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
 import { fromGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import {

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

@@ -24,7 +24,6 @@ import {
   SimpleFunctionExpression,
   VariableExpression,
   getAllClassDerivedProperties,
-  CORE_PURE_PATH,
   PropertyExplicitReference,
   Multiplicity,
   PrimitiveType,
@@ -36,6 +35,7 @@ import {
   type TDS_COLUMN_GETTER,
   getTDSColumnDerivedProperyFromType,
 } from '../QueryBuilderPostFilterState.js';
+import { QUERY_BUILDER_PURE_PATH } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 
 export const buildPostFilterConditionExpression = (
   filterConditionState: PostFilterConditionState,
@@ -65,9 +65,9 @@ export const buildPostFilterConditionExpression = (
   }
   tdsPropertyExpression.func = PropertyExplicitReference.create(
     guaranteeNonNullable(
-      getAllClassDerivedProperties(graph.getClass(CORE_PURE_PATH.TDS_ROW)).find(
-        (p) => p.name === tdsDerivedPropertyName,
-      ),
+      getAllClassDerivedProperties(
+        graph.getClass(QUERY_BUILDER_PURE_PATH.TDS_ROW),
+      ).find((p) => p.name === tdsDerivedPropertyName),
     ),
   );
   const variableName = new VariableExpression(

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

@@ -41,8 +41,8 @@ import {
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.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 QueryBuilderPostFilterOperator_Contain
@@ -116,7 +116,7 @@ export class QueryBuilderPostFilterOperator_Contain
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_OPERATOR_CONTAIN,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_CONTAIN,
     ]);
   }
 }
@@ -146,7 +146,7 @@ export class QueryBuilderPostFilterOperator_NotContain extends QueryBuilderPostF
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_CONTAIN,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_CONTAIN,
     ]);
   }
 }

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

@@ -39,8 +39,8 @@ import {
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.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 QueryBuilderPostFilterOperator_EndWith
@@ -112,7 +112,7 @@ export class QueryBuilderPostFilterOperator_EndWith
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_OPERATOR_END_WITH,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_END_WITH,
     ]);
   }
 }
@@ -143,7 +143,7 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_END_WITH,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_END_WITH,
     ]);
   }
 }

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

@@ -27,7 +27,6 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PRIMITIVE_TYPE,
-  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -49,8 +48,8 @@ import {
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.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';
 import { instanceValue_setValues } from '../../../../shared/ValueSpecificationModifierHelper.js';
 
@@ -175,7 +174,7 @@ export class QueryBuilderPostFilterOperator_Equal
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.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,
     );
   }
@@ -192,14 +191,16 @@ export class QueryBuilderPostFilterOperator_Equal
           .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.POST_FILTER_OPERATOR_EQUAL]);
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_EQUAL,
+    ]);
   }
 }
 export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFilterOperator_Equal {
@@ -228,7 +229,7 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_EQUAL,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_OPERATOR_NOT_EQUAL,
     ]);
   }
 }