@finos/legend-query-builder 0.2.0 → 0.2.2

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

@@ -72,7 +72,7 @@ import {
   QueryBuilderDerivationProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
   type QueryBuilderProjectionColumnState,
-} from './QueryBuilderProjectionColumnState.js';
+} from './projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
 import {
   buildPropertyExpressionFromExplorerTreeNodeData,
@@ -85,18 +85,18 @@ import {
   ActionAlertType,
 } from '@finos/legend-application';
 import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
-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
+export class QueryBuilderTDSState
   extends QueryBuilderFetchStructureImplementationState
   implements Hashable
 {
   readonly aggregationState: QueryBuilderAggregationState;
   readonly postFilterState: QueryBuilderPostFilterState;
   readonly resultSetModifierState: QueryResultSetModifierState;
-  columns: QueryBuilderProjectionColumnState[] = [];
+  projectionColumns: QueryBuilderProjectionColumnState[] = [];
   isConvertDerivationProjectionObjects = false;
   showPostFilterPanel = false;
 
@@ -112,7 +112,7 @@ export class QueryBuilderProjectionState
     super(queryBuilderState, fetchStructureState);
 
     makeObservable(this, {
-      columns: observable,
+      projectionColumns: observable,
       isConvertDerivationProjectionObjects: observable,
       showPostFilterPanel: observable,
       derivations: computed,
@@ -136,11 +136,11 @@ export class QueryBuilderProjectionState
   }
 
   get type(): string {
-    return FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION;
+    return FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE;
   }
 
   get derivations(): QueryBuilderDerivationProjectionColumnState[] {
-    return this.columns.filter(
+    return this.projectionColumns.filter(
       filterByType(QueryBuilderDerivationProjectionColumnState),
     );
   }
@@ -153,7 +153,7 @@ export class QueryBuilderProjectionState
 
   get usedExplorerTreePropertyNodeIDs(): string[] {
     let nodeIDs: string[] = [];
-    this.columns.forEach((column) => {
+    this.projectionColumns.forEach((column) => {
       if (column instanceof QueryBuilderSimpleProjectionColumnState) {
         let chunks: (string | Class)[] = [];
         let currentExpression: ValueSpecification =
@@ -226,15 +226,15 @@ export class QueryBuilderProjectionState
   }
 
   get validationIssues(): string[] | undefined {
-    const hasDuplicatedProjectionColumns = this.columns.some(
+    const hasDuplicatedProjectionColumns = this.projectionColumns.some(
       (column) =>
-        this.columns.filter((c) => c.columnName === column.columnName).length >
-        1,
+        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'];
     }
@@ -357,11 +357,11 @@ export class QueryBuilderProjectionState
       corresspondingSortColumnState.setColumnState(newVal);
     }
 
-    changeEntry(this.columns, oldVal, newVal);
+    changeEntry(this.projectionColumns, oldVal, newVal);
   }
 
   removeColumn(val: QueryBuilderProjectionColumnState): void {
-    deleteEntry(this.columns, val);
+    deleteEntry(this.projectionColumns, val);
 
     // remove aggregation that goes with the projection
     const existingAggregateColumnState = this.aggregationState.columns.find(
@@ -386,11 +386,11 @@ export class QueryBuilderProjectionState
       skipSorting?: boolean | undefined;
     },
   ): void {
-    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) =>
@@ -411,18 +411,20 @@ export class QueryBuilderProjectionState
   moveColumn(sourceIndex: number, targetIndex: number): void {
     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,
+      this.projectionColumns,
       (projectionCol) =>
         !this.aggregationState.columns.find(
           (column) => column.projectionColumnState === projectionCol,
@@ -430,7 +432,7 @@ export class QueryBuilderProjectionState
     );
 
     const lastNonAggregateColumnIndex = lastNonAggregateColumn
-      ? this.columns.lastIndexOf(lastNonAggregateColumn)
+      ? this.projectionColumns.lastIndexOf(lastNonAggregateColumn)
       : 0;
     if (
       this.aggregationState.columns.find(
@@ -441,7 +443,10 @@ export class QueryBuilderProjectionState
       // it cannot be moved to before the first aggregate column
       targetIndex = Math.max(
         targetIndex,
-        Math.min(lastNonAggregateColumnIndex + 1, this.columns.length - 1),
+        Math.min(
+          lastNonAggregateColumnIndex + 1,
+          this.projectionColumns.length - 1,
+        ),
       );
     } else {
       // if the column being moved is not an aggregate column,
@@ -450,8 +455,8 @@ export class QueryBuilderProjectionState
     }
 
     // move
-    this.columns.splice(sourceIndex, 1);
-    this.columns.splice(targetIndex, 0, sourceColumn);
+    this.projectionColumns.splice(sourceIndex, 1);
+    this.projectionColumns.splice(targetIndex, 0, sourceColumn);
   }
 
   addNewBlankDerivation(): void {
@@ -477,7 +482,7 @@ export class QueryBuilderProjectionState
       elementCoordinates[0] === QUERY_BUILDER_SOURCE_ID_LABEL.QUERY_BUILDER &&
       elementCoordinates[1] === QUERY_BUILDER_SOURCE_ID_LABEL.PROJECTION
     ) {
-      const derivationProjectionState = this.columns.find(
+      const derivationProjectionState = this.projectionColumns.find(
         (projectionColumnState) =>
           projectionColumnState.uuid === elementCoordinates[2],
       );
@@ -532,7 +537,7 @@ export class QueryBuilderProjectionState
 
   checkBeforeChangingImplementation(onChange: () => void): void {
     if (
-      this.columns.length > 0
+      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
@@ -567,7 +572,7 @@ export class QueryBuilderProjectionState
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_HASH_STRUCTURE.PROJECTION_STATE,
-      hashArray(this.columns),
+      hashArray(this.projectionColumns),
       this.aggregationState,
       this.postFilterState,
       this.resultSetModifierState,

package/src/stores/fetch-structure/{projection → tds}/QueryResultSetModifierState.ts

@@ -15,8 +15,8 @@
  */
 
 import { action, computed, makeObservable, observable } from 'mobx';
-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 {
   addUniqueEntry,
   deleteEntry,
@@ -64,13 +64,13 @@ export class SortColumnState implements Hashable {
 }
 
 export class QueryResultSetModifierState implements Hashable {
-  readonly projectionState: QueryBuilderProjectionState;
+  readonly tdsState: QueryBuilderTDSState;
   showModal = false;
   limit?: number | undefined;
   distinct = false;
   sortColumns: SortColumnState[] = [];
 
-  constructor(projectionState: QueryBuilderProjectionState) {
+  constructor(tdsState: QueryBuilderTDSState) {
     makeObservable(this, {
       showModal: observable,
       limit: observable,
@@ -85,7 +85,7 @@ export class QueryResultSetModifierState implements Hashable {
       hashCode: computed,
     });
 
-    this.projectionState = projectionState;
+    this.tdsState = tdsState;
   }
 
   setShowModal(val: boolean): void {
@@ -110,7 +110,7 @@ export class QueryResultSetModifierState implements Hashable {
 
   updateSortColumns(): void {
     this.sortColumns = this.sortColumns.filter((e) =>
-      this.projectionState.columns.includes(e.columnState),
+      this.tdsState.projectionColumns.includes(e.columnState),
     );
   }
 

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

@@ -30,7 +30,7 @@ import type {
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../QueryBuilderProjectionColumnState.js';
+} from '../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
 import { computed, makeObservable } from 'mobx';
 
@@ -67,7 +67,7 @@ export abstract class QueryBuilderAggregateOperator implements Hashable {
             .propertyExpression
         : undefined,
       aggregateColumnState.lambdaParameterName,
-      aggregateColumnState.aggregationState.projectionState.queryBuilderState
+      aggregateColumnState.aggregationState.tdsState.queryBuilderState
         .graphManagerState.graph,
     );
   }

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

@@ -24,9 +24,9 @@ import {
 } from '@finos/legend-shared';
 import type { Type } from '@finos/legend-graph';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
-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';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
 
 export class QueryBuilderAggregateColumnState implements Hashable {
@@ -85,12 +85,12 @@ export class QueryBuilderAggregateColumnState implements Hashable {
 }
 
 export class QueryBuilderAggregationState implements Hashable {
-  readonly projectionState: QueryBuilderProjectionState;
+  readonly tdsState: QueryBuilderTDSState;
   readonly operators: QueryBuilderAggregateOperator[] = [];
   columns: QueryBuilderAggregateColumnState[] = [];
 
   constructor(
-    projectionState: QueryBuilderProjectionState,
+    tdsState: QueryBuilderTDSState,
     operators: QueryBuilderAggregateOperator[],
   ) {
     makeObservable(this, {
@@ -101,7 +101,7 @@ export class QueryBuilderAggregationState implements Hashable {
       hashCode: computed,
     });
 
-    this.projectionState = projectionState;
+    this.tdsState = tdsState;
     this.operators = operators;
   }
 
@@ -142,17 +142,17 @@ export class QueryBuilderAggregationState implements Hashable {
         // 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),
+        this.tdsState.moveColumn(
+          this.tdsState.projectionColumns.indexOf(projectionColumnState),
           0,
         );
 

package/src/stores/fetch-structure/{projection → tds}/aggregation/QueryBuilderAggregationStateBuilder.ts

@@ -35,7 +35,7 @@ import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 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: SimpleFunctionExpression,
@@ -71,15 +71,14 @@ export const processTDSAggregateExpression = (
   // build state
   if (
     queryBuilderState.fetchStructureState.implementation instanceof
-    QueryBuilderProjectionState
+    QueryBuilderTDSState
   ) {
-    const projectionState =
-      queryBuilderState.fetchStructureState.implementation;
-    const aggregationState = projectionState.aggregationState;
+    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],
+      tdsState.projectionColumns[tdsState.projectionColumns.length - 1],
     );
     const aggregateLambda = expression.parametersValues[1];
     assertType(
@@ -139,9 +138,9 @@ export const processTDSGroupByExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
 ): void => {
-  // update fetch-structure
+  // update fetch-structureTABULAR_DATA_STRUCTURE
   queryBuilderState.fetchStructureState.changeImplementation(
-    FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION,
+    FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE,
   );
 
   // check parameters
@@ -217,11 +216,10 @@ export const processTDSGroupByExpression = (
   // build state
   if (
     queryBuilderState.fetchStructureState.implementation instanceof
-    QueryBuilderProjectionState
+    QueryBuilderTDSState
   ) {
-    const projectionState =
-      queryBuilderState.fetchStructureState.implementation;
-    projectionState.columns.forEach((column, idx) =>
+    const tdsState = queryBuilderState.fetchStructureState.implementation;
+    tdsState.projectionColumns.forEach((column, idx) =>
       column.setColumnName(aliases[idx] as string),
     );
   }

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

@@ -25,7 +25,7 @@ import {
 } from '@finos/legend-graph';
 import { guaranteeType, assertTrue } from '@finos/legend-shared';
 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 const buildAggregateExpression = (
@@ -55,7 +55,7 @@ export const buildAggregateColumnState = (
 ): QueryBuilderAggregateColumnState | undefined => {
   if (matchFunctionName(expression.functionName, operatorFunctionFullPath)) {
     const aggregateColumnState = new QueryBuilderAggregateColumnState(
-      projectionColumnState.projectionState.aggregationState,
+      projectionColumnState.tdsState.aggregationState,
       projectionColumnState,
       operator,
     );

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

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
@@ -96,7 +96,7 @@ export class QueryBuilderAggregateOperator_Average
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.aggregationState.projectionState.queryBuilderState
+      aggregateColumnState.aggregationState.tdsState.queryBuilderState
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.FLOAT);
   }

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

@@ -29,7 +29,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
@@ -104,7 +104,7 @@ export class QueryBuilderAggregateOperator_Count
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.aggregationState.projectionState.queryBuilderState
+      aggregateColumnState.aggregationState.tdsState.queryBuilderState
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.INTEGER);
   }

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Distinct.ts

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts

@@ -38,7 +38,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
@@ -113,7 +113,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
       )
     ) {
       const aggregateColumnState = new QueryBuilderAggregateColumnState(
-        projectionColumnState.projectionState.aggregationState,
+        projectionColumnState.tdsState.aggregationState,
         projectionColumnState,
         this,
       );
@@ -175,7 +175,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.aggregationState.projectionState.queryBuilderState
+      aggregateColumnState.aggregationState.tdsState.queryBuilderState
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.INTEGER);
   }

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_JoinString.ts

@@ -40,7 +40,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
 
@@ -107,7 +107,7 @@ export class QueryBuilderAggregateOperator_JoinString
       )
     ) {
       const aggregateColumnState = new QueryBuilderAggregateColumnState(
-        projectionColumnState.projectionState.aggregationState,
+        projectionColumnState.tdsState.aggregationState,
         projectionColumnState,
         this,
       );
@@ -157,7 +157,7 @@ export class QueryBuilderAggregateOperator_JoinString
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.aggregationState.projectionState.queryBuilderState
+      aggregateColumnState.aggregationState.tdsState.queryBuilderState
         .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.STRING);
   }

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Max.ts

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Min.ts

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
@@ -96,8 +96,8 @@ export class QueryBuilderAggregateOperator_StdDev_Population
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.projectionColumnState.projectionState
-        .queryBuilderState.graphManagerState.graph;
+      aggregateColumnState.projectionColumnState.tdsState.queryBuilderState
+        .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.NUMBER);
   }
 

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.ts

@@ -28,7 +28,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,
@@ -96,8 +96,8 @@ export class QueryBuilderAggregateOperator_StdDev_Sample
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
     const graph =
-      aggregateColumnState.projectionColumnState.projectionState
-        .queryBuilderState.graphManagerState.graph;
+      aggregateColumnState.projectionColumnState.tdsState.queryBuilderState
+        .graphManagerState.graph;
     return graph.getType(PRIMITIVE_TYPE.NUMBER);
   }
 

package/src/stores/fetch-structure/{projection → tds}/aggregation/operators/QueryBuilderAggregateOperator_Sum.ts

@@ -27,7 +27,7 @@ import { QueryBuilderAggregateOperator } from '../QueryBuilderAggregateOperator.
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildAggregateColumnState,
   buildAggregateExpression,