@finos/legend-query-builder 0.4.0 → 0.4.2

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js

@@ -13,22 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { extractElementNameFromPath, GenericType, GenericTypeExplicitReference, matchFunctionName, PrimitiveInstanceValue, PRIMITIVE_TYPE, SimpleFunctionExpression, TYPICAL_MULTIPLICITY_TYPE, RootGraphFetchTreeInstanceValue, } from '@finos/legend-graph';
+import { extractElementNameFromPath, GenericType, GenericTypeExplicitReference, matchFunctionName, PrimitiveInstanceValue, SimpleFunctionExpression, GraphFetchTreeInstanceValue, PrimitiveType, } from '@finos/legend-graph';
 import { guaranteeNonNullable, guaranteeType } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { isGraphFetchTreeDataEmpty } from './QueryBuilderGraphFetchTreeUtil.js';
-const appendTakeLimit = (queryBuilderState, lambda, previewLimit) => {
+const appendTakeLimit = (lambda, previewLimit) => {
     if (!previewLimit) {
         return lambda;
     }
-    const multiplicityOne = queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
     if (lambda.expressionSequence.length === 1) {
         const func = lambda.expressionSequence[0];
         if (func instanceof SimpleFunctionExpression) {
             if (matchFunctionName(func.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE)) {
-                const limit = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(queryBuilderState.graphManagerState.graph.getPrimitiveType(PRIMITIVE_TYPE.INTEGER))), multiplicityOne);
+                const limit = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.INTEGER)));
                 limit.values = [previewLimit];
-                const takeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TAKE), multiplicityOne);
+                const takeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TAKE));
                 // NOTE: `take()` does not work on `graphFetch()` or `serialize()` so we need to
                 // put it next to `all()`
                 const serializeFunction = func;
@@ -50,23 +49,22 @@ const appendTakeLimit = (queryBuilderState, lambda, previewLimit) => {
 export const appendGraphFetch = (graphFetchTreeState, lambdaFunction, options) => {
     const queryBuilderState = graphFetchTreeState.queryBuilderState;
     const precedingExpression = guaranteeNonNullable(lambdaFunction.expressionSequence[0], `Can't build graph-fetch tree expression: preceding expression is not defined`);
-    const multiplicityOne = queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
     // build graph-fetch tree
     if (graphFetchTreeState.treeData &&
         !isGraphFetchTreeDataEmpty(graphFetchTreeState.treeData)) {
-        const graphFetchInstance = new RootGraphFetchTreeInstanceValue(multiplicityOne);
+        const graphFetchInstance = new GraphFetchTreeInstanceValue();
         graphFetchInstance.values = [graphFetchTreeState.treeData.tree];
-        const serializeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE), multiplicityOne);
+        const serializeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE));
         const graphFetchFunc = new SimpleFunctionExpression(graphFetchTreeState.isChecked
             ? extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED)
-            : extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH), multiplicityOne);
+            : extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH));
         graphFetchFunc.parametersValues = [precedingExpression, graphFetchInstance];
         serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
         lambdaFunction.expressionSequence[0] = serializeFunction;
     }
     // build result set modifier: i.e. preview limit
     if (options?.isBuildingExecutionQuery) {
-        appendTakeLimit(queryBuilderState, lambdaFunction, queryBuilderState.resultState.previewLimit);
+        appendTakeLimit(lambdaFunction, queryBuilderState.resultState.previewLimit);
     }
 };
 //# sourceMappingURL=QueryBuilderGraphFetchTreeValueSpecificationBuilder.js.map

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js.map

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

package/lib/stores/fetch-structure/tds/{QueryBuilderTDSColumnState_.d.ts → QueryBuilderTDSColumnState.d.ts}

@@ -21,4 +21,4 @@ export declare abstract class QueryBuilderTDSColumnState implements Hashable {
     abstract getColumnType(): Type | undefined;
     abstract get hashCode(): string;
 }
-//# sourceMappingURL=QueryBuilderTDSColumnState_.d.ts.map
+//# sourceMappingURL=QueryBuilderTDSColumnState.d.ts.map

package/lib/stores/fetch-structure/tds/QueryBuilderTDSColumnState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderTDSColumnState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,8BAAsB,0BAA2B,YAAW,QAAQ;IAClE,QAAQ,CAAC,IAAI,SAAU;IAEvB,QAAQ,KAAK,UAAU,IAAI,MAAM,CAAC;IAElC,QAAQ,CAAC,aAAa,IAAI,IAAI,GAAG,SAAS;IAE1C,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC"}

package/lib/stores/fetch-structure/tds/{QueryBuilderTDSColumnState_.js → QueryBuilderTDSColumnState.js}

@@ -17,4 +17,4 @@ import { uuid } from '@finos/legend-shared';
 export class QueryBuilderTDSColumnState {
     uuid = uuid();
 }
-//# sourceMappingURL=QueryBuilderTDSColumnState_.js.map
+//# sourceMappingURL=QueryBuilderTDSColumnState.js.map

package/lib/stores/fetch-structure/tds/QueryBuilderTDSColumnState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderTDSColumnState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAiB,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG3D,MAAM,OAAgB,0BAA0B;IACrC,IAAI,GAAG,IAAI,EAAE,CAAC;CAOxB"}

package/lib/stores/fetch-structure/tds/QueryBuilderTDSHelper.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { QueryBuilderTDSState } from './QueryBuilderTDSState.js';
-import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 import { COLUMN_SORT_TYPE } from './QueryResultSetModifierState.js';
 export declare const findTDSColumnState: (projectionState: QueryBuilderTDSState, columnName: string) => QueryBuilderTDSColumnState | undefined;
 export declare const getTDSColumnState: (projectionState: QueryBuilderTDSState, columnName: string) => QueryBuilderTDSColumnState;

package/lib/stores/fetch-structure/tds/QueryBuilderTDSHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderTDSHelper.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,eAAO,MAAM,kBAAkB,oBACZ,oBAAoB,cACzB,MAAM,KACjB,0BAA0B,GAAG,SACqC,CAAC;AAEtE,eAAO,MAAM,iBAAiB,oBACX,oBAAoB,cACzB,MAAM,KACjB,0BAIA,CAAC;AAEJ,eAAO,MAAM,iCAAiC,iBAC9B,MAAM,KACnB,gBAaF,CAAC;AAEF,eAAO,MAAM,gCAAgC,mBAC3B,gBAAgB,KAC/B,MAeF,CAAC"}
+{"version":3,"file":"QueryBuilderTDSHelper.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryBuilderTDSHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,eAAO,MAAM,kBAAkB,oBACZ,oBAAoB,cACzB,MAAM,KACjB,0BAA0B,GAAG,SACqC,CAAC;AAEtE,eAAO,MAAM,iBAAiB,oBACX,oBAAoB,cACzB,MAAM,KACjB,0BAIA,CAAC;AAEJ,eAAO,MAAM,iCAAiC,iBAC9B,MAAM,KACnB,gBAaF,CAAC;AAEF,eAAO,MAAM,gCAAgC,mBAC3B,gBAAgB,KAC/B,MAeF,CAAC"}

package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.d.ts

@@ -26,13 +26,13 @@ import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjecti
 import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
 import { type QueryBuilderExplorerTreePropertyNodeData } from '../../explorer/QueryBuilderExplorerState.js';
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { QueryBuilderOlapGroupByState } from './olapGroupBy/QueryBuilderOlapGroupByState.js';
-import type { QueryBuilderTDSOlapOperator } from './olapGroupBy/operators/QueryBuilderTDSOlapOperator_.js';
-import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState_.js';
+import { QueryBuilderOLAPGroupByState } from './olapGroupBy/QueryBuilderOLAPGroupByState_.js';
+import type { QueryBuilderTDS_OLAPOperator } from './olapGroupBy/operators/QueryBuilderTDS_OLAPOperator.js';
+import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 export declare class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementationState implements Hashable {
     readonly aggregationState: QueryBuilderAggregationState;
     readonly postFilterState: QueryBuilderPostFilterState;
-    readonly olapGroupByState: QueryBuilderOlapGroupByState;
+    readonly olapGroupByState: QueryBuilderOLAPGroupByState;
     readonly resultSetModifierState: QueryResultSetModifierState;
     projectionColumns: QueryBuilderProjectionColumnState[];
     isConvertDerivationProjectionObjects: boolean;
@@ -40,7 +40,7 @@ export declare class QueryBuilderTDSState extends QueryBuilderFetchStructureImpl
     showOlapGroupByPanel: boolean;
     postFilterOperators: QueryBuilderPostFilterOperator[];
     aggregationOperators: QueryBuilderAggregateOperator[];
-    olapGroupByOperators: QueryBuilderTDSOlapOperator[];
+    olapGroupByOperators: QueryBuilderTDS_OLAPOperator[];
     constructor(queryBuilderState: QueryBuilderState, fetchStructureState: QueryBuilderFetchStructureState);
     get type(): string;
     get derivations(): QueryBuilderDerivationProjectionColumnState[];

package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.d.ts.map

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

package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.js

@@ -30,8 +30,8 @@ import { ActionAlertActionType, ActionAlertType, } from '@finos/legend-applicati
 import { appendProjection } from './projection/QueryBuilderProjectionValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-import { QueryBuilderOlapGroupByState } from './olapGroupBy/QueryBuilderOlapGroupByState.js';
-import { getQueryBuilderCoreOlapGroupByOperators } from './olapGroupBy/QueryBuilderOlapGroupByOperatorLoader.js';
+import { QueryBuilderOLAPGroupByState } from './olapGroupBy/QueryBuilderOLAPGroupByState_.js';
+import { getQueryBuilderCoreOLAPGroupByOperators } from './olapGroupBy/QueryBuilderOLAPGroupByOperatorLoader_.js';
 export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementationState {
     aggregationState;
     postFilterState;
@@ -43,7 +43,7 @@ export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementati
     showOlapGroupByPanel = false;
     postFilterOperators = getQueryBuilderCorePostFilterOperators();
     aggregationOperators = getQueryBuilderCoreAggregrationOperators();
-    olapGroupByOperators = getQueryBuilderCoreOlapGroupByOperators();
+    olapGroupByOperators = getQueryBuilderCoreOLAPGroupByOperators();
     constructor(queryBuilderState, fetchStructureState) {
         super(queryBuilderState, fetchStructureState);
         makeObservable(this, {
@@ -64,7 +64,7 @@ export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementati
         this.resultSetModifierState = new QueryResultSetModifierState(this);
         this.postFilterState = new QueryBuilderPostFilterState(this, this.postFilterOperators);
         this.aggregationState = new QueryBuilderAggregationState(this, this.aggregationOperators);
-        this.olapGroupByState = new QueryBuilderOlapGroupByState(this, this.olapGroupByOperators);
+        this.olapGroupByState = new QueryBuilderOLAPGroupByState(this, this.olapGroupByOperators);
     }
     get type() {
         return FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE;

package/lib/stores/fetch-structure/tds/QueryBuilderTDSState.js.map

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

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.d.ts

@@ -18,7 +18,7 @@ import type { Type } from '@finos/legend-graph';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
 import type { QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
-import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 export declare class QueryBuilderAggregateColumnState extends QueryBuilderTDSColumnState implements Hashable {
     readonly aggregationState: QueryBuilderAggregationState;
     projectionColumnState: QueryBuilderProjectionColumnState;

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregationState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AAE5G,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAE/E,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;IACxD,qBAAqB,EAAE,iCAAiC,CAAC;IACzD,mBAAmB,EAAE,MAAM,CAAgC;IAC3D,QAAQ,EAAE,6BAA6B,CAAC;gBAGtC,gBAAgB,EAAE,4BAA4B,EAC9C,qBAAqB,EAAE,iCAAiC,EACxD,QAAQ,EAAE,6BAA6B;IAiBzC,cAAc,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAI5D,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzC,WAAW,CAAC,GAAG,EAAE,6BAA6B,GAAG,IAAI;IAIrD,aAAa,IAAI,IAAI;IAIrB,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;CACF;AAED,qBAAa,4BAA6B,YAAW,QAAQ;IAC3D,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,6BAA6B,EAAE,CAAM;IACzD,OAAO,EAAE,gCAAgC,EAAE,CAAM;gBAG/C,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,6BAA6B,EAAE;IAc5C,YAAY,CAAC,GAAG,EAAE,gCAAgC,GAAG,IAAI;IAIzD,SAAS,CAAC,GAAG,EAAE,gCAAgC,GAAG,IAAI;IAItD,6BAA6B,CAC3B,GAAG,EAAE,6BAA6B,GAAG,SAAS,EAC9C,qBAAqB,EAAE,iCAAiC,GACvD,IAAI;IA6CP,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}
+{"version":3,"file":"QueryBuilderAggregationState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AAE5G,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;IACxD,qBAAqB,EAAE,iCAAiC,CAAC;IACzD,mBAAmB,EAAE,MAAM,CAAgC;IAC3D,QAAQ,EAAE,6BAA6B,CAAC;gBAGtC,gBAAgB,EAAE,4BAA4B,EAC9C,qBAAqB,EAAE,iCAAiC,EACxD,QAAQ,EAAE,6BAA6B;IAiBzC,cAAc,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAI5D,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzC,WAAW,CAAC,GAAG,EAAE,6BAA6B,GAAG,IAAI;IAIrD,aAAa,IAAI,IAAI;IAIrB,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;CACF;AAED,qBAAa,4BAA6B,YAAW,QAAQ;IAC3D,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,6BAA6B,EAAE,CAAM;IACzD,OAAO,EAAE,gCAAgC,EAAE,CAAM;gBAG/C,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,6BAA6B,EAAE;IAc5C,YAAY,CAAC,GAAG,EAAE,gCAAgC,GAAG,IAAI;IAIzD,SAAS,CAAC,GAAG,EAAE,gCAAgC,GAAG,IAAI;IAItD,6BAA6B,CAC3B,GAAG,EAAE,6BAA6B,GAAG,SAAS,EAC9C,qBAAqB,EAAE,iCAAiC,GACvD,IAAI;IA6CP,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.js

@@ -17,7 +17,7 @@ import { action, computed, makeObservable, observable } from 'mobx';
 import { deleteEntry, addUniqueEntry, hashArray, } from '@finos/legend-shared';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
-import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 export class QueryBuilderAggregateColumnState extends QueryBuilderTDSColumnState {
     aggregationState;
     projectionColumnState;

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.js.map

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

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperatorValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,wBAAwB,EAGxB,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,uDAAuD,CAAC;AAC/G,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEzF,eAAO,MAAM,wBAAwB,6BACT,MAAM,gBAClB,MAAM,SACb,SAAS,KACf,kBAYF,CAAC;AAEF,eAAO,MAAM,yBAAyB,0BACb,iCAAiC,eAC3C,kBAAkB,cACnB,wBAAwB,4BACV,MAAM,YACtB,6BAA6B,KACtC,gCAAgC,GAAG,SAsDrC,CAAC"}
+{"version":3,"file":"QueryBuilderAggregateOperatorValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,wBAAwB,EAGxB,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,uDAAuD,CAAC;AAC/G,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEzF,eAAO,MAAM,wBAAwB,6BACT,MAAM,gBAClB,MAAM,SACb,SAAS,KACf,kBAQF,CAAC;AAEF,eAAO,MAAM,yBAAyB,0BACb,iCAAiC,eAC3C,kBAAkB,cACnB,wBAAwB,4BACV,MAAM,YACtB,6BAA6B,KACtC,gCAAgC,GAAG,SAsDrC,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.js

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression, extractElementNameFromPath, matchFunctionName, VariableExpression, TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
+import { SimpleFunctionExpression, extractElementNameFromPath, matchFunctionName, VariableExpression, Multiplicity, } from '@finos/legend-graph';
 import { guaranteeType, assertTrue } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 export const buildAggregateExpression = (operatorFunctionFullPath, variableName, graph) => {
-    const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
-    const expression = new SimpleFunctionExpression(extractElementNameFromPath(operatorFunctionFullPath), multiplicityOne);
-    expression.parametersValues.push(new VariableExpression(variableName, multiplicityOne));
+    const expression = new SimpleFunctionExpression(extractElementNameFromPath(operatorFunctionFullPath));
+    expression.parametersValues.push(new VariableExpression(variableName, Multiplicity.ONE));
     return expression;
 };
 export const buildAggregateColumnState = (projectionColumnState, lambdaParam, expression, operatorFunctionFullPath, operator) => {

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperatorValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,wBAAwB,EACxB,0BAA0B,EAC1B,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAItF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,wBAAgC,EAChC,YAAoB,EACpB,KAAgB,EACI,EAAE;IACtB,MAAM,eAAe,GAAG,KAAK,CAAC,sBAAsB,CAClD,yBAAyB,CAAC,GAAG,CAC9B,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,wBAAwB,CAC7C,0BAA0B,CAAC,wBAAwB,CAAC,EACpD,eAAe,CAChB,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAC9B,IAAI,kBAAkB,CAAC,YAAY,EAAE,eAAe,CAAC,CACtD,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,qBAAwD,EACxD,WAA+B,EAC/B,UAAoC,EACpC,wBAAgC,EAChC,QAAuC,EACO,EAAE;IAChD,IAAI,iBAAiB,CAAC,UAAU,CAAC,YAAY,EAAE,wBAAwB,CAAC,EAAE;QACxE,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,CAC/D,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,EAC/C,qBAAqB,EACrB,QAAQ,CACT,CAAC;QACF,oBAAoB,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE9D,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,kBAAkB,0BAA0B,CAC3C,wBAAwB,CACzB,wBAAwB,CAC1B,CAAC;QAEF,WAAW;QACX,MAAM,kBAAkB,GAAG,aAAa,CACtC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,kBAAkB,EAClB,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,+BAA+B,0BAA0B,CACxD,wBAAwB,CACzB,gDAAgD,CAClD,CAAC;QACF,UAAU,CACR,oBAAoB,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,IAAI,EACpE,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,wDACC,kBAAkB,CAAC,IACrB,gCACE,oBAAoB,CAAC,mBACvB,GAAG,CACJ,CAAC;QAEF,WAAW;QACX,UAAU,CACR,QAAQ,CAAC,sBAAsB,CAC7B,oBAAoB,CAAC,qBAAqB,CAC3C,EACD,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,yDAAyD,CAC3D,CAAC;QACF,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,oBAAoB,CAAC;KAC7B;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderAggregateOperatorValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,wBAAwB,EACxB,0BAA0B,EAC1B,iBAAiB,EACjB,kBAAkB,EAClB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAItF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,wBAAgC,EAChC,YAAoB,EACpB,KAAgB,EACI,EAAE;IACtB,MAAM,UAAU,GAAG,IAAI,wBAAwB,CAC7C,0BAA0B,CAAC,wBAAwB,CAAC,CACrD,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAC9B,IAAI,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CACvD,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,qBAAwD,EACxD,WAA+B,EAC/B,UAAoC,EACpC,wBAAgC,EAChC,QAAuC,EACO,EAAE;IAChD,IAAI,iBAAiB,CAAC,UAAU,CAAC,YAAY,EAAE,wBAAwB,CAAC,EAAE;QACxE,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,CAC/D,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,EAC/C,qBAAqB,EACrB,QAAQ,CACT,CAAC;QACF,oBAAoB,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE9D,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,kBAAkB,0BAA0B,CAC3C,wBAAwB,CACzB,wBAAwB,CAC1B,CAAC;QAEF,WAAW;QACX,MAAM,kBAAkB,GAAG,aAAa,CACtC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,kBAAkB,EAClB,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,+BAA+B,0BAA0B,CACxD,wBAAwB,CACzB,gDAAgD,CAClD,CAAC;QACF,UAAU,CACR,oBAAoB,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,IAAI,EACpE,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,wDACC,kBAAkB,CAAC,IACrB,gCACE,oBAAoB,CAAC,mBACvB,GAAG,CACJ,CAAC;QAEF,WAAW;QACX,UAAU,CACR,QAAQ,CAAC,sBAAsB,CAC7B,oBAAoB,CAAC,qBAAqB,CAC3C,EACD,iBAAiB,0BAA0B,CACzC,wBAAwB,CACzB,yDAAyD,CAC3D,CAAC;QACF,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,oBAAoB,CAAC;KAC7B;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Average.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,0BAA0B,EAC/B,KAAK,IAAI,EACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,qCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAmBV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Average.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,0BAA0B,EAC/B,KAAK,IAAI,EAEV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,qCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAmBV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAIP,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
+import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
@@ -44,9 +44,7 @@ export class QueryBuilderAggregateOperator_Average extends QueryBuilderAggregate
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.AVERAGE, this);
     }
     getReturnType(aggregateColumnState) {
-        const graph = aggregateColumnState.aggregationState.tdsState.queryBuilderState
-            .graphManagerState.graph;
-        return graph.getType(PRIMITIVE_TYPE.FLOAT);
+        return PrimitiveType.FLOAT;
     }
     get hashCode() {
         return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_AVERAGE]);

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Average.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.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,uDAAuD,CAAC;AAC/D,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,qCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,SAAS,CAAC;IACnB,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,OAAO,EACzC,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,OAAO,EACzC,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB;aAC7D,iBAAiB,CAAC,KAAK,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC9E,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Average.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAOd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,uDAAuD,CAAC;AAC/D,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,qCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,SAAS,CAAC;IACnB,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,OAAO,EACzC,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,OAAO,EACzC,IAAI,CACL,CAAC;IACJ,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,OAAO,aAAa,CAAC,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC9E,CAAC;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Count.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,0BAA0B,EAEhC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,mCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IA0BV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_Count.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,0BAA0B,EAGhC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,mCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IA0BV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAIP,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF"}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { PRIMITIVE_TYPE, Enumeration, } from '@finos/legend-graph';
+import { PRIMITIVE_TYPE, Enumeration, PrimitiveType, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
@@ -49,9 +49,7 @@ export class QueryBuilderAggregateOperator_Count extends QueryBuilderAggregateOp
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.COUNT, this);
     }
     getReturnType(aggregateColumnState) {
-        const graph = aggregateColumnState.aggregationState.tdsState.queryBuilderState
-            .graphManagerState.graph;
-        return graph.getType(PRIMITIVE_TYPE.INTEGER);
+        return PrimitiveType.INTEGER;
     }
     get hashCode() {
         return hashArray([QUERY_BUILDER_HASH_STRUCTURE.AGGREGATE_OPERATOR_COUNT]);

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_Count.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/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,uDAAuD,CAAC;AAC/D,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,QAAQ,CAAC,iBAAiB;aAC7D,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/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EAOd,WAAW,EACX,aAAa,GACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,uDAAuD,CAAC;AAC/D,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,OAAO,aAAa,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,4BAA4B,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC5E,CAAC;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,wBAAwB,EACxB,kBAAkB,EAKlB,KAAK,IAAI,EAEV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAI/D,qBAAa,2CACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IA0BV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAmBrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAkEtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,wBAAwB,EACxB,kBAAkB,EAIlB,KAAK,IAAI,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAI/D,qBAAa,2CACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IA0BV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAcrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAkEtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression, VariableExpression, TYPICAL_MULTIPLICITY_TYPE, extractElementNameFromPath, matchFunctionName, PRIMITIVE_TYPE, Enumeration, } from '@finos/legend-graph';
+import { SimpleFunctionExpression, VariableExpression, extractElementNameFromPath, matchFunctionName, PRIMITIVE_TYPE, Enumeration, Multiplicity, } from '@finos/legend-graph';
 import { assertTrue, guaranteeType, hashArray, } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -43,10 +43,9 @@ export class QueryBuilderAggregateOperator_DistinctCount extends QueryBuilderAgg
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
-        const distinctExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.DISTINCT), multiplicityOne);
-        distinctExpression.parametersValues.push(new VariableExpression(variableName, multiplicityOne));
-        const distinctCountExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.COUNT), multiplicityOne);
+        const distinctExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.DISTINCT));
+        distinctExpression.parametersValues.push(new VariableExpression(variableName, Multiplicity.ONE));
+        const distinctCountExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.COUNT));
         distinctCountExpression.parametersValues.push(distinctExpression);
         return distinctCountExpression;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderAggregateOperator_DistinctCount.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,EACjB,cAAc,EAEd,WAAW,EACX,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,aAAa,EAEb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,2CACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,gBAAgB,CAAC;IAC1B,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,MAAM,kBAAkB,GAAG,IAAI,wBAAwB,CACrD,0BAA0B,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CACvE,CAAC;QACF,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CACtC,IAAI,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CACvD,CAAC;QACF,MAAM,uBAAuB,GAAG,IAAI,wBAAwB,CAC1D,0BAA0B,CAAC,iCAAiC,CAAC,KAAK,CAAC,CACpE,CAAC;QACF,uBAAuB,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClE,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,IACE,iBAAiB,CACf,UAAU,CAAC,YAAY,EACvB,iCAAiC,CAAC,KAAK,CACxC,EACD;YACA,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,CAC/D,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,EAC/C,qBAAqB,EACrB,IAAI,CACL,CAAC;YACF,oBAAoB,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAE9D,2BAA2B;YAC3B,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,+DAA+D,CAChE,CAAC;YAEF,sBAAsB;YACtB,MAAM,kBAAkB,GAAG,aAAa,CACtC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,kBAAkB,IAAI,CAAC,QAAQ,CAC7B,qBAAqB,CACtB,8EAA8E,CAChF,CAAC;YACF,UAAU,CACR,iBAAiB,CACf,kBAAkB,CAAC,YAAY,EAC/B,iCAAiC,CAAC,QAAQ,CAC3C,EACD,kBAAkB,IAAI,CAAC,QAAQ,CAC7B,qBAAqB,CACtB,sFAAsF,CACxF,CAAC;YACF,UAAU,CACR,kBAAkB,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAChD,qEAAqE,CACtE,CAAC;YAEF,WAAW;YACX,MAAM,kBAAkB,GAAG,aAAa,CACtC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EACtC,kBAAkB,EAClB,0GAA0G,CAC3G,CAAC;YACF,UAAU,CACR,oBAAoB,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,IAAI,EACpE,8EAA8E,kBAAkB,CAAC,IAAI,gCAAgC,oBAAoB,CAAC,mBAAmB,GAAG,CACjL,CAAC;YAEF,WAAW;YACX,UAAU,CACR,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,EACvE,yEAAyE,CAC1E,CAAC;YACF,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEvC,OAAO,oBAAoB,CAAC;SAC7B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB;aAC7D,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;YACf,4BAA4B,CAAC,iCAAiC;SAC/D,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,IAAI,EAET,wBAAwB,EACxB,kBAAkB,EAOnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAI/D,qBAAa,wCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAaV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAwBrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAsDtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,IAAI,EAET,wBAAwB,EACxB,kBAAkB,EAOnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAI/D,qBAAa,wCACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAcV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAmBrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAsDtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAIP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { matchFunctionName, SimpleFunctionExpression, VariableExpression, TYPICAL_MULTIPLICITY_TYPE, extractElementNameFromPath, PrimitiveInstanceValue, GenericTypeExplicitReference, GenericType, PRIMITIVE_TYPE, } from '@finos/legend-graph';
+import { matchFunctionName, SimpleFunctionExpression, VariableExpression, extractElementNameFromPath, PrimitiveInstanceValue, GenericTypeExplicitReference, GenericType, Multiplicity, PrimitiveType, } from '@finos/legend-graph';
 import { assertTrue, guaranteeType, hashArray, } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
@@ -26,19 +26,18 @@ export class QueryBuilderAggregateOperator_JoinString extends QueryBuilderAggreg
     }
     isCompatibleWithColumn(projectionColumnState) {
         if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
-            const propertyType = projectionColumnState.propertyExpressionState.propertyExpression.func
-                .value.genericType.value.rawType;
             // NOTE: Engine does not support Enumerations at the moment.
-            return PRIMITIVE_TYPE.STRING === propertyType.path;
+            return (PrimitiveType.STRING ===
+                projectionColumnState.propertyExpressionState.propertyExpression.func
+                    .value.genericType.value.rawType);
         }
         return true;
     }
     buildAggregateExpression(propertyExpression, variableName, graph) {
-        const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
-        const expression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.JOIN_STRINGS), multiplicityOne);
-        const delimiter = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(graph.getPrimitiveType(PRIMITIVE_TYPE.STRING))), multiplicityOne);
+        const expression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.JOIN_STRINGS));
+        const delimiter = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)));
         delimiter.values = [';'];
-        expression.parametersValues.push(new VariableExpression(variableName, multiplicityOne), delimiter);
+        expression.parametersValues.push(new VariableExpression(variableName, Multiplicity.ONE), delimiter);
         return expression;
     }
     buildAggregateColumnState(expression, lambdaParam, projectionColumnState) {
@@ -60,9 +59,7 @@ export class QueryBuilderAggregateOperator_JoinString extends QueryBuilderAggreg
         return undefined;
     }
     getReturnType(aggregateColumnState) {
-        const graph = aggregateColumnState.aggregationState.tdsState.queryBuilderState
-            .graphManagerState.graph;
-        return graph.getType(PRIMITIVE_TYPE.STRING);
+        return PrimitiveType.STRING;
     }
     get hashCode() {
         return hashArray([

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAKL,iBAAiB,EACjB,wBAAwB,EACxB,kBAAkB,EAClB,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,4BAA4B,EAC5B,WAAW,EACX,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,aAAa,EAEb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,wCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,MAAM,CAAC;IAChB,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,4DAA4D;YAC5D,OAAO,cAAc,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC;SACpD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,MAAM,eAAe,GAAG,KAAK,CAAC,sBAAsB,CAClD,yBAAyB,CAAC,GAAG,CAC9B,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,wBAAwB,CAC7C,0BAA0B,CACxB,iCAAiC,CAAC,YAAY,CAC/C,EACD,eAAe,CAChB,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,sBAAsB,CAC1C,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CAAC,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAC/D,EACD,eAAe,CAChB,CAAC;QACF,SAAS,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAC9B,IAAI,kBAAkB,CAAC,YAAY,EAAE,eAAe,CAAC,EACrD,SAAS,CACV,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,IACE,iBAAiB,CACf,UAAU,CAAC,YAAY,EACvB,iCAAiC,CAAC,YAAY,CAC/C,EACD;YACA,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,CAC/D,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,EAC/C,qBAAqB,EACrB,IAAI,CACL,CAAC;YACF,oBAAoB,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAE9D,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,0EAA0E,CAC3E,CAAC;YAEF,WAAW;YACX,MAAM,kBAAkB,GAAG,aAAa,CACtC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,kBAAkB,EAClB,gHAAgH,CACjH,CAAC;YACF,UAAU,CACR,oBAAoB,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,IAAI,EACpE,iFAAiF,kBAAkB,CAAC,IAAI,gCAAgC,oBAAoB,CAAC,mBAAmB,GAAG,CACpL,CAAC;YAEF,YAAY;YACZ,MAAM,SAAS,GAAG,aAAa,CAC7B,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,sBAAsB,EACtB,4GAA4G,CAC7G,CAAC;YACF,UAAU,CACR,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAC5D,uEAAuE,CACxE,CAAC;YAEF,WAAW;YACX,UAAU,CACR,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,EACvE,kFAAkF,CACnF,CAAC;YACF,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEvC,OAAO,oBAAoB,CAAC;SAC7B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,MAAM,KAAK,GACT,oBAAoB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB;aAC7D,iBAAiB,CAAC,KAAK,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,8BAA8B;SAC5D,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_JoinString.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAKL,iBAAiB,EACjB,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,sBAAsB,EACtB,4BAA4B,EAC5B,WAAW,EACX,YAAY,EACZ,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,aAAa,EAEb,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAEL,uCAAuC,GACxC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,+DAA+D,CAAC;AAClH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AAEpG,MAAM,OAAO,wCACX,SAAQ,6BAA6B;IAGrC,QAAQ,CAAC,qBAAwD;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB,CACpB,qBAAwD;QAExD,IACE,qBAAqB,YAAY,uCAAuC,EACxE;YACA,4DAA4D;YAC5D,OAAO,CACL,aAAa,CAAC,MAAM;gBACpB,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;qBAClE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CACnC,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,kBAA0D,EAC1D,YAAoB,EACpB,KAAgB;QAEhB,MAAM,UAAU,GAAG,IAAI,wBAAwB,CAC7C,0BAA0B,CACxB,iCAAiC,CAAC,YAAY,CAC/C,CACF,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,sBAAsB,CAC1C,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CACtC,CACF,CAAC;QACF,SAAS,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAC9B,IAAI,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,EACtD,SAAS,CACV,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,yBAAyB,CACvB,UAAoC,EACpC,WAA+B,EAC/B,qBAAwD;QAExD,IACE,iBAAiB,CACf,UAAU,CAAC,YAAY,EACvB,iCAAiC,CAAC,YAAY,CAC/C,EACD;YACA,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,CAC/D,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,EAC/C,qBAAqB,EACrB,IAAI,CACL,CAAC;YACF,oBAAoB,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAE9D,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,0EAA0E,CAC3E,CAAC;YAEF,WAAW;YACX,MAAM,kBAAkB,GAAG,aAAa,CACtC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,kBAAkB,EAClB,gHAAgH,CACjH,CAAC;YACF,UAAU,CACR,oBAAoB,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,IAAI,EACpE,iFAAiF,kBAAkB,CAAC,IAAI,gCAAgC,oBAAoB,CAAC,mBAAmB,GAAG,CACpL,CAAC;YAEF,YAAY;YACZ,MAAM,SAAS,GAAG,aAAa,CAC7B,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,sBAAsB,EACtB,4GAA4G,CAC7G,CAAC;YACF,UAAU,CACR,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAC5D,uEAAuE,CACxE,CAAC;YAEF,WAAW;YACX,UAAU,CACR,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,EACvE,kFAAkF,CACnF,CAAC;YACF,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEvC,OAAO,oBAAoB,CAAC;SAC7B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEQ,aAAa,CACpB,oBAAsD;QAEtD,OAAO,aAAa,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,8BAA8B;SAC5D,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Population.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EAET,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,+CACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAmBV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAOP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
+{"version":3,"file":"QueryBuilderAggregateOperator_StdDev_Population.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EAET,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,uDAAuD,CAAC;AAM/D,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,+CACX,SAAQ,6BACR,YAAW,QAAQ;IAEnB,QAAQ,CAAC,qBAAqB,EAAE,iCAAiC,GAAG,MAAM;IAI1E,sBAAsB,CACpB,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAmBV,wBAAwB,CACtB,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAQrB,yBAAyB,CACvB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAUtC,aAAa,CACpB,oBAAoB,EAAE,gCAAgC,GACrD,IAAI;IAIP,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
+import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 import { QueryBuilderSimpleProjectionColumnState, } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
@@ -44,9 +44,7 @@ export class QueryBuilderAggregateOperator_StdDev_Population extends QueryBuilde
         return buildAggregateColumnState(projectionColumnState, lambdaParam, expression, QUERY_BUILDER_SUPPORTED_FUNCTIONS.STD_DEV_POPULATION, this);
     }
     getReturnType(aggregateColumnState) {
-        const graph = aggregateColumnState.projectionColumnState.tdsState.queryBuilderState
-            .graphManagerState.graph;
-        return graph.getType(PRIMITIVE_TYPE.NUMBER);
+        return PrimitiveType.NUMBER;
     }
     get hashCode() {
         return hashArray([