@finos/legend-query-builder 0.4.1 → 0.4.2

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   type FunctionExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -51,10 +52,7 @@ export class QueryBuilderPostFilterOperator_EndWith
   }
 
   isCompatibleWithType(type: Type): boolean {
-    if (type.path === PRIMITIVE_TYPE.STRING) {
-      return true;
-    }
-    return false;
+    return PrimitiveType.STRING === type;
   }
 
   isCompatibleWithConditionValue(
@@ -63,7 +61,7 @@ export class QueryBuilderPostFilterOperator_EndWith
     const type = postFilterConditionState.value
       ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
       : undefined;
-    return PRIMITIVE_TYPE.STRING === type?.path;
+    return PrimitiveType.STRING === type;
   }
 
   getDefaultFilterConditionValue(
@@ -128,13 +126,7 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
     );
-    return expression
-      ? buildNotExpression(
-          expression,
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-        )
-      : undefined;
+    return expression ? buildNotExpression(expression) : undefined;
   }
 
   override buildPostFilterConditionState(

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

@@ -27,7 +27,6 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PRIMITIVE_TYPE,
-  TYPICAL_MULTIPLICITY_TYPE,
   SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import {
@@ -131,15 +130,10 @@ export class QueryBuilderPostFilterOperator_Equal
       default:
         if (propertyType instanceof Enumeration) {
           if (propertyType.values.length > 0) {
-            const multiplicityOne =
-              postFilterConditionState.postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-                TYPICAL_MULTIPLICITY_TYPE.ONE,
-              );
             const enumValueInstanceValue = new EnumValueInstanceValue(
               GenericTypeExplicitReference.create(
                 new GenericType(propertyType),
               ),
-              multiplicityOne,
             );
             instanceValue_setValues(enumValueInstanceValue, [
               EnumValueExplicitReference.create(propertyType.values[0] as Enum),
@@ -208,13 +202,7 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
     );
-    return expression
-      ? buildNotExpression(
-          expression,
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-        )
-      : undefined;
+    return expression ? buildNotExpression(expression) : undefined;
   }
 
   override buildPostFilterConditionState(

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

@@ -25,7 +25,7 @@ import {
   VariableExpression,
   GenericTypeExplicitReference,
   GenericType,
-  TYPICAL_MULTIPLICITY_TYPE,
+  Multiplicity,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -123,15 +123,11 @@ export class QueryBuilderPostFilterOperator_In
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const multiplicityOne =
-      postFilterConditionState.postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-        TYPICAL_MULTIPLICITY_TYPE.ONE,
-      );
     const propertyType = guaranteeNonNullable(
       postFilterConditionState.columnState.getColumnType(),
     );
     return new CollectionInstanceValue(
-      multiplicityOne,
+      Multiplicity.ONE,
       GenericTypeExplicitReference.create(new GenericType(propertyType)),
     );
   }
@@ -174,13 +170,7 @@ export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilter
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
     );
-    return expression
-      ? buildNotExpression(
-          expression,
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-        )
-      : undefined;
+    return expression ? buildNotExpression(expression) : undefined;
   }
 
   override buildPostFilterConditionState(

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

@@ -19,7 +19,7 @@ import {
   type ValueSpecification,
   type FunctionExpression,
   Enumeration,
-  PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
@@ -47,10 +47,7 @@ export class QueryBuilderPostFilterOperator_IsEmpty
   }
 
   isCompatibleWithType(type: Type): boolean {
-    return (
-      Object.values(PRIMITIVE_TYPE).includes(type.path as PRIMITIVE_TYPE) ||
-      type instanceof Enumeration
-    );
+    return type instanceof PrimitiveType || type instanceof Enumeration;
   }
 
   isCompatibleWithConditionValue(

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

@@ -20,6 +20,7 @@ import {
   type SimpleFunctionExpression,
   type FunctionExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -52,10 +53,7 @@ export class QueryBuilderPostFilterOperator_StartWith
   }
 
   isCompatibleWithType(type: Type): boolean {
-    if (type.path === PRIMITIVE_TYPE.STRING) {
-      return true;
-    }
-    return false;
+    return PrimitiveType.STRING === type;
   }
 
   isCompatibleWithConditionValue(
@@ -64,7 +62,7 @@ export class QueryBuilderPostFilterOperator_StartWith
     const type = postFilterConditionState.value
       ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
       : undefined;
-    return PRIMITIVE_TYPE.STRING === type?.path;
+    return PrimitiveType.STRING === type;
   }
 
   getDefaultFilterConditionValue(
@@ -131,13 +129,7 @@ export class QueryBuilderPostFilterOperator_NotStartWith
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
     );
-    return expression
-      ? buildNotExpression(
-          expression,
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-        )
-      : undefined;
+    return expression ? buildNotExpression(expression) : undefined;
   }
 
   override buildPostFilterConditionState(

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

@@ -40,16 +40,16 @@ import {
   type VariableExpression,
   PackageableElementExplicitReference,
   GRAPH_MANAGER_EVENT,
-  PRIMITIVE_TYPE,
   buildSourceInformationSourceId,
   ParserError,
-  TYPICAL_MULTIPLICITY_TYPE,
   RawVariableExpression,
   Enumeration,
   RawLambda,
   stub_RawLambda,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
-import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
   DEFAULT_LAMBDA_VARIABLE_NAME,
@@ -294,16 +294,13 @@ export class QueryBuilderDerivationProjectionColumnState
     assertTrue(Array.isArray(this.lambda.parameters));
     const projectionParameter = this.lambda.parameters as object[];
     const graph = this.tdsState.queryBuilderState.graphManagerState.graph;
-    const multiplicityOne = graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
     assertTrue(projectionParameter.length === 1);
     const variable = projectionParameter[0] as VariableExpression;
     assertNonEmptyString(variable.name);
     // assign variable to query class
     const rawVariableExpression = new RawVariableExpression(
       variable.name,
-      multiplicityOne,
+      Multiplicity.ONE,
       PackageableElementExplicitReference.create(
         guaranteeNonNullable(this.tdsState.queryBuilderState.class),
       ),
@@ -323,10 +320,9 @@ export class QueryBuilderDerivationProjectionColumnState
       )) as string;
     const resolvedType = graph.getType(type);
     assertTrue(
-      Object.values(PRIMITIVE_TYPE).includes(
-        resolvedType.path as PRIMITIVE_TYPE,
-      ) || resolvedType instanceof Enumeration,
-      'projection column must have primitive return type',
+      resolvedType instanceof PrimitiveType ||
+        resolvedType instanceof Enumeration,
+      'Projection column must have return type of either primitve type or enumeration',
     );
     this.setReturnType(resolvedType);
   }

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

@@ -21,15 +21,14 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PrimitiveInstanceValue,
-  PRIMITIVE_TYPE,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   type ValueSpecification,
   INTERNAL__UnknownValueSpecification,
   V1_serializeRawValueSpecification,
   V1_transformRawLambda,
   V1_GraphTransformerContextBuilder,
   matchFunctionName,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -48,33 +47,21 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { appendOlapGroupByState } from '../olapGroupBy/QueryBuilderOlapGroupByValueSpecificationBuilder.js';
+import { appendOLAPGroupByState } from '../olapGroupBy/QueryBuilderOLAPGroupByValueSpecificationBuilder_.js';
 import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
 
 const buildSortExpression = (
   sortColumnState: SortColumnState,
 ): SimpleFunctionExpression => {
-  const multiplicityOne =
-    sortColumnState.columnState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   const sortColumnFunction = new SimpleFunctionExpression(
     extractElementNameFromPath(
       sortColumnState.sortType === COLUMN_SORT_TYPE.ASC
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC,
     ),
-    multiplicityOne,
   );
   const sortColumnName = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(
-      new GenericType(
-        sortColumnState.columnState.tdsState.queryBuilderState.graphManagerState.graph.getPrimitiveType(
-          PRIMITIVE_TYPE.STRING,
-        ),
-      ),
-    ),
-    multiplicityOne,
+    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
   );
   sortColumnName.values = [sortColumnState.columnState.columnName];
   sortColumnFunction.parametersValues[0] = sortColumnName;
@@ -90,10 +77,6 @@ const appendResultSetModifier = (
       }
     | undefined,
 ): LambdaFunction => {
-  const multiplicityOne =
-    resultModifierState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   if (lambdaFunction.expressionSequence.length === 1) {
     const func = lambdaFunction.expressionSequence[0];
     if (func instanceof SimpleFunctionExpression) {
@@ -112,7 +95,6 @@ const appendResultSetModifier = (
             extractElementNameFromPath(
               QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DISTINCT,
             ),
-            multiplicityOne,
           );
           distinctFunction.parametersValues[0] = currentExpression;
           currentExpression = distinctFunction;
@@ -124,7 +106,6 @@ const appendResultSetModifier = (
             extractElementNameFromPath(
               QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT,
             ),
-            multiplicityOne,
           );
           const multiplicity =
             resultModifierState.tdsState.queryBuilderState.graphManagerState.graph.getMultiplicity(
@@ -146,13 +127,8 @@ const appendResultSetModifier = (
         if (resultModifierState.limit || options?.overridingLimit) {
           const limit = new PrimitiveInstanceValue(
             GenericTypeExplicitReference.create(
-              new GenericType(
-                resultModifierState.tdsState.queryBuilderState.graphManagerState.graph.getPrimitiveType(
-                  PRIMITIVE_TYPE.INTEGER,
-                ),
-              ),
+              new GenericType(PrimitiveType.INTEGER),
             ),
-            multiplicityOne,
           );
           limit.values = [
             Math.min(
@@ -164,7 +140,6 @@ const appendResultSetModifier = (
             extractElementNameFromPath(
               QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE,
             ),
-            multiplicityOne,
           );
           takeFunction.parametersValues[0] = currentExpression;
           takeFunction.parametersValues[1] = limit;
@@ -195,13 +170,6 @@ export const appendProjection = (
     lambdaFunction.expressionSequence[0],
     `Can't build projection expression: preceding expression is not defined`,
   );
-  const multiplicityOne =
-    queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
-  const typeString = queryBuilderState.graphManagerState.graph.getPrimitiveType(
-    PRIMITIVE_TYPE.STRING,
-  );
 
   // build projection
   if (tdsState.aggregationState.columns.length) {
@@ -210,7 +178,6 @@ export const appendProjection = (
       extractElementNameFromPath(
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
       ),
-      multiplicityOne,
     );
 
     const colLambdas = new CollectionInstanceValue(
@@ -236,8 +203,9 @@ export const appendProjection = (
     tdsState.projectionColumns.forEach((projectionColumnState) => {
       // column alias
       const colAlias = new PrimitiveInstanceValue(
-        GenericTypeExplicitReference.create(new GenericType(typeString)),
-        multiplicityOne,
+        GenericTypeExplicitReference.create(
+          new GenericType(PrimitiveType.STRING),
+        ),
       );
       colAlias.values.push(projectionColumnState.columnName);
       colAliases.values.push(colAlias);
@@ -292,7 +260,6 @@ export const appendProjection = (
       if (aggregateColumnState) {
         const aggregateFunctionExpression = new SimpleFunctionExpression(
           extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG),
-          multiplicityOne,
         );
         const aggregateLambda = buildGenericLambdaFunctionInstanceValue(
           aggregateColumnState.lambdaParameterName,
@@ -324,7 +291,6 @@ export const appendProjection = (
     // projection
     const projectFunction = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT),
-      multiplicityOne,
     );
     const colLambdas = new CollectionInstanceValue(
       queryBuilderState.graphManagerState.graph.getMultiplicity(
@@ -341,8 +307,9 @@ export const appendProjection = (
     tdsState.projectionColumns.forEach((projectionColumnState) => {
       // column alias
       const colAlias = new PrimitiveInstanceValue(
-        GenericTypeExplicitReference.create(new GenericType(typeString)),
-        multiplicityOne,
+        GenericTypeExplicitReference.create(
+          new GenericType(PrimitiveType.STRING),
+        ),
       );
       colAlias.values.push(projectionColumnState.columnName);
       colAliases.values.push(colAlias);
@@ -398,7 +365,7 @@ export const appendProjection = (
   }
 
   // build olapGroupBy
-  appendOlapGroupByState(tdsState.olapGroupByState, lambdaFunction);
+  appendOLAPGroupByState(tdsState.olapGroupByState, lambdaFunction);
 
   // build post-filter
   appendPostFilter(tdsState.postFilterState, lambdaFunction);

package/src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts

@@ -19,7 +19,6 @@ import {
   type ValueSpecification,
   extractElementNameFromPath,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
 } from '@finos/legend-graph';
 import { buildGenericLambdaFunctionInstanceValue } from '../QueryBuilderValueSpecificationHelper.js';
 import { fromGroupOperation } from '../QueryBuilderGroupOperationHelper.js';
@@ -40,13 +39,8 @@ const buildFilterConditionExpression = (
       node.condition,
     );
   } else if (node instanceof QueryBuilderFilterTreeGroupNodeData) {
-    const multiplicityOne =
-      filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-        TYPICAL_MULTIPLICITY_TYPE.ONE,
-      );
     const func = new SimpleFunctionExpression(
       extractElementNameFromPath(fromGroupOperation(node.groupOperation)),
-      multiplicityOne,
     );
     const clauses = node.childrenIds
       .map((e) => filterState.nodes.get(e))
@@ -71,7 +65,6 @@ const buildFilterConditionExpression = (
         const clause2 = currentClause;
         const groupClause = new SimpleFunctionExpression(
           extractElementNameFromPath(fromGroupOperation(node.groupOperation)),
-          multiplicityOne,
         );
         groupClause.parametersValues = [clause1, clause2];
         currentClause = groupClause;
@@ -97,14 +90,9 @@ export const buildFilterExpression = (
   if (!filterConditionExpressions.length) {
     return undefined;
   }
-  const multiplicityOne =
-    filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   // main filter expression
   const filterExpression = new SimpleFunctionExpression(
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER),
-    multiplicityOne,
   );
   // param [0]
   filterExpression.parametersValues.push(getAllFunc);

package/src/stores/filter/operators/QueryBuilderFilterOperatorValueSpecificationBuilder.ts

@@ -22,7 +22,7 @@ import {
   VariableExpression,
   AbstractPropertyExpression,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
+  Multiplicity,
 } from '@finos/legend-graph';
 import {
   guaranteeType,
@@ -68,10 +68,6 @@ const buildFilterConditionExpressionWithExists = (
   filterConditionState: FilterConditionState,
   operatorFunctionFullPath: string,
 ): ValueSpecification => {
-  const multiplicityOne =
-    filterConditionState.filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   assertTrue(
     filterConditionState.propertyExpressionState.requiresExistsHandling,
   );
@@ -95,10 +91,9 @@ const buildFilterConditionExpressionWithExists = (
     if (currentPropertyExpression instanceof SimpleFunctionExpression) {
       exp = new SimpleFunctionExpression(
         extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE),
-        multiplicityOne,
       );
     } else {
-      exp = new AbstractPropertyExpression('', multiplicityOne);
+      exp = new AbstractPropertyExpression('');
       exp.func = currentPropertyExpression.func;
     }
     // NOTE: we must retain the rest of the parameters as those are derived property parameters
@@ -155,7 +150,7 @@ const buildFilterConditionExpressionWithExists = (
       existsLambdaPropertyChains.push(
         new VariableExpression(
           existsLambdaParamNames[currentParamNameIndex] as string,
-          multiplicityOne,
+          Multiplicity.ONE,
         ),
       );
       currentParamNameIndex++;
@@ -167,7 +162,6 @@ const buildFilterConditionExpressionWithExists = (
   for (let i = 0; i < existsLambdaPropertyChains.length - 1; ++i) {
     const simpleFunctionExpression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXISTS),
-      multiplicityOne,
     );
     simpleFunctionExpression.parametersValues.push(
       existsLambdaPropertyChains[i] as ValueSpecification,
@@ -177,7 +171,6 @@ const buildFilterConditionExpressionWithExists = (
   // build the leaf simple function expression which uses the operator
   const operatorEpression = new SimpleFunctionExpression(
     extractElementNameFromPath(operatorFunctionFullPath),
-    multiplicityOne,
   );
   operatorEpression.parametersValues.push(
     existsLambdaPropertyChains[
@@ -220,10 +213,6 @@ export const buildFilterConditionExpression = (
   filterConditionState: FilterConditionState,
   operatorFunctionFullPath: string,
 ): ValueSpecification => {
-  const multiplicityOne =
-    filterConditionState.filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   if (filterConditionState.propertyExpressionState.requiresExistsHandling) {
     return buildFilterConditionExpressionWithExists(
       filterConditionState,
@@ -232,7 +221,6 @@ export const buildFilterConditionExpression = (
   }
   const expression = new SimpleFunctionExpression(
     extractElementNameFromPath(operatorFunctionFullPath),
-    multiplicityOne,
   );
   const propertyExpression = buildPropertyExpressionChain(
     filterConditionState.propertyExpressionState.propertyExpression,
@@ -333,18 +321,11 @@ const buildFilterConditionStateWithExists = (
     }
 
     // 2. Build the property expression
-    const multiplicityOne =
-      filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-        TYPICAL_MULTIPLICITY_TYPE.ONE,
-      );
     const initialPropertyExpression = guaranteeType(
       parentExpression.parametersValues[0],
       AbstractPropertyExpression,
     );
-    let flattenedPropertyExpressionChain = new AbstractPropertyExpression(
-      '',
-      multiplicityOne,
-    );
+    let flattenedPropertyExpressionChain = new AbstractPropertyExpression('');
     flattenedPropertyExpressionChain.func = initialPropertyExpression.func;
     flattenedPropertyExpressionChain.parametersValues = [
       ...initialPropertyExpression.parametersValues,
@@ -370,17 +351,13 @@ const buildFilterConditionStateWithExists = (
             extractElementNameFromPath(
               QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE,
             ),
-            multiplicityOne,
           );
           functionExpression.parametersValues.unshift(
             guaranteeNonNullable(currentExpression.parametersValues[1]),
           );
           expressions.push(functionExpression);
         } else if (currentExpression instanceof AbstractPropertyExpression) {
-          const propertyExpression = new AbstractPropertyExpression(
-            '',
-            multiplicityOne,
-          );
+          const propertyExpression = new AbstractPropertyExpression('');
           propertyExpression.func = currentExpression.func;
           // NOTE: we must retain the rest of the parameters as those are derived property parameters
           propertyExpression.parametersValues =

package/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts

@@ -23,6 +23,7 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -54,10 +55,11 @@ export class QueryBuilderFilterOperator_Contain
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return (
+      PrimitiveType.STRING ===
       filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
-    return PRIMITIVE_TYPE.STRING === propertyType.path;
+        .genericType.value.rawType
+    );
   }
 
   isCompatibleWithFilterConditionValue(
@@ -66,7 +68,7 @@ export class QueryBuilderFilterOperator_Contain
     const type = filterConditionState.value
       ? getNonCollectionValueSpecificationType(filterConditionState.value)
       : undefined;
-    return PRIMITIVE_TYPE.STRING === type?.path;
+    return PrimitiveType.STRING === type;
   }
 
   getDefaultFilterConditionValue(
@@ -129,8 +131,6 @@ export class QueryBuilderFilterOperator_NotContain extends QueryBuilderFilterOpe
   ): ValueSpecification {
     return buildNotExpression(
       super.buildFilterConditionExpression(filterConditionState),
-      filterConditionState.filterState.queryBuilderState.graphManagerState
-        .graph,
     );
   }
 

package/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts

@@ -23,6 +23,7 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -54,10 +55,11 @@ export class QueryBuilderFilterOperator_EndWith
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return (
+      PrimitiveType.STRING ===
       filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
-    return PRIMITIVE_TYPE.STRING === propertyType.path;
+        .genericType.value.rawType
+    );
   }
 
   isCompatibleWithFilterConditionValue(
@@ -66,7 +68,7 @@ export class QueryBuilderFilterOperator_EndWith
     const type = filterConditionState.value
       ? getNonCollectionValueSpecificationType(filterConditionState.value)
       : undefined;
-    return PRIMITIVE_TYPE.STRING === type?.path;
+    return PrimitiveType.STRING === type;
   }
 
   getDefaultFilterConditionValue(
@@ -129,8 +131,6 @@ export class QueryBuilderFilterOperator_NotEndWith extends QueryBuilderFilterOpe
   ): ValueSpecification {
     return buildNotExpression(
       super.buildFilterConditionExpression(filterConditionState),
-      filterConditionState.filterState.queryBuilderState.graphManagerState
-        .graph,
     );
   }
 

package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts

@@ -27,7 +27,6 @@ import {
   EnumValueInstanceValue,
   GenericTypeExplicitReference,
   GenericType,
-  TYPICAL_MULTIPLICITY_TYPE,
   EnumValueExplicitReference,
   Enumeration,
   PRIMITIVE_TYPE,
@@ -132,15 +131,10 @@ export class QueryBuilderFilterOperator_Equal
       default:
         if (propertyType instanceof Enumeration) {
           if (propertyType.values.length > 0) {
-            const multiplicityOne =
-              filterConditionState.filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-                TYPICAL_MULTIPLICITY_TYPE.ONE,
-              );
             const enumValueInstanceValue = new EnumValueInstanceValue(
               GenericTypeExplicitReference.create(
                 new GenericType(propertyType),
               ),
-              multiplicityOne,
             );
             instanceValue_setValues(enumValueInstanceValue, [
               EnumValueExplicitReference.create(propertyType.values[0] as Enum),
@@ -207,8 +201,6 @@ export class QueryBuilderFilterOperator_NotEqual extends QueryBuilderFilterOpera
   ): ValueSpecification {
     return buildNotExpression(
       super.buildFilterConditionExpression(filterConditionState),
-      filterConditionState.filterState.queryBuilderState.graphManagerState
-        .graph,
     );
   }