@finos/legend-query-builder 0.1.2 → 0.2.0

package/src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.ts

@@ -31,7 +31,7 @@ import {
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
-} from './QueryBuilderAggregateOperatorHelper.js';
+} from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
@@ -52,7 +52,7 @@ export class QueryBuilderAggregateOperator_Sum
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       return (
         [
           PRIMITIVE_TYPE.NUMBER,
@@ -72,8 +72,8 @@ export class QueryBuilderAggregateOperator_Sum
   ): ValueSpecification {
     return buildAggregateExpression(
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUM,
-      graph,
       variableName,
+      graph,
     );
   }
 

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

@@ -57,7 +57,7 @@ const findProjectionColumnState = (
   postFilterState: QueryBuilderPostFilterState,
 ): QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState => {
   const projectionState = postFilterState.projectionState;
-  const properyExpressionName = propertyExpression.func.name;
+  const properyExpressionName = propertyExpression.func.value.name;
   assertTrue(
     Object.values(TDS_COLUMN_GETTER).includes(
       properyExpressionName as TDS_COLUMN_GETTER,
@@ -121,7 +121,7 @@ export const buildPostFilterConditionState = (
   if (
     tdsColumnGetter &&
     expression instanceof AbstractPropertyExpression &&
-    expression.func.name === tdsColumnGetter
+    expression.func.value.name === tdsColumnGetter
   ) {
     const columnState = findProjectionColumnState(expression, postFilterState);
     postConditionState = new PostFilterConditionState(

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

@@ -33,7 +33,7 @@ import {
 } from './QueryBuilderPostFilterState.js';
 
 const buildPostFilterExpression = (
-  filterState: QueryBuilderPostFilterState,
+  postFilterState: QueryBuilderPostFilterState,
   node: QueryBuilderPostFilterTreeNodeData,
 ): ValueSpecification | undefined => {
   if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
@@ -42,7 +42,7 @@ const buildPostFilterExpression = (
     );
   } else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
     const multiplicityOne =
-      filterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+      postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
         TYPICAL_MULTIPLICITY_TYPE.ONE,
       );
     const func = new SimpleFunctionExpression(
@@ -50,9 +50,9 @@ const buildPostFilterExpression = (
       multiplicityOne,
     );
     const clauses = node.childrenIds
-      .map((e) => filterState.nodes.get(e))
+      .map((e) => postFilterState.nodes.get(e))
       .filter(isNonNullable)
-      .map((e) => buildPostFilterExpression(filterState, e))
+      .map((e) => buildPostFilterExpression(postFilterState, e))
       .filter(isNonNullable);
     /**
      * NOTE: Due to a limitation (or perhaps design decision) in the engine, group operations
@@ -88,7 +88,7 @@ const buildPostFilterExpression = (
 
 export const appendPostFilter = (
   postFilterState: QueryBuilderPostFilterState,
-  lambda: LambdaFunction,
+  lambdaFunction: LambdaFunction,
 ): LambdaFunction => {
   const postFilterConditionExpressions = postFilterState.rootIds
     .map((e) => guaranteeNonNullable(postFilterState.nodes.get(e)))
@@ -96,9 +96,9 @@ export const appendPostFilter = (
     .filter(isNonNullable);
   if (
     !postFilterConditionExpressions.length ||
-    lambda.expressionSequence.length !== 1
+    lambdaFunction.expressionSequence.length !== 1
   ) {
-    return lambda;
+    return lambdaFunction;
   }
   const multiplicityOne =
     postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
@@ -114,8 +114,10 @@ export const appendPostFilter = (
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER),
     multiplicityOne,
   );
-  const currentExpression = guaranteeNonNullable(lambda.expressionSequence[0]);
+  const currentExpression = guaranteeNonNullable(
+    lambdaFunction.expressionSequence[0],
+  );
   filterExpression.parametersValues = [currentExpression, filterLambda];
-  lambda.expressionSequence[0] = filterExpression;
-  return lambda;
+  lambdaFunction.expressionSequence[0] = filterExpression;
+  return lambdaFunction;
 };

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts

@@ -16,30 +16,10 @@
 
 import {
   type Multiplicity,
-  type FunctionExpression,
-  AbstractPropertyExpression,
-  extractElementNameFromPath,
-  GenericType,
-  GenericTypeExplicitReference,
-  PrimitiveInstanceValue,
-  PRIMITIVE_TYPE,
-  SimpleFunctionExpression,
   TYPICAL_MULTIPLICITY_TYPE,
-  VariableExpression,
-  getAllClassDerivedProperties,
-  CORE_PURE_PATH,
 } from '@finos/legend-graph';
-import {
-  guaranteeNonNullable,
-  UnsupportedOperationError,
-} from '@finos/legend-shared';
+import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import {
-  type PostFilterConditionState,
-  type TDS_COLUMN_GETTER,
-  getTDSColumnDerivedProperyFromType,
-} from '../QueryBuilderPostFilterState.js';
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
@@ -55,7 +35,7 @@ export const getColumnMultiplicity = (
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
   } else if (columnState instanceof QueryBuilderSimpleProjectionColumnState) {
-    return columnState.propertyExpressionState.propertyExpression.func
+    return columnState.propertyExpressionState.propertyExpression.func.value
       .multiplicity;
   }
   throw new UnsupportedOperationError(
@@ -63,67 +43,3 @@ export const getColumnMultiplicity = (
     columnState,
   );
 };
-
-export const buildPostFilterConditionExpression = (
-  filterConditionState: PostFilterConditionState,
-  operator: QueryBuilderPostFilterOperator,
-  /**
-   * If provided, this will be used to construct the simple
-   * function expression for the function with the specified
-   * name. If not provided, we will fall back to use the TDS column getter function expression.
-   * 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,
-): FunctionExpression => {
-  // primitives
-  const graph =
-    filterConditionState.postFilterState.projectionState.queryBuilderState
-      .graphManagerState.graph;
-  const multiplicityOne = graph.getTypicalMultiplicity(
-    TYPICAL_MULTIPLICITY_TYPE.ONE,
-  );
-  const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
-  // property expression
-  const colState = filterConditionState.columnState;
-  const tdsPropertyExpression = new AbstractPropertyExpression(
-    '',
-    multiplicityOne,
-  );
-  let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
-  const correspondingTdsDerivedProperty = operator.getTdsColumnGetter();
-  if (correspondingTdsDerivedProperty) {
-    tdsDerivedPropertyName = correspondingTdsDerivedProperty;
-  } else {
-    const type = guaranteeNonNullable(colState.getReturnType());
-    tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
-  }
-  tdsPropertyExpression.func = guaranteeNonNullable(
-    getAllClassDerivedProperties(graph.getClass(CORE_PURE_PATH.TDS_ROW)).find(
-      (p) => p.name === tdsDerivedPropertyName,
-    ),
-  );
-  const variableName = new VariableExpression(
-    filterConditionState.postFilterState.lambdaParameterName,
-    multiplicityOne,
-  );
-  const colInstanceValue = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(typeString)),
-    multiplicityOne,
-  );
-  colInstanceValue.values = [colState.columnName];
-  tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
-
-  if (operatorFunctionFullPath) {
-    const expression = new SimpleFunctionExpression(
-      extractElementNameFromPath(operatorFunctionFullPath),
-      multiplicityOne,
-    );
-    expression.parametersValues.push(tdsPropertyExpression);
-    if (filterConditionState.value) {
-      expression.parametersValues.push(filterConditionState.value);
-    }
-    return expression;
-  } else {
-    return tdsPropertyExpression;
-  }
-};

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

@@ -0,0 +1,104 @@
+/**
+ * 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 {
+  type FunctionExpression,
+  AbstractPropertyExpression,
+  extractElementNameFromPath,
+  GenericType,
+  GenericTypeExplicitReference,
+  PrimitiveInstanceValue,
+  PRIMITIVE_TYPE,
+  SimpleFunctionExpression,
+  TYPICAL_MULTIPLICITY_TYPE,
+  VariableExpression,
+  getAllClassDerivedProperties,
+  CORE_PURE_PATH,
+  PropertyExplicitReference,
+} from '@finos/legend-graph';
+import { guaranteeNonNullable } from '@finos/legend-shared';
+import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
+import {
+  type PostFilterConditionState,
+  type TDS_COLUMN_GETTER,
+  getTDSColumnDerivedProperyFromType,
+} from '../QueryBuilderPostFilterState.js';
+
+export const buildPostFilterConditionExpression = (
+  filterConditionState: PostFilterConditionState,
+  operator: QueryBuilderPostFilterOperator,
+  /**
+   * If provided, this will be used to construct the simple
+   * function expression for the function with the specified
+   * name. If not provided, we will fall back to use the TDS column getter function expression.
+   * 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,
+): FunctionExpression => {
+  // primitives
+  const graph =
+    filterConditionState.postFilterState.projectionState.queryBuilderState
+      .graphManagerState.graph;
+  const multiplicityOne = graph.getTypicalMultiplicity(
+    TYPICAL_MULTIPLICITY_TYPE.ONE,
+  );
+  const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
+  // property expression
+  const colState = filterConditionState.columnState;
+  const tdsPropertyExpression = new AbstractPropertyExpression(
+    '',
+    multiplicityOne,
+  );
+  let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
+  const correspondingTdsDerivedProperty = operator.getTdsColumnGetter();
+  if (correspondingTdsDerivedProperty) {
+    tdsDerivedPropertyName = correspondingTdsDerivedProperty;
+  } else {
+    const type = guaranteeNonNullable(colState.getReturnType());
+    tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
+  }
+  tdsPropertyExpression.func = PropertyExplicitReference.create(
+    guaranteeNonNullable(
+      getAllClassDerivedProperties(graph.getClass(CORE_PURE_PATH.TDS_ROW)).find(
+        (p) => p.name === tdsDerivedPropertyName,
+      ),
+    ),
+  );
+  const variableName = new VariableExpression(
+    filterConditionState.postFilterState.lambdaParameterName,
+    multiplicityOne,
+  );
+  const colInstanceValue = new PrimitiveInstanceValue(
+    GenericTypeExplicitReference.create(new GenericType(typeString)),
+    multiplicityOne,
+  );
+  colInstanceValue.values = [colState.columnName];
+  tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
+
+  if (operatorFunctionFullPath) {
+    const expression = new SimpleFunctionExpression(
+      extractElementNameFromPath(operatorFunctionFullPath),
+      multiplicityOne,
+    );
+    expression.parametersValues.push(tdsPropertyExpression);
+    if (filterConditionState.value) {
+      expression.parametersValues.push(filterConditionState.value);
+    }
+    return expression;
+  } else {
+    return tdsPropertyExpression;
+  }
+};

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

@@ -20,7 +20,6 @@ import {
   type ValueSpecification,
   type FunctionExpression,
   PRIMITIVE_TYPE,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -40,9 +39,10 @@ import {
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_Contain
   extends QueryBuilderPostFilterOperator
@@ -133,9 +133,9 @@ export class QueryBuilderPostFilterOperator_NotContain extends QueryBuilderPostF
     );
     return expression
       ? buildNotExpression(
+          expression,
           postFilterConditionState.postFilterState.projectionState
             .queryBuilderState.graphManagerState.graph,
-          expression,
         )
       : undefined;
   }

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

@@ -19,7 +19,6 @@ import {
   type ValueSpecification,
   type FunctionExpression,
   PRIMITIVE_TYPE,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -38,9 +37,10 @@ import {
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_EndWith
   extends QueryBuilderPostFilterOperator
@@ -130,9 +130,9 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
     );
     return expression
       ? buildNotExpression(
+          expression,
           postFilterConditionState.postFilterState.projectionState
             .queryBuilderState.graphManagerState.graph,
-          expression,
         )
       : undefined;
   }

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

@@ -29,7 +29,6 @@ import {
   PRIMITIVE_TYPE,
   TYPICAL_MULTIPLICITY_TYPE,
   SUPPORTED_FUNCTIONS,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -50,9 +49,11 @@ import {
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { instanceValue_setValues } from '../../../../shared/ValueSpecificationModifierHelper.js';
 
 export class QueryBuilderPostFilterOperator_Equal
   extends QueryBuilderPostFilterOperator
@@ -140,9 +141,9 @@ export class QueryBuilderPostFilterOperator_Equal
               ),
               multiplicityOne,
             );
-            enumValueInstanceValue.values = [
+            instanceValue_setValues(enumValueInstanceValue, [
               EnumValueExplicitReference.create(propertyType.values[0] as Enum),
-            ];
+            ]);
             return enumValueInstanceValue;
           }
           throw new UnsupportedOperationError(
@@ -182,8 +183,8 @@ export class QueryBuilderPostFilterOperator_Equal
       postFilterState,
       expression,
       expression.parametersValues[0] instanceof AbstractPropertyExpression &&
-        expression.parametersValues[0].func.genericType.value.rawType.path ===
-          PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[0].func.value.genericType.value.rawType
+          .path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? SUPPORTED_FUNCTIONS.IS_ON_DAY
@@ -209,9 +210,9 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
     );
     return expression
       ? buildNotExpression(
+          expression,
           postFilterConditionState.postFilterState.projectionState
             .queryBuilderState.graphManagerState.graph,
-          expression,
         )
       : undefined;
   }

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

@@ -21,7 +21,6 @@ import {
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
   SUPPORTED_FUNCTIONS,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -40,9 +39,10 @@ import {
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_GreaterThan
   extends QueryBuilderPostFilterOperator
@@ -137,8 +137,8 @@ export class QueryBuilderPostFilterOperator_GreaterThan
       postFilterState,
       expression,
       expression.parametersValues[0] instanceof AbstractPropertyExpression &&
-        expression.parametersValues[0].func.genericType.value.rawType.path ===
-          PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[0].func.value.genericType.value.rawType
+          .path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? SUPPORTED_FUNCTIONS.IS_AFTER_DAY

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

@@ -26,7 +26,7 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QueryBuilderPostFilterOperator_GreaterThan } from './QueryBuilderPostFilterOperator_GreaterThan.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
@@ -60,8 +60,8 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
       postFilterState,
       expression,
       expression.parametersValues[0] instanceof AbstractPropertyExpression &&
-        expression.parametersValues[0].func.genericType.value.rawType.path ===
-          PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[0].func.value.genericType.value.rawType
+          .path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? SUPPORTED_FUNCTIONS.IS_AFTER_DAY

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

@@ -38,7 +38,7 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
   getCollectionValueSpecificationType,
@@ -176,9 +176,9 @@ export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilter
     );
     return expression
       ? buildNotExpression(
+          expression,
           postFilterConditionState.postFilterState.projectionState
             .queryBuilderState.graphManagerState.graph,
-          expression,
         )
       : undefined;
   }

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

@@ -29,7 +29,7 @@ import {
   TDS_COLUMN_GETTER,
 } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { isPropertyExpressionChainOptional } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -21,7 +21,6 @@ import {
   type FunctionExpression,
   PRIMITIVE_TYPE,
   SUPPORTED_FUNCTIONS,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -40,9 +39,10 @@ import {
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_LessThan
   extends QueryBuilderPostFilterOperator
@@ -137,8 +137,8 @@ export class QueryBuilderPostFilterOperator_LessThan
       postFilterState,
       expression,
       expression.parametersValues[0] instanceof AbstractPropertyExpression &&
-        expression.parametersValues[0].func.genericType.value.rawType.path ===
-          PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[0].func.value.genericType.value.rawType
+          .path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? SUPPORTED_FUNCTIONS.IS_BEFORE_DAY

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.ts

@@ -26,7 +26,7 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QueryBuilderPostFilterOperator_LessThan } from './QueryBuilderPostFilterOperator_LessThan.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
@@ -63,8 +63,8 @@ export class QueryBuilderPostFilterOperator_LessThanEqual
       postFilterState,
       expression,
       expression.parametersValues[0] instanceof AbstractPropertyExpression &&
-        expression.parametersValues[0].func.genericType.value.rawType.path ===
-          PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[0].func.value.genericType.value.rawType
+          .path === PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts

@@ -20,7 +20,6 @@ import {
   type SimpleFunctionExpression,
   type FunctionExpression,
   PRIMITIVE_TYPE,
-  buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -39,9 +38,10 @@ import {
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_StartWith
   extends QueryBuilderPostFilterOperator
@@ -133,9 +133,9 @@ export class QueryBuilderPostFilterOperator_NotStartWith
     );
     return expression
       ? buildNotExpression(
+          expression,
           postFilterConditionState.postFilterState.projectionState
             .queryBuilderState.graphManagerState.graph,
-          expression,
         )
       : undefined;
   }

package/src/stores/filter/operators/{QueryBuilderFilterOperatorHelper.ts → QueryBuilderFilterOperatorValueSpecificationBuilder.ts}

@@ -138,8 +138,8 @@ const buildFilterConditionExpressionWithExists = (
     // ... but if the property is of multiplicity multiple, start a new property chain
     if (
       exp instanceof AbstractPropertyExpression &&
-      (exp.func.multiplicity.upperBound === undefined ||
-        exp.func.multiplicity.upperBound > 1)
+      (exp.func.value.multiplicity.upperBound === undefined ||
+        exp.func.value.multiplicity.upperBound > 1)
     ) {
       // NOTE: we need to find/generate the property chain variable name
       // here, by doing this, we try our best to respect original/user-input variable name
@@ -346,8 +346,9 @@ const buildFilterConditionStateWithExists = (
       multiplicityOne,
     );
     flattenedPropertyExpressionChain.func = initialPropertyExpression.func;
-    flattenedPropertyExpressionChain.parametersValues =
-      initialPropertyExpression.parametersValues;
+    flattenedPropertyExpressionChain.parametersValues = [
+      ...initialPropertyExpression.parametersValues,
+    ];
 
     for (const expression of existsLambdaExpressions) {
       // when rebuilding the property expression chain, disregard the initial variable that starts the chain
@@ -381,13 +382,11 @@ const buildFilterConditionStateWithExists = (
             multiplicityOne,
           );
           propertyExpression.func = currentExpression.func;
-          if (currentExpression.parametersValues.length > 1) {
-            // NOTE: we must retain the rest of the parameters as those are derived property parameters
-            propertyExpression.parametersValues =
-              currentExpression.parametersValues.slice(1);
-          } else {
-            propertyExpression.parametersValues = [];
-          }
+          // NOTE: we must retain the rest of the parameters as those are derived property parameters
+          propertyExpression.parametersValues =
+            currentExpression.parametersValues.length > 1
+              ? currentExpression.parametersValues.slice(1)
+              : [];
           expressions.push(propertyExpression);
         }
         currentExpression = guaranteeNonNullable(