@finos/legend-query-builder 0.4.1 → 0.4.2

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOlapGroupByValueSpecificationBuilder.ts → QueryBuilderOLAPGroupByValueSpecificationBuilder_.ts}

@@ -21,38 +21,35 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PrimitiveInstanceValue,
-  PRIMITIVE_TYPE,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   VariableExpression,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { getFunctionNameFromTDSSortColumn } from '../QueryBuilderTDSHelper.js';
 import {
-  type QueryBuilderOlapGroupByColumnState,
-  type QueryBuilderOlapGroupByState,
-  QueryBuilderTDSOlapAggreationOperatorState,
-} from './QueryBuilderOlapGroupByState.js';
+  type QueryBuilderOLAPGroupByColumnState,
+  type QueryBuilderOLAPGroupByState,
+  QueryBuilderTDS_OLAPAggreationOperatorState,
+} from './QueryBuilderOLAPGroupByState_.js';
 
-const appendOlapGroupByColumnState = (
-  olapGroupByColumnState: QueryBuilderOlapGroupByColumnState,
+const appendOLAPGroupByColumnState = (
+  olapGroupByColumnState: QueryBuilderOLAPGroupByColumnState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
   const graph =
     olapGroupByColumnState.olapState.tdsState.queryBuilderState
       .graphManagerState.graph;
-  const multiplicityOne = graph.getTypicalMultiplicity(
-    TYPICAL_MULTIPLICITY_TYPE.ONE,
-  );
-  const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
 
   // create window cols expression
   const windowColumns = olapGroupByColumnState.windowColumns.map((column) => {
     const stringInstance = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     stringInstance.values = [column.columnName];
     return stringInstance;
@@ -69,11 +66,11 @@ const appendOlapGroupByColumnState = (
     const sortByState = olapGroupByColumnState.sortByState;
     sortByFunction = new SimpleFunctionExpression(
       getFunctionNameFromTDSSortColumn(sortByState.sortType),
-      multiplicityOne,
     );
     const sortColInstance = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     sortColInstance.values = [sortByState.columnState.columnName];
     sortByFunction.parametersValues[0] = sortColInstance;
@@ -82,12 +79,12 @@ const appendOlapGroupByColumnState = (
   // create olap operation expression
   const operationState = olapGroupByColumnState.operationState;
   const olapFunc = extractElementNameFromPath(operationState.operator.pureFunc);
-  const olapFuncExpression = new SimpleFunctionExpression(
-    olapFunc,
-    multiplicityOne,
-  );
+  const olapFuncExpression = new SimpleFunctionExpression(olapFunc);
   olapFuncExpression.parametersValues = [
-    new VariableExpression(operationState.lambdaParameterName, multiplicityOne),
+    new VariableExpression(
+      operationState.lambdaParameterName,
+      Multiplicity.ONE,
+    ),
   ];
   const olapLambdaFuncInstance = buildGenericLambdaFunctionInstanceValue(
     operationState.lambdaParameterName,
@@ -95,17 +92,17 @@ const appendOlapGroupByColumnState = (
     graph,
   );
   let olapAggregationExpression: SimpleFunctionExpression | undefined;
-  if (operationState instanceof QueryBuilderTDSOlapAggreationOperatorState) {
+  if (operationState instanceof QueryBuilderTDS_OLAPAggreationOperatorState) {
     // column param
     const olapAggregateColumn = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(new GenericType(typeString)),
-      multiplicityOne,
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
     );
     olapAggregateColumn.values = [operationState.columnState.columnName];
     // build `meta::pure::tds::func`
     olapAggregationExpression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FUNC),
-      multiplicityOne,
     );
     olapAggregationExpression.parametersValues = [
       olapAggregateColumn,
@@ -115,17 +112,15 @@ const appendOlapGroupByColumnState = (
   const olapOperationExpression =
     olapAggregationExpression ?? olapLambdaFuncInstance;
 
-  // OLAP column nam expression
+  // OLAP column name expression
   const olapColumn = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(typeString)),
-    multiplicityOne,
+    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
   );
   olapColumn.values = [olapGroupByColumnState.columnName];
 
   // create main expression
   const olapExpression = new SimpleFunctionExpression(
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY),
-    multiplicityOne,
   );
   const currentExpression = guaranteeNonNullable(lambda.expressionSequence[0]);
   olapExpression.parametersValues = [
@@ -137,12 +132,12 @@ const appendOlapGroupByColumnState = (
   return lambda;
 };
 
-export const appendOlapGroupByState = (
-  olapGroupByState: QueryBuilderOlapGroupByState,
+export const appendOLAPGroupByState = (
+  olapGroupByState: QueryBuilderOLAPGroupByState,
   lambda: LambdaFunction,
 ): LambdaFunction => {
   olapGroupByState.olapColumns.forEach((c) =>
-    appendOlapGroupByColumnState(c, lambda),
+    appendOLAPGroupByColumnState(c, lambda),
   );
   return lambda;
 };

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_.ts → QueryBuilderTDS_OLAPOperator.ts}

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { PRIMITIVE_TYPE, type PureModel, type Type } from '@finos/legend-graph';
+import { PrimitiveType, type PureModel, type Type } from '@finos/legend-graph';
 import { type Hashable, uuid } from '@finos/legend-shared';
-import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
 
-export abstract class QueryBuilderTDSOlapOperator implements Hashable {
+export abstract class QueryBuilderTDS_OLAPOperator implements Hashable {
   readonly uuid = uuid();
 
   abstract getLabel(): string;
@@ -34,7 +34,7 @@ export abstract class QueryBuilderTDSOlapOperator implements Hashable {
   }
 
   getOperatorReturnType(graph: PureModel): Type {
-    return graph.getPrimitiveType(PRIMITIVE_TYPE.NUMBER);
+    return PrimitiveType.NUMBER;
   }
 
   isCompatibleWithColumn(column: QueryBuilderTDSColumnState): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Average.ts → QueryBuilderTDS_OLAPOperator_Average.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Average extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Average extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Average extends QueryBuilderTDSOlapOper
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_AVERAGE]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_AVERAGE]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Count.ts → QueryBuilderTDS_OLAPOperator_Count.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Count extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Count extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Count extends QueryBuilderTDSOlapOperat
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_COUNT]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_COUNT]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Max.ts → QueryBuilderTDS_OLAPOperator_Max.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Max extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Max extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Max extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_MAX]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_MAX]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Min.ts → QueryBuilderTDS_OLAPOperator_Min.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Min extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Min extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Min extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_MIN]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_MIN]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapOperator_Sum.ts → QueryBuilderTDS_OLAPOperator_Sum.ts}

@@ -16,11 +16,11 @@
 
 import { hashArray } from '@finos/legend-shared';
 import { type Type, PRIMITIVE_TYPE } from '@finos/legend-graph';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
-export class QueryBuilderTDSOlapOperator_Sum extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPOperator_Sum extends QueryBuilderTDS_OLAPOperator {
   override isColumnAggregator(): boolean {
     return true;
   }
@@ -33,7 +33,7 @@ export class QueryBuilderTDSOlapOperator_Sum extends QueryBuilderTDSOlapOperator
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_SUM]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_SUM]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_AverageRank_.ts → QueryBuilderTDS_OLAPRankOperator_AverageRank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_AverageRank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_AverageRank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'average rank';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_AverageRank extends QueryBuilderTDS
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_DENSE_RANK]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_DENSE_RANK,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_DenseRank_.ts → QueryBuilderTDS_OLAPRankOperator_DenseRank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_DenseRank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_DenseRank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'dense rank';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_DenseRank extends QueryBuilderTDSOl
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_DENSE_RANK]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_DENSE_RANK,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_Rank_.ts → QueryBuilderTDS_OLAPRankOperator_Rank.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_Rank extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_Rank extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'rank';
   }
@@ -30,7 +30,7 @@ export class QueryBuilderTDSOlapRankOperator_Rank extends QueryBuilderTDSOlapOpe
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_RANK]);
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_RANK]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

package/src/stores/fetch-structure/tds/olapGroupBy/operators/{QueryBuilderTDSOlapRankOperator_RowNumber_.ts → QueryBuilderTDS_OLAPRankOperator_RowNumber.ts}

@@ -18,9 +18,9 @@ import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+import { QueryBuilderTDS_OLAPOperator } from './QueryBuilderTDS_OLAPOperator.js';
 
-export class QueryBuilderTDSOlapRankOperator_RowNumber extends QueryBuilderTDSOlapOperator {
+export class QueryBuilderTDS_OLAPRankOperator_RowNumber extends QueryBuilderTDS_OLAPOperator {
   getLabel(): string {
     return 'row number';
   }
@@ -30,7 +30,9 @@ export class QueryBuilderTDSOlapRankOperator_RowNumber extends QueryBuilderTDSOl
   }
 
   get hashCode(): string {
-    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_ROW_NUMBER]);
+    return hashArray([
+      QUERY_BUILDER_HASH_STRUCTURE.TDS_OLAP_OPERATOR_ROW_NUMBER,
+    ]);
   }
 
   isCompatibleWithType(type: Type | undefined): boolean {

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

@@ -23,6 +23,7 @@ import {
   Enumeration,
   PRIMITIVE_TYPE,
   observe_ValueSpecification,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -66,7 +67,7 @@ import {
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../../QueryBuilderGroupOperationHelper.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
-import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -127,23 +128,23 @@ export const getTypeFromDerivedProperty = (
 ): Type | undefined => {
   switch (derivedProperty) {
     case TDS_COLUMN_GETTER.GET_STRING:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
+      return PrimitiveType.STRING;
     case TDS_COLUMN_GETTER.GET_NUMBER:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.NUMBER);
+      return PrimitiveType.NUMBER;
     case TDS_COLUMN_GETTER.GET_INTEGER:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.INTEGER);
+      return PrimitiveType.INTEGER;
     case TDS_COLUMN_GETTER.GET_FLOAT:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.FLOAT);
+      return PrimitiveType.FLOAT;
     case TDS_COLUMN_GETTER.GET_DECIMAL:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.DECIMAL);
+      return PrimitiveType.DECIMAL;
     case TDS_COLUMN_GETTER.GET_DATE:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.DATE);
+      return PrimitiveType.DATE;
     case TDS_COLUMN_GETTER.GET_DATETIME:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.DATETIME);
+      return PrimitiveType.DATETIME;
     case TDS_COLUMN_GETTER.GET_STRICTDATE:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.STRICTDATE);
+      return PrimitiveType.STRICTDATE;
     case TDS_COLUMN_GETTER.GET_BOOLEAN:
-      return graph.getPrimitiveType(PRIMITIVE_TYPE.BOOLEAN);
+      return PrimitiveType.BOOLEAN;
     default:
       return undefined;
   }

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

@@ -33,7 +33,7 @@ import {
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { QueryBuilderDerivationProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
-import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import { getTDSColumnState } from '../QueryBuilderTDSHelper.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {

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

@@ -17,7 +17,6 @@
 import {
   extractElementNameFromPath,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   type LambdaFunction,
   type ValueSpecification,
 } from '@finos/legend-graph';
@@ -41,13 +40,8 @@ const buildPostFilterExpression = (
       node.condition,
     );
   } else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
-    const multiplicityOne =
-      postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-        TYPICAL_MULTIPLICITY_TYPE.ONE,
-      );
     const func = new SimpleFunctionExpression(
       extractElementNameFromPath(fromGroupOperation(node.groupOperation)),
-      multiplicityOne,
     );
     const clauses = node.childrenIds
       .map((e) => postFilterState.nodes.get(e))
@@ -72,7 +66,6 @@ const buildPostFilterExpression = (
         const clause2 = currentClause;
         const groupClause = new SimpleFunctionExpression(
           extractElementNameFromPath(fromGroupOperation(node.groupOperation)),
-          multiplicityOne,
         );
         groupClause.parametersValues = [clause1, clause2];
         currentClause = groupClause;
@@ -100,10 +93,6 @@ export const appendPostFilter = (
   ) {
     return lambdaFunction;
   }
-  const multiplicityOne =
-    postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
   const filterLambda = buildGenericLambdaFunctionInstanceValue(
     postFilterState.lambdaParameterName,
     postFilterConditionExpressions,
@@ -112,7 +101,6 @@ export const appendPostFilter = (
   // main filter expression
   const filterExpression = new SimpleFunctionExpression(
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER),
-    multiplicityOne,
   );
   const currentExpression = guaranteeNonNullable(
     lambdaFunction.expressionSequence[0],

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

@@ -14,27 +14,21 @@
  * limitations under the License.
  */
 
-import {
-  type Multiplicity,
-  TYPICAL_MULTIPLICITY_TYPE,
-} from '@finos/legend-graph';
+import { Multiplicity } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import { QueryBuilderOlapGroupByColumnState } from '../../olapGroupBy/QueryBuilderOlapGroupByState.js';
+import { QueryBuilderOLAPGroupByColumnState } from '../../olapGroupBy/QueryBuilderOLAPGroupByState_.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
-import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
 
 export const getColumnMultiplicity = (
   columnState: QueryBuilderTDSColumnState | QueryBuilderAggregateColumnState,
 ): Multiplicity => {
-  if (columnState instanceof QueryBuilderAggregateColumnState) {
-    return columnState.aggregationState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
-  } else if (columnState instanceof QueryBuilderOlapGroupByColumnState) {
-    return columnState.olapState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-    );
+  if (
+    columnState instanceof QueryBuilderAggregateColumnState ||
+    columnState instanceof QueryBuilderOLAPGroupByColumnState
+  ) {
+    return Multiplicity.ONE;
   } else if (columnState instanceof QueryBuilderSimpleProjectionColumnState) {
     return columnState.propertyExpressionState.propertyExpression.func.value
       .multiplicity;

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

@@ -21,13 +21,13 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   PrimitiveInstanceValue,
-  PRIMITIVE_TYPE,
   SimpleFunctionExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   VariableExpression,
   getAllClassDerivedProperties,
   CORE_PURE_PATH,
   PropertyExplicitReference,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
@@ -52,16 +52,9 @@ export const buildPostFilterConditionExpression = (
   const graph =
     filterConditionState.postFilterState.tdsState.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,
-  );
+  const tdsPropertyExpression = new AbstractPropertyExpression('');
   let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
   const correspondingTDSDerivedProperty = operator.getTDSColumnGetter();
   if (correspondingTDSDerivedProperty) {
@@ -79,11 +72,10 @@ export const buildPostFilterConditionExpression = (
   );
   const variableName = new VariableExpression(
     filterConditionState.postFilterState.lambdaParameterName,
-    multiplicityOne,
+    Multiplicity.ONE,
   );
   const colInstanceValue = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(typeString)),
-    multiplicityOne,
+    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
   );
   colInstanceValue.values = [colState.columnName];
   tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
@@ -91,7 +83,6 @@ export const buildPostFilterConditionExpression = (
   if (operatorFunctionFullPath) {
     const expression = new SimpleFunctionExpression(
       extractElementNameFromPath(operatorFunctionFullPath),
-      multiplicityOne,
     );
     expression.parametersValues.push(tdsPropertyExpression);
     if (filterConditionState.value) {

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

@@ -20,6 +20,7 @@ import {
   type ValueSpecification,
   type FunctionExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -53,10 +54,7 @@ export class QueryBuilderPostFilterOperator_Contain
   }
 
   isCompatibleWithType(type: Type): boolean {
-    if (type.path === PRIMITIVE_TYPE.STRING) {
-      return true;
-    }
-    return false;
+    return type === PrimitiveType.STRING;
   }
 
   isCompatibleWithConditionValue(
@@ -65,7 +63,7 @@ export class QueryBuilderPostFilterOperator_Contain
     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_NotContain 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(