@finos/legend-query-builder 4.10.1 → 4.10.2

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts

@@ -26,6 +26,7 @@ import {
   type Type,
   Enumeration,
   Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   assertTrue,
@@ -169,10 +170,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.aggregationState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.INTEGER);
+    return PrimitiveType.INTEGER;
   }
 
   get hashCode(): string {

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

@@ -23,8 +23,8 @@ import { type Hashable, uuid } from '@finos/legend-shared';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
-  TDS_COLUMN_GETTER,
 } from './QueryBuilderPostFilterState.js';
+import type { TDS_COLUMN_GETTER } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export abstract class QueryBuilderPostFilterOperator implements Hashable {
   readonly uuid = uuid();

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

@@ -22,8 +22,6 @@ import {
   type ExecutionResult,
   type VariableExpression,
   type SimpleFunctionExpression,
-  Enumeration,
-  PRIMITIVE_TYPE,
   observe_ValueSpecification,
   PrimitiveType,
   CollectionInstanceValue,
@@ -38,7 +36,6 @@ import {
   guaranteeNonNullable,
   guaranteeType,
   IllegalStateError,
-  UnsupportedOperationError,
   uuid,
   filterByType,
   ActionState,
@@ -78,6 +75,7 @@ import {
   isValueExpressionReferencedInValue,
 } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { buildtdsPropertyExpressionFromColState } from './operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { TDS_COLUMN_GETTER } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -85,53 +83,6 @@ export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   BLANK_CONDITION = 'BLANK_CONDITION',
 }
 
-export enum TDS_COLUMN_GETTER {
-  GET_STRING = 'getString',
-  GET_NUMBER = 'getNumber',
-  GET_INTEGER = 'getInteger',
-  GET_FLOAT = 'getFloat',
-  GET_DECIMAL = 'getDecimal',
-  GET_DATE = 'getDate',
-  GET_DATETIME = 'getDateTime',
-  GET_STRICTDATE = 'getStrictDate',
-  GET_BOOLEAN = 'getBoolean',
-  GET_ENUM = 'getEnum',
-  IS_NULL = 'isNull',
-  IS_NOT_NULL = 'isNotNull',
-}
-
-export const getTDSColumnDerivedProperyFromType = (
-  type: Type,
-): TDS_COLUMN_GETTER => {
-  if (type instanceof Enumeration) {
-    return TDS_COLUMN_GETTER.GET_ENUM;
-  }
-  switch (type.path) {
-    case PRIMITIVE_TYPE.STRING:
-      return TDS_COLUMN_GETTER.GET_STRING;
-    case PRIMITIVE_TYPE.NUMBER:
-      return TDS_COLUMN_GETTER.GET_NUMBER;
-    case PRIMITIVE_TYPE.INTEGER:
-      return TDS_COLUMN_GETTER.GET_INTEGER;
-    case PRIMITIVE_TYPE.FLOAT:
-      return TDS_COLUMN_GETTER.GET_FLOAT;
-    case PRIMITIVE_TYPE.DECIMAL:
-      return TDS_COLUMN_GETTER.GET_DECIMAL;
-    case PRIMITIVE_TYPE.DATE:
-      return TDS_COLUMN_GETTER.GET_DATE;
-    case PRIMITIVE_TYPE.DATETIME:
-      return TDS_COLUMN_GETTER.GET_DATETIME;
-    case PRIMITIVE_TYPE.STRICTDATE:
-      return TDS_COLUMN_GETTER.GET_STRICTDATE;
-    case PRIMITIVE_TYPE.BOOLEAN:
-      return TDS_COLUMN_GETTER.GET_BOOLEAN;
-    default:
-      throw new UnsupportedOperationError(
-        `Can't find TDS column derived property name for type: '${type.path}'`,
-      );
-  }
-};
-
 export const getTypeFromDerivedProperty = (
   derivedProperty: TDS_COLUMN_GETTER,
   graph: PureModel,

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

@@ -36,24 +36,29 @@ import {
 } from '@finos/legend-shared';
 import { QueryBuilderDerivationProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
-import { getTDSColumnState } from '../QueryBuilderTDSHelper.js';
+import {
+  getTDSColumnDerivedProperyFromType,
+  getTDSColumnState,
+} from '../QueryBuilderTDSHelper.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {
   type QueryBuilderPostFilterState,
-  getTDSColumnDerivedProperyFromType,
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
   QueryBuilderPostFilterTreeGroupNodeData,
-  TDS_COLUMN_GETTER,
   getTypeFromDerivedProperty,
   PostFilterValueSpecConditionValueState,
   PostFilterTDSColumnValueConditionValueState,
 } from './QueryBuilderPostFilterState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import {
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  TDS_COLUMN_GETTER,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
 import { simplifyValueExpression } from '../../../QueryBuilderValueSpecificationHelper.js';
+import { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
 
 const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
@@ -93,6 +98,19 @@ const findProjectionColumnState = (
         columnState.setReturnType(type);
       }
       return columnState;
+    } else if (
+      columnState instanceof QueryBuilderAggregateColumnState &&
+      columnState.projectionColumnState instanceof
+        QueryBuilderDerivationProjectionColumnState
+    ) {
+      const type = getTypeFromDerivedProperty(
+        tdsColumnGetter,
+        postFilterState.tdsState.queryBuilderState.graphManagerState.graph,
+      );
+      if (type) {
+        columnState.handleUsedPostFilterType(type);
+      }
+      return columnState;
     }
     const columnType = guaranteeNonNullable(columnState.getColumnType());
     assertTrue(

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

@@ -31,13 +31,13 @@ import {
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
+import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
 import {
-  type PostFilterConditionState,
+  QUERY_BUILDER_PURE_PATH,
   type TDS_COLUMN_GETTER,
-  getTDSColumnDerivedProperyFromType,
-} from '../QueryBuilderPostFilterState.js';
-import { QUERY_BUILDER_PURE_PATH } from '../../../../../graph/QueryBuilderMetaModelConst.js';
+} from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
+import { getTDSColumnDerivedProperyFromType } from '../../QueryBuilderTDSHelper.js';
 
 export const buildtdsPropertyExpressionFromColState = (
   filterConditionState: PostFilterConditionState,

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

@@ -26,7 +26,6 @@ import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBui
 import {
   type PostFilterConditionState,
   type QueryBuilderPostFilterState,
-  TDS_COLUMN_GETTER,
   PostFilterValueSpecConditionValueState,
 } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
@@ -34,6 +33,7 @@ import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOper
 import { isPropertyExpressionChainOptional } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
+import { TDS_COLUMN_GETTER } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilderPostFilterOperator_IsEmpty
   extends QueryBuilderPostFilterOperator

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -37,7 +37,10 @@ import {
   isNonNullable,
   returnUndefOnError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import {
+  COLUMN_SORT_TYPE,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
 import {
@@ -51,10 +54,7 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from './QueryBuilderProjectionColumnState.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import {
-  COLUMN_SORT_TYPE,
-  SortColumnState,
-} from '../QueryResultSetModifierState.js';
+import { SortColumnState } from '../QueryResultSetModifierState.js';
 
 export const processTDSProjectExpression = (
   expression: SimpleFunctionExpression,

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -40,7 +40,6 @@ import {
 } from './QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
-  COLUMN_SORT_TYPE,
   type QueryResultSetModifierState,
   type SortColumnState,
 } from '../QueryResultSetModifierState.js';
@@ -49,24 +48,15 @@ import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderVa
 import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
 import { appendOLAPGroupByState } from '../window/QueryBuilderWindowValueSpecificationBuilder.js';
 import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
+import { buildTDSSortTypeExpression } from '../QueryBuilderTDSHelper.js';
 
 const buildSortExpression = (
   sortColumnState: SortColumnState,
-): SimpleFunctionExpression => {
-  const sortColumnFunction = new SimpleFunctionExpression(
-    extractElementNameFromPath(
-      sortColumnState.sortType === COLUMN_SORT_TYPE.ASC
-        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC
-        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC,
-    ),
+): SimpleFunctionExpression =>
+  buildTDSSortTypeExpression(
+    sortColumnState.sortType,
+    sortColumnState.columnState.columnName,
   );
-  const sortColumnName = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
-  );
-  sortColumnName.values = [sortColumnState.columnState.columnName];
-  sortColumnFunction.parametersValues[0] = sortColumnName;
-  return sortColumnFunction;
-};
 
 const appendResultSetModifier = (
   resultModifierState: QueryResultSetModifierState,

package/src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts

@@ -29,8 +29,8 @@ import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderProjectionColumnDragSource } from '../projection/QueryBuilderProjectionColumnState.js';
 import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import type { COLUMN_SORT_TYPE } from '../QueryResultSetModifierState.js';
 import type { QueryBuilderTDS_WindowOperator } from './operators/QueryBuilderTDS_WindowOperator.js';
+import type { COLUMN_SORT_TYPE } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export const QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE = 'WINDOW_COLUMN';