@finos/legend-query-builder 4.14.88 → 4.14.89

package/src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts

@@ -23,6 +23,7 @@ import {
   guaranteeType,
   isNonNullable,
   returnUndefOnError,
+  UnsupportedOperationError,
 } from '@finos/legend-shared';
 import {
   type V1_GraphBuilderContext,
@@ -62,6 +63,10 @@ import {
   ColSpecArrayInstance,
   ColSpecArray,
   ColSpec,
+  Relation_RelationType,
+  Relation_RelationalColumn,
+  getValueSpecificationReturnType,
+  Relation_Relation,
 } from '@finos/legend-graph';
 import {
   QUERY_BUILDER_PURE_PATH,
@@ -641,7 +646,7 @@ const V1_buildTypedProjectFunctionExpression = (
   const processedExpression = new ColSpecArrayInstance(Multiplicity.ONE);
   const processedColSpecArray = new ColSpecArray();
   processedExpression.values = [processedColSpecArray];
-
+  const relationType = new Relation_RelationType(Relation_RelationType.ID);
   processedColSpecArray.colSpecs = specArray.colSpecs.map((colSpec) => {
     const pColSpec = new ColSpec();
     let lambda: ValueSpecification;
@@ -667,6 +672,16 @@ const V1_buildTypedProjectFunctionExpression = (
     }
     pColSpec.function1 = lambda;
     pColSpec.name = colSpec.name;
+    const returnType = getValueSpecificationReturnType(lambda);
+    if (returnType) {
+      relationType.columns.push(
+        new Relation_RelationalColumn(colSpec.name, returnType),
+      );
+    } else {
+      throw new UnsupportedOperationError(
+        'Unable to get return type for current lambda',
+      );
+    }
     return pColSpec;
   });
 
@@ -675,12 +690,13 @@ const V1_buildTypedProjectFunctionExpression = (
     functionName,
     compileContext,
   );
-  expression.genericType = GenericTypeExplicitReference.create(
-    new GenericType(
-      compileContext.resolveType(QUERY_BUILDER_PURE_PATH.RELATION).value,
-    ),
-  );
-
+  const relationGenericType = new GenericType(Relation_Relation.INSTANCE);
+  const relationTypeGenericType = new GenericType(relationType);
+  relationGenericType.typeArguments = [
+    GenericTypeExplicitReference.create(relationTypeGenericType),
+  ];
+  expression.genericType =
+    GenericTypeExplicitReference.create(relationGenericType);
   return expression;
 };
 

package/src/index.ts

@@ -35,6 +35,8 @@ export { QUERY_BUILDER_COMPONENT_ELEMENT_ID } from './components/QueryBuilderCom
 export {
   type QueryableSourceInfo as QuerySDLC,
   QueryBuilderState,
+  QUERY_BUILDER_LAMBDA_WRITER_MODE,
+  INTERNAL__BasicQueryBuilderState,
 } from './stores/QueryBuilderState.js';
 export {
   getTDSColumnDerivedProperyFromType,
@@ -59,6 +61,10 @@ export {
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
   QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS,
 } from './graph/QueryBuilderMetaModelConst.js';
+export {
+  TEST__LegendApplicationPluginManager,
+  TEST__getGenericApplicationConfig,
+} from './stores/__test-utils__/QueryBuilderStateTestUtils.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';
@@ -87,6 +93,7 @@ export {
   getQueryBuilderExplorerTreeNodeSortRank,
   QueryBuilderSubclassInfoTooltip,
 } from './components/explorer/QueryBuilderExplorerPanel.js';
+export { QueryBuilderActionConfig } from './stores/query-workflow/QueryBuilderWorkFlowState.js';
 // ------------------------------------------- Shared components -------------------------------------------
 
 export * from './components/shared/LambdaEditor.js';

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

@@ -16,6 +16,7 @@
 
 import type {
   FunctionExpression,
+  LambdaFunction,
   Type,
   ValueSpecification,
 } from '@finos/legend-graph';
@@ -57,6 +58,7 @@ export abstract class QueryBuilderPostFilterOperator implements Hashable {
 
   abstract buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined;
 
   abstract buildPostFilterConditionState(

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

@@ -26,6 +26,7 @@ import {
   PrimitiveType,
   CollectionInstanceValue,
   InstanceValue,
+  type LambdaFunction,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -298,7 +299,10 @@ export abstract class PostFilterConditionValueState implements Hashable {
     ]);
   }
 
-  abstract appendConditionValue(expressionVal: SimpleFunctionExpression): void;
+  abstract appendConditionValue(
+    expressionVal: SimpleFunctionExpression,
+    parentExpression: LambdaFunction | undefined,
+  ): void;
 }
 
 export class PostFilterValueSpecConditionValueState extends PostFilterConditionValueState {
@@ -341,7 +345,10 @@ export class PostFilterValueSpecConditionValueState extends PostFilterConditionV
       : undefined;
     return this.value;
   }
-  override appendConditionValue(expressionVal: SimpleFunctionExpression): void {
+  override appendConditionValue(
+    expressionVal: SimpleFunctionExpression,
+    parentExpression: LambdaFunction | undefined,
+  ): void {
     if (this.value) {
       expressionVal.parametersValues.push(this.value);
     }
@@ -381,13 +388,17 @@ export class PostFilterTDSColumnValueConditionValueState extends PostFilterCondi
   override get isCollection(): boolean {
     return false;
   }
-  override appendConditionValue(expressionVal: SimpleFunctionExpression): void {
+  override appendConditionValue(
+    expressionVal: SimpleFunctionExpression,
+    parentExpression: LambdaFunction | undefined,
+  ): void {
     const tdsPropertyExpression = buildtdsPropertyExpressionFromColState(
       this.conditionState,
       this.tdsColumn,
       this.conditionState.postFilterState.tdsState.queryBuilderState
         .graphManagerState.graph,
       undefined,
+      parentExpression,
     );
     expressionVal.parametersValues.push(tdsPropertyExpression);
   }

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

@@ -188,17 +188,20 @@ export const buildPostFilterConditionState = (
     );
 
     // get projection column
-    const tdsColumnPropertyExpression = guaranteeType(
-      expression.parametersValues[0],
-      AbstractPropertyExpression,
-      `Can't process ${extractElementNameFromPath(
-        operatorFunctionFullPath,
-      )}() expression: expects property expression in lambda body`,
-    );
-    const columnState = findProjectionColumnState(
-      tdsColumnPropertyExpression,
-      postFilterState,
-    );
+    const paramValue = expression.parametersValues[0];
+    let columnState: QueryBuilderTDSColumnState;
+    if (paramValue instanceof AbstractPropertyExpression) {
+      columnState = findProjectionColumnState(paramValue, postFilterState);
+    } else if (paramValue instanceof FunctionExpression) {
+      const columnName = paramValue.functionName;
+      columnState = getTDSColumnState(postFilterState.tdsState, columnName);
+    } else {
+      throw new UnsupportedOperationError(
+        `Can't process ${extractElementNameFromPath(
+          operatorFunctionFullPath,
+        )}() expression: expects property expression in lambda body`,
+      );
+    }
 
     // get operation value specification
     const rightSide = expression.parametersValues[1];

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

@@ -34,10 +34,12 @@ import {
 const buildPostFilterExpression = (
   postFilterState: QueryBuilderPostFilterState,
   node: QueryBuilderPostFilterTreeNodeData,
+  parentExpression: LambdaFunction | undefined,
 ): ValueSpecification | undefined => {
   if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
     return node.condition.operator.buildPostFilterConditionExpression(
       node.condition,
+      parentExpression,
     );
   } else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
     const func = new SimpleFunctionExpression(
@@ -46,7 +48,9 @@ const buildPostFilterExpression = (
     const clauses = node.childrenIds
       .map((e) => postFilterState.nodes.get(e))
       .filter(isNonNullable)
-      .map((e) => buildPostFilterExpression(postFilterState, e))
+      .map((e) =>
+        buildPostFilterExpression(postFilterState, e, parentExpression),
+      )
       .filter(isNonNullable);
     /**
      * NOTE: Due to a limitation (or perhaps design decision) in the engine, group operations
@@ -84,8 +88,10 @@ export const appendPostFilter = (
   lambdaFunction: LambdaFunction,
 ): LambdaFunction => {
   const postFilterConditionExpressions = postFilterState.rootIds
-    .map((e) => guaranteeNonNullable(postFilterState.nodes.get(e)))
-    .map((e) => buildPostFilterExpression(postFilterState, e))
+    .map((node) => guaranteeNonNullable(postFilterState.nodes.get(node)))
+    .map((_node) =>
+      buildPostFilterExpression(postFilterState, _node, lambdaFunction),
+    )
     .filter(isNonNullable);
   if (
     !postFilterConditionExpressions.length ||

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

@@ -15,9 +15,9 @@
  */
 
 import {
-  type FunctionExpression,
   AbstractPropertyExpression,
   extractElementNameFromPath,
+  FunctionExpression,
   GenericType,
   GenericTypeExplicitReference,
   PrimitiveInstanceValue,
@@ -28,6 +28,8 @@ import {
   Multiplicity,
   PrimitiveType,
   type PureModel,
+  type LambdaFunction,
+  getRelationTypeGenericType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
@@ -44,38 +46,55 @@ export const buildtdsPropertyExpressionFromColState = (
   colState: QueryBuilderTDSColumnState,
   graph: PureModel,
   operator: QueryBuilderPostFilterOperator | undefined,
-): AbstractPropertyExpression => {
-  const tdsPropertyExpression = new AbstractPropertyExpression('');
-  let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
-  const correspondingTDSDerivedProperty = operator
-    ? operator.getTDSColumnGetter()
+  parentExpression: LambdaFunction | undefined,
+): FunctionExpression => {
+  const relationType = parentExpression?.expressionSequence[0]
+    ? getRelationTypeGenericType(parentExpression.expressionSequence[0])
     : undefined;
-  if (correspondingTDSDerivedProperty) {
-    tdsDerivedPropertyName = correspondingTDSDerivedProperty;
-  } else {
-    const type = guaranteeNonNullable(colState.getColumnType());
-    tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
-  }
-  tdsPropertyExpression.func = PropertyExplicitReference.create(
-    guaranteeNonNullable(
-      getAllClassDerivedProperties(
-        graph.getClass(QUERY_BUILDER_PURE_PATH.TDS_ROW),
-      ).find((p) => p.name === tdsDerivedPropertyName),
-    ),
-  );
   const variableName = new VariableExpression(
     filterConditionState.postFilterState.lambdaParameterName,
     Multiplicity.ONE,
   );
-  const colInstanceValue = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
-  );
-  colInstanceValue.values = [colState.columnName];
-  tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
-  return tdsPropertyExpression;
+  if (relationType) {
+    const col = guaranteeNonNullable(
+      relationType.columns.find((e) => colState.columnName === e.name),
+      `Can't find property ${colState.columnName} in relation`,
+    );
+    const _funcExp = new FunctionExpression(col.name);
+    _funcExp.func = col;
+    _funcExp.parametersValues = [variableName];
+    return _funcExp;
+  } else {
+    const tdsPropertyExpression = new AbstractPropertyExpression('');
+    let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
+    const correspondingTDSDerivedProperty = operator
+      ? operator.getTDSColumnGetter()
+      : undefined;
+    if (correspondingTDSDerivedProperty) {
+      tdsDerivedPropertyName = correspondingTDSDerivedProperty;
+    } else {
+      const type = guaranteeNonNullable(colState.getColumnType());
+      tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
+    }
+    tdsPropertyExpression.func = PropertyExplicitReference.create(
+      guaranteeNonNullable(
+        getAllClassDerivedProperties(
+          graph.getClass(QUERY_BUILDER_PURE_PATH.TDS_ROW),
+        ).find((p) => p.name === tdsDerivedPropertyName),
+      ),
+    );
+    const colInstanceValue = new PrimitiveInstanceValue(
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
+    );
+    colInstanceValue.values = [colState.columnName];
+    tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
+    return tdsPropertyExpression;
+  }
 };
 
-export const buildPostFilterConditionExpression = (
+export const buildPostFilterConditionExpressionHelper = (
   filterConditionState: PostFilterConditionState,
   operator: QueryBuilderPostFilterOperator,
   /**
@@ -85,6 +104,7 @@ export const buildPostFilterConditionExpression = (
    * This is the case because with TDS, we are provided some filter-like operators, e.g. IS_NULL, IS_NOT_NULL, etc.
    */
   operatorFunctionFullPath: string | undefined,
+  parentExpression: LambdaFunction | undefined,
 ): FunctionExpression => {
   // primitives
   const graph =
@@ -96,6 +116,7 @@ export const buildPostFilterConditionExpression = (
     filterConditionState.leftConditionValue,
     graph,
     operator,
+    parentExpression,
   );
 
   if (operatorFunctionFullPath) {
@@ -103,7 +124,10 @@ export const buildPostFilterConditionExpression = (
       extractElementNameFromPath(operatorFunctionFullPath),
     );
     expression.parametersValues.push(tdsPropertyExpression);
-    filterConditionState.rightConditionValue.appendConditionValue(expression);
+    filterConditionState.rightConditionValue.appendConditionValue(
+      expression,
+      parentExpression,
+    );
     return expression;
   } else {
     return tdsPropertyExpression;

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

@@ -18,6 +18,7 @@ import {
   type SimpleFunctionExpression,
   type Type,
   type ValueSpecification,
+  type LambdaFunction,
   type FunctionExpression,
   PRIMITIVE_TYPE,
   PrimitiveType,
@@ -38,7 +39,7 @@ import {
   buildNotExpression,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -93,11 +94,13 @@ export class QueryBuilderPostFilterOperator_Contain
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.CONTAINS,
+      parentExpression,
     );
   }
 
@@ -126,9 +129,11 @@ export class QueryBuilderPostFilterOperator_NotContain extends QueryBuilderPostF
   }
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
+      parentExpression,
     );
     return expression ? buildNotExpression(expression) : undefined;
   }

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

@@ -18,6 +18,7 @@ import {
   type Type,
   type ValueSpecification,
   type FunctionExpression,
+  type LambdaFunction,
   PRIMITIVE_TYPE,
   PrimitiveType,
 } from '@finos/legend-graph';
@@ -36,7 +37,7 @@ import {
   buildNotExpression,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -88,11 +89,13 @@ export class QueryBuilderPostFilterOperator_EndWith
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.ENDS_WITH,
+      parentExpression,
     );
   }
 
@@ -122,9 +125,11 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
+      parentExpression,
     );
     return expression ? buildNotExpression(expression) : undefined;
   }

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type FunctionExpression,
+  type LambdaFunction,
   AbstractPropertyExpression,
   Enumeration,
   PRIMITIVE_TYPE,
@@ -40,7 +41,7 @@ import {
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -106,8 +107,9 @@ export class QueryBuilderPostFilterOperator_Equal
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       postFilterConditionState.leftConditionValue.getColumnType() ===
@@ -116,6 +118,7 @@ export class QueryBuilderPostFilterOperator_Equal
           PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL,
+      parentExpression,
     );
   }
 
@@ -150,9 +153,11 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
+      parentExpression,
     );
     return expression ? buildNotExpression(expression) : undefined;
   }

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

@@ -18,6 +18,7 @@ import {
   type Type,
   type ValueSpecification,
   type FunctionExpression,
+  type LambdaFunction,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
   PrimitiveType,
@@ -35,7 +36,7 @@ import type {
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
 import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -107,8 +108,9 @@ export class QueryBuilderPostFilterOperator_GreaterThan
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       postFilterConditionState.leftConditionValue.getColumnType() ===
@@ -117,6 +119,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
           PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN,
+      parentExpression,
     );
   }
 

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

@@ -17,6 +17,7 @@
 import {
   type FunctionExpression,
   type ValueSpecification,
+  type LambdaFunction,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
   PrimitiveType,
@@ -26,7 +27,7 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QueryBuilderPostFilterOperator_GreaterThan } from './QueryBuilderPostFilterOperator_GreaterThan.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { hashArray } from '@finos/legend-shared';
@@ -39,8 +40,9 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       postFilterConditionState.leftConditionValue.getColumnType() ===
@@ -49,6 +51,7 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
           PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
+      parentExpression,
     );
   }
 

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type FunctionExpression,
+  type LambdaFunction,
   CollectionInstanceValue,
   Enumeration,
   PRIMITIVE_TYPE,
@@ -39,7 +40,7 @@ import {
   type PostFilterConditionState,
   type QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
   getCollectionValueSpecificationType,
@@ -139,11 +140,13 @@ export class QueryBuilderPostFilterOperator_In
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.IN,
+      parentExpression,
     );
   }
 
@@ -173,9 +176,11 @@ export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilter
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
+      parentExpression,
     );
     return expression ? buildNotExpression(expression) : undefined;
   }

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

@@ -18,6 +18,7 @@ import {
   type Type,
   type ValueSpecification,
   type FunctionExpression,
+  type LambdaFunction,
   Enumeration,
   PrimitiveType,
 } from '@finos/legend-graph';
@@ -29,7 +30,7 @@ import {
   PostFilterValueSpecConditionValueState,
 } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { isPropertyExpressionChainOptional } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -91,11 +92,13 @@ export class QueryBuilderPostFilterOperator_IsEmpty
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       undefined,
+      parentExpression,
     );
   }