@finos/legend-query-builder 0.2.1 → 0.2.2

package/lib/stores/fetch-structure/{projection/QueryBuilderProjectionState.d.ts → tds/QueryBuilderTDSState.d.ts}

@@ -22,15 +22,15 @@ 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, QueryBuilderSimpleProjectionColumnState, type QueryBuilderProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
+import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, type QueryBuilderProjectionColumnState } from './projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
 import { type QueryBuilderExplorerTreePropertyNodeData } from '../../explorer/QueryBuilderExplorerState.js';
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
-export declare class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState implements Hashable {
+export declare class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementationState implements Hashable {
     readonly aggregationState: QueryBuilderAggregationState;
     readonly postFilterState: QueryBuilderPostFilterState;
     readonly resultSetModifierState: QueryResultSetModifierState;
-    columns: QueryBuilderProjectionColumnState[];
+    projectionColumns: QueryBuilderProjectionColumnState[];
     isConvertDerivationProjectionObjects: boolean;
     showPostFilterPanel: boolean;
     postFilterOperators: QueryBuilderPostFilterOperator[];
@@ -66,4 +66,4 @@ export declare class QueryBuilderProjectionState extends QueryBuilderFetchStruct
     checkBeforeChangingImplementation(onChange: () => void): void;
     get hashCode(): string;
 }
-//# sourceMappingURL=QueryBuilderProjectionState.d.ts.map
+//# sourceMappingURL=QueryBuilderTDSState.d.ts.map

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

@@ -0,0 +1 @@
+{"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/{projection/QueryBuilderProjectionState.js → tds/QueryBuilderTDSState.js}

@@ -24,17 +24,17 @@ 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, QueryBuilderSimpleProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
+import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, } from './projection/QueryBuilderProjectionColumnState.js';
 import { buildPropertyExpressionFromExplorerTreeNodeData, generateExplorerTreePropertyNodeID, generateExplorerTreeSubtypeNodeID, } from '../../explorer/QueryBuilderExplorerState.js';
 import { ActionAlertActionType, ActionAlertType, } from '@finos/legend-application';
-import { appendProjection } from './QueryBuilderProjectionValueSpecificationBuilder.js';
+import { appendProjection } from './projection/QueryBuilderProjectionValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
+export class QueryBuilderTDSState extends QueryBuilderFetchStructureImplementationState {
     aggregationState;
     postFilterState;
     resultSetModifierState;
-    columns = [];
+    projectionColumns = [];
     isConvertDerivationProjectionObjects = false;
     showPostFilterPanel = false;
     postFilterOperators = getQueryBuilderCorePostFilterOperators();
@@ -42,7 +42,7 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
     constructor(queryBuilderState, fetchStructureState) {
         super(queryBuilderState, fetchStructureState);
         makeObservable(this, {
-            columns: observable,
+            projectionColumns: observable,
             isConvertDerivationProjectionObjects: observable,
             showPostFilterPanel: observable,
             derivations: computed,
@@ -58,17 +58,17 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         this.aggregationState = new QueryBuilderAggregationState(this, this.aggregationOperators);
     }
     get type() {
-        return FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION;
+        return FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE;
     }
     get derivations() {
-        return this.columns.filter(filterByType(QueryBuilderDerivationProjectionColumnState));
+        return this.projectionColumns.filter(filterByType(QueryBuilderDerivationProjectionColumnState));
     }
     get hasParserError() {
         return this.derivations.some((derivation) => derivation.derivationLambdaEditorState.parserError);
     }
     get usedExplorerTreePropertyNodeIDs() {
         let nodeIDs = [];
-        this.columns.forEach((column) => {
+        this.projectionColumns.forEach((column) => {
             if (column instanceof QueryBuilderSimpleProjectionColumnState) {
                 let chunks = [];
                 let currentExpression = column.propertyExpressionState.propertyExpression;
@@ -118,12 +118,12 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         return Array.from(new Set(nodeIDs).values());
     }
     get validationIssues() {
-        const hasDuplicatedProjectionColumns = this.columns.some((column) => this.columns.filter((c) => c.columnName === column.columnName).length >
-            1);
+        const hasDuplicatedProjectionColumns = this.projectionColumns.some((column) => this.projectionColumns.filter((c) => c.columnName === column.columnName)
+            .length > 1);
         if (hasDuplicatedProjectionColumns) {
             return ['Query has duplicated projection columns'];
         }
-        const hasNoProjectionColumns = this.columns.length === 0;
+        const hasNoProjectionColumns = this.projectionColumns.length === 0;
         if (hasNoProjectionColumns) {
             return ['Query has no projection columns'];
         }
@@ -185,10 +185,10 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         if (corresspondingSortColumnState) {
             corresspondingSortColumnState.setColumnState(newVal);
         }
-        changeEntry(this.columns, oldVal, newVal);
+        changeEntry(this.projectionColumns, oldVal, newVal);
     }
     removeColumn(val) {
-        deleteEntry(this.columns, val);
+        deleteEntry(this.projectionColumns, val);
         // remove aggregation that goes with the projection
         const existingAggregateColumnState = this.aggregationState.columns.find((column) => column.projectionColumnState === val);
         if (existingAggregateColumnState) {
@@ -197,10 +197,10 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         this.resultSetModifierState.updateSortColumns();
     }
     addColumn(val, options) {
-        addUniqueEntry(this.columns, val);
+        addUniqueEntry(this.projectionColumns, val);
         if (!options?.skipSorting) {
             // sort columns: aggregate columns go last
-            this.columns = this.columns
+            this.projectionColumns = this.projectionColumns
                 .slice()
                 .sort((colA, colB) => (this.aggregationState.columns.find((column) => column.projectionColumnState === colA)
                 ? 1
@@ -212,21 +212,21 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
     }
     moveColumn(sourceIndex, targetIndex) {
         if (sourceIndex < 0 ||
-            sourceIndex >= this.columns.length ||
+            sourceIndex >= this.projectionColumns.length ||
             targetIndex < 0 ||
-            targetIndex >= this.columns.length) {
+            targetIndex >= this.projectionColumns.length) {
             return;
         }
-        const sourceColumn = guaranteeNonNullable(this.columns[sourceIndex]);
+        const sourceColumn = guaranteeNonNullable(this.projectionColumns[sourceIndex]);
         // find last non aggregate column index for computation
-        const lastNonAggregateColumn = findLast(this.columns, (projectionCol) => !this.aggregationState.columns.find((column) => column.projectionColumnState === projectionCol));
+        const lastNonAggregateColumn = findLast(this.projectionColumns, (projectionCol) => !this.aggregationState.columns.find((column) => column.projectionColumnState === projectionCol));
         const lastNonAggregateColumnIndex = lastNonAggregateColumn
-            ? this.columns.lastIndexOf(lastNonAggregateColumn)
+            ? this.projectionColumns.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));
+            targetIndex = Math.max(targetIndex, Math.min(lastNonAggregateColumnIndex + 1, this.projectionColumns.length - 1));
         }
         else {
             // if the column being moved is not an aggregate column,
@@ -234,8 +234,8 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
             targetIndex = Math.min(targetIndex, lastNonAggregateColumnIndex);
         }
         // move
-        this.columns.splice(sourceIndex, 1);
-        this.columns.splice(targetIndex, 0, sourceColumn);
+        this.projectionColumns.splice(sourceIndex, 1);
+        this.projectionColumns.splice(targetIndex, 0, sourceColumn);
     }
     addNewBlankDerivation() {
         const derivation = new QueryBuilderDerivationProjectionColumnState(this, this.queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda({ addDummyParameter: true }));
@@ -248,7 +248,7 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
             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]);
+            const derivationProjectionState = this.projectionColumns.find((projectionColumnState) => projectionColumnState.uuid === elementCoordinates[2]);
             if (derivationProjectionState instanceof
                 QueryBuilderDerivationProjectionColumnState) {
                 derivationProjectionState.derivationLambdaEditorState.setCompilationError(compilationError);
@@ -269,7 +269,7 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
         });
     }
     checkBeforeChangingImplementation(onChange) {
-        if (this.columns.length > 0
+        if (this.projectionColumns.length > 0
         // NOTE: here we could potentially check for the presence of post-filter as well
         // but we make the assumption that if there is no projection column, there should
         // not be any post-filter at all
@@ -300,11 +300,11 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
     get hashCode() {
         return hashArray([
             QUERY_BUILDER_HASH_STRUCTURE.PROJECTION_STATE,
-            hashArray(this.columns),
+            hashArray(this.projectionColumns),
             this.aggregationState,
             this.postFilterState,
             this.resultSetModifierState,
         ]);
     }
 }
-//# sourceMappingURL=QueryBuilderProjectionState.js.map
+//# sourceMappingURL=QueryBuilderTDSState.js.map

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

@@ -0,0 +1 @@
+{"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/{projection → tds}/QueryResultSetModifierState.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
-import type { QueryBuilderProjectionColumnState } from './QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderTDSState } from './QueryBuilderTDSState.js';
+import type { QueryBuilderProjectionColumnState } from './projection/QueryBuilderProjectionColumnState.js';
 import { type Hashable } from '@finos/legend-shared';
 export declare enum COLUMN_SORT_TYPE {
     ASC = 0,
@@ -29,12 +29,12 @@ export declare class SortColumnState implements Hashable {
     get hashCode(): string;
 }
 export declare class QueryResultSetModifierState implements Hashable {
-    readonly projectionState: QueryBuilderProjectionState;
+    readonly tdsState: QueryBuilderTDSState;
     showModal: boolean;
     limit?: number | undefined;
     distinct: boolean;
     sortColumns: SortColumnState[];
-    constructor(projectionState: QueryBuilderProjectionState);
+    constructor(tdsState: QueryBuilderTDSState);
     setShowModal(val: boolean): void;
     setLimit(val: number | undefined): void;
     toggleDistinct(): void;

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryResultSetModifierState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/tds/QueryResultSetModifierState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,mDAAmD,CAAC;AAC3G,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAG9B,oBAAY,gBAAgB;IAC1B,GAAG,IAAA;IACH,IAAI,IAAA;CACL;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,WAAW,EAAE,iCAAiC,CAAC;IAC/C,QAAQ,mBAAwB;gBAEpB,WAAW,EAAE,iCAAiC;IAY1D,cAAc,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAI5D,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAIxC,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,qBAAa,2BAA4B,YAAW,QAAQ;IAC1D,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,SAAS,UAAS;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,UAAS;IACjB,WAAW,EAAE,eAAe,EAAE,CAAM;gBAExB,QAAQ,EAAE,oBAAoB;IAkB1C,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;IAMzB,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}

package/lib/stores/fetch-structure/{projection → tds}/QueryResultSetModifierState.js

@@ -49,12 +49,12 @@ export class SortColumnState {
     }
 }
 export class QueryResultSetModifierState {
-    projectionState;
+    tdsState;
     showModal = false;
     limit;
     distinct = false;
     sortColumns = [];
-    constructor(projectionState) {
+    constructor(tdsState) {
         makeObservable(this, {
             showModal: observable,
             limit: observable,
@@ -68,7 +68,7 @@ export class QueryResultSetModifierState {
             updateSortColumns: action,
             hashCode: computed,
         });
-        this.projectionState = projectionState;
+        this.tdsState = tdsState;
     }
     setShowModal(val) {
         this.showModal = val;
@@ -86,7 +86,7 @@ export class QueryResultSetModifierState {
         addUniqueEntry(this.sortColumns, val);
     }
     updateSortColumns() {
-        this.sortColumns = this.sortColumns.filter((e) => this.projectionState.columns.includes(e.columnState));
+        this.sortColumns = this.sortColumns.filter((e) => this.tdsState.projectionColumns.includes(e.columnState));
     }
     get hashCode() {
         return hashArray([

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

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

package/lib/stores/fetch-structure/{projection → tds}/aggregation/QueryBuilderAggregateOperator.d.ts

@@ -15,7 +15,7 @@
  */
 import { type Hashable } from '@finos/legend-shared';
 import type { AbstractPropertyExpression, PureModel, SimpleFunctionExpression, Type, ValueSpecification, VariableExpression } from '@finos/legend-graph';
-import { type QueryBuilderProjectionColumnState } from '../QueryBuilderProjectionColumnState.js';
+import { type QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
 export declare abstract class QueryBuilderAggregateOperator implements Hashable {
     readonly uuid: string;

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperator.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,sBAAsB,CAAC;AAC9B,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,oDAAoD,CAAC;AAC5D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AAG1F,8BAAsB,6BAA8B,YAAW,QAAQ;IACrE,QAAQ,CAAC,IAAI,SAAU;;IAQvB,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;IAM3E,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/QueryBuilderAggregateOperator.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { uuid, guaranteeNonNullable, } from '@finos/legend-shared';
-import { QueryBuilderSimpleProjectionColumnState, } from '../QueryBuilderProjectionColumnState.js';
+import { QueryBuilderSimpleProjectionColumnState, } from '../projection/QueryBuilderProjectionColumnState.js';
 import { computed, makeObservable } from 'mobx';
 export class QueryBuilderAggregateOperator {
     uuid = uuid();
@@ -28,7 +28,7 @@ export class QueryBuilderAggregateOperator {
             QueryBuilderSimpleProjectionColumnState
             ? aggregateColumnState.projectionColumnState.propertyExpressionState
                 .propertyExpression
-            : undefined, aggregateColumnState.lambdaParameterName, aggregateColumnState.aggregationState.projectionState.queryBuilderState
+            : undefined, aggregateColumnState.lambdaParameterName, aggregateColumnState.aggregationState.tdsState.queryBuilderState
             .graphManagerState.graph);
     }
     /**

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperator.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,IAAI,EACJ,oBAAoB,GAErB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAEL,uCAAuC,GACxC,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAEhD,MAAM,OAAgB,6BAA6B;IACxC,IAAI,GAAG,IAAI,EAAE,CAAC;IAEvB;QACE,cAAc,CAAC,IAAI,EAAE;YACnB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;IAgBD,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,QAAQ,CAAC,iBAAiB;aAC7D,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;CAGF"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregateOperatorLoader.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,mCAAmC,EAAE,MAAM,oDAAoD,CAAC;AACzG,OAAO,EAAE,sCAAsC,EAAE,MAAM,uDAAuD,CAAC;AAC/G,OAAO,EAAE,iCAAiC,EAAE,MAAM,kDAAkD,CAAC;AACrG,OAAO,EAAE,qCAAqC,EAAE,MAAM,sDAAsD,CAAC;AAC7G,OAAO,EAAE,+CAA+C,EAAE,MAAM,gEAAgE,CAAC;AACjI,OAAO,EAAE,2CAA2C,EAAE,MAAM,4DAA4D,CAAC;AACzH,OAAO,EAAE,2CAA2C,EAAE,MAAM,4DAA4D,CAAC;AACzH,OAAO,EAAE,iCAAiC,EAAE,MAAM,kDAAkD,CAAC;AACrG,OAAO,EAAE,iCAAiC,EAAE,MAAM,kDAAkD,CAAC;AACrG,OAAO,EAAE,wCAAwC,EAAE,MAAM,yDAAyD,CAAC;AAGnH,MAAM,CAAC,MAAM,wCAAwC,GACnD,GAAoC,EAAE,CAAC;IACrC,IAAI,mCAAmC,EAAE;IACzC,IAAI,2CAA2C,EAAE;IACjD,IAAI,sCAAsC,EAAE;IAC5C,IAAI,iCAAiC,EAAE;IACvC,IAAI,qCAAqC,EAAE;IAC3C,IAAI,iCAAiC,EAAE;IACvC,IAAI,iCAAiC,EAAE;IACvC,IAAI,+CAA+C,EAAE;IACrD,IAAI,2CAA2C,EAAE;IACjD,IAAI,wCAAwC,EAAE;CAC/C,CAAC"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/QueryBuilderAggregationState.d.ts

@@ -15,9 +15,9 @@
  */
 import { type Hashable } from '@finos/legend-shared';
 import type { Type } from '@finos/legend-graph';
-import type { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
+import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
-import type { QueryBuilderProjectionColumnState } from '../QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
 export declare class QueryBuilderAggregateColumnState implements Hashable {
     readonly uuid: string;
     readonly aggregationState: QueryBuilderAggregationState;
@@ -33,10 +33,10 @@ export declare class QueryBuilderAggregateColumnState implements Hashable {
     get hashCode(): string;
 }
 export declare class QueryBuilderAggregationState implements Hashable {
-    readonly projectionState: QueryBuilderProjectionState;
+    readonly tdsState: QueryBuilderTDSState;
     readonly operators: QueryBuilderAggregateOperator[];
     columns: QueryBuilderAggregateColumnState[];
-    constructor(projectionState: QueryBuilderProjectionState, operators: QueryBuilderAggregateOperator[]);
+    constructor(tdsState: QueryBuilderTDSState, operators: QueryBuilderAggregateOperator[]);
     removeColumn(val: QueryBuilderAggregateColumnState): void;
     addColumn(val: QueryBuilderAggregateColumnState): void;
     changeColumnAggregateOperator(val: QueryBuilderAggregateOperator | undefined, projectionColumnState: QueryBuilderProjectionColumnState): void;

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregationState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAIL,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;AAG5G,qBAAa,gCAAiC,YAAW,QAAQ;IAC/D,QAAQ,CAAC,IAAI,SAAU;IACvB,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,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,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;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/{projection → tds}/aggregation/QueryBuilderAggregationState.js

@@ -60,10 +60,10 @@ export class QueryBuilderAggregateColumnState {
     }
 }
 export class QueryBuilderAggregationState {
-    projectionState;
+    tdsState;
     operators = [];
     columns = [];
-    constructor(projectionState, operators) {
+    constructor(tdsState, operators) {
         makeObservable(this, {
             columns: observable,
             removeColumn: action,
@@ -71,7 +71,7 @@ export class QueryBuilderAggregationState {
             changeColumnAggregateOperator: action,
             hashCode: computed,
         });
-        this.projectionState = projectionState;
+        this.tdsState = tdsState;
         this.operators = operators;
     }
     removeColumn(val) {
@@ -98,14 +98,14 @@ export class QueryBuilderAggregationState {
                 // as aggregate column should always be the last one
                 // NOTE: unless we do `olap` aggregation
                 // See https://github.com/finos/legend-studio/issues/253
-                this.projectionState.moveColumn(this.projectionState.columns.indexOf(projectionColumnState), this.projectionState.columns.length - 1);
+                this.tdsState.moveColumn(this.tdsState.projectionColumns.indexOf(projectionColumnState), this.tdsState.projectionColumns.length - 1);
             }
         }
         else {
             if (aggregateColumnState) {
                 // automatically move the column to the last position before the aggregate columns
                 // NOTE: `moveColumn` will take care of this placement calculation
-                this.projectionState.moveColumn(this.projectionState.columns.indexOf(projectionColumnState), 0);
+                this.tdsState.moveColumn(this.tdsState.projectionColumns.indexOf(projectionColumnState), 0);
                 this.removeColumn(aggregateColumnState);
             }
         }

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

@@ -0,0 +1 @@
+{"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/QueryBuilderAggregationStateBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderAggregationStateBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMvE,eAAO,MAAM,6BAA6B,eAC5B,wBAAwB,oBAClB,wBAAwB,GAAG,SAAS,qBACnC,iBAAiB,KACnC,IA2FF,CAAC;AAEF,eAAO,MAAM,2BAA2B,eAC1B,wBAAwB,qBACjB,iBAAiB,KACnC,IAsFF,CAAC"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/QueryBuilderAggregationStateBuilder.js

@@ -19,7 +19,7 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/Quer
 import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
 import { extractNullableStringFromInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { FETCH_STRUCTURE_IMPLEMENTATION } from '../../QueryBuilderFetchStructureImplementationState.js';
-import { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
+import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 export const processTDSAggregateExpression = (expression, parentExpression, queryBuilderState) => {
     // check parent expression
     assertTrue(Boolean(parentExpression &&
@@ -32,12 +32,12 @@ export const processTDSAggregateExpression = (expression, parentExpression, quer
     guaranteeNonNullable(expression.parametersValues[0]), expression, queryBuilderState);
     // build state
     if (queryBuilderState.fetchStructureState.implementation instanceof
-        QueryBuilderProjectionState) {
-        const projectionState = queryBuilderState.fetchStructureState.implementation;
-        const aggregationState = projectionState.aggregationState;
+        QueryBuilderTDSState) {
+        const tdsState = queryBuilderState.fetchStructureState.implementation;
+        const aggregationState = tdsState.aggregationState;
         // NOTE: since we process agg() expressions one by one, we know that the current agg()
         // always correspond to the last column projection state, based on our processing procedure
-        const projectionColumnState = guaranteeNonNullable(projectionState.columns[projectionState.columns.length - 1]);
+        const projectionColumnState = guaranteeNonNullable(tdsState.projectionColumns[tdsState.projectionColumns.length - 1]);
         const aggregateLambda = expression.parametersValues[1];
         assertType(aggregateLambda, LambdaFunctionInstanceValue, `Can't process agg() expression: agg() expects argument #1 to be a lambda function`);
         const lambdaFunc = guaranteeNonNullable(aggregateLambda.values[0], `Can't process agg() lambda: agg() lambda function is missing`);
@@ -59,8 +59,8 @@ export const processTDSAggregateExpression = (expression, parentExpression, quer
     }
 };
 export const processTDSGroupByExpression = (expression, queryBuilderState) => {
-    // update fetch-structure
-    queryBuilderState.fetchStructureState.changeImplementation(FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION);
+    // update fetch-structureTABULAR_DATA_STRUCTURE
+    queryBuilderState.fetchStructureState.changeImplementation(FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE);
     // check parameters
     assertTrue(expression.parametersValues.length === 4, `Can't process groupBy() expression: groupBy() expects 3 arguments`);
     // check preceding expression
@@ -88,9 +88,9 @@ export const processTDSGroupByExpression = (expression, queryBuilderState) => {
         .filter(isNonNullable);
     // build state
     if (queryBuilderState.fetchStructureState.implementation instanceof
-        QueryBuilderProjectionState) {
-        const projectionState = queryBuilderState.fetchStructureState.implementation;
-        projectionState.columns.forEach((column, idx) => column.setColumnName(aliases[idx]));
+        QueryBuilderTDSState) {
+        const tdsState = queryBuilderState.fetchStructureState.implementation;
+        tdsState.projectionColumns.forEach((column, idx) => column.setColumnName(aliases[idx]));
     }
 };
 //# sourceMappingURL=QueryBuilderAggregationStateBuilder.js.map

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

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

package/lib/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.d.ts

@@ -15,7 +15,7 @@
  */
 import { type PureModel, type ValueSpecification, SimpleFunctionExpression, VariableExpression } from '@finos/legend-graph';
 import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
-import type { QueryBuilderProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
 export declare const buildAggregateExpression: (operatorFunctionFullPath: string, variableName: string, graph: PureModel) => ValueSpecification;
 export declare const buildAggregateColumnState: (projectionColumnState: QueryBuilderProjectionColumnState, lambdaParam: VariableExpression, expression: SimpleFunctionExpression, operatorFunctionFullPath: string, operator: QueryBuilderAggregateOperator) => QueryBuilderAggregateColumnState | undefined;

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

@@ -0,0 +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"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.js

@@ -24,7 +24,7 @@ export const buildAggregateExpression = (operatorFunctionFullPath, variableName,
 };
 export const buildAggregateColumnState = (projectionColumnState, lambdaParam, expression, operatorFunctionFullPath, operator) => {
     if (matchFunctionName(expression.functionName, operatorFunctionFullPath)) {
-        const aggregateColumnState = new QueryBuilderAggregateColumnState(projectionColumnState.projectionState.aggregationState, projectionColumnState, operator);
+        const aggregateColumnState = new QueryBuilderAggregateColumnState(projectionColumnState.tdsState.aggregationState, projectionColumnState, operator);
         aggregateColumnState.setLambdaParameterName(lambdaParam.name);
         assertTrue(expression.parametersValues.length === 1, `Can't process ${extractElementNameFromPath(operatorFunctionFullPath)}() expression: ${extractElementNameFromPath(operatorFunctionFullPath)}() expects no argument`);
         // variable

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

@@ -0,0 +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"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Average.d.ts

@@ -16,7 +16,7 @@
 import { type ValueSpecification, type SimpleFunctionExpression, type VariableExpression, type PureModel, type AbstractPropertyExpression, type Type } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
-import { type QueryBuilderProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
+import { type QueryBuilderProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { type Hashable } from '@finos/legend-shared';
 export declare class QueryBuilderAggregateOperator_Average extends QueryBuilderAggregateOperator implements Hashable {
     getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string;

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

@@ -0,0 +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"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Average.js

@@ -15,7 +15,7 @@
  */
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
-import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
+import { QueryBuilderSimpleProjectionColumnState, } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildAggregateColumnState, buildAggregateExpression, } from './QueryBuilderAggregateOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { hashArray } from '@finos/legend-shared';
@@ -44,7 +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.projectionState.queryBuilderState
+        const graph = aggregateColumnState.aggregationState.tdsState.queryBuilderState
             .graphManagerState.graph;
         return graph.getType(PRIMITIVE_TYPE.FLOAT);
     }

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

@@ -0,0 +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"}

package/lib/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Count.d.ts

@@ -16,7 +16,7 @@
 import { type Type, type ValueSpecification, type SimpleFunctionExpression, type VariableExpression, type PureModel, type AbstractPropertyExpression } from '@finos/legend-graph';
 import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
 import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.js';
-import { type QueryBuilderProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
+import { type QueryBuilderProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { type Hashable } from '@finos/legend-shared';
 export declare class QueryBuilderAggregateOperator_Count extends QueryBuilderAggregateOperator implements Hashable {
     getLabel(projectionColumnState: QueryBuilderProjectionColumnState): string;

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

@@ -0,0 +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"}