@finos/legend-query-builder 0.1.2 → 0.2.0

package/src/stores/QueryBuilderValueSpecificationBuilderHelper.ts

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  functionExpression_setParametersValues,
-  propertyExpression_setParametersValue,
-} from '@finos/legend-application';
 import {
   AbstractPropertyExpression,
   Class,
@@ -78,14 +74,14 @@ const isDefaultDatePropagationSupported = (
   queryBuilderState: QueryBuilderState,
   prevPropertyExpression?: AbstractPropertyExpression | undefined,
 ): boolean => {
-  const property = currentPropertyExpression.func;
+  const property = currentPropertyExpression.func.value;
   const graph = queryBuilderState.graphManagerState.graph;
   // Default date propagation is not supported for current expression when the previous property expression is a derived property.
   if (
     prevPropertyExpression &&
-    prevPropertyExpression.func instanceof DerivedProperty &&
-    prevPropertyExpression.func._OWNER.derivedProperties.includes(
-      prevPropertyExpression.func,
+    prevPropertyExpression.func.value instanceof DerivedProperty &&
+    prevPropertyExpression.func.value._OWNER.derivedProperties.includes(
+      prevPropertyExpression.func.value,
     )
   ) {
     return false;
@@ -94,10 +90,10 @@ const isDefaultDatePropagationSupported = (
   // the previous property expression doesn't match with the global milestonedParameterValues
   if (
     prevPropertyExpression &&
-    prevPropertyExpression.func.genericType.value.rawType instanceof Class
+    prevPropertyExpression.func.value.genericType.value.rawType instanceof Class
   ) {
     const milestoningStereotype = getMilestoneTemporalStereotype(
-      prevPropertyExpression.func.genericType.value.rawType,
+      prevPropertyExpression.func.value.genericType.value.rawType,
       graph,
     );
     if (
@@ -152,7 +148,9 @@ export const buildPropertyExpressionChain = (
     graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE),
   );
   newPropertyExpression.func = propertyExpression.func;
-  newPropertyExpression.parametersValues = propertyExpression.parametersValues;
+  newPropertyExpression.parametersValues = [
+    ...propertyExpression.parametersValues,
+  ];
 
   let nextExpression: ValueSpecification | undefined;
   let currentExpression: ValueSpecification | undefined = newPropertyExpression;
@@ -166,11 +164,15 @@ export const buildPropertyExpressionChain = (
         graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE),
       );
       parameterValue.func = nextExpression.func;
-      parameterValue.parametersValues = nextExpression.parametersValues;
+      parameterValue.parametersValues = [...nextExpression.parametersValues];
       nextExpression = parameterValue;
       currentExpression.parametersValues[0] = parameterValue;
     }
-    if (currentExpression.func instanceof DerivedProperty) {
+    if (
+      currentExpression instanceof AbstractPropertyExpression &&
+      currentExpression.func.value instanceof DerivedProperty
+    ) {
+      const currentPropertyExpression = currentExpression;
       const parameterValues = currentExpression.parametersValues.slice(1);
       parameterValues.forEach((parameterValue, index) => {
         if (parameterValue instanceof INTERNAL__PropagatedValue) {
@@ -178,7 +180,7 @@ export const buildPropertyExpressionChain = (
           if (
             !TEMPORARY__disableDatePropagation &&
             isDefaultDatePropagationSupported(
-              guaranteeType(currentExpression, AbstractPropertyExpression),
+              currentPropertyExpression,
               queryBuilderState,
               nextExpression instanceof AbstractPropertyExpression
                 ? nextExpression
@@ -189,41 +191,27 @@ export const buildPropertyExpressionChain = (
             // `INTERNAL_PropagatedValue` then pass the parameters as user explicitly changed values of either of the parameters.
             if (
               (index === 1 &&
-                guaranteeType(currentExpression, AbstractPropertyExpression)
-                  .parametersValues.length === 3) ||
+                currentPropertyExpression.parametersValues.length === 3) ||
               (index === 0 &&
-                guaranteeType(currentExpression, AbstractPropertyExpression)
-                  .parametersValues.length === 3 &&
+                currentPropertyExpression.parametersValues.length === 3 &&
                 !(
-                  guaranteeType(currentExpression, AbstractPropertyExpression)
-                    .parametersValues[2] instanceof INTERNAL__PropagatedValue
+                  currentPropertyExpression.parametersValues[2] instanceof
+                  INTERNAL__PropagatedValue
                 ))
             ) {
-              propertyExpression_setParametersValue(
-                guaranteeType(currentExpression, AbstractPropertyExpression),
-                index + 1,
-                parameterValue.getValue(),
-                queryBuilderState.observableContext,
-              );
+              currentPropertyExpression.parametersValues[index + 1] =
+                parameterValue.getValue();
             } else {
-              functionExpression_setParametersValues(
-                guaranteeType(currentExpression, AbstractPropertyExpression),
-                [
-                  guaranteeNonNullable(
-                    guaranteeType(currentExpression, AbstractPropertyExpression)
-                      .parametersValues[0],
-                  ),
-                ],
-                queryBuilderState.observableContext,
-              );
+              currentPropertyExpression.parametersValues = [
+                guaranteeNonNullable(
+                  guaranteeType(currentExpression, AbstractPropertyExpression)
+                    .parametersValues[0],
+                ),
+              ];
             }
           } else {
-            propertyExpression_setParametersValue(
-              guaranteeType(currentExpression, AbstractPropertyExpression),
-              index + 1,
-              parameterValue.getValue(),
-              queryBuilderState.observableContext,
-            );
+            currentPropertyExpression.parametersValues[index + 1] =
+              parameterValue.getValue();
           }
         }
       });

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -40,6 +40,7 @@ import {
   getMilestoneTemporalStereotype,
   DerivedProperty,
   MILESTONING_STEREOTYPE,
+  PackageableElementExplicitReference,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -135,8 +136,8 @@ export const unwrapNotExpression = (
 };
 
 export const buildNotExpression = (
-  graph: PureModel,
   expression: ValueSpecification,
+  graph: PureModel,
 ): ValueSpecification => {
   const multiplicityOne = graph.getTypicalMultiplicity(
     TYPICAL_MULTIPLICITY_TYPE.ONE,
@@ -158,7 +159,7 @@ export const isPropertyExpressionChainOptional = (
     propertyExpression &&
     propertyExpression instanceof AbstractPropertyExpression
   ) {
-    if (propertyExpression.func.multiplicity.lowerBound === 0) {
+    if (propertyExpression.func.value.multiplicity.lowerBound === 0) {
       isOptional = true;
       break;
     }
@@ -241,7 +242,10 @@ export const buildGenericLambdaFunctionInstanceValue = (
   const functionInstanceValue = new LambdaFunctionInstanceValue(
     multiplicityOne,
   );
-  const functionType = new FunctionType(typeAny, multiplicityOne);
+  const functionType = new FunctionType(
+    PackageableElementExplicitReference.create(typeAny),
+    multiplicityOne,
+  );
   functionType.parameters.push(
     new VariableExpression(lambdaParameterName, multiplicityOne),
   );
@@ -289,17 +293,18 @@ export const validatePropertyExpressionChain = (
   graph: PureModel,
 ): void => {
   if (
-    propertyExpression.func.genericType.value.rawType instanceof Class &&
-    propertyExpression.func._OWNER._generatedMilestonedProperties.length !== 0
+    propertyExpression.func.value.genericType.value.rawType instanceof Class &&
+    propertyExpression.func.value._OWNER._generatedMilestonedProperties
+      .length !== 0
   ) {
-    const name = propertyExpression.func.name;
+    const name = propertyExpression.func.value.name;
     const func =
-      propertyExpression.func._OWNER._generatedMilestonedProperties.find(
+      propertyExpression.func.value._OWNER._generatedMilestonedProperties.find(
         (e) => e.name === name,
       );
     if (func) {
       const targetStereotype = getMilestoneTemporalStereotype(
-        propertyExpression.func.genericType.value.rawType,
+        propertyExpression.func.value.genericType.value.rawType,
         graph,
       );
 

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -57,6 +57,7 @@ import {
   TdsExecutionResult,
   type ExecutionResult,
   getAllSubclasses,
+  PropertyExplicitReference,
 } from '@finos/legend-graph';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
@@ -68,6 +69,7 @@ import {
 } from '../QueryBuilderPreviewDataHelper.js';
 import { QueryBuilderPropertySearchState } from './QueryBuilderPropertySearchState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
+import { propertyExpression_setFunc } from '../shared/ValueSpecificationModifierHelper.js';
 
 export enum QUERY_BUILDER_EXPLORER_TREE_DND_TYPE {
   ROOT = 'ROOT',
@@ -209,7 +211,10 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
     '',
     multiplicityOne,
   );
-  propertyExpression.func = guaranteeNonNullable(node.property);
+  propertyExpression_setFunc(
+    propertyExpression,
+    PropertyExplicitReference.create(guaranteeNonNullable(node.property)),
+  );
   let currentExpression: AbstractPropertyExpression | SimpleFunctionExpression =
     propertyExpression;
   let parentNode =
@@ -241,7 +246,12 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
         '',
         multiplicityOne,
       );
-      parentPropertyExpression.func = guaranteeNonNullable(parentNode.property);
+      propertyExpression_setFunc(
+        parentPropertyExpression,
+        PropertyExplicitReference.create(
+          guaranteeNonNullable(parentNode.property),
+        ),
+      );
     }
     currentExpression.parametersValues.push(parentPropertyExpression);
     if (

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts

@@ -44,7 +44,7 @@ import {
   ActionAlertType,
 } from '@finos/legend-application';
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { appendGraphFetch } from './QueryBuilderGraphFetchValueSpecificationBuilder.js';
+import { appendGraphFetch } from './QueryBuilderGraphFetchTreeValueSpecificationBuilder.js';
 import {
   guaranteeNonNullable,
   hashArray,

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts

@@ -39,12 +39,12 @@ import {
   QueryBuilderExplorerTreeSubTypeNodeData,
 } from '../../explorer/QueryBuilderExplorerState.js';
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { computed, makeObservable } from 'mobx';
 import {
   graphFetchTree_addSubTree,
   graphFetchTree_removeSubTree,
-} from '@finos/legend-application';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-import { computed, makeObservable } from 'mobx';
+} from '../../shared/ValueSpecificationModifierHelper.js';
 
 export class QueryBuilderGraphFetchTreeNodeData
   implements TreeNodeData, Hashable

package/src/stores/fetch-structure/graph-fetch/{QueryBuilderGraphFetchValueSpecificationBuilder.ts → QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts}

@@ -137,7 +137,6 @@ export const appendGraphFetch = (
           ),
       multiplicityOne,
     );
-
     graphFetchFunc.parametersValues = [precedingExpression, graphFetchInstance];
     serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
     lambdaFunction.expressionSequence[0] = serializeFunction;

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

@@ -54,9 +54,9 @@ import {
   DEFAULT_LAMBDA_VARIABLE_NAME,
   QUERY_BUILDER_SOURCE_ID_LABEL,
 } from '../../QueryBuilderConfig.js';
-import { LambdaEditorState } from '@finos/legend-application';
 import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import { LambdaEditorState } from '../../shared/LambdaEditorState.js';
 
 export const QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE = 'PROJECTION_COLUMN';
 
@@ -147,8 +147,8 @@ export class QueryBuilderSimpleProjectionColumnState
   }
 
   override getReturnType(): Type | undefined {
-    return this.propertyExpressionState.propertyExpression.func.genericType
-      .value.rawType;
+    return this.propertyExpressionState.propertyExpression.func.value
+      .genericType.value.rawType;
   }
 
   get hashCode(): string {

package/src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts

@@ -159,7 +159,7 @@ export class QueryBuilderProjectionState
         let currentExpression: ValueSpecification =
           column.propertyExpressionState.propertyExpression;
         while (currentExpression instanceof AbstractPropertyExpression) {
-          chunks.push(currentExpression.func.name);
+          chunks.push(currentExpression.func.value.name);
           currentExpression = guaranteeNonNullable(
             currentExpression.parametersValues[0],
           );

package/src/stores/fetch-structure/projection/QueryBuilderProjectionStateBuilder.ts

@@ -157,13 +157,13 @@ export const processTDSProjectionColumnPropertyExpression = (
       );
       // here we just do a simple check to ensure that if we encounter derived properties
       // the number of parameters and arguments provided match
-      if (propertyExpression.func instanceof DerivedProperty) {
+      if (propertyExpression.func.value instanceof DerivedProperty) {
         assertTrue(
-          (Array.isArray(propertyExpression.func.parameters)
-            ? propertyExpression.func.parameters.length
+          (Array.isArray(propertyExpression.func.value.parameters)
+            ? propertyExpression.func.value.parameters.length
             : 0) ===
             propertyExpression.parametersValues.length - 1,
-          `Can't process property expression: derived property '${propertyExpression.func.name}' expects number of provided arguments to match number of parameters`,
+          `Can't process property expression: derived property '${propertyExpression.func.value.name}' expects number of provided arguments to match number of parameters`,
         );
       }
       // Take care of chains of subtype (a pattern that is not useful, but we want to support and rectify)

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

@@ -82,7 +82,7 @@ const buildSortExpression = (
 
 const appendResultSetModifier = (
   resultModifierState: QueryResultSetModifierState,
-  lambda: LambdaFunction,
+  lambdaFunction: LambdaFunction,
   options?:
     | {
         overridingLimit?: number | undefined;
@@ -93,8 +93,8 @@ const appendResultSetModifier = (
     resultModifierState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
-  if (lambda.expressionSequence.length === 1) {
-    const func = lambda.expressionSequence[0];
+  if (lambdaFunction.expressionSequence.length === 1) {
+    const func = lambdaFunction.expressionSequence[0];
     if (func instanceof SimpleFunctionExpression) {
       if (
         matchFunctionName(func.functionName, [
@@ -165,18 +165,16 @@ const appendResultSetModifier = (
             ),
             multiplicityOne,
           );
-
           takeFunction.parametersValues[0] = currentExpression;
           takeFunction.parametersValues[1] = limit;
           currentExpression = takeFunction;
         }
-
-        lambda.expressionSequence[0] = currentExpression;
-        return lambda;
+        lambdaFunction.expressionSequence[0] = currentExpression;
+        return lambdaFunction;
       }
     }
   }
-  return lambda;
+  return lambdaFunction;
 };
 
 export const appendProjection = (
@@ -310,7 +308,6 @@ export const appendProjection = (
           columnLambda,
           aggregateLambda,
         ];
-
         aggregateLambdas.values.push(aggregateFunctionExpression);
       } else {
         colLambdas.values.push(columnLambda);

package/src/stores/fetch-structure/projection/aggregation/operators/{QueryBuilderAggregateOperatorHelper.ts → QueryBuilderAggregateOperatorValueSpecificationBuilder.ts}

@@ -30,8 +30,8 @@ import type { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOper
 
 export const buildAggregateExpression = (
   operatorFunctionFullPath: string,
-  graph: PureModel,
   variableName: string,
+  graph: PureModel,
 ): ValueSpecification => {
   const multiplicityOne = graph.getTypicalMultiplicity(
     TYPICAL_MULTIPLICITY_TYPE.ONE,

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

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

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

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

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

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

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

@@ -58,7 +58,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       return (
         (
           [

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

@@ -60,7 +60,7 @@ export class QueryBuilderAggregateOperator_JoinString
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       // NOTE: Engine does not support Enumerations at the moment.
       return PRIMITIVE_TYPE.STRING === propertyType.path;
     }

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

@@ -32,7 +32,7 @@ import {
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
-} from './QueryBuilderAggregateOperatorHelper.js';
+} from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -53,7 +53,7 @@ export class QueryBuilderAggregateOperator_Max
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       return (
         [
           PRIMITIVE_TYPE.NUMBER,
@@ -82,13 +82,13 @@ export class QueryBuilderAggregateOperator_Max
           PRIMITIVE_TYPE.DATETIME,
         ] as string[]
       ).includes(
-        propertyExpression?.func.genericType.value.rawType.path ??
+        propertyExpression?.func.value.genericType.value.rawType.path ??
           PRIMITIVE_TYPE.NUMBER, // this decision does not affect the output expression
       )
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.DATE_MAX
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MAX,
-      graph,
       variableName,
+      graph,
     );
   }
 
@@ -102,7 +102,7 @@ export class QueryBuilderAggregateOperator_Max
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       switch (propertyType.path) {
         case PRIMITIVE_TYPE.NUMBER:
         case PRIMITIVE_TYPE.INTEGER:

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

@@ -32,7 +32,7 @@ import {
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
-} from './QueryBuilderAggregateOperatorHelper.js';
+} from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -53,7 +53,7 @@ export class QueryBuilderAggregateOperator_Min
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       return (
         [
           PRIMITIVE_TYPE.NUMBER,
@@ -82,13 +82,13 @@ export class QueryBuilderAggregateOperator_Min
           PRIMITIVE_TYPE.DATETIME,
         ] as string[]
       ).includes(
-        propertyExpression?.func.genericType.value.rawType.path ??
+        propertyExpression?.func.value.genericType.value.rawType.path ??
           PRIMITIVE_TYPE.NUMBER, // this decision does not affect the output expression
       )
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.DATE_MIN
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MIN,
-      graph,
       variableName,
+      graph,
     );
   }
 
@@ -102,7 +102,7 @@ export class QueryBuilderAggregateOperator_Min
     ) {
       const propertyType =
         projectionColumnState.propertyExpressionState.propertyExpression.func
-          .genericType.value.rawType;
+          .value.genericType.value.rawType;
       switch (propertyType.path) {
         case PRIMITIVE_TYPE.NUMBER:
         case PRIMITIVE_TYPE.INTEGER:

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

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

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

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