@finos/legend-query-builder 0.2.1 → 0.2.2

package/src/stores/fetch-structure/{projection → tds}/post-filter/QueryBuilderPostFilterState.ts

@@ -56,14 +56,14 @@ import {
   type QueryBuilderProjectionColumnState,
   type QueryBuilderProjectionColumnDragSource,
   QueryBuilderDerivationProjectionColumnState,
-} from '../QueryBuilderProjectionColumnState.js';
+} from '../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildProjectionColumnTypeaheadQuery,
   buildTypeaheadOptions,
   performTypeahead,
 } from '../../../QueryBuilderTypeaheadHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../../QueryBuilderGroupOperationHelper.js';
-import type { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
+import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
@@ -365,21 +365,20 @@ export class PostFilterConditionState implements Hashable {
       this.typeaheadSearchResults = undefined;
       if (performTypeahead(this.value)) {
         const result =
-          (yield this.postFilterState.projectionState.queryBuilderState.graphManagerState.graphManager.executeMapping(
+          (yield this.postFilterState.tdsState.queryBuilderState.graphManagerState.graphManager.executeMapping(
             buildProjectionColumnTypeaheadQuery(
-              this.postFilterState.projectionState.queryBuilderState,
+              this.postFilterState.tdsState.queryBuilderState,
               this.columnState,
               this.value,
             ),
             guaranteeNonNullable(
-              this.postFilterState.projectionState.queryBuilderState.mapping,
+              this.postFilterState.tdsState.queryBuilderState.mapping,
             ),
             guaranteeNonNullable(
-              this.postFilterState.projectionState.queryBuilderState
-                .runtimeValue,
+              this.postFilterState.tdsState.queryBuilderState.runtimeValue,
             ),
-            this.postFilterState.projectionState.queryBuilderState
-              .graphManagerState.graph,
+            this.postFilterState.tdsState.queryBuilderState.graphManagerState
+              .graph,
           )) as ExecutionResult;
         this.typeaheadSearchResults = buildTypeaheadOptions(result);
       }
@@ -403,8 +402,7 @@ export class PostFilterConditionState implements Hashable {
     this.value = val
       ? observe_ValueSpecification(
           val,
-          this.postFilterState.projectionState.queryBuilderState
-            .observableContext,
+          this.postFilterState.tdsState.queryBuilderState.observableContext,
         )
       : undefined;
   }
@@ -424,7 +422,7 @@ export class PostFilterConditionState implements Hashable {
   ): GeneratorFn<void> {
     try {
       const aggregateColumnState =
-        this.postFilterState.projectionState.aggregationState.columns.find(
+        this.postFilterState.tdsState.aggregationState.columns.find(
           (column) => column.projectionColumnState === columnState,
         );
       const colState = aggregateColumnState ?? columnState;
@@ -446,7 +444,7 @@ export class PostFilterConditionState implements Hashable {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.postFilterState.projectionState.queryBuilderState.applicationStore.notifyError(
+      this.postFilterState.tdsState.queryBuilderState.applicationStore.notifyError(
         `Can't drag column '${columnState.columnName}' due to: ${error.message}`,
       );
     }
@@ -465,7 +463,7 @@ export class PostFilterConditionState implements Hashable {
 export class QueryBuilderPostFilterState
   implements TreeData<QueryBuilderPostFilterTreeNodeData>, Hashable
 {
-  projectionState: QueryBuilderProjectionState;
+  tdsState: QueryBuilderTDSState;
   lambdaParameterName = DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME;
   selectedNode?: QueryBuilderPostFilterTreeNodeData | undefined;
   isRearrangingConditions = false;
@@ -475,11 +473,11 @@ export class QueryBuilderPostFilterState
   _suppressClickawayEventListener = false;
 
   constructor(
-    projectionState: QueryBuilderProjectionState,
+    tdsState: QueryBuilderTDSState,
     operators: QueryBuilderPostFilterOperator[],
   ) {
     makeObservable(this, {
-      projectionState: false,
+      tdsState: false,
       selectedNode: observable,
       isRearrangingConditions: observable,
       rootIds: observable,
@@ -501,7 +499,7 @@ export class QueryBuilderPostFilterState
       hashCode: computed,
     });
 
-    this.projectionState = projectionState;
+    this.tdsState = tdsState;
     this.operators = operators;
   }
 

package/src/stores/fetch-structure/{projection → tds}/post-filter/QueryBuilderPostFilterStateBuilder.ts

@@ -46,9 +46,9 @@ import {
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderDerivationProjectionColumnState,
-} from '../QueryBuilderProjectionColumnState.js';
+} from '../projection/QueryBuilderProjectionColumnState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
-import { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
+import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 
@@ -56,7 +56,7 @@ const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
   postFilterState: QueryBuilderPostFilterState,
 ): QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState => {
-  const projectionState = postFilterState.projectionState;
+  const tdsState = postFilterState.tdsState;
   const properyExpressionName = propertyExpression.func.value.name;
   assertTrue(
     Object.values(TDS_COLUMN_GETTER).includes(
@@ -77,8 +77,8 @@ const findProjectionColumnState = (
     'Can`t process TDS column expression: Column should be a string primitive instance value',
   );
   const columnStates = [
-    ...projectionState.aggregationState.columns,
-    ...projectionState.columns,
+    ...tdsState.aggregationState.columns,
+    ...tdsState.projectionColumns,
   ];
   const columnState = guaranteeNonNullable(
     columnStates.find((c) => c.columnName === columnName),
@@ -90,8 +90,7 @@ const findProjectionColumnState = (
     if (columnState instanceof QueryBuilderDerivationProjectionColumnState) {
       const type = getTypeFromDerivedProperty(
         tdsColumnGetter,
-        postFilterState.projectionState.queryBuilderState.graphManagerState
-          .graph,
+        postFilterState.tdsState.queryBuilderState.graphManagerState.graph,
       );
       if (type) {
         columnState.setReturnType(type);
@@ -243,12 +242,11 @@ export const processTDSPostFilterExpression = (
 ): void => {
   if (
     queryBuilderState.fetchStructureState.implementation instanceof
-    QueryBuilderProjectionState
+    QueryBuilderTDSState
   ) {
-    const projectionState =
-      queryBuilderState.fetchStructureState.implementation;
-    const postFilterState = projectionState.postFilterState;
-    const fetchStructureState = projectionState.fetchStructureState;
+    const tdsState = queryBuilderState.fetchStructureState.implementation;
+    const postFilterState = tdsState.postFilterState;
+    const fetchStructureState = tdsState.fetchStructureState;
     const postFilterLambda = expression.parametersValues[1];
     assertType(
       postFilterLambda,
@@ -258,11 +256,11 @@ export const processTDSPostFilterExpression = (
 
     assertType(
       fetchStructureState.implementation,
-      QueryBuilderProjectionState,
+      QueryBuilderTDSState,
       `Can't process post-filter lambda: post-filter lambda must use projection fetch structure`,
     );
     assertTrue(
-      Boolean(projectionState.columns.length),
+      Boolean(tdsState.projectionColumns.length),
       `Can't process post-filter lambda: post-filter lambda must have at least one projection column `,
     );
     const lambdaFunc = guaranteeNonNullable(
@@ -291,7 +289,7 @@ export const processTDSPostFilterExpression = (
     );
     processPostFilterTree(rootExpression, postFilterState, undefined);
 
-    projectionState.setShowPostFilterPanel(true);
+    tdsState.setShowPostFilterPanel(true);
     postFilterState.simplifyTree();
   }
 };

package/src/stores/fetch-structure/{projection → tds}/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts

@@ -42,7 +42,7 @@ const buildPostFilterExpression = (
     );
   } else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
     const multiplicityOne =
-      postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+      postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
         TYPICAL_MULTIPLICITY_TYPE.ONE,
       );
     const func = new SimpleFunctionExpression(
@@ -101,13 +101,13 @@ export const appendPostFilter = (
     return lambdaFunction;
   }
   const multiplicityOne =
-    postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+    postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
   const filterLambda = buildGenericLambdaFunctionInstanceValue(
     postFilterState.lambdaParameterName,
     postFilterConditionExpressions,
-    postFilterState.projectionState.queryBuilderState.graphManagerState.graph,
+    postFilterState.tdsState.queryBuilderState.graphManagerState.graph,
   );
   // main filter expression
   const filterExpression = new SimpleFunctionExpression(

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts

@@ -23,7 +23,7 @@ import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilder
 import {
   type QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from '../../QueryBuilderProjectionColumnState.js';
+} from '../../projection/QueryBuilderProjectionColumnState.js';
 
 export const getColumnMultiplicity = (
   columnState:
@@ -31,7 +31,7 @@ export const getColumnMultiplicity = (
     | QueryBuilderAggregateColumnState,
 ): Multiplicity => {
   if (columnState instanceof QueryBuilderAggregateColumnState) {
-    return columnState.aggregationState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+    return columnState.aggregationState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
   } else if (columnState instanceof QueryBuilderSimpleProjectionColumnState) {

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts

@@ -50,7 +50,7 @@ export const buildPostFilterConditionExpression = (
 ): FunctionExpression => {
   // primitives
   const graph =
-    filterConditionState.postFilterState.projectionState.queryBuilderState
+    filterConditionState.postFilterState.tdsState.queryBuilderState
       .graphManagerState.graph;
   const multiplicityOne = graph.getTypicalMultiplicity(
     TYPICAL_MULTIPLICITY_TYPE.ONE,

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts

@@ -77,8 +77,8 @@ export class QueryBuilderPostFilterOperator_Contain
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
@@ -134,8 +134,8 @@ export class QueryBuilderPostFilterOperator_NotContain extends QueryBuilderPostF
     return expression
       ? buildNotExpression(
           expression,
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
         )
       : undefined;
   }

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts

@@ -73,8 +73,8 @@ export class QueryBuilderPostFilterOperator_EndWith
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
@@ -131,8 +131,8 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
     return expression
       ? buildNotExpression(
           expression,
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
         )
       : undefined;
   }

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts

@@ -114,16 +114,16 @@ export class QueryBuilderPostFilterOperator_Equal
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
       case PRIMITIVE_TYPE.DATE: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
@@ -132,7 +132,7 @@ export class QueryBuilderPostFilterOperator_Equal
         if (propertyType instanceof Enumeration) {
           if (propertyType.values.length > 0) {
             const multiplicityOne =
-              postFilterConditionState.postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+              postFilterConditionState.postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
                 TYPICAL_MULTIPLICITY_TYPE.ONE,
               );
             const enumValueInstanceValue = new EnumValueInstanceValue(
@@ -211,8 +211,8 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
     return expression
       ? buildNotExpression(
           expression,
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
         )
       : undefined;
   }

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -91,16 +91,16 @@ export class QueryBuilderPostFilterOperator_GreaterThan
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
       case PRIMITIVE_TYPE.DATE: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -83,8 +83,8 @@ export class QueryBuilderPostFilterOperator_In
         return true;
       }
       const collectionType = getCollectionValueSpecificationType(
-        postFilterConditionState.postFilterState.projectionState
-          .queryBuilderState.graphManagerState.graph,
+        postFilterConditionState.postFilterState.tdsState.queryBuilderState
+          .graphManagerState.graph,
         valueSpec.values,
       );
       if (!collectionType) {
@@ -124,7 +124,7 @@ export class QueryBuilderPostFilterOperator_In
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
     const multiplicityOne =
-      postFilterConditionState.postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+      postFilterConditionState.postFilterState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
         TYPICAL_MULTIPLICITY_TYPE.ONE,
       );
     const propertyType = guaranteeNonNullable(
@@ -177,8 +177,8 @@ export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilter
     return expression
       ? buildNotExpression(
           expression,
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
         )
       : undefined;
   }

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts

@@ -28,7 +28,7 @@ import {
   type QueryBuilderPostFilterState,
   TDS_COLUMN_GETTER,
 } from '../QueryBuilderPostFilterState.js';
-import { QueryBuilderSimpleProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
+import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { isPropertyExpressionChainOptional } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -91,16 +91,16 @@ export class QueryBuilderPostFilterOperator_LessThan
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
       case PRIMITIVE_TYPE.DATE: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );

package/src/stores/fetch-structure/{projection → tds}/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts

@@ -74,8 +74,8 @@ export class QueryBuilderPostFilterOperator_StartWith
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
@@ -134,8 +134,8 @@ export class QueryBuilderPostFilterOperator_NotStartWith
     return expression
       ? buildNotExpression(
           expression,
-          postFilterConditionState.postFilterState.projectionState
-            .queryBuilderState.graphManagerState.graph,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
         )
       : undefined;
   }

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

@@ -29,12 +29,12 @@ import {
 import {
   type QueryBuilderExplorerTreePropertyNodeData,
   buildPropertyExpressionFromExplorerTreeNodeData,
-} from '../../explorer/QueryBuilderExplorerState.js';
+} from '../../../explorer/QueryBuilderExplorerState.js';
 import {
   getPropertyChainName,
   QueryBuilderPropertyExpressionState,
-} from '../../QueryBuilderPropertyEditorState.js';
-import type { QueryBuilderState } from '../../QueryBuilderState.js';
+} from '../../../QueryBuilderPropertyEditorState.js';
+import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import {
   type AbstractPropertyExpression,
   type Type,
@@ -53,10 +53,10 @@ import {
 import {
   DEFAULT_LAMBDA_VARIABLE_NAME,
   QUERY_BUILDER_SOURCE_ID_LABEL,
-} from '../../QueryBuilderConfig.js';
-import type { QueryBuilderProjectionState } from './QueryBuilderProjectionState.js';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-import { LambdaEditorState } from '../../shared/LambdaEditorState.js';
+} from '../../../QueryBuilderConfig.js';
+import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
+import { LambdaEditorState } from '../../../shared/LambdaEditorState.js';
 
 export const QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE = 'PROJECTION_COLUMN';
 
@@ -66,22 +66,19 @@ export interface QueryBuilderProjectionColumnDragSource {
 
 export abstract class QueryBuilderProjectionColumnState implements Hashable {
   readonly uuid = uuid();
-  projectionState: QueryBuilderProjectionState;
+  tdsState: QueryBuilderTDSState;
   columnName: string;
 
-  constructor(
-    projectionState: QueryBuilderProjectionState,
-    columnName: string,
-  ) {
+  constructor(tdsState: QueryBuilderTDSState, columnName: string) {
     makeObservable(this, {
       uuid: false,
-      projectionState: false,
+      tdsState: false,
       columnName: observable,
       setColumnName: action,
       hashCode: computed,
     });
 
-    this.projectionState = projectionState;
+    this.tdsState = tdsState;
     this.columnName = columnName;
   }
 
@@ -102,11 +99,11 @@ export class QueryBuilderSimpleProjectionColumnState
   propertyExpressionState: QueryBuilderPropertyExpressionState;
 
   constructor(
-    projectionState: QueryBuilderProjectionState,
+    tdsState: QueryBuilderTDSState,
     propertyExpression: AbstractPropertyExpression,
     humanizePropertyName: boolean,
   ) {
-    super(projectionState, '');
+    super(tdsState, '');
 
     makeObservable(this, {
       lambdaParameterName: observable,
@@ -116,7 +113,7 @@ export class QueryBuilderSimpleProjectionColumnState
     });
 
     this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
-      projectionState.queryBuilderState,
+      tdsState.queryBuilderState,
       propertyExpression,
     );
     this.columnName = getPropertyChainName(
@@ -134,10 +131,10 @@ export class QueryBuilderSimpleProjectionColumnState
     humanizePropertyName: boolean,
   ): void {
     this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
-      this.projectionState.queryBuilderState,
+      this.tdsState.queryBuilderState,
       buildPropertyExpressionFromExplorerTreeNodeData(
         node,
-        this.projectionState.queryBuilderState.explorerState,
+        this.tdsState.queryBuilderState.explorerState,
       ),
     );
     this.columnName = getPropertyChainName(
@@ -264,8 +261,8 @@ export class QueryBuilderDerivationProjectionColumnState
   lambda: RawLambda;
   returnType: Type | undefined;
 
-  constructor(projectionState: QueryBuilderProjectionState, lambda: RawLambda) {
-    super(projectionState, '(derivation)');
+  constructor(tdsState: QueryBuilderTDSState, lambda: RawLambda) {
+    super(tdsState, '(derivation)');
 
     makeObservable(this, {
       lambda: observable,
@@ -276,7 +273,7 @@ export class QueryBuilderDerivationProjectionColumnState
 
     this.derivationLambdaEditorState =
       new QueryBuilderDerivationProjectionLambdaState(
-        projectionState.queryBuilderState,
+        tdsState.queryBuilderState,
         this,
       );
     this.lambda = lambda;
@@ -298,8 +295,7 @@ export class QueryBuilderDerivationProjectionColumnState
   *fetchDerivationLambdaReturnType(): GeneratorFn<void> {
     assertTrue(Array.isArray(this.lambda.parameters));
     const projectionParameter = this.lambda.parameters as object[];
-    const graph =
-      this.projectionState.queryBuilderState.graphManagerState.graph;
+    const graph = this.tdsState.queryBuilderState.graphManagerState.graph;
     const multiplicityOne = graph.getTypicalMultiplicity(
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
@@ -311,11 +307,11 @@ export class QueryBuilderDerivationProjectionColumnState
       variable.name,
       multiplicityOne,
       PackageableElementExplicitReference.create(
-        guaranteeNonNullable(this.projectionState.queryBuilderState.class),
+        guaranteeNonNullable(this.tdsState.queryBuilderState.class),
       ),
     );
     const _rawVariableExpression =
-      this.projectionState.queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(
+      this.tdsState.queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(
         rawVariableExpression,
       );
     const isolatedLambda = new RawLambda(
@@ -323,7 +319,7 @@ export class QueryBuilderDerivationProjectionColumnState
       this.lambda.body,
     );
     const type =
-      (yield this.projectionState.queryBuilderState.graphManagerState.graphManager.getLambdaReturnType(
+      (yield this.tdsState.queryBuilderState.graphManagerState.graphManager.getLambdaReturnType(
         isolatedLambda,
         graph,
       )) as string;