@finos/legend-application-query 5.2.2 → 5.2.5

package/src/stores/QueryBuilderTypeaheadHelper.ts

@@ -21,44 +21,43 @@ import {
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
   TdsExecutionResult,
+  type RawLambda,
 } from '@finos/legend-graph';
 import { guaranteeType, isNonNullable, isString } from '@finos/legend-shared';
-import { QueryBuilderPostFilterOperator_StartWith } from './postFilterOperators/QueryBuilderPostFilterOperator_StartWith.js';
-import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
+import { QueryBuilderPostFilterOperator_StartWith } from './fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js';
+import type { QueryBuilderAggregateColumnState } from './fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
 import {
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
-} from './QueryBuilderPostFilterState.js';
+} from './fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import {
   QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from './QueryBuilderProjectionState.js';
+} from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 
 const TYPEAHEAD_TAKE_LIMIT = 10;
 const START_LENGTH = 3;
 
-const createAndSetupQueryBuilderStateForTypeAhead = (
+const createAndSetupQueryBuilderStateForTypeahead = (
   queryBuilderState: QueryBuilderState,
 ): QueryBuilderState => {
-  // builderState to build dummy query
-  const builderState = queryBuilderState.createBareBuilderState();
-  // setup
+  const builderState = queryBuilderState.cloneQueryBuilderState();
   builderState.querySetupState = queryBuilderState.querySetupState;
-  // result modifiers
-  builderState.resultSetModifierState.distinct = true;
-  builderState.resultSetModifierState.limit = TYPEAHEAD_TAKE_LIMIT;
+  builderState.fetchStructureState.projectionState.resultSetModifierState.distinct =
+    true;
+  builderState.fetchStructureState.projectionState.resultSetModifierState.limit =
+    TYPEAHEAD_TAKE_LIMIT;
   return builderState;
 };
 
-const buildColumnTypeAheadQuery = (
+const buildColumnTypeaheadQuery = (
   builderState: QueryBuilderState,
   columnState:
     | QueryBuilderProjectionColumnState
     | QueryBuilderAggregateColumnState,
   value: ValueSpecification | undefined,
-): QueryBuilderState => {
-  // projection column
+): RawLambda => {
   let projectionState;
   if (columnState instanceof QueryBuilderProjectionColumnState) {
     projectionState = columnState;
@@ -69,9 +68,8 @@ const buildColumnTypeAheadQuery = (
     aggregationState.columns = [columnState];
   }
   builderState.fetchStructureState.projectionState.columns = [projectionState];
-  // post filter
   const postConditionState = new PostFilterConditionState(
-    builderState.postFilterState,
+    builderState.fetchStructureState.projectionState.postFilterState,
     columnState,
     value,
     new QueryBuilderPostFilterOperator_StartWith(),
@@ -80,44 +78,45 @@ const buildColumnTypeAheadQuery = (
     undefined,
     postConditionState,
   );
-  builderState.postFilterState.addNodeFromNode(postFilterNode, undefined);
-  return builderState;
+  builderState.fetchStructureState.projectionState.postFilterState.addNodeFromNode(
+    postFilterNode,
+    undefined,
+  );
+  return builderState.resultState.buildExecutionRawLambda();
 };
 
-export const buildPropertyTypeAheadQuery = (
+export const buildPropertyTypeaheadQuery = (
   queryBuilderState: QueryBuilderState,
   propertyExpression: AbstractPropertyExpression,
   value: ValueSpecification | undefined,
-): QueryBuilderState => {
-  // builderState to build dummy query
+): RawLambda => {
   const builderState =
-    createAndSetupQueryBuilderStateForTypeAhead(queryBuilderState);
-  const projectionState = new QueryBuilderSimpleProjectionColumnState(
+    createAndSetupQueryBuilderStateForTypeahead(queryBuilderState);
+  const columnState = new QueryBuilderSimpleProjectionColumnState(
     builderState.fetchStructureState.projectionState,
     propertyExpression,
     false,
   );
-  return buildColumnTypeAheadQuery(builderState, projectionState, value);
+  return buildColumnTypeaheadQuery(builderState, columnState, value);
 };
 
-export const buildProjectionColumnTypeAheadQuery = (
+export const buildProjectionColumnTypeaheadQuery = (
   queryBuilderState: QueryBuilderState,
   columnState:
     | QueryBuilderProjectionColumnState
     | QueryBuilderAggregateColumnState,
   value: ValueSpecification | undefined,
-): QueryBuilderState => {
-  // builderState to build dummy query
+): RawLambda => {
   const builderState =
-    createAndSetupQueryBuilderStateForTypeAhead(queryBuilderState);
-  return buildColumnTypeAheadQuery(builderState, columnState, value);
+    createAndSetupQueryBuilderStateForTypeahead(queryBuilderState);
+  return buildColumnTypeaheadQuery(builderState, columnState, value);
 };
 
-export const buildTypeAheadOptions = (result: ExecutionResult): string[] => {
+export const buildTypeaheadOptions = (result: ExecutionResult): string[] => {
   const tdsResult = guaranteeType(
     result,
     TdsExecutionResult,
-    'Type ahead search is only supported for tds result sets',
+    'Typeahead search is only supported for TDS result sets',
   );
   const options: string[] = [];
   tdsResult.result.rows
@@ -131,7 +130,7 @@ export const buildTypeAheadOptions = (result: ExecutionResult): string[] => {
   return options;
 };
 
-export const performTypeAhead = (
+export const performTypeahead = (
   val: ValueSpecification | undefined,
 ): boolean => {
   if (val instanceof PrimitiveInstanceValue) {