@finos/legend-query-builder 0.1.2 → 0.2.1

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Count.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAOd,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,mCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,OAAO,CAEH;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,WAAW,CACrE,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,KAAK,EACvC,KAAK,EACL,YAAY,CACb,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,KAAK,EACvC,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,gBAAgB,CAAC,eAAe,CAAC,iBAAiB;aACpE,iBAAiB,CAAC,KAAK,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC5E,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Count.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAOd,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,mCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YACrC,OAAO,CAEH;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,WAAW,CACrE,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,KAAK,EACvC,YAAY,EACZ,KAAK,CACN,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,KAAK,EACvC,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,gBAAgB,CAAC,eAAe,CAAC,iBAAiB;aACpE,iBAAiB,CAAC,KAAK,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC5E,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Distinct.js

@@ -16,7 +16,7 @@
 import { PRIMITIVE_TYPE, Enumeration, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_Distinct extends QueryBuilderAggregat
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return ([
                 PRIMITIVE_TYPE.STRING,
                 PRIMITIVE_TYPE.BOOLEAN,
@@ -43,7 +43,7 @@ export class QueryBuilderAggregateOperator_Distinct extends QueryBuilderAggregat
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.UNIQUE_VALUE_ONLY, graph, variableName);
+        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.UNIQUE_VALUE_ONLY, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.UNIQUE_VALUE_ONLY, this);

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Distinct.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Distinct.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Distinct.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAMd,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,sCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,OAAO,CAEH;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,WAAW,CACrE,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,iBAAiB,EACnD,KAAK,EACL,YAAY,CACb,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,iBAAiB,EACnD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,2BAA2B;SACzD,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Distinct.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Distinct.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAMd,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,sCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YACrC,OAAO,CAEH;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,WAAW,CACrE,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,iBAAiB,EACnD,YAAY,EACZ,KAAK,CACN,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,iBAAiB,EACnD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,2BAA2B;SACzD,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js

@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_DistinctCount extends QueryBuilderAgg
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return ([
                 PRIMITIVE_TYPE.STRING,
                 PRIMITIVE_TYPE.BOOLEAN,

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_JoinString.js

@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_JoinString extends QueryBuilderAggreg
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             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/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_JoinString.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.js

@@ -16,7 +16,7 @@
 import { matchFunctionName, PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_Max extends QueryBuilderAggregateOper
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return [
                 PRIMITIVE_TYPE.NUMBER,
                 PRIMITIVE_TYPE.INTEGER,
@@ -45,15 +45,15 @@ export class QueryBuilderAggregateOperator_Max extends QueryBuilderAggregateOper
             PRIMITIVE_TYPE.DATE,
             PRIMITIVE_TYPE.STRICTDATE,
             PRIMITIVE_TYPE.DATETIME,
-        ].includes(propertyExpression?.func.genericType.value.rawType.path ??
+        ].includes(propertyExpression?.func.value.genericType.value.rawType.path ??
             PRIMITIVE_TYPE.NUMBER)
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.DATE_MAX
-            : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MAX, graph, variableName);
+            : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MAX, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             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/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Max.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Max.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.js

@@ -16,7 +16,7 @@
 import { matchFunctionName, PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_Min extends QueryBuilderAggregateOper
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return [
                 PRIMITIVE_TYPE.NUMBER,
                 PRIMITIVE_TYPE.INTEGER,
@@ -45,15 +45,15 @@ export class QueryBuilderAggregateOperator_Min extends QueryBuilderAggregateOper
             PRIMITIVE_TYPE.DATE,
             PRIMITIVE_TYPE.STRICTDATE,
             PRIMITIVE_TYPE.DATETIME,
-        ].includes(propertyExpression?.func.genericType.value.rawType.path ??
+        ].includes(propertyExpression?.func.value.genericType.value.rawType.path ??
             PRIMITIVE_TYPE.NUMBER)
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.DATE_MIN
-            : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MIN, graph, variableName);
+            : QUERY_BUILDER_SUPPORTED_FUNCTIONS.MIN, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             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/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Min.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Min.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js

@@ -16,7 +16,7 @@
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_StdDev_Population extends QueryBuilde
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return [
                 PRIMITIVE_TYPE.NUMBER,
                 PRIMITIVE_TYPE.INTEGER,
@@ -38,7 +38,7 @@ export class QueryBuilderAggregateOperator_StdDev_Population extends QueryBuilde
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_POPULATION, graph, variableName);
+        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_POPULATION, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_POPULATION, this);

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Population.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,cAAc,GAMf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,+CACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,kBAAkB,EACpD,KAAK,EACL,YAAY,CACb,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,kBAAkB,EACpD,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,qBAAqB,CAAC,eAAe;aACvD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,qCAAqC;SACnE,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Population.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,cAAc,GAMf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,+CACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YACrC,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,kBAAkB,EACpD,YAAY,EACZ,KAAK,CACN,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,kBAAkB,EACpD,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,qBAAqB,CAAC,eAAe;aACvD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,qCAAqC;SACnE,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js

@@ -16,7 +16,7 @@
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_StdDev_Sample extends QueryBuilderAgg
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return [
                 PRIMITIVE_TYPE.NUMBER,
                 PRIMITIVE_TYPE.INTEGER,
@@ -38,7 +38,7 @@ export class QueryBuilderAggregateOperator_StdDev_Sample extends QueryBuilderAgg
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_SAMPLE, graph, variableName);
+        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_SAMPLE, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_SAMPLE, this);

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Sample.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAOf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,2CACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,cAAc,EAChD,KAAK,EACL,YAAY,CACb,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,cAAc,EAChD,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,qBAAqB,CAAC,eAAe;aACvD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,iCAAiC;SAC/D,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Sample.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAOf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,2CACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YACrC,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,cAAc,EAChD,YAAY,EACZ,KAAK,CACN,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,cAAc,EAChD,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,qBAAqB,CAAC,eAAe;aACvD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,iCAAiC;SAC/D,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.js

@@ -16,7 +16,7 @@
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
-import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorHelper.js';
+import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 import { hashArray } from '@finos/legend-shared';
@@ -27,7 +27,7 @@ export class QueryBuilderAggregateOperator_Sum extends QueryBuilderAggregateOper
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
             const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .genericType.value.rawType;
+                .value.genericType.value.rawType;
             return [
                 PRIMITIVE_TYPE.NUMBER,
                 PRIMITIVE_TYPE.INTEGER,
@@ -38,7 +38,7 @@ export class QueryBuilderAggregateOperator_Sum extends QueryBuilderAggregateOper
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUM, graph, variableName);
+        return buildAggregateExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUM, variableName, graph);
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUM, this);

package/lib/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Sum.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAMf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,OAAO,iCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,GAAG,EACrC,KAAK,EACL,YAAY,CACb,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,GAAG,EACrC,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Sum.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAMf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,OAAO,iCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,MAAM,YAAY,GAChB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;iBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YACrC,OACE;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;aAEvB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,OAAO,wBAAwB,CAC7B,iCAAiC,CAAC,GAAG,EACrC,YAAY,EACZ,KAAK,CACN,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,OAAO,yBAAyB,CAC9B,qBAAqB,EACrB,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,GAAG,EACrC,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.js

@@ -22,7 +22,7 @@ import { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 const findProjectionColumnState = (propertyExpression, postFilterState) => {
     const projectionState = postFilterState.projectionState;
-    const properyExpressionName = propertyExpression.func.name;
+    const properyExpressionName = propertyExpression.func.value.name;
     assertTrue(Object.values(TDS_COLUMN_GETTER).includes(properyExpressionName), `Can't process TDS column expression: TDS column property '${properyExpressionName}' not supported. Supported types are ${Object.values(TDS_COLUMN_GETTER).join(',')}`);
     const tdsColumnGetter = properyExpressionName;
     const columnNameExpression = propertyExpression.parametersValues[1];
@@ -53,7 +53,7 @@ export const buildPostFilterConditionState = (postFilterState, expression, opera
     const tdsColumnGetter = operator.getTdsColumnGetter();
     if (tdsColumnGetter &&
         expression instanceof AbstractPropertyExpression &&
-        expression.func.name === tdsColumnGetter) {
+        expression.func.value.name === tdsColumnGetter) {
         const columnState = findProjectionColumnState(expression, postFilterState);
         postConditionState = new PostFilterConditionState(postFilterState, columnState, undefined, operator);
         return postConditionState;

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderPostFilterStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.ts"],"names":[],"mappings":"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"}

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

@@ -15,5 +15,5 @@
  */
 import { type LambdaFunction } from '@finos/legend-graph';
 import { type QueryBuilderPostFilterState } from './QueryBuilderPostFilterState.js';
-export declare const appendPostFilter: (postFilterState: QueryBuilderPostFilterState, lambda: LambdaFunction) => LambdaFunction;
+export declare const appendPostFilter: (postFilterState: QueryBuilderPostFilterState, lambdaFunction: LambdaFunction) => LambdaFunction;
 //# sourceMappingURL=QueryBuilderPostFilterValueSpecificationBuilder.d.ts.map

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAIL,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAwD1C,eAAO,MAAM,gBAAgB,oBACV,2BAA2B,UACpC,cAAc,KACrB,cA6BF,CAAC"}
+{"version":3,"file":"QueryBuilderPostFilterValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAIL,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAwD1C,eAAO,MAAM,gBAAgB,oBACV,2BAA2B,kBAC5B,cAAc,KAC7B,cA+BF,CAAC"}

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js

@@ -19,17 +19,17 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/Quer
 import { fromGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, } from './QueryBuilderPostFilterState.js';
-const buildPostFilterExpression = (filterState, node) => {
+const buildPostFilterExpression = (postFilterState, node) => {
     if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
         return node.condition.operator.buildPostFilterConditionExpression(node.condition);
     }
     else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
-        const multiplicityOne = filterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+        const multiplicityOne = postFilterState.projectionState.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))
+            .map((e) => postFilterState.nodes.get(e))
             .filter(isNonNullable)
-            .map((e) => buildPostFilterExpression(filterState, e))
+            .map((e) => buildPostFilterExpression(postFilterState, e))
             .filter(isNonNullable);
         /**
          * NOTE: Due to a limitation (or perhaps design decision) in the engine, group operations
@@ -58,22 +58,22 @@ const buildPostFilterExpression = (filterState, node) => {
     }
     return undefined;
 };
-export const appendPostFilter = (postFilterState, lambda) => {
+export const appendPostFilter = (postFilterState, lambdaFunction) => {
     const postFilterConditionExpressions = postFilterState.rootIds
         .map((e) => guaranteeNonNullable(postFilterState.nodes.get(e)))
         .map((e) => buildPostFilterExpression(postFilterState, e))
         .filter(isNonNullable);
     if (!postFilterConditionExpressions.length ||
-        lambda.expressionSequence.length !== 1) {
-        return lambda;
+        lambdaFunction.expressionSequence.length !== 1) {
+        return lambdaFunction;
     }
     const multiplicityOne = postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
     const filterLambda = buildGenericLambdaFunctionInstanceValue(postFilterState.lambdaParameterName, postFilterConditionExpressions, postFilterState.projectionState.queryBuilderState.graphManagerState.graph);
     // main filter expression
     const filterExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER), multiplicityOne);
-    const currentExpression = guaranteeNonNullable(lambda.expressionSequence[0]);
+    const currentExpression = guaranteeNonNullable(lambdaFunction.expressionSequence[0]);
     filterExpression.parametersValues = [currentExpression, filterLambda];
-    lambda.expressionSequence[0] = filterExpression;
-    return lambda;
+    lambdaFunction.expressionSequence[0] = filterExpression;
+    return lambdaFunction;
 };
 //# sourceMappingURL=QueryBuilderPostFilterValueSpecificationBuilder.js.map

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderPostFilterValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,yBAAyB,GAG1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,4DAA4D,CAAC;AAC/G,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EACL,2CAA2C,EAC3C,uCAAuC,GAGxC,MAAM,kCAAkC,CAAC;AAE1C,MAAM,yBAAyB,GAAG,CAChC,eAA4C,EAC5C,IAAwC,EACR,EAAE;IAClC,IAAI,IAAI,YAAY,2CAA2C,EAAE;QAC/D,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,kCAAkC,CAC/D,IAAI,CAAC,SAAS,CACf,CAAC;KACH;SAAM,IAAI,IAAI,YAAY,uCAAuC,EAAE;QAClE,MAAM,eAAe,GACnB,eAAe,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,sBAAsB,CAC9F,yBAAyB,CAAC,GAAG,CAC9B,CAAC;QACJ,MAAM,IAAI,GAAG,IAAI,wBAAwB,CACvC,0BAA0B,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EACnE,eAAe,CAChB,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW;aAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxC,MAAM,CAAC,aAAa,CAAC;aACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;aACzD,MAAM,CAAC,aAAa,CAAC,CAAC;QACzB;;;;;;;WAOG;QACH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAuB,CAAC;YACrD,IAAI,aAAa,GAAuB,OAAO,CAC7C,OAAO,CAAC,MAAM,GAAG,CAAC,CACG,CAAC;YACxB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;gBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAuB,CAAC;gBACjD,MAAM,OAAO,GAAG,aAAa,CAAC;gBAC9B,MAAM,WAAW,GAAG,IAAI,wBAAwB,CAC9C,0BAA0B,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EACnE,eAAe,CAChB,CAAC;gBACF,WAAW,CAAC,gBAAgB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAClD,aAAa,GAAG,WAAW,CAAC;aAC7B;YACD,IAAI,CAAC,gBAAgB,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;SACtD;aAAM;YACL,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;KACxD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,eAA4C,EAC5C,cAA8B,EACd,EAAE;IAClB,MAAM,8BAA8B,GAAG,eAAe,CAAC,OAAO;SAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;SACzD,MAAM,CAAC,aAAa,CAAC,CAAC;IACzB,IACE,CAAC,8BAA8B,CAAC,MAAM;QACtC,cAAc,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAC9C;QACA,OAAO,cAAc,CAAC;KACvB;IACD,MAAM,eAAe,GACnB,eAAe,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,sBAAsB,CAC9F,yBAAyB,CAAC,GAAG,CAC9B,CAAC;IACJ,MAAM,YAAY,GAAG,uCAAuC,CAC1D,eAAe,CAAC,mBAAmB,EACnC,8BAA8B,EAC9B,eAAe,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC1E,CAAC;IACF,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,IAAI,wBAAwB,CACnD,0BAA0B,CAAC,iCAAiC,CAAC,UAAU,CAAC,EACxE,eAAe,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CACrC,CAAC;IACF,gBAAgB,CAAC,gBAAgB,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IACtE,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;IACxD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}

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

@@ -13,11 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type Multiplicity, type FunctionExpression } from '@finos/legend-graph';
+import { type Multiplicity } from '@finos/legend-graph';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
 import { type QueryBuilderProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
 export declare const getColumnMultiplicity: (columnState: QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState) => Multiplicity;
-export declare const buildPostFilterConditionExpression: (filterConditionState: PostFilterConditionState, operator: QueryBuilderPostFilterOperator, operatorFunctionFullPath: string | undefined) => FunctionExpression;
 //# sourceMappingURL=QueryBuilderPostFilterOperatorHelper.d.ts.map

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAYxB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EACL,KAAK,wBAAwB,EAG9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,4CAA4C,CAAC;AAEpD,eAAO,MAAM,qBAAqB,gBAE5B,iCAAiC,GACjC,gCAAgC,KACnC,YAaF,CAAC;AAEF,eAAO,MAAM,kCAAkC,yBACvB,wBAAwB,YACpC,8BAA8B,4BAOd,MAAM,GAAG,SAAS,KAC3C,kBAoDF,CAAC"}
+{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,4CAA4C,CAAC;AAEpD,eAAO,MAAM,qBAAqB,gBAE5B,iCAAiC,GACjC,gCAAgC,KACnC,YAaF,CAAC"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.js

@@ -13,61 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AbstractPropertyExpression, extractElementNameFromPath, GenericType, GenericTypeExplicitReference, PrimitiveInstanceValue, PRIMITIVE_TYPE, SimpleFunctionExpression, TYPICAL_MULTIPLICITY_TYPE, VariableExpression, getAllClassDerivedProperties, CORE_PURE_PATH, } from '@finos/legend-graph';
-import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
+import { TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
+import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import { getTDSColumnDerivedProperyFromType, } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
 export const getColumnMultiplicity = (columnState) => {
     if (columnState instanceof QueryBuilderAggregateColumnState) {
         return columnState.aggregationState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
     }
     else if (columnState instanceof QueryBuilderSimpleProjectionColumnState) {
-        return columnState.propertyExpressionState.propertyExpression.func
+        return columnState.propertyExpressionState.propertyExpression.func.value
             .multiplicity;
     }
     throw new UnsupportedOperationError(`Can't get multiplicity for column`, columnState);
 };
-export const buildPostFilterConditionExpression = (filterConditionState, operator, 
-/**
- * If provided, this will be used to construct the simple
- * function expression for the function with the specified
- * name. If not provided, we will fall back to use the TDS column getter function expression.
- * This is the case because with TDS, we are provided some filter-like operators, e.g. IS_NULL, IS_NOT_NULL, etc.
- */
-operatorFunctionFullPath) => {
-    // primitives
-    const graph = filterConditionState.postFilterState.projectionState.queryBuilderState
-        .graphManagerState.graph;
-    const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
-    const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
-    // property expression
-    const colState = filterConditionState.columnState;
-    const tdsPropertyExpression = new AbstractPropertyExpression('', multiplicityOne);
-    let tdsDerivedPropertyName;
-    const correspondingTdsDerivedProperty = operator.getTdsColumnGetter();
-    if (correspondingTdsDerivedProperty) {
-        tdsDerivedPropertyName = correspondingTdsDerivedProperty;
-    }
-    else {
-        const type = guaranteeNonNullable(colState.getReturnType());
-        tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
-    }
-    tdsPropertyExpression.func = guaranteeNonNullable(getAllClassDerivedProperties(graph.getClass(CORE_PURE_PATH.TDS_ROW)).find((p) => p.name === tdsDerivedPropertyName));
-    const variableName = new VariableExpression(filterConditionState.postFilterState.lambdaParameterName, multiplicityOne);
-    const colInstanceValue = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(typeString)), multiplicityOne);
-    colInstanceValue.values = [colState.columnName];
-    tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
-    if (operatorFunctionFullPath) {
-        const expression = new SimpleFunctionExpression(extractElementNameFromPath(operatorFunctionFullPath), multiplicityOne);
-        expression.parametersValues.push(tdsPropertyExpression);
-        if (filterConditionState.value) {
-            expression.parametersValues.push(filterConditionState.value);
-        }
-        return expression;
-    }
-    else {
-        return tdsPropertyExpression;
-    }
-};
 //# sourceMappingURL=QueryBuilderPostFilterOperatorHelper.js.map

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,EAEL,uCAAuC,GACxC,MAAM,4CAA4C,CAAC;AAEpD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,WAEoC,EACtB,EAAE;IAChB,IAAI,WAAW,YAAY,gCAAgC,EAAE;QAC3D,OAAO,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,sBAAsB,CAClH,yBAAyB,CAAC,GAAG,CAC9B,CAAC;KACH;SAAM,IAAI,WAAW,YAAY,uCAAuC,EAAE;QACzE,OAAO,WAAW,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACrE,YAAY,CAAC;KACjB;IACD,MAAM,IAAI,yBAAyB,CACjC,mCAAmC,EACnC,WAAW,CACZ,CAAC;AACJ,CAAC,CAAC"}

package/{src/graphManager/protocol/pure/v1/V1_QueryBuilder_PropertyExpressionTypeInferenceBuilder.ts → lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts}

@@ -13,16 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import {
-  type SimpleFunctionExpression,
-  type Type,
-  InstanceValue,
-} from '@finos/legend-graph';
-
-export const V1_buildSubTypePropertyExpressionTypeInference = (
-  inferredVariable: SimpleFunctionExpression,
-): Type | undefined =>
-  inferredVariable.parametersValues.filter(
-    (param) => param instanceof InstanceValue,
-  )[0]?.genericType?.value.rawType;
+import { type FunctionExpression } from '@finos/legend-graph';
+import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
+import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
+export declare const buildPostFilterConditionExpression: (filterConditionState: PostFilterConditionState, operator: QueryBuilderPostFilterOperator, operatorFunctionFullPath: string | undefined) => FunctionExpression;
+//# sourceMappingURL=QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts.map