@finos/legend-query-builder 2.1.7 → 3.0.1

package/src/components/{QueryBuilderComponentTestUtils.tsx → __test-utils__/QueryBuilderComponentTestUtils.tsx}

@@ -15,7 +15,8 @@
  */
 
 import { type RenderResult, render, waitFor } from '@testing-library/react';
-import { createSpy, LogService } from '@finos/legend-shared';
+import { LogService } from '@finos/legend-shared';
+import { createSpy } from '@finos/legend-shared/test';
 import {
   type RawMappingModelCoverageAnalysisResult,
   type RawLambda,
@@ -24,24 +25,23 @@ import {
   RuntimePointer,
 } from '@finos/legend-graph';
 import {
-  TEST__ApplicationStoreProvider,
-  TEST__getGenericApplicationConfig,
-  TEST__LegendApplicationPluginManager,
-  TEST__provideMockedApplicationStore,
-  WebApplicationNavigator,
-  TEST__provideMockedWebApplicationNavigator,
-  LegendApplicationComponentFrameworkProvider,
-  Router,
-  createMemoryHistory,
+  ApplicationStoreProvider,
+  ApplicationFrameworkProvider,
+  ApplicationStore,
 } from '@finos/legend-application';
+import { TEST__BrowserEnvironmentProvider } from '@finos/legend-application/test';
 import type { Entity } from '@finos/legend-storage';
-import { QueryBuilder } from './QueryBuilder.js';
+import { QueryBuilder } from '../QueryBuilder.js';
 import {
   type QueryBuilderState,
   INTERNAL__BasicQueryBuilderState,
-} from '../stores/QueryBuilderState.js';
-import { QueryBuilder_GraphManagerPreset } from '../graphManager/QueryBuilder_GraphManagerPreset.js';
-import { QUERY_BUILDER_TEST_ID } from '../application/QueryBuilderTesting.js';
+} from '../../stores/QueryBuilderState.js';
+import { QueryBuilder_GraphManagerPreset } from '../../graph-manager/QueryBuilder_GraphManagerPreset.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
+import {
+  TEST__LegendApplicationPluginManager,
+  TEST__getGenericApplicationConfig,
+} from '../../stores/__test-utils__/QueryBuilderStateTestUtils.js';
 
 export const TEST__setUpQueryBuilder = async (
   entities: Entity[],
@@ -53,12 +53,15 @@ export const TEST__setUpQueryBuilder = async (
   renderResult: RenderResult;
   queryBuilderState: QueryBuilderState;
 }> => {
-  const pluginManager = TEST__LegendApplicationPluginManager.create();
-  pluginManager.usePresets([new QueryBuilder_GraphManagerPreset()]).install();
+  const MOCK__pluginManager = TEST__LegendApplicationPluginManager.create();
+  MOCK__pluginManager.usePresets([
+    new QueryBuilder_GraphManagerPreset(),
+  ]).install();
   const graphManagerState = new GraphManagerState(
-    pluginManager,
+    MOCK__pluginManager,
     new LogService(),
   );
+
   await graphManagerState.initializeSystem();
   await graphManagerState.graphManager.buildGraph(
     graphManagerState.graph,
@@ -66,18 +69,13 @@ export const TEST__setUpQueryBuilder = async (
     graphManagerState.graphBuildState,
   );
 
-  const history = createMemoryHistory();
-  const navigator = new WebApplicationNavigator(history);
-  TEST__provideMockedWebApplicationNavigator({ mock: navigator });
-
-  const applicationStore = TEST__provideMockedApplicationStore(
+  const MOCK__applicationStore = new ApplicationStore(
     TEST__getGenericApplicationConfig(),
-    pluginManager,
-    { navigator },
+    MOCK__pluginManager,
   );
 
   const queryBuilderState = new INTERNAL__BasicQueryBuilderState(
-    applicationStore,
+    MOCK__applicationStore,
     graphManagerState,
   );
   const mapping = graphManagerState.graph.getMapping(mappingPath);
@@ -103,16 +101,13 @@ export const TEST__setUpQueryBuilder = async (
   }
 
   const renderResult = render(
-    <Router history={history}>
-      <TEST__ApplicationStoreProvider
-        config={TEST__getGenericApplicationConfig()}
-        pluginManager={pluginManager}
-      >
-        <LegendApplicationComponentFrameworkProvider>
+    <ApplicationStoreProvider store={MOCK__applicationStore}>
+      <TEST__BrowserEnvironmentProvider>
+        <ApplicationFrameworkProvider>
           <QueryBuilder queryBuilderState={queryBuilderState} />
-        </LegendApplicationComponentFrameworkProvider>
-      </TEST__ApplicationStoreProvider>
-    </Router>,
+        </ApplicationFrameworkProvider>
+      </TEST__BrowserEnvironmentProvider>
+    </ApplicationStoreProvider>,
   );
 
   await waitFor(() =>

package/src/components/execution-plan/ExecutionPlanViewer.tsx

@@ -59,8 +59,11 @@ import {
   type RawExecutionPlan,
 } from '@finos/legend-graph';
 import { SQLExecutionNodeViewer } from './SQLExecutionNodeViewer.js';
-import { CodeEditor } from '@finos/legend-lego/code-editor';
-import { CODE_EDITOR_LANGUAGE, TAB_SIZE } from '@finos/legend-application';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CodeEditor,
+} from '@finos/legend-lego/code-editor';
+import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 
 /**
  * @modularize
@@ -456,7 +459,7 @@ const ExecutionPlanViewerContent = observer(
           </ResizablePanelGroup>
         ) : (
           <CodeEditor
-            inputValue={JSON.stringify(rawPlan, undefined, TAB_SIZE)}
+            inputValue={JSON.stringify(rawPlan, undefined, DEFAULT_TAB_SIZE)}
             isReadOnly={true}
             language={CODE_EDITOR_LANGUAGE.JSON}
             showMiniMap={true}

package/src/components/execution-plan/SQLExecutionNodeViewer.tsx

@@ -18,8 +18,10 @@ import { observer } from 'mobx-react-lite';
 import type { ExecutionPlanState } from '../../stores/execution-plan/ExecutionPlanState.js';
 import { format as formatSQL } from 'sql-formatter';
 import type { SQLResultColumn } from '@finos/legend-graph';
-import { CodeEditor } from '@finos/legend-lego/code-editor';
-import { CODE_EDITOR_LANGUAGE } from '@finos/legend-application';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CodeEditor,
+} from '@finos/legend-lego/code-editor';
 
 /**
  * TODO: Create a new `AbstractPlugin` for this, called `ExecutionPlanViewerPlugin`

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -87,8 +87,7 @@ import {
   isElementDeprecated,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
-import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import {
   filterByType,
   guaranteeNonNullable,
@@ -97,6 +96,7 @@ import {
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
+import { getClassPropertyIcon } from '@finos/legend-lego/graph-editor';
 
 const checkForDeprecatedNode = (
   node: QueryBuilderExplorerTreeNodeData,

package/src/components/explorer/QueryBuilderPropertySearchPanel.tsx

@@ -60,8 +60,8 @@ import {
   renderPropertyTypeIcon,
 } from './QueryBuilderExplorerPanel.js';
 import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
-import { FuzzySearchAdvancedConfigMenu } from '@finos/legend-application/components';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
+import { FuzzySearchAdvancedConfigMenu } from '@finos/legend-lego/application';
 
 const prettyPropertyNameFromNodeId = (name: string): string => {
   let propNameArray = name.split('.');

package/src/components/fetch-structure/QueryBuilderGraphFetchTreePanel.tsx

@@ -48,7 +48,7 @@ import {
   CustomSelectorInput,
   FolderIcon,
 } from '@finos/legend-art';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import {
   deepClone,
   filterByType,
@@ -74,7 +74,6 @@ import {
   SERIALIZATION_TYPE,
   type QueryBuilderGraphFetchTreeState,
 } from '../../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js';
-import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 import { QueryBuilderTextEditorMode } from '../../stores/QueryBuilderTextEditorState.js';
 import {
   type PackageableElement,
@@ -85,9 +84,12 @@ import {
 import {
   ActionAlertActionType,
   ActionAlertType,
+} from '@finos/legend-application';
+import {
   buildElementOption,
+  getClassPropertyIcon,
   type PackageableElementOption,
-} from '@finos/legend-application';
+} from '@finos/legend-lego/graph-editor';
 
 const getBindingFormatter = (props: {
   darkMode?: boolean;

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -79,7 +79,7 @@ import {
   QueryBuilderDerivationProjectionColumnState,
 } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';

package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx

@@ -53,7 +53,7 @@ import {
 } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
 import { QueryResultModifierModal } from './QueryBuilderResultModifierPanel.js';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { flowResult } from 'mobx';
 import { useApplicationStore } from '@finos/legend-application';
 import {

package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx

@@ -63,7 +63,7 @@ import { QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE } from '../../stores/fetch-str
 import type { QueryBuilderTDSColumnState } from '../../stores/fetch-structure/tds/QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { COLUMN_SORT_TYPE } from '../../stores/fetch-structure/tds/QueryResultSetModifierState.js';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
 
 // helpers

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -68,7 +68,7 @@ import {
   debounce,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { useApplicationStore } from '@finos/legend-application';
 import type { ValueSpecification } from '@finos/legend-graph';
 import {

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -76,7 +76,7 @@ import {
   instanceValue_setValues,
 } from '../../stores/shared/ValueSpecificationModifierHelper.js';
 import { CustomDatePicker } from './CustomDatePicker.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { simplifyValueExpression } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { evaluate } from 'mathjs';
 

package/src/components/shared/CustomDatePicker.tsx

@@ -34,12 +34,8 @@ import {
   EnumValueExplicitReference,
   EnumValueInstanceValue,
   matchFunctionName,
-  SUPPORTED_FUNCTIONS,
-  DAY_OF_WEEK,
-  DURATION_UNIT,
   type ObserverContext,
   PrimitiveType,
-  getSupportFunctionFullPath,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -58,6 +54,10 @@ import {
   instanceValue_setValues,
   valueSpecification_setGenericType,
 } from '../../stores/shared/ValueSpecificationModifierHelper.js';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../graph/QueryBuilderMetaModelConst.js';
 
 export enum CUSTOM_DATE_PICKER_OPTION {
   ABSOLUTE_DATE = 'Absolute Date',
@@ -237,6 +237,13 @@ const reservedCustomDateOptions: CustomDateOption[] = [
   ),
 ];
 
+const getSupportedDateFunctionFullPath = (
+  functionName: string,
+): string | undefined =>
+  Object.values(QUERY_BUILDER_SUPPORTED_FUNCTIONS).find((_func) =>
+    matchFunctionName(functionName, _func),
+  );
+
 /**
  * Generate pure date functions based on the DatePickerOption.
  */
@@ -247,7 +254,7 @@ const buildPureDateFunctionExpression = (
 ): SimpleFunctionExpression => {
   if (datePickerOption instanceof CustomPreviousDayOfWeekOption) {
     const previousFridaySFE = new SimpleFunctionExpression(
-      SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
     );
     valueSpecification_setGenericType(
       previousFridaySFE,
@@ -255,7 +262,7 @@ const buildPureDateFunctionExpression = (
     );
     const dayOfWeekEnumIntanceValue = new EnumValueInstanceValue(
       GenericTypeExplicitReference.create(
-        new GenericType(graph.getType(DAY_OF_WEEK)),
+        new GenericType(graph.getType(QUERY_BUILDER_PURE_PATH.DAY_OF_WEEK)),
       ),
     );
     instanceValue_setValues(
@@ -265,7 +272,7 @@ const buildPureDateFunctionExpression = (
         EnumValueExplicitReference.create(
           guaranteeNonNullable(
             graph
-              .getEnumeration(DAY_OF_WEEK)
+              .getEnumeration(QUERY_BUILDER_PURE_PATH.DAY_OF_WEEK)
               .values.filter((e) => e.name === datePickerOption.day)[0],
           ),
         ),
@@ -282,7 +289,7 @@ const buildPureDateFunctionExpression = (
     switch (datePickerOption.unit) {
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.YEAR: {
         const firstDayOfYearSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
         );
         valueSpecification_setGenericType(
           firstDayOfYearSFE,
@@ -294,7 +301,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.QUARTER: {
         const firstDayOfQuarterSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
         );
         valueSpecification_setGenericType(
           firstDayOfQuarterSFE,
@@ -306,7 +313,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.MONTH: {
         const firstDayOfMonthSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
         );
         valueSpecification_setGenericType(
           firstDayOfMonthSFE,
@@ -318,7 +325,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.WEEK: {
         const firstDayOfWeekSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
         );
         valueSpecification_setGenericType(
           firstDayOfWeekSFE,
@@ -337,19 +344,19 @@ const buildPureDateFunctionExpression = (
     switch (datePickerOption.value) {
       case CUSTOM_DATE_PICKER_OPTION.TODAY: {
         return createSupportedFunctionExpression(
-          SUPPORTED_FUNCTIONS.TODAY,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
           PrimitiveType.STRICTDATE,
         );
       }
       case CUSTOM_DATE_PICKER_OPTION.NOW: {
         return createSupportedFunctionExpression(
-          SUPPORTED_FUNCTIONS.NOW,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
           PrimitiveType.DATETIME,
         );
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR: {
         const firstDayOfYearSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
         );
         valueSpecification_setGenericType(
           firstDayOfYearSFE,
@@ -361,7 +368,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER: {
         const firstDayOfQuarterSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
         );
         valueSpecification_setGenericType(
           firstDayOfQuarterSFE,
@@ -373,7 +380,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH: {
         const firstDayOfMonthSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
         );
         valueSpecification_setGenericType(
           firstDayOfMonthSFE,
@@ -385,7 +392,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK: {
         const firstDayOfWeekSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
         );
         valueSpecification_setGenericType(
           firstDayOfWeekSFE,
@@ -410,7 +417,9 @@ const buildPureDurationEnumValue = (
   unitString: string,
   graph: PureModel,
 ): Enum => {
-  const durationUnitEnum = graph.getEnumeration(DURATION_UNIT);
+  const durationUnitEnum = graph.getEnumeration(
+    QUERY_BUILDER_PURE_PATH.DURATION_UNIT,
+  );
   const targetPureDurationEnumValue = durationUnitEnum.values.filter(
     (e) =>
       e.name ===
@@ -436,7 +445,7 @@ const buildPureAdjustDateFunction = (
   observerContext: ObserverContext,
 ): SimpleFunctionExpression => {
   const dateAdjustSimpleFunctionExpression = new SimpleFunctionExpression(
-    SUPPORTED_FUNCTIONS.ADJUST,
+    QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
   );
   functionExpression_addParameterValue(
     dateAdjustSimpleFunctionExpression,
@@ -451,7 +460,9 @@ const buildPureAdjustDateFunction = (
     observerContext,
   );
   if (customDateOption.direction === CUSTOM_DATE_OPTION_DIRECTION.BEFORE) {
-    const minusFunc = new SimpleFunctionExpression(SUPPORTED_FUNCTIONS.MINUS);
+    const minusFunc = new SimpleFunctionExpression(
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
+    );
     functionExpression_addParameterValue(
       minusFunc,
       buildPrimitiveInstanceValue(
@@ -481,7 +492,7 @@ const buildPureAdjustDateFunction = (
   }
   const durationUnitEnumIntanceValue = new EnumValueInstanceValue(
     GenericTypeExplicitReference.create(
-      new GenericType(graph.getType(DURATION_UNIT)),
+      new GenericType(graph.getType(QUERY_BUILDER_PURE_PATH.DURATION_UNIT)),
     ),
   );
   instanceValue_setValues(
@@ -521,7 +532,10 @@ const buildCustomDateOptionDurationValue = (
   return durationParam instanceof PrimitiveInstanceValue
     ? (durationParam.values[0] as number)
     : durationParam instanceof SimpleFunctionExpression &&
-      matchFunctionName(durationParam.functionName, SUPPORTED_FUNCTIONS.MINUS)
+      matchFunctionName(
+        durationParam.functionName,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
+      )
     ? durationParam.parametersValues[0] instanceof PrimitiveInstanceValue
       ? (durationParam.parametersValues[0].values[0] as number)
       : 0
@@ -538,7 +552,7 @@ const buildCustomDateOptionDirectionValue = (
     SimpleFunctionExpression &&
   matchFunctionName(
     pureDateAdjustFunction.parametersValues[1].functionName,
-    SUPPORTED_FUNCTIONS.MINUS,
+    QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
   )
     ? CUSTOM_DATE_OPTION_DIRECTION.BEFORE
     : CUSTOM_DATE_OPTION_DIRECTION.AFTER;
@@ -572,18 +586,18 @@ const buildCustomDateOptionReferenceMomentValue = (
   const funcName = (
     pureDateAjustFunction.parametersValues[0] as SimpleFunctionExpression
   ).functionName;
-  switch (getSupportFunctionFullPath(funcName)) {
-    case SUPPORTED_FUNCTIONS.TODAY:
+  switch (getSupportedDateFunctionFullPath(funcName)) {
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.TODAY;
-    case SUPPORTED_FUNCTIONS.NOW:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.NOW;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK;
     default:
       throw new UnsupportedOperationError(
@@ -603,7 +617,7 @@ const buildCustomDateOption = (
     valueSpecification instanceof SimpleFunctionExpression &&
     matchFunctionName(
       valueSpecification.functionName,
-      SUPPORTED_FUNCTIONS.ADJUST,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
     )
   ) {
     const customDateOption = new CustomDateOption(
@@ -640,38 +654,38 @@ export const buildDatePickerOption = (
   valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
 ): DatePickerOption => {
   if (valueSpecification instanceof SimpleFunctionExpression) {
-    switch (getSupportFunctionFullPath(valueSpecification.functionName)) {
-      case SUPPORTED_FUNCTIONS.TODAY:
+    switch (getSupportedDateFunctionFullPath(valueSpecification.functionName)) {
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY:
         return new DatePickerOption(
           CUSTOM_DATE_PICKER_OPTION.TODAY,
           CUSTOM_DATE_PICKER_OPTION.TODAY,
         );
-      case SUPPORTED_FUNCTIONS.NOW:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW:
         return new DatePickerOption(
           CUSTOM_DATE_PICKER_OPTION.NOW,
           CUSTOM_DATE_PICKER_OPTION.NOW,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.YEAR,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.QUARTER,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.MONTH,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.WEEK,
         );
-      case SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
         return new CustomPreviousDayOfWeekOption(
           `Previous ${
             (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
@@ -680,8 +694,7 @@ export const buildDatePickerOption = (
           (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
             .values[0]?.value.name as CUSTOM_DATE_DAY_OF_WEEK,
         );
-
-      case SUPPORTED_FUNCTIONS.ADJUST:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST:
         return buildCustomDateOption(valueSpecification);
       default:
         return new DatePickerOption('', '');

package/src/components/shared/LambdaEditor.tsx

@@ -37,6 +37,8 @@ import {
   normalizeLineEnding,
   clearMarkers,
   setErrorMarkers,
+  CODE_EDITOR_LANGUAGE,
+  CODE_EDITOR_THEME,
 } from '@finos/legend-lego/code-editor';
 import type { LambdaEditorState } from '../../stores/shared/LambdaEditorState.js';
 import {
@@ -48,12 +50,10 @@ import {
 import { flowResult } from 'mobx';
 import { ParserError, type EngineError, type Type } from '@finos/legend-graph';
 import {
-  CODE_EDITOR_LANGUAGE,
-  CODE_EDITOR_THEME,
-  TAB_SIZE,
+  DEFAULT_TAB_SIZE,
   useApplicationStore,
 } from '@finos/legend-application';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 
 const LambdaErrorFeedback: React.FC<{
   error?: EngineError | undefined;
@@ -303,7 +303,7 @@ const LambdaEditorInline = observer(
 
       // Set the errors
       if (editorModel) {
-        editorModel.updateOptions({ tabSize: TAB_SIZE });
+        editorModel.updateOptions({ tabSize: DEFAULT_TAB_SIZE });
         const error = parserError ?? compilationError;
         if (error?.sourceInformation) {
           setErrorMarkers(editorModel, [
@@ -321,6 +321,7 @@ const LambdaEditorInline = observer(
       }
     }
 
+    // dispose editor
     useEffect(
       () => (): void => {
         if (editor) {
@@ -330,7 +331,7 @@ const LambdaEditorInline = observer(
         onDidFocusEditorWidgetDisposer.current?.dispose();
       },
       [editor],
-    ); // dispose editor
+    );
 
     return (
       <>
@@ -537,7 +538,7 @@ const LambdaEditorPopUp = observer(
 
       // Set the errors
       if (editorModel) {
-        editorModel.updateOptions({ tabSize: TAB_SIZE });
+        editorModel.updateOptions({ tabSize: DEFAULT_TAB_SIZE });
         const error = parserError ?? compilationError;
         if (error?.sourceInformation) {
           setErrorMarkers(editorModel, [
@@ -561,6 +562,7 @@ const LambdaEditorPopUp = observer(
       ).catch(applicationStore.alertUnhandledError);
     }, [applicationStore, lambdaEditorState]);
 
+    // dispose editor
     useEffect(
       () => (): void => {
         if (editor) {
@@ -569,7 +571,7 @@ const LambdaEditorPopUp = observer(
         onDidChangeModelContentEventDisposer.current?.dispose();
       },
       [editor],
-    ); // dispose editor
+    );
 
     return (
       <Dialog