@finos/legend-query-builder 0.4.1 → 0.4.3

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(

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);
@@ -257,6 +225,7 @@ export const appendProjection = (
             buildPropertyExpressionChain(
               projectionColumnState.propertyExpressionState.propertyExpression,
               projectionColumnState.propertyExpressionState.queryBuilderState,
+              projectionColumnState.lambdaParameterName,
               true,
             ),
           ],
@@ -292,7 +261,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 +292,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 +308,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);
@@ -358,6 +326,7 @@ export const appendProjection = (
             buildPropertyExpressionChain(
               projectionColumnState.propertyExpressionState.propertyExpression,
               projectionColumnState.propertyExpressionState.queryBuilderState,
+              projectionColumnState.lambdaParameterName,
             ),
           ],
           queryBuilderState.graphManagerState.graph,
@@ -398,7 +367,7 @@ export const appendProjection = (
   }
 
   // build olapGroupBy
-  appendOlapGroupByState(tdsState.olapGroupByState, lambdaFunction);
+  appendOLAPGroupByState(tdsState.olapGroupByState, lambdaFunction);
 
   // build post-filter
   appendPostFilter(tdsState.postFilterState, lambdaFunction);