@finos/legend-application-query 5.2.1 → 5.2.4

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.d.ts

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { type GeneratorFn } from '@finos/legend-shared';
+import type { QueryBuilderState } from '../../QueryBuilderState.js';
+import { type CompilationError } from '@finos/legend-graph';
+import { QueryBuilderAggregationState } from './aggregation/QueryBuilderAggregationState.js';
+import { QueryBuilderFetchStructureImplementationState } from '../QueryBuilderFetchStructureImplementationState.js';
+import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
+import { QueryBuilderPostFilterState } from './post-filter/QueryBuilderPostFilterState.js';
+import type { QueryBuilderPostFilterOperator } from './post-filter/QueryBuilderPostFilterOperator.js';
+import type { QueryBuilderAggregateOperator } from './aggregation/QueryBuilderAggregateOperator.js';
+import { QueryBuilderDerivationProjectionColumnState, type QueryBuilderProjectionColumnState, type QueryBuilderSimpleProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
+export declare class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
+    columns: QueryBuilderProjectionColumnState[];
+    aggregationState: QueryBuilderAggregationState;
+    postFilterState: QueryBuilderPostFilterState;
+    resultSetModifierState: QueryResultSetModifierState;
+    isConvertDerivationProjectionObjects: boolean;
+    showPostFilterPanel: boolean;
+    postFilterOperators: QueryBuilderPostFilterOperator[];
+    aggregationOperators: QueryBuilderAggregateOperator[];
+    constructor(queryBuilderState: QueryBuilderState, fetchStructureState: QueryBuilderFetchStructureState);
+    get derivations(): QueryBuilderDerivationProjectionColumnState[];
+    get hasParserError(): boolean;
+    get validationIssues(): string[] | undefined;
+    setShowPostFilterPanel(val: boolean): void;
+    convertDerivationProjectionObjects(): GeneratorFn<void>;
+    transformSimpleProjectionToDerivation(simpleProjectionColumnState: QueryBuilderSimpleProjectionColumnState): void;
+    replaceColumn(oldVal: QueryBuilderProjectionColumnState, newVal: QueryBuilderProjectionColumnState): void;
+    removeColumn(val: QueryBuilderProjectionColumnState): void;
+    addColumn(val: QueryBuilderProjectionColumnState, options?: {
+        /**
+         * Often time, we would want to enforce doing a sort when adding new column
+         * to ensure aggregate columns stay at the bottom of the list of projections
+         * But sometimes, we can opt in to use this flag to disable this sorting behavior,
+         * such as when we build/process.
+         */
+        skipSorting?: boolean | undefined;
+    }): void;
+    moveColumn(sourceIndex: number, targetIndex: number): void;
+    addNewBlankDerivation(): void;
+    revealCompilationError(compilationError: CompilationError): boolean;
+    clearCompilationError(): void;
+}
+//# sourceMappingURL=QueryBuilderProjectionState.d.ts.map

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProjectionState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,KAAK,WAAW,EAUjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,KAAK,gBAAgB,EAMtB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAE7F,OAAO,EAAE,6CAA6C,EAAE,MAAM,qDAAqD,CAAC;AACpH,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,iDAAiD,CAAC;AAEtG,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAEpG,OAAO,EACL,2CAA2C,EAC3C,KAAK,iCAAiC,EACtC,KAAK,uCAAuC,EAC7C,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAE7F,qBAAa,2BAA4B,SAAQ,6CAA6C;IAC5F,OAAO,EAAE,iCAAiC,EAAE,CAAM;IAClD,gBAAgB,EAAE,4BAA4B,CAAC;IAC/C,eAAe,EAAE,2BAA2B,CAAC;IAC7C,sBAAsB,EAAE,2BAA2B,CAAC;IACpD,oCAAoC,UAAS;IAC7C,mBAAmB,UAAS;IAE5B,mBAAmB,EAAE,8BAA8B,EAAE,CACV;IAC3C,oBAAoB,EAAE,6BAA6B,EAAE,CACR;gBAG3C,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;IAgCtD,IAAI,WAAW,IAAI,2CAA2C,EAAE,CAI/D;IAED,IAAI,cAAc,IAAI,OAAO,CAI5B;IAED,IAAI,gBAAgB,IAAI,MAAM,EAAE,GAAG,SAAS,CAc3C;IAED,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIzC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IA8CxD,qCAAqC,CACnC,2BAA2B,EAAE,uCAAuC,GACnE,IAAI;IA8BP,aAAa,CACX,MAAM,EAAE,iCAAiC,EACzC,MAAM,EAAE,iCAAiC,GACxC,IAAI;IAuBP,YAAY,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAc1D,SAAS,CACP,GAAG,EAAE,iCAAiC,EACtC,OAAO,CAAC,EAAE;QACR;;;;;WAKG;QACH,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KACnC,GACA,IAAI;IAuBP,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IA8C1D,qBAAqB,IAAI,IAAI;IAa7B,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;IA2BnE,qBAAqB,IAAI,IAAI;CAO9B"}

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.js

@@ -0,0 +1,203 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { action, flowResult, makeObservable, observable, flow, computed, } from 'mobx';
+import { LogEvent, assertErrorThrown, changeEntry, guaranteeType, deleteEntry, addUniqueEntry, guaranteeNonNullable, findLast, filterByType, } from '@finos/legend-shared';
+import { GRAPH_MANAGER_EVENT, extractSourceInformationCoordinates, LAMBDA_PIPE, RawLambda, isStubbed_RawLambda, } from '@finos/legend-graph';
+import { DEFAULT_LAMBDA_VARIABLE_NAME, QUERY_BUILDER_SOURCE_ID_LABEL, } from '../../../QueryBuilder_Const.js';
+import { QueryBuilderAggregationState } from './aggregation/QueryBuilderAggregationState.js';
+import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
+import { QueryBuilderFetchStructureImplementationState } from '../QueryBuilderFetchStructureImplementationState.js';
+import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
+import { QueryBuilderPostFilterState } from './post-filter/QueryBuilderPostFilterState.js';
+import { getQueryBuilderCorePostFilterOperators } from './post-filter/QueryBuilderPostFilterOperatorLoader.js';
+import { getQueryBuilderCoreAggregrationOperators } from './aggregation/QueryBuilderAggregateOperatorLoader.js';
+import { QueryBuilderDerivationProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
+export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
+    columns = [];
+    aggregationState;
+    postFilterState;
+    resultSetModifierState;
+    isConvertDerivationProjectionObjects = false;
+    showPostFilterPanel = false;
+    postFilterOperators = getQueryBuilderCorePostFilterOperators();
+    aggregationOperators = getQueryBuilderCoreAggregrationOperators();
+    constructor(queryBuilderState, fetchStructureState) {
+        super(queryBuilderState, fetchStructureState);
+        makeObservable(this, {
+            columns: observable,
+            aggregationState: observable,
+            postFilterState: observable,
+            resultSetModifierState: observable,
+            isConvertDerivationProjectionObjects: observable,
+            showPostFilterPanel: observable,
+            derivations: computed,
+            hasParserError: computed,
+            validationIssues: computed,
+            addColumn: action,
+            moveColumn: action,
+            replaceColumn: action,
+            setShowPostFilterPanel: action,
+            convertDerivationProjectionObjects: flow,
+        });
+        this.resultSetModifierState = new QueryResultSetModifierState(this);
+        this.postFilterState = new QueryBuilderPostFilterState(this, this.postFilterOperators);
+        this.aggregationState = new QueryBuilderAggregationState(this, this.aggregationOperators);
+    }
+    get derivations() {
+        return this.columns.filter(filterByType(QueryBuilderDerivationProjectionColumnState));
+    }
+    get hasParserError() {
+        return this.derivations.some((derivation) => derivation.derivationLambdaEditorState.parserError);
+    }
+    get validationIssues() {
+        const hasDuplicatedProjectionColumns = this.columns.some((column) => this.columns.filter((c) => c.columnName === column.columnName).length >
+            1);
+        if (hasDuplicatedProjectionColumns) {
+            return ['Query has duplicated projection columns'];
+        }
+        const hasNoProjectionColumns = this.columns.length === 0;
+        if (hasNoProjectionColumns) {
+            return ['Query has no projection columns'];
+        }
+        return undefined;
+    }
+    setShowPostFilterPanel(val) {
+        this.showPostFilterPanel = val;
+    }
+    *convertDerivationProjectionObjects() {
+        const lambdas = new Map();
+        const derivationProjectionColumnStateMap = new Map();
+        this.derivations.forEach((derivationProjectionColumnState) => {
+            if (!isStubbed_RawLambda(derivationProjectionColumnState.lambda)) {
+                lambdas.set(derivationProjectionColumnState.derivationLambdaEditorState.lambdaId, derivationProjectionColumnState.lambda);
+                derivationProjectionColumnStateMap.set(derivationProjectionColumnState.derivationLambdaEditorState.lambdaId, derivationProjectionColumnState);
+            }
+        });
+        if (lambdas.size) {
+            this.isConvertDerivationProjectionObjects = true;
+            try {
+                const isolatedLambdas = (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(lambdas));
+                isolatedLambdas.forEach((grammarText, key) => {
+                    const derivationProjectionColumnState = derivationProjectionColumnStateMap.get(key);
+                    derivationProjectionColumnState?.derivationLambdaEditorState.setLambdaString(derivationProjectionColumnState.derivationLambdaEditorState.extractLambdaString(grammarText));
+                });
+            }
+            catch (error) {
+                assertErrorThrown(error);
+                this.queryBuilderState.applicationStore.log.error(LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE), error);
+            }
+            finally {
+                this.isConvertDerivationProjectionObjects = false;
+            }
+        }
+    }
+    transformSimpleProjectionToDerivation(simpleProjectionColumnState) {
+        // setup new derivation column state
+        const columnColumnLambda = buildGenericLambdaFunctionInstanceValue(simpleProjectionColumnState.lambdaParameterName, [simpleProjectionColumnState.propertyExpressionState.propertyExpression], this.queryBuilderState.graphManagerState.graph);
+        const derivationColumnState = new QueryBuilderDerivationProjectionColumnState(this, guaranteeType(this.queryBuilderState.graphManagerState.graphManager.buildRawValueSpecification(columnColumnLambda, this.queryBuilderState.graphManagerState.graph), RawLambda));
+        derivationColumnState.setColumnName(simpleProjectionColumnState.columnName);
+        this.replaceColumn(simpleProjectionColumnState, derivationColumnState);
+        // convert to grammar for display
+        flowResult(derivationColumnState.derivationLambdaEditorState.convertLambdaObjectToGrammarString(false)).catch(this.queryBuilderState.applicationStore.alertUnhandledError);
+    }
+    replaceColumn(oldVal, newVal) {
+        // reassociation with column aggregation state if applicable
+        const corresspondingAggregateColumnState = this.aggregationState.columns.find((aggregateColState) => aggregateColState.projectionColumnState === oldVal);
+        if (corresspondingAggregateColumnState) {
+            corresspondingAggregateColumnState.setColumnState(newVal);
+        }
+        // reassociation with column sorting state if applicable
+        const corresspondingSortColumnState = this.resultSetModifierState.sortColumns.find((sortColState) => sortColState.columnState === oldVal);
+        if (corresspondingSortColumnState) {
+            corresspondingSortColumnState.setColumnState(newVal);
+        }
+        changeEntry(this.columns, oldVal, newVal);
+    }
+    removeColumn(val) {
+        deleteEntry(this.columns, val);
+        // remove aggregation that goes with the projection
+        const existingAggregateColumnState = this.aggregationState.columns.find((column) => column.projectionColumnState === val);
+        if (existingAggregateColumnState) {
+            this.aggregationState.removeColumn(existingAggregateColumnState);
+        }
+        this.resultSetModifierState.updateSortColumns();
+    }
+    addColumn(val, options) {
+        addUniqueEntry(this.columns, val);
+        if (!options?.skipSorting) {
+            // sort columns: aggregate columns go last
+            this.columns = this.columns
+                .slice()
+                .sort((colA, colB) => (this.aggregationState.columns.find((column) => column.projectionColumnState === colA)
+                ? 1
+                : 0) -
+                (this.aggregationState.columns.find((column) => column.projectionColumnState === colB)
+                    ? 1
+                    : 0));
+        }
+    }
+    moveColumn(sourceIndex, targetIndex) {
+        if (sourceIndex < 0 ||
+            sourceIndex >= this.columns.length ||
+            targetIndex < 0 ||
+            targetIndex >= this.columns.length) {
+            return;
+        }
+        const sourceColumn = guaranteeNonNullable(this.columns[sourceIndex]);
+        // find last non aggregate column index for computation
+        const lastNonAggregateColumn = findLast(this.columns, (projectionCol) => !this.aggregationState.columns.find((column) => column.projectionColumnState === projectionCol));
+        const lastNonAggregateColumnIndex = lastNonAggregateColumn
+            ? this.columns.lastIndexOf(lastNonAggregateColumn)
+            : 0;
+        if (this.aggregationState.columns.find((column) => column.projectionColumnState === sourceColumn)) {
+            // if the column being moved is an aggregate column,
+            // it cannot be moved to before the first aggregate column
+            targetIndex = Math.max(targetIndex, Math.min(lastNonAggregateColumnIndex + 1, this.columns.length - 1));
+        }
+        else {
+            // if the column being moved is not an aggregate column,
+            // it cannot be moved to after the last non-aggregate column
+            targetIndex = Math.min(targetIndex, lastNonAggregateColumnIndex);
+        }
+        // move
+        this.columns.splice(sourceIndex, 1);
+        this.columns.splice(targetIndex, 0, sourceColumn);
+    }
+    addNewBlankDerivation() {
+        const derivation = new QueryBuilderDerivationProjectionColumnState(this, this.queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda({ addDummyParameter: true }));
+        this.addColumn(derivation);
+        derivation.derivationLambdaEditorState.setLambdaString(`${DEFAULT_LAMBDA_VARIABLE_NAME}${LAMBDA_PIPE}''`);
+    }
+    revealCompilationError(compilationError) {
+        const elementCoordinates = extractSourceInformationCoordinates(compilationError.sourceInformation);
+        if (elementCoordinates &&
+            elementCoordinates.length === 3 &&
+            elementCoordinates[0] === QUERY_BUILDER_SOURCE_ID_LABEL.QUERY_BUILDER &&
+            elementCoordinates[1] === QUERY_BUILDER_SOURCE_ID_LABEL.PROJECTION) {
+            const derivationProjectionState = this.columns.find((projectionColumnState) => projectionColumnState.uuid === elementCoordinates[2]);
+            if (derivationProjectionState instanceof
+                QueryBuilderDerivationProjectionColumnState) {
+                derivationProjectionState.derivationLambdaEditorState.setCompilationError(compilationError);
+                return true;
+            }
+        }
+        return false;
+    }
+    clearCompilationError() {
+        this.derivations.forEach((derivationProjectionColumnState) => derivationProjectionColumnState.derivationLambdaEditorState.setCompilationError(undefined));
+    }
+}
+//# sourceMappingURL=QueryBuilderProjectionState.js.map

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionState.js.map

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

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { type LambdaFunction } from '@finos/legend-graph';
+import { type QueryResultSetModifierState } from './QueryResultSetModifierState.js';
+export declare const appendResultSetModifiers: (resultModifiersState: QueryResultSetModifierState, lambda: LambdaFunction, options?: {
+    overridingLimit?: number | undefined;
+} | undefined) => LambdaFunction;
+//# sourceMappingURL=QueryBuilderProjectionValueSpecificationBuilder.d.ts.map

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EAWpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAEL,KAAK,2BAA2B,EAEjC,MAAM,kCAAkC,CAAC;AAgC1C,eAAO,MAAM,wBAAwB,yBACb,2BAA2B,UACzC,cAAc,YAElB;IACE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,GACD,SAAS,KACZ,cA+FF,CAAC"}

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.js

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CollectionInstanceValue, extractElementNameFromPath, GenericType, GenericTypeExplicitReference, matchFunctionName, Multiplicity, PrimitiveInstanceValue, PRIMITIVE_TYPE, SimpleFunctionExpression, TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
+import { COLUMN_SORT_TYPE, } from './QueryResultSetModifierState.js';
+const buildSortExpression = (sortColumnState) => {
+    const multiplicityOne = sortColumnState.columnState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+    const sortColumnFunction = new SimpleFunctionExpression(extractElementNameFromPath(sortColumnState.sortType === COLUMN_SORT_TYPE.ASC
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC), multiplicityOne);
+    const sortColumnName = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(sortColumnState.columnState.projectionState.queryBuilderState.graphManagerState.graph.getPrimitiveType(PRIMITIVE_TYPE.STRING))), multiplicityOne);
+    sortColumnName.values = [sortColumnState.columnState.columnName];
+    sortColumnFunction.parametersValues[0] = sortColumnName;
+    return sortColumnFunction;
+};
+export const appendResultSetModifiers = (resultModifiersState, lambda, options) => {
+    const multiplicityOne = resultModifiersState.projectionState.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.TDS_PROJECT) ||
+                matchFunctionName(func.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY) ||
+                matchFunctionName(func.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER)) {
+                let currentExpression = func;
+                // build distinct()
+                if (resultModifiersState.distinct) {
+                    const distinctFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DISTINCT), multiplicityOne);
+                    distinctFunction.parametersValues[0] = currentExpression;
+                    currentExpression = distinctFunction;
+                }
+                // build sort()
+                if (resultModifiersState.sortColumns.length) {
+                    const sortFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT), multiplicityOne);
+                    const multiplicity = new Multiplicity(resultModifiersState.sortColumns.length, resultModifiersState.sortColumns.length);
+                    const collection = new CollectionInstanceValue(multiplicity, undefined);
+                    collection.values =
+                        resultModifiersState.sortColumns.map(buildSortExpression);
+                    sortFunction.parametersValues[0] = currentExpression;
+                    sortFunction.parametersValues[1] = collection;
+                    currentExpression = sortFunction;
+                }
+                // build take()
+                if (resultModifiersState.limit || options?.overridingLimit) {
+                    const limit = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(resultModifiersState.projectionState.queryBuilderState.graphManagerState.graph.getPrimitiveType(PRIMITIVE_TYPE.INTEGER))), multiplicityOne);
+                    limit.values = [
+                        Math.min(resultModifiersState.limit ?? Number.MAX_SAFE_INTEGER, options?.overridingLimit ?? Number.MAX_SAFE_INTEGER),
+                    ];
+                    const takeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE), multiplicityOne);
+                    takeFunction.parametersValues[0] = currentExpression;
+                    takeFunction.parametersValues[1] = limit;
+                    currentExpression = takeFunction;
+                }
+                lambda.expressionSequence[0] = currentExpression;
+                return lambda;
+            }
+        }
+    }
+    return lambda;
+};
+//# sourceMappingURL=QueryBuilderProjectionValueSpecificationBuilder.js.map

package/lib/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.js.map

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

package/lib/stores/{QueryResultSetModifierState.d.ts → fetch-structure/projection/QueryResultSetModifierState.d.ts}

@@ -13,40 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { QueryBuilderProjectionColumnState } from './QueryBuilderProjectionState.js';
-import type { QueryBuilderState } from './QueryBuilderState.js';
-import { type LambdaFunction, SimpleFunctionExpression } from '@finos/legend-graph';
+import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
+import type { QueryBuilderProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
 export declare enum COLUMN_SORT_TYPE {
     ASC = 0,
     DESC = 1
 }
 export declare class SortColumnState {
-    queryBuilderState: QueryBuilderState;
     columnState: QueryBuilderProjectionColumnState;
     sortType: COLUMN_SORT_TYPE;
-    constructor(queryBuilderState: QueryBuilderState, columnState: QueryBuilderProjectionColumnState);
+    constructor(columnState: QueryBuilderProjectionColumnState);
     setColumnState(val: QueryBuilderProjectionColumnState): void;
     setSortType(val: COLUMN_SORT_TYPE): void;
-    buildFunctionExpression(): SimpleFunctionExpression;
 }
 export declare class QueryResultSetModifierState {
-    queryBuilderState: QueryBuilderState;
+    projectionState: QueryBuilderProjectionState;
     showModal: boolean;
     limit?: number | undefined;
     distinct: boolean;
     sortColumns: SortColumnState[];
-    constructor(queryBuilderState: QueryBuilderState);
+    constructor(projectionState: QueryBuilderProjectionState);
     setShowModal(val: boolean): void;
     setLimit(val: number | undefined): void;
     toggleDistinct(): void;
     deleteSortColumn(val: SortColumnState): void;
     addSortColumn(val: SortColumnState): void;
     updateSortColumns(): void;
-    /**
-     * Build result set modifiers into the lambda.
-     */
-    buildResultSetModifiers(lambda: LambdaFunction, options?: {
-        overridingLimit?: number | undefined;
-    } | undefined): LambdaFunction;
 }
 //# sourceMappingURL=QueryResultSetModifierState.d.ts.map

package/lib/stores/fetch-structure/projection/QueryResultSetModifierState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryResultSetModifierState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryResultSetModifierState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAGhG,oBAAY,gBAAgB;IAC1B,GAAG,IAAA;IACH,IAAI,IAAA;CACL;AAED,qBAAa,eAAe;IAC1B,WAAW,EAAE,iCAAiC,CAAC;IAC/C,QAAQ,mBAAwB;gBAEpB,WAAW,EAAE,iCAAiC;IAS1D,cAAc,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAI5D,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;CAGzC;AAED,qBAAa,2BAA2B;IACtC,eAAe,EAAE,2BAA2B,CAAC;IAC7C,SAAS,UAAS;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,UAAS;IACjB,WAAW,EAAE,eAAe,EAAE,CAAM;gBAExB,eAAe,EAAE,2BAA2B;IAcxD,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIhC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIvC,cAAc,IAAI,IAAI;IAItB,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAI5C,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAIzC,iBAAiB,IAAI,IAAI;CAK1B"}

package/lib/stores/fetch-structure/projection/QueryResultSetModifierState.js

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { action, makeAutoObservable } from 'mobx';
+import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
+export var COLUMN_SORT_TYPE;
+(function (COLUMN_SORT_TYPE) {
+    COLUMN_SORT_TYPE[COLUMN_SORT_TYPE["ASC"] = 0] = "ASC";
+    COLUMN_SORT_TYPE[COLUMN_SORT_TYPE["DESC"] = 1] = "DESC";
+})(COLUMN_SORT_TYPE = COLUMN_SORT_TYPE || (COLUMN_SORT_TYPE = {}));
+export class SortColumnState {
+    columnState;
+    sortType = COLUMN_SORT_TYPE.ASC;
+    constructor(columnState) {
+        makeAutoObservable(this, {
+            setColumnState: action,
+            setSortType: action,
+        });
+        this.columnState = columnState;
+    }
+    setColumnState(val) {
+        this.columnState = val;
+    }
+    setSortType(val) {
+        this.sortType = val;
+    }
+}
+export class QueryResultSetModifierState {
+    projectionState;
+    showModal = false;
+    limit;
+    distinct = false;
+    sortColumns = [];
+    constructor(projectionState) {
+        makeAutoObservable(this, {
+            projectionState: false,
+            setShowModal: action,
+            setLimit: action,
+            toggleDistinct: action,
+            deleteSortColumn: action,
+            addSortColumn: action,
+            updateSortColumns: action,
+        });
+        this.projectionState = projectionState;
+    }
+    setShowModal(val) {
+        this.showModal = val;
+    }
+    setLimit(val) {
+        this.limit = val === undefined || val <= 0 ? undefined : val;
+    }
+    toggleDistinct() {
+        this.distinct = !this.distinct;
+    }
+    deleteSortColumn(val) {
+        deleteEntry(this.sortColumns, val);
+    }
+    addSortColumn(val) {
+        addUniqueEntry(this.sortColumns, val);
+    }
+    updateSortColumns() {
+        this.sortColumns = this.sortColumns.filter((e) => this.projectionState.columns.includes(e.columnState));
+    }
+}
+//# sourceMappingURL=QueryResultSetModifierState.js.map

package/lib/stores/fetch-structure/projection/QueryResultSetModifierState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryResultSetModifierState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryResultSetModifierState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,qDAAG,CAAA;IACH,uDAAI,CAAA;AACN,CAAC,EAHW,gBAAgB,GAAhB,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,OAAO,eAAe;IAC1B,WAAW,CAAoC;IAC/C,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC;IAEhC,YAAY,WAA8C;QACxD,kBAAkB,CAAC,IAAI,EAAE;YACvB,cAAc,EAAE,MAAM;YACtB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,GAAsC;QACnD,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,GAAqB;QAC/B,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,2BAA2B;IACtC,eAAe,CAA8B;IAC7C,SAAS,GAAG,KAAK,CAAC;IAClB,KAAK,CAAsB;IAC3B,QAAQ,GAAG,KAAK,CAAC;IACjB,WAAW,GAAsB,EAAE,CAAC;IAEpC,YAAY,eAA4C;QACtD,kBAAkB,CAAC,IAAI,EAAE;YACvB,eAAe,EAAE,KAAK;YACtB,YAAY,EAAE,MAAM;YACpB,QAAQ,EAAE,MAAM;YAChB,cAAc,EAAE,MAAM;YACtB,gBAAgB,EAAE,MAAM;YACxB,aAAa,EAAE,MAAM;YACrB,iBAAiB,EAAE,MAAM;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,YAAY,CAAC,GAAY;QACvB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,GAAuB;QAC9B,IAAI,CAAC,KAAK,GAAG,GAAG,KAAK,SAAS,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;IAC/D,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,gBAAgB,CAAC,GAAoB;QACnC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,GAAoB;QAChC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CACrD,CAAC;IACJ,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { AbstractPropertyExpression, PureModel, SimpleFunctionExpression, Type, ValueSpecification, VariableExpression } from '@finos/legend-graph';
+import { type QueryBuilderProjectionColumnState } from '../QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
+export declare abstract class QueryBuilderAggregateOperator {
+    readonly uuid: string;
+    abstract getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string;
+    abstract isCompatibleWithColumn(projectionColumnState: QueryBuilderProjectionColumnState): boolean;
+    abstract buildAggregateExpression(propertyExpression: AbstractPropertyExpression | undefined, variableName: string, graph: PureModel): ValueSpecification;
+    buildAggregateExpressionFromState(aggregateColumnState: QueryBuilderAggregateColumnState): ValueSpecification;
+    abstract buildAggregateColumnState(expression: SimpleFunctionExpression, lambdaParam: VariableExpression, projectionColumnState: QueryBuilderProjectionColumnState): QueryBuilderAggregateColumnState | undefined;
+    /**
+     * Returns the expected return type of the operator.
+     * defaults to using the return type of the projection column state which is being aggregated.
+     */
+    getReturnType(aggregateColumnState: QueryBuilderAggregateColumnState): Type;
+}
+//# sourceMappingURL=QueryBuilderAggregateOperator.d.ts.map

package/lib/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperator.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,0BAA0B,EAC1B,SAAS,EACT,wBAAwB,EACxB,IAAI,EACJ,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AAE1F,8BAAsB,6BAA6B;IACjD,QAAQ,CAAC,IAAI,SAAU;IAEvB,QAAQ,CAAC,QAAQ,CACf,qBAAqB,EAAE,iCAAiC,GACvD,MAAM;IAET,QAAQ,CAAC,sBAAsB,CAC7B,qBAAqB,EAAE,iCAAiC,GACvD,OAAO;IAEV,QAAQ,CAAC,wBAAwB,CAC/B,kBAAkB,EAAE,0BAA0B,GAAG,SAAS,EAC1D,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,kBAAkB;IAErB,iCAAiC,CAC/B,oBAAoB,EAAE,gCAAgC,GACrD,kBAAkB;IAarB,QAAQ,CAAC,yBAAyB,CAChC,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,kBAAkB,EAC/B,qBAAqB,EAAE,iCAAiC,GACvD,gCAAgC,GAAG,SAAS;IAE/C;;;OAGG;IACH,aAAa,CAAC,oBAAoB,EAAE,gCAAgC,GAAG,IAAI;CAK5E"}

package/lib/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { uuid, guaranteeNonNullable } from '@finos/legend-shared';
+import { QueryBuilderSimpleProjectionColumnState, } from '../QueryBuilderProjectionColumnState.js';
+export class QueryBuilderAggregateOperator {
+    uuid = uuid();
+    buildAggregateExpressionFromState(aggregateColumnState) {
+        return this.buildAggregateExpression(aggregateColumnState.projectionColumnState instanceof
+            QueryBuilderSimpleProjectionColumnState
+            ? aggregateColumnState.projectionColumnState.propertyExpressionState
+                .propertyExpression
+            : undefined, aggregateColumnState.lambdaParameterName, aggregateColumnState.aggregationState.projectionState.queryBuilderState
+            .graphManagerState.graph);
+    }
+    /**
+     * Returns the expected return type of the operator.
+     * defaults to using the return type of the projection column state which is being aggregated.
+     */
+    getReturnType(aggregateColumnState) {
+        return guaranteeNonNullable(aggregateColumnState.projectionColumnState.getReturnType());
+    }
+}
+//# sourceMappingURL=QueryBuilderAggregateOperator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperator.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AASlE,OAAO,EAEL,uCAAuC,GACxC,MAAM,yCAAyC,CAAC;AAGjD,MAAM,OAAgB,6BAA6B;IACxC,IAAI,GAAG,IAAI,EAAE,CAAC;IAgBvB,iCAAiC,CAC/B,oBAAsD;QAEtD,OAAO,IAAI,CAAC,wBAAwB,CAClC,oBAAoB,CAAC,qBAAqB;YACxC,uCAAuC;YACvC,CAAC,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,uBAAuB;iBAC/D,kBAAkB;YACvB,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,mBAAmB,EACxC,oBAAoB,CAAC,gBAAgB,CAAC,eAAe,CAAC,iBAAiB;aACpE,iBAAiB,CAAC,KAAK,CAC3B,CAAC;IACJ,CAAC;IAQD;;;OAGG;IACH,aAAa,CAAC,oBAAsD;QAClE,OAAO,oBAAoB,CACzB,oBAAoB,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAC3D,CAAC;IACJ,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperatorLoader.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
+export declare const getQueryBuilderCoreAggregrationOperators: () => QueryBuilderAggregateOperator[];
+//# sourceMappingURL=QueryBuilderAggregateOperatorLoader.d.ts.map

package/lib/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperatorLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperatorLoader.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperatorLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAYH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,eAAO,MAAM,wCAAwC,QAC/C,6BAA6B,EAWhC,CAAC"}