@finos/legend-query-builder 2.1.7 → 3.0.0

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -30,18 +30,18 @@ import {
   getMappingCompatibleRuntimes,
   getClassCompatibleMappings,
 } from '@finos/legend-graph';
-import {
-  type PackageableElementOption,
-  getPackageableElementOptionFormatter,
-  buildElementOption,
-  useApplicationStore,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   buildRuntimeValueOption,
   getRuntimeOptionFormatter,
   QueryBuilderClassSelector,
 } from '../QueryBuilderSideBar.js';
 import type { ClassQueryBuilderState } from '../../stores/workflows/ClassQueryBuilderState.js';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 /**
  * This setup panel supports cascading in order: Class -> Mapping -> Runtime
@@ -162,7 +162,6 @@ const ClassQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>
@@ -192,7 +191,6 @@ const ClassQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>

package/src/components/workflows/MappingQueryBuilder.tsx

@@ -29,12 +29,7 @@ import {
   getMappingCompatibleRuntimes,
   getMappingCompatibleClasses,
 } from '@finos/legend-graph';
-import {
-  type PackageableElementOption,
-  getPackageableElementOptionFormatter,
-  buildElementOption,
-  useApplicationStore,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   buildRuntimeValueOption,
   getRuntimeOptionFormatter,
@@ -42,6 +37,11 @@ import {
 } from '../QueryBuilderSideBar.js';
 import { guaranteeType } from '@finos/legend-shared';
 import type { MappingQueryBuilderState } from '../../stores/workflows/MappingQueryBuilderState.js';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 /**
  * This setup panel supports cascading in order: Mapping -> Runtime + Class
@@ -156,7 +156,6 @@ const MappingQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>
@@ -184,7 +183,6 @@ const MappingQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>

package/src/components/workflows/ServiceQueryBuilder.tsx

@@ -17,16 +17,16 @@
 import { CustomSelectorInput, PlayIcon, RobotIcon } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { getMappingCompatibleClasses, type Service } from '@finos/legend-graph';
-import {
-  buildElementOption,
-  useApplicationStore,
-  type PackageableElementOption,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import { QueryBuilderClassSelector } from '../QueryBuilderSideBar.js';
 import type {
   ServiceExecutionContext,
   ServiceQueryBuilderState,
 } from '../../stores/workflows/ServiceQueryBuilderState.js';
+import {
+  buildElementOption,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 type ExecutionContextOption = {
   label: string;

package/src/{graphManager/QueryBuilderSupportedFunctions.ts → graph/QueryBuilderMetaModelConst.ts}

@@ -14,6 +14,20 @@
  * limitations under the License.
  */
 
+export enum QUERY_BUILDER_PURE_PATH {
+  // TDS
+  TDS_ROW = 'meta::pure::tds::TDSRow',
+  TDS_COLUMN = 'meta::pure::tds::TDSColumn',
+  TDS_TABULAR_DATASET = 'meta::pure::tds::TabularDataSet',
+
+  // time
+  DURATION_UNIT = 'meta::pure::functions::date::DurationUnit',
+  DAY_OF_WEEK = 'meta::pure::functions::date::DayOfWeek',
+
+  // serialization
+  SERIALIZE_CONFIG = 'meta::pure::graphFetch::execution::AlloySerializationConfig',
+}
+
 export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   AND = 'meta::pure::functions::boolean::and',
   EXISTS = 'meta::pure::functions::collection::exists',
@@ -26,6 +40,21 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   SUBTYPE = 'meta::pure::functions::lang::subType',
   MINUS = 'meta::pure::functions::math::minus',
 
+  // time
+  ADJUST = 'meta::pure::functions::date::adjust',
+  TODAY = 'meta::pure::functions::date::today',
+  NOW = 'meta::pure::functions::date::now',
+  FIRST_DAY_OF_WEEK = 'meta::pure::functions::date::firstDayOfThisWeek',
+  FIRST_DAY_OF_MONTH = 'meta::pure::functions::date::firstDayOfThisMonth',
+  FIRST_DAY_OF_QUARTER = 'meta::pure::functions::date::firstDayOfThisQuarter',
+  FIRST_DAY_OF_YEAR = 'meta::pure::functions::date::firstDayOfThisYear',
+  PREVIOUS_DAY_OF_WEEK = 'meta::pure::functions::date::previousDayOfWeek',
+  IS_ON_DAY = 'meta::pure::functions::date::isOnDay',
+  IS_ON_OR_AFTER_DAY = 'meta::pure::functions::date::isOnOrAfterDay',
+  IS_AFTER_DAY = 'meta::pure::functions::date::isAfterDay',
+  IS_ON_OR_BEFORE_DAY = 'meta::pure::functions::date::isOnOrBeforeDay',
+  IS_BEFORE_DAY = 'meta::pure::functions::date::isBeforeDay',
+
   // graph-fetch
   GRAPH_FETCH = 'meta::pure::graphFetch::execution::graphFetch',
   GRAPH_FETCH_CHECKED = 'meta::pure::graphFetch::execution::graphFetchChecked',

package/src/{graphManager → graph-manager}/QueryBuilder_GraphManagerPreset.ts

@@ -17,7 +17,7 @@
 import packageJson from '../../package.json';
 import { AbstractPreset } from '@finos/legend-shared';
 import { QueryBuilder_PureProtocolProcessorPlugin } from './protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.js';
-import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_GraphManagerPlugin.js';
+import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_PureGraphManagerPlugin.js';
 
 /**
  * This is the core graph manager preset and should not be exported

package/src/{graphManager/QueryBuilder_GraphManagerPlugin.ts → graph-manager/QueryBuilder_PureGraphManagerPlugin.ts}

@@ -20,6 +20,7 @@ import {
   type PureGraphManagerExtensionBuilder,
 } from '@finos/legend-graph';
 import { QueryBuilder_buildGraphManagerExtension } from './protocol/pure/QueryBuilder_PureGraphManagerExtensionBuilder.js';
+import { QUERY_BUILDER_PURE_PATH } from '../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilder_PureGraphManagerPlugin extends PureGraphManagerPlugin {
   constructor() {
@@ -29,4 +30,12 @@ export class QueryBuilder_PureGraphManagerPlugin extends PureGraphManagerPlugin
   override getExtraPureGraphManagerExtensionBuilders(): PureGraphManagerExtensionBuilder[] {
     return [QueryBuilder_buildGraphManagerExtension];
   }
+
+  override getExtraExposedSystemElementPath(): string[] {
+    return [
+      QUERY_BUILDER_PURE_PATH.TDS_TABULAR_DATASET,
+      QUERY_BUILDER_PURE_PATH.TDS_ROW,
+      QUERY_BUILDER_PURE_PATH.TDS_COLUMN,
+    ];
+  }
 }

package/src/{graphManager → graph-manager}/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -38,8 +38,11 @@ import {
   SimpleFunctionExpression,
   extractElementNameFromPath,
   V1_buildGenericFunctionExpression,
+  GenericType,
+  GenericTypeExplicitReference,
+  PrimitiveType,
 } from '@finos/legend-graph';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
   constructor() {
@@ -149,6 +152,57 @@ export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProces
             compileContext,
             processingContext,
           );
+        } else if (
+          matchFunctionName(functionName, [
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          ])
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.STRICTDATE),
+          );
+          return expression;
+        } else if (
+          matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW)
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.DATETIME),
+          );
+          return expression;
+        } else if (
+          matchFunctionName(functionName, [
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
+          ])
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.DATE),
+          );
+          return expression;
         } else if (
           matchFunctionName(
             functionName,

package/src/{graphManager → graph-manager}/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts

@@ -142,7 +142,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
     dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
   ): Promise<MappingRuntimeCompatibilityAnalysisResult[]> {
     const result: MappingRuntimeCompatibilityAnalysisResult[] = [];
-    const graph = await this.graphManager.createEmptyGraph({
+    const graph = await this.graphManager.createBasicGraph({
       initializeSystem: false,
     });
 
@@ -252,7 +252,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
     dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
   ): Promise<ServiceExecutionAnalysisResult[]> {
     const result: ServiceExecutionAnalysisResult[] = [];
-    const graph = await this.graphManager.createEmptyGraph({
+    const graph = await this.graphManager.createBasicGraph({
       initializeSystem: false,
     });
 

package/src/{graphManager → graph-manager}/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts

@@ -48,11 +48,13 @@ import {
   V1_ValueSpecificationBuilder,
   AbstractPropertyExpression,
   VariableExpression,
-  CORE_PURE_PATH,
   Multiplicity,
   PrimitiveType,
 } from '@finos/legend-graph';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilderSupportedFunctions.js';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 const buildProjectionColumnLambda = (
   valueSpecification: V1_ValueSpecification,
@@ -433,7 +435,9 @@ export const V1_buildProjectFunctionExpression = (
     compileContext,
   );
   expression.genericType = GenericTypeExplicitReference.create(
-    new GenericType(compileContext.resolveType(CORE_PURE_PATH.TDS_ROW).value),
+    new GenericType(
+      compileContext.resolveType(QUERY_BUILDER_PURE_PATH.TDS_ROW).value,
+    ),
   );
 
   return expression;
@@ -574,7 +578,9 @@ export const V1_buildGroupByFunctionExpression = (
     compileContext,
   );
   expression.genericType = GenericTypeExplicitReference.create(
-    new GenericType(compileContext.resolveType(CORE_PURE_PATH.TDS_ROW).value),
+    new GenericType(
+      compileContext.resolveType(QUERY_BUILDER_PURE_PATH.TDS_ROW).value,
+    ),
   );
 
   return expression;
@@ -774,7 +780,9 @@ export const V1_buildOLAPGroupByFunctionExpression = (
     compileContext,
   );
   expression.genericType = GenericTypeExplicitReference.create(
-    new GenericType(compileContext.resolveType(CORE_PURE_PATH.TDS_ROW).value),
+    new GenericType(
+      compileContext.resolveType(QUERY_BUILDER_PURE_PATH.TDS_ROW).value,
+    ),
   );
 
   return expression;

package/src/index.ts

@@ -15,12 +15,12 @@
  */
 
 // application
-export * from './application/QueryBuilderTelemetryHelper.js';
-export * from './application/QueryBuilderEvent.js';
+export * from './__lib__/QueryBuilderTelemetryHelper.js';
+export * from './__lib__/QueryBuilderEvent.js';
 
-export { QueryBuilder_GraphManagerPreset } from './graphManager/QueryBuilder_GraphManagerPreset.js';
+export { QueryBuilder_GraphManagerPreset } from './graph-manager/QueryBuilder_GraphManagerPreset.js';
 
-export { QUERY_BUILDER_TEST_ID } from './application/QueryBuilderTesting.js';
+export { QUERY_BUILDER_TEST_ID } from './__lib__/QueryBuilderTesting.js';
 export {
   type CheckEntitlementEditorRender,
   QueryBuilder_LegendApplicationPlugin,
@@ -43,26 +43,28 @@ export {
   ServiceQueryBuilderState,
 } from './stores/workflows/ServiceQueryBuilderState.js';
 
-export { getQueryBuilderGraphManagerExtension } from './graphManager/protocol/pure/QueryBuilder_PureGraphManagerExtension.js';
-export type { ServiceExecutionAnalysisResult } from './graphManager/action/analytics/ServiceExecutionAnalysis.js';
-export type { MappingRuntimeCompatibilityAnalysisResult } from './graphManager/action/analytics/MappingRuntimeCompatibilityAnalysis.js';
+export { getQueryBuilderGraphManagerExtension } from './graph-manager/protocol/pure/QueryBuilder_PureGraphManagerExtension.js';
+export type { ServiceExecutionAnalysisResult } from './graph-manager/action/analytics/ServiceExecutionAnalysis.js';
+export type { MappingRuntimeCompatibilityAnalysisResult } from './graph-manager/action/analytics/MappingRuntimeCompatibilityAnalysis.js';
 export * from './stores/ServiceInfo.js';
 export * from './components/ServiceQuerySetupUtils.js';
 export * from './components/QuerySetupUtils.js';
 export * from './components/QueryBuilderTextEditor.js';
 
-export { TEST__setUpQueryBuilder } from './components/QueryBuilderComponentTestUtils.js';
 export { QueryBuilderTextEditorMode } from './stores/QueryBuilderTextEditorState.js';
 
 // ------------------------------------------- Shared components -------------------------------------------
 
 export * from './components/shared/LambdaEditor.js';
+export { LambdaEditorState } from './stores/shared/LambdaEditorState.js';
+
+export * from './stores/shared/LambdaParameterState.js';
+
 export * from './components/shared/BasicValueSpecificationEditor.js';
 export * from './components/shared/LambdaParameterValuesEditor.js';
-export * from './components/execution-plan/ExecutionPlanViewer.js';
 
-export { LambdaEditorState } from './stores/shared/LambdaEditorState.js';
-export * from './stores/shared/LambdaParameterState.js';
 export * from './stores/shared/ValueSpecificationModifierHelper.js';
 export * from './stores/shared/ValueSpecificationEditorHelper.js';
+
+export * from './components/execution-plan/ExecutionPlanViewer.js';
 export * from './stores/execution-plan/ExecutionPlanState.js';

package/src/stores/QueryBuilderConstantsState.ts

@@ -32,7 +32,7 @@ import {
   assertErrorThrown,
 } from '@finos/legend-shared';
 import { action, 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 { buildDefaultInstanceValue } from './shared/ValueSpecificationEditorHelper.js';
 import { valueSpecification_setGenericType } from './shared/ValueSpecificationModifierHelper.js';
@@ -109,7 +109,7 @@ export class QueryBuilderConstantExpressionState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
       this.variable.name,
       this.value,
     ]);
@@ -169,7 +169,7 @@ export class QueryBuilderConstantsState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.CONSTANT_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_STATE,
       hashArray(this.constants),
     ]);
   }

package/src/stores/QueryBuilderGroupOperationHelper.ts

@@ -16,7 +16,7 @@
 
 import { matchFunctionName } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 
 export enum QUERY_BUILDER_GROUP_OPERATION {
   AND = 'and',

package/src/stores/QueryBuilderParametersState.ts

@@ -16,7 +16,7 @@
 
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { observable, makeObservable, action, override } 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 {
   type LambdaParameterState,
@@ -50,7 +50,7 @@ export class QueryBuilderParametersState
 
   override get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.PARAMETERS_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.PARAMETERS_STATE,
       hashArray(this.parameterStates),
     ]);
   }

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -53,8 +53,8 @@ import {
   generateDefaultValueForPrimitiveType,
 } from './QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderState } from './QueryBuilderState.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 {
   propertyExpression_setFunc,
   functionExpression_setParametersValues,
@@ -426,7 +426,7 @@ export class QueryBuilderPropertyExpressionState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.PROPERTY_EXPRESSION_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.PROPERTY_EXPRESSION_STATE,
       this.propertyExpression,
     ]);
   }

package/src/stores/QueryBuilderResultState.ts

@@ -39,14 +39,14 @@ import {
   extractExecutionResultValues,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
-import { TAB_SIZE } from '@finos/legend-application';
+import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import {
   buildExecutionParameterValues,
   getExecutionQueryFromRawLambda,
 } from './shared/LambdaParameterState.js';
 import type { LambdaFunctionBuilderOption } from './QueryBuilderValueSpecificationBuilderHelper.js';
-import { QueryBuilderTelemetryHelper } from '../application/QueryBuilderTelemetryHelper.js';
-import { QUERY_BUILDER_EVENT } from '../application/QueryBuilderEvent.js';
+import { QueryBuilderTelemetryHelper } from '../__lib__/QueryBuilderTelemetryHelper.js';
+import { QUERY_BUILDER_EVENT } from '../__lib__/QueryBuilderEvent.js';
 import { ExecutionPlanState } from './execution-plan/ExecutionPlanState.js';
 
 const DEFAULT_LIMIT = 1000;
@@ -185,7 +185,7 @@ export class QueryBuilderResultState {
         content = JSON.stringify(
           extractExecutionResultValues(result),
           null,
-          TAB_SIZE,
+          DEFAULT_TAB_SIZE,
         );
       }
       const fileName = `result.${getContentTypeFileExtension(contentType)}`;

package/src/stores/QueryBuilderState.ts

@@ -74,7 +74,7 @@ import type { QueryBuilderFilterOperator } from './filter/QueryBuilderFilterOper
 import { getQueryBuilderCoreFilterOperators } from './filter/QueryBuilderFilterOperatorLoader.js';
 import { QueryBuilderChangeDetectionState } from './QueryBuilderChangeDetectionState.js';
 import { QueryBuilderMilestoningState } from './milestoning/QueryBuilderMilestoningState.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from './QueryBuilderStateHashUtils.js';
 import { QUERY_BUILDER_COMMAND_KEY } from './QueryBuilderCommand.js';
 import { QueryBuilderWatermarkState } from './watermark/QueryBuilderWatermarkState.js';
 import { QueryBuilderConstantsState } from './QueryBuilderConstantsState.js';
@@ -577,7 +577,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.QUERY_BUILDER_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.QUERY_BUILDER_STATE,
       this.unsupportedQueryState,
       this.milestoningState,
       this.parametersState,

package/src/stores/QueryBuilderStateBuilder.ts

@@ -66,7 +66,7 @@ import {
   processTDSSortExpression,
   processTDSTakeExpression,
 } from './fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { LambdaParameterState } from './shared/LambdaParameterState.js';
 import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/window/QueryBuilderWindowStateBuilder.js';
 import { processWatermarkExpression } from './watermark/QueryBuilderWatermarkStateBuilder.js';

package/src/{graphManager/QueryBuilderHashUtils.ts → stores/QueryBuilderStateHashUtils.ts}

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export enum QUERY_BUILDER_HASH_STRUCTURE {
+export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
   // parameters state
   PARAMETERS_STATE = 'PARAMETERS_STATE',
   CONSTANT_STATE = 'CONSTANT_STATE',

package/src/stores/QueryBuilderTextEditorState.ts

@@ -30,7 +30,7 @@ import {
 } from '@finos/legend-shared';
 import { observable, action, flow, makeObservable, flowResult } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import { TAB_SIZE } from '@finos/legend-application';
+import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import { LambdaEditorState } from './shared/LambdaEditorState.js';
 
 export class QueryBuilderRawLambdaState {
@@ -182,7 +182,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
             ),
           ),
           null,
-          TAB_SIZE,
+          DEFAULT_TAB_SIZE,
         ),
       );
     }

package/src/stores/QueryBuilderUnsupportedQueryState.ts

@@ -18,7 +18,7 @@ import { makeObservable, action, observable, computed } from 'mobx';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import type { RawLambda } from '@finos/legend-graph';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from './QueryBuilderStateHashUtils.js';
 
 export class QueryBuilderUnsupportedQueryState implements Hashable {
   readonly queryBuilderState: QueryBuilderState;
@@ -47,7 +47,7 @@ export class QueryBuilderUnsupportedQueryState implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      QUERY_BUILDER_HASH_STRUCTURE.UNSUPPORTED_QUERY_STATE,
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.UNSUPPORTED_QUERY_STATE,
       this.rawLambda ?? '',
     ]);
   }

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -36,7 +36,7 @@ import type { QueryBuilderState } from './QueryBuilderState.js';
 import { buildFilterExpression } from './filter/QueryBuilderFilterValueSpecificationBuilder.js';
 import type { LambdaFunctionBuilderOption } from './QueryBuilderValueSpecificationBuilderHelper.js';
 import type { QueryBuilderFetchStructureState } from './fetch-structure/QueryBuilderFetchStructureState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
 import type { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';

package/src/stores/QueryBuilderValueSpecificationBuilderHelper.ts

@@ -31,7 +31,7 @@ import {
   guaranteeNonNullable,
   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 {
   functionExpression_setParametersValues,

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -56,7 +56,7 @@ import {
   isString,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import {
   getDerivedPropertyMilestoningSteoreotype,
   validateMilestoningPropertyExpressionChain,