@finos/legend-application-query 5.1.0 → 5.2.3

package/src/index.ts

@@ -49,7 +49,3 @@ export {
   StandardQueryBuilderMode,
   QueryBuilderState,
 } from './stores/QueryBuilderState.js';
-export { QueryBuilderExplorerTreeRootNodeData } from './stores/QueryBuilderExplorerState.js';
-export { FETCH_STRUCTURE_MODE } from './stores/QueryBuilderFetchStructureState.js';
-export { COLUMN_SORT_TYPE } from './stores/QueryResultSetModifierState.js';
-export { QueryBuilderSimpleProjectionColumnState } from './stores/QueryBuilderProjectionState.js';

package/src/stores/QueryBuilderGroupOperationHelper.ts

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { matchFunctionName } from '@finos/legend-graph';
+import { UnsupportedOperationError } from '@finos/legend-shared';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../QueryBuilder_Const.js';
+
+export enum QUERY_BUILDER_GROUP_OPERATION {
+  AND = 'and',
+  OR = 'or',
+}
+
+export const fromGroupOperation = (
+  operation: QUERY_BUILDER_GROUP_OPERATION,
+): string => {
+  switch (operation) {
+    case QUERY_BUILDER_GROUP_OPERATION.AND:
+      return QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND;
+    case QUERY_BUILDER_GROUP_OPERATION.OR:
+      return QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR;
+    default:
+      throw new UnsupportedOperationError(
+        `Can't derive function name from group operation '${operation}'`,
+      );
+  }
+};
+
+export const toGroupOperation = (
+  functionName: string,
+): QUERY_BUILDER_GROUP_OPERATION => {
+  if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND)) {
+    return QUERY_BUILDER_GROUP_OPERATION.AND;
+  } else if (
+    matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR)
+  ) {
+    return QUERY_BUILDER_GROUP_OPERATION.OR;
+  }
+  throw new UnsupportedOperationError(
+    `Can't derive group operation from function name '${functionName}'`,
+  );
+};

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -19,21 +19,21 @@ import type {
   AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregationState.js';
-import { QueryBuilderAggregateOperator_Average } from './aggregateOperators/QueryBuilderAggregateOperator_Average.js';
-import { QueryBuilderAggregateOperator_Count } from './aggregateOperators/QueryBuilderAggregateOperator_Count.js';
-import { QueryBuilderAggregateOperator_DistinctCount } from './aggregateOperators/QueryBuilderAggregateOperator_DistinctCount.js';
-import { QueryBuilderAggregateOperator_Max } from './aggregateOperators/QueryBuilderAggregateOperator_Max.js';
-import { QueryBuilderAggregateOperator_Min } from './aggregateOperators/QueryBuilderAggregateOperator_Min.js';
-import { QueryBuilderAggregateOperator_StdDev_Population } from './aggregateOperators/QueryBuilderAggregateOperator_StdDev_Population.js';
-import { QueryBuilderAggregateOperator_StdDev_Sample } from './aggregateOperators/QueryBuilderAggregateOperator_StdDev_Sample.js';
-import { QueryBuilderAggregateOperator_Sum } from './aggregateOperators/QueryBuilderAggregateOperator_Sum.js';
-import { QueryBuilderSimpleProjectionColumnState } from './QueryBuilderProjectionState.js';
+import { QueryBuilderAggregateOperator_Average } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Average.js';
+import { QueryBuilderAggregateOperator_Count } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.js';
+import { QueryBuilderAggregateOperator_DistinctCount } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js';
+import { QueryBuilderAggregateOperator_Max } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.js';
+import { QueryBuilderAggregateOperator_Min } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.js';
+import { QueryBuilderAggregateOperator_StdDev_Population } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js';
+import { QueryBuilderAggregateOperator_StdDev_Sample } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js';
+import { QueryBuilderAggregateOperator_Sum } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.js';
+import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import {
   COLUMN_SORT_TYPE,
   SortColumnState,
-} from './QueryResultSetModifierState.js';
+} from './fetch-structure/projection/QueryResultSetModifierState.js';
+import type { QueryBuilderAggregateOperator } from './fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js';
 
 const PREVIEW_DATA_TAKE_LIMIT = 10;
 const PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME = 'Value';
@@ -90,7 +90,7 @@ const createProjectionColumn = (
 const createQueryBuilderState = (
   queryBuilderState: QueryBuilderState,
 ): QueryBuilderState => {
-  const builderState = queryBuilderState.createBareBuilderState();
+  const builderState = queryBuilderState.cloneQueryBuilderState();
   builderState.querySetupState = queryBuilderState.querySetupState;
   return builderState;
 };
@@ -191,15 +191,11 @@ export const buildNonNumericPreviewDataQuery = (
     valueCountProjectionState,
   );
   // result set
-  builderState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;
-  const sortValueCount = new SortColumnState(
-    builderState,
-    valueCountProjectionState,
-  );
+  builderState.fetchStructureState.projectionState.resultSetModifierState.limit =
+    PREVIEW_DATA_TAKE_LIMIT;
+  const sortValueCount = new SortColumnState(valueCountProjectionState);
   sortValueCount.sortType = COLUMN_SORT_TYPE.DESC;
-  builderState.resultSetModifierState.sortColumns = [
-    sortValueCount,
-    new SortColumnState(builderState, valueProjectionColState),
-  ];
+  builderState.fetchStructureState.projectionState.resultSetModifierState.sortColumns =
+    [sortValueCount, new SortColumnState(valueProjectionColState)];
   return builderState.resultState.buildExecutionRawLambda();
 };

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -52,8 +52,9 @@ import {
   DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
   INTERNAL__PropagatedValue,
   Association,
+  getGeneratedMilestonedPropertiesForAssociation,
 } from '@finos/legend-graph';
-import { generateDefaultValueForPrimitiveType } from './QueryBuilderValueSpecificationBuilderHelper.js';
+import { generateDefaultValueForPrimitiveType } from './QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import type { QueryBuilderSetupState } from './QueryBuilderSetupState.js';
 import { functionExpression_setParametersValues } from '@finos/legend-application';
@@ -67,9 +68,11 @@ export const getDerivedPropertyMilestoningSteoreotype = (
   if (owner instanceof Class) {
     return getMilestoneTemporalStereotype(owner, graph);
   } else if (owner instanceof Association) {
-    if (owner._generatedMilestonedProperties.length) {
+    const generatedMilestonedProperties =
+      getGeneratedMilestonedPropertiesForAssociation(owner, property);
+    if (generatedMilestonedProperties.length) {
       const ownerClass =
-        owner._generatedMilestonedProperties[0]?.genericType.value.rawType;
+        generatedMilestonedProperties[0]?.genericType.value.rawType;
       return getMilestoneTemporalStereotype(
         guaranteeType(ownerClass, Class),
         graph,

package/src/stores/QueryBuilderResultState.ts

@@ -36,7 +36,7 @@ import {
   RawExecutionResult,
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
-import { buildLambdaFunction } from './QueryBuilderLambdaBuilder.js';
+import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import {
   buildParametersLetLambdaFunc,
   ExecutionPlanState,

package/src/stores/QueryBuilderSetupState.ts

@@ -106,7 +106,7 @@ export class QueryBuilderSetupState {
   get classes(): Class[] {
     return this.queryBuilderState.graphManagerState.graph.ownClasses
       .concat(
-        this.queryBuilderState.graphManagerState.filterSystemElementOptions(
+        this.queryBuilderState.graphManagerState.collectExposedSystemElements(
           this.queryBuilderState.graphManagerState.graph.systemModel.ownClasses,
         ),
       )

package/src/stores/QueryBuilderState.ts

@@ -24,23 +24,19 @@ import {
   filterByType,
   hashObject,
 } from '@finos/legend-shared';
-import {
-  type QueryBuilderFilterOperator,
-  QueryBuilderFilterState,
-} from './QueryBuilderFilterState.js';
-import { QueryBuilderFetchStructureState } from './QueryBuilderFetchStructureState.js';
-import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
+import { QueryBuilderFilterState } from './filter/QueryBuilderFilterState.js';
+import { QueryBuilderFetchStructureState } from './fetch-structure/QueryBuilderFetchStructureState.js';
 import {
   QueryTextEditorMode,
   QueryTextEditorState,
 } from './QueryTextEditorState.js';
 import { QueryBuilderSetupState } from './QueryBuilderSetupState.js';
-import { QueryBuilderExplorerState } from './QueryBuilderExplorerState.js';
+import { QueryBuilderExplorerState } from './explorer/QueryBuilderExplorerState.js';
 import { QueryBuilderResultState } from './QueryBuilderResultState.js';
 import {
   processQueryBuilderLambdaFunction,
   processQueryParameters,
-} from './QueryBuilderLambdaProcessor.js';
+} from './QueryBuilderValueSpecificationProcessor.js';
 import { QueryBuilderUnsupportedState } from './QueryBuilderUnsupportedState.js';
 import {
   type Class,
@@ -62,25 +58,29 @@ import {
   buildLambdaVariableExpressions,
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
-import { buildLambdaFunction } from './QueryBuilderLambdaBuilder.js';
+import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import {
   LambdaParameterState,
   type GenericLegendApplicationStore,
 } from '@finos/legend-application';
-import { QueryBuilderPostFilterState } from './QueryBuilderPostFilterState.js';
-import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
-import { QueryFunctionsExplorerState } from './QueryFunctionsExplorerState.js';
+import { QueryFunctionsExplorerState } from './explorer/QueryFunctionsExplorerState.js';
 import { QueryParametersState } from './QueryParametersState.js';
-import {
-  AGGREGATION_OPERATORS,
-  FILTER_OPERATORS,
-  POST_FILTER_OPERATORS,
-} from './QueryBuilderOperatorLoader.js';
+import type { QueryBuilderFilterOperator } from './filter/QueryBuilderFilterOperator.js';
+import { getQueryBuilderCoreFilterOperators } from './filter/QueryBuilderFilterOperatorLoader.js';
+import { QueryResultSetModifierState } from './fetch-structure/projection/QueryResultSetModifierState.js';
 
 export abstract class QueryBuilderMode {
   abstract get isParametersDisabled(): boolean;
 
   abstract get isResultPanelHidden(): boolean;
+
+  /**
+   * This flag is for turning on/off dnd from projection panel to filter panel,
+   * and will be leveraged when the concepts of workflows are introduced into query builder.
+   */
+  get isDnDFetchStructureToFilterSupported(): boolean {
+    return true;
+  }
 }
 
 export class StandardQueryBuilderMode extends QueryBuilderMode {
@@ -122,20 +122,18 @@ export class QueryBuilderState {
   queryFunctionsExplorerState: QueryFunctionsExplorerState;
   fetchStructureState: QueryBuilderFetchStructureState;
   filterState: QueryBuilderFilterState;
-  postFilterState: QueryBuilderPostFilterState;
-  resultSetModifierState: QueryResultSetModifierState;
   resultState: QueryBuilderResultState;
   queryTextEditorState: QueryTextEditorState;
   queryUnsupportedState: QueryBuilderUnsupportedState;
   observableContext: ObserverContext;
-  filterOperators: QueryBuilderFilterOperator[] = FILTER_OPERATORS;
-  postFilterOperators: QueryBuilderPostFilterOperator[] = POST_FILTER_OPERATORS;
+  changeDetectionState: QueryBuilderChangeDetectionState;
   isCompiling = false;
   backdrop = false;
   showFunctionPanel = false;
   showParameterPanel = false;
-  showPostFilterPanel = false;
-  changeDetectionState: QueryBuilderChangeDetectionState;
+
+  filterOperators: QueryBuilderFilterOperator[] =
+    getQueryBuilderCoreFilterOperators();
 
   constructor(
     applicationStore: GenericLegendApplicationStore,
@@ -149,8 +147,6 @@ export class QueryBuilderState {
       queryFunctionsExplorerState: observable,
       fetchStructureState: observable,
       filterState: observable,
-      postFilterState: observable,
-      resultSetModifierState: observable,
       resultState: observable,
       queryTextEditorState: observable,
       queryUnsupportedState: observable,
@@ -159,7 +155,6 @@ export class QueryBuilderState {
       mode: observable,
       showFunctionPanel: observable,
       showParameterPanel: observable,
-      showPostFilterPanel: observable,
       changeDetectionState: observable,
       setMode: action,
       resetQueryBuilder: action,
@@ -169,7 +164,6 @@ export class QueryBuilderState {
       setBackdrop: action,
       setShowFunctionPanel: action,
       setShowParameterPanel: action,
-      setShowPostFilterPanel: action,
       changeClass: action,
       changeFetchStructure: action,
       compileQuery: flow,
@@ -182,16 +176,8 @@ export class QueryBuilderState {
     this.explorerState = new QueryBuilderExplorerState(this);
     this.queryParametersState = new QueryParametersState(this);
     this.queryFunctionsExplorerState = new QueryFunctionsExplorerState(this);
-    this.fetchStructureState = new QueryBuilderFetchStructureState(
-      this,
-      AGGREGATION_OPERATORS,
-    );
+    this.fetchStructureState = new QueryBuilderFetchStructureState(this);
     this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
-    this.postFilterState = new QueryBuilderPostFilterState(
-      this,
-      this.postFilterOperators,
-    );
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
     this.resultState = new QueryBuilderResultState(this);
     this.queryTextEditorState = new QueryTextEditorState(this);
     this.queryUnsupportedState = new QueryBuilderUnsupportedState(this);
@@ -218,10 +204,6 @@ export class QueryBuilderState {
     this.showParameterPanel = val;
   }
 
-  setShowPostFilterPanel(val: boolean): void {
-    this.showPostFilterPanel = val;
-  }
-
   getQuery(options?: { keepSourceInformation: boolean }): RawLambda {
     if (!this.isQuerySupported()) {
       const parameters = this.queryParametersState.parameterStates.map((e) =>
@@ -256,21 +238,13 @@ export class QueryBuilderState {
     this.explorerState.refreshTreeData();
     this.queryParametersState = new QueryParametersState(this);
     this.queryFunctionsExplorerState = new QueryFunctionsExplorerState(this);
-    const fetchStructureState = new QueryBuilderFetchStructureState(
-      this,
-      this.fetchStructureState.projectionState.aggregationState.operators,
-    );
+    const fetchStructureState = new QueryBuilderFetchStructureState(this);
     fetchStructureState.setFetchStructureMode(
       this.fetchStructureState.fetchStructureMode,
     );
     this.fetchStructureState = fetchStructureState;
-    this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
-    this.postFilterState = new QueryBuilderPostFilterState(
-      this,
-      this.postFilterOperators,
-    );
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
     this.fetchStructureState.graphFetchTreeState.initialize();
+    this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
   }
 
   initialize(rawLambda: RawLambda, options?: { notifyError: boolean }): void {
@@ -354,6 +328,7 @@ export class QueryBuilderState {
       const variableState = new LambdaParameterState(
         milestoningParameter,
         this.querySetupState.queryBuilderState.observableContext,
+        this.querySetupState.queryBuilderState.graphManagerState.graph,
       );
       variableState.mockParameterValue();
       this.queryParametersState.addParameter(variableState);
@@ -472,19 +447,21 @@ export class QueryBuilderState {
     this.explorerState.refreshTreeData();
   }
 
+  // TODO-BEFORE-PR: consider removing this
   changeFetchStructure(): void {
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
+    this.fetchStructureState.projectionState.resultSetModifierState =
+      new QueryResultSetModifierState(this.fetchStructureState.projectionState);
     const treeData = this.fetchStructureState.graphFetchTreeState.treeData;
     if (!treeData) {
       this.fetchStructureState.graphFetchTreeState.initialize();
     }
   }
 
-  isValidQueryBuilderState(): boolean {
-    return this.fetchStructureState.projectionState.isValidProjectionState();
+  get validationIssues(): string[] | undefined {
+    return this.fetchStructureState.validationIssues;
   }
 
-  createBareBuilderState(): QueryBuilderState {
+  cloneQueryBuilderState(): QueryBuilderState {
     return new QueryBuilderState(
       this.applicationStore,
       this.graphManagerState,

package/src/stores/QueryBuilderTestUtils.ts

@@ -23,6 +23,7 @@ import {
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
 import { jest } from '@jest/globals';
+import { flowResult } from 'mobx';
 import { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import { QueryBuilder_GraphManagerPreset } from '../graphManager/QueryBuilder_GraphManagerPreset.js';
 import {
@@ -87,7 +88,9 @@ export const TEST_setUpQueryBuilderState = async (
         ),
       );
 
-    await queryBuilderState.explorerState.analyzeMappingModelCoverage();
+    await flowResult(
+      queryBuilderState.explorerState.analyzeMappingModelCoverage(),
+    );
   }
   return queryBuilderState;
 };

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) {