@finos/legend-query-builder 4.15.42 → 4.15.44

package/lib/stores/fetch-structure/tds/result-modifier/ResultModifierValueSpecificationBuilder.d.ts.map

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

package/lib/stores/fetch-structure/tds/result-modifier/ResultModifierValueSpecificationBuilder.js

@@ -0,0 +1,213 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ColSpec, ColSpecInstanceValue, CollectionInstanceValue, GenericType, GenericTypeExplicitReference, Multiplicity, PrimitiveInstanceValue, PrimitiveType, SimpleFunctionExpression, createPrimitiveInstance_String, extractElementNameFromPath, matchFunctionName, } from '@finos/legend-graph';
+import { COLUMN_SORT_TYPE, QUERY_BUILDER_SUPPORTED_FUNCTIONS, } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import { guaranteeNonNullable } from '@finos/legend-shared';
+export class ResultModifierValueSpecificationBuilder {
+    _currentResultModifierFunc;
+    graphManagerState;
+    options;
+    distinct = false;
+    sortColumns;
+    limit;
+    slice;
+    constructor(graphManagerState) {
+        this.graphManagerState = graphManagerState;
+    }
+    get currentExpression() {
+        return guaranteeNonNullable(this._currentResultModifierFunc, `Current expression needs to be defined to build result modifier`);
+    }
+    get supportedResultModifiersFunctions() {
+        return [
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
+        ];
+    }
+    getSortTypeFunctionName(sortType) {
+        return sortType === COLUMN_SORT_TYPE.ASC
+            ? this.ascFunctionname
+            : this.descFunctionName;
+    }
+    // builders
+    setCurrentResultModifierFunction(val) {
+        this._currentResultModifierFunc = val;
+    }
+    withOptions(options) {
+        this.options = options;
+        return this;
+    }
+    withDistinct(distinct) {
+        this.distinct = distinct;
+        return this;
+    }
+    withSortColumns(sortCols) {
+        if (sortCols?.length) {
+            this.sortColumns = sortCols;
+        }
+        return this;
+    }
+    withLimit(limit) {
+        this.limit = limit;
+        return this;
+    }
+    withSlice(slice) {
+        this.slice = slice;
+        return this;
+    }
+    // builder
+    buildDistinctFunction() {
+        const distinctFunction = new SimpleFunctionExpression(extractElementNameFromPath(this.distinctFunctionName));
+        distinctFunction.parametersValues[0] = this.currentExpression;
+        this.setCurrentResultModifierFunction(distinctFunction);
+    }
+    buildSortFunction(sortColumns) {
+        const sortFunction = new SimpleFunctionExpression(extractElementNameFromPath(this.sortFunctionName));
+        const multiplicity = this.graphManagerState.graph.getMultiplicity(sortColumns.length, sortColumns.length);
+        const collection = new CollectionInstanceValue(multiplicity, undefined);
+        collection.values = sortColumns.map((e) => this.buildSortExpression(e));
+        sortFunction.parametersValues[0] = this.currentExpression;
+        sortFunction.parametersValues[1] = collection;
+        this.setCurrentResultModifierFunction(sortFunction);
+    }
+    buildSortExpression(sortColumnState) {
+        const sortColumnFunction = new SimpleFunctionExpression(extractElementNameFromPath(this.getSortTypeFunctionName(sortColumnState.sortType)));
+        sortColumnFunction.parametersValues[0] = this.buildColumnValueSpec(sortColumnState.columnState.columnName);
+        return sortColumnFunction;
+    }
+    buildLimitFunction(limit) {
+        const limitPrimitiveInstanceVal = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.INTEGER)));
+        limitPrimitiveInstanceVal.values = [
+            Math.min(limit
+                ? this.options?.withDataOverflowCheck
+                    ? limit + 1
+                    : limit
+                : Number.MAX_SAFE_INTEGER, this.options?.overridingLimit
+                ? this.options.withDataOverflowCheck
+                    ? this.options.overridingLimit + 1
+                    : this.options.overridingLimit
+                : Number.MAX_SAFE_INTEGER),
+        ];
+        const takeFunction = new SimpleFunctionExpression(extractElementNameFromPath(this.limitFunctionName));
+        takeFunction.parametersValues[0] = this.currentExpression;
+        takeFunction.parametersValues[1] = limitPrimitiveInstanceVal;
+        this.setCurrentResultModifierFunction(takeFunction);
+    }
+    buildSliceFunction(slice) {
+        const sliceStart = slice[0];
+        const sliceEnd = slice[1];
+        const startVal = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.INTEGER)));
+        const endVal = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.INTEGER)));
+        startVal.values = [sliceStart];
+        endVal.values = [sliceEnd];
+        const sliceFunction = new SimpleFunctionExpression(extractElementNameFromPath(this.sliceFunctionName));
+        sliceFunction.parametersValues = [this.currentExpression, startVal, endVal];
+        this.setCurrentResultModifierFunction(sliceFunction);
+    }
+    build(lambdaFunction) {
+        if (lambdaFunction.expressionSequence.length === 1) {
+            const func = lambdaFunction.expressionSequence[0];
+            if (func instanceof SimpleFunctionExpression) {
+                if (matchFunctionName(func.functionName, this.supportedResultModifiersFunctions)) {
+                    this._currentResultModifierFunc = func;
+                    // build distinct()
+                    if (this.distinct) {
+                        this.buildDistinctFunction();
+                    }
+                    // build sort()
+                    if (this.sortColumns) {
+                        this.buildSortFunction(this.sortColumns);
+                    }
+                    // build take()
+                    if (this.limit || this.options?.overridingLimit) {
+                        this.buildLimitFunction(this.limit);
+                    }
+                    // build slice()
+                    if (this.slice) {
+                        this.buildSliceFunction(this.slice);
+                    }
+                    lambdaFunction.expressionSequence[0] = this.currentExpression;
+                    return lambdaFunction;
+                }
+            }
+        }
+        return lambdaFunction;
+    }
+}
+export class TDSResultModifierValueSpecificationBuilder extends ResultModifierValueSpecificationBuilder {
+    get limitFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE;
+    }
+    get sliceFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.SLICE;
+    }
+    get sortFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT;
+    }
+    get distinctFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DISTINCT;
+    }
+    get ascFunctionname() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC;
+    }
+    get descFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC;
+    }
+    buildColumnValueSpec(columnName) {
+        return createPrimitiveInstance_String(columnName);
+    }
+}
+export class TypedResultModifierValueSpecificationBuilder extends ResultModifierValueSpecificationBuilder {
+    get limitFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_LIMIT;
+    }
+    get sliceFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_SLICE;
+    }
+    get ascFunctionname() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_ASC;
+    }
+    get descFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_DESC;
+    }
+    get sortFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_SORT;
+    }
+    get distinctFunctionName() {
+        return QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_DISTINCT;
+    }
+    buildColumnValueSpec(columnName) {
+        const colSpec = new ColSpecInstanceValue(Multiplicity.ONE, undefined);
+        const value = new ColSpec();
+        value.name = columnName;
+        colSpec.values = [value];
+        return colSpec;
+    }
+}
+export const appendResultSetModifier = (resultModifierState, lambdaFunction, isTyped, options) => {
+    const builder = isTyped
+        ? new TypedResultModifierValueSpecificationBuilder(resultModifierState.tdsState.queryBuilderState.graphManagerState)
+        : new TDSResultModifierValueSpecificationBuilder(resultModifierState.tdsState.queryBuilderState.graphManagerState);
+    return builder
+        .withOptions(options)
+        .withDistinct(resultModifierState.distinct)
+        .withSortColumns(resultModifierState.sortColumns)
+        .withLimit(resultModifierState.limit)
+        .withSlice(resultModifierState.slice)
+        .build(lambdaFunction);
+};
+//# sourceMappingURL=ResultModifierValueSpecificationBuilder.js.map

package/lib/stores/fetch-structure/tds/result-modifier/ResultModifierValueSpecificationBuilder.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.15.42",
+  "version": "4.15.44",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,10 +44,10 @@
   "dependencies": {
     "@finos/legend-application": "16.0.21",
     "@finos/legend-art": "7.1.78",
-    "@finos/legend-code-editor": "2.0.37",
-    "@finos/legend-data-cube": "0.0.44",
-    "@finos/legend-graph": "32.0.5",
-    "@finos/legend-lego": "2.0.40",
+    "@finos/legend-code-editor": "2.0.39",
+    "@finos/legend-data-cube": "0.0.46",
+    "@finos/legend-graph": "32.0.7",
+    "@finos/legend-lego": "2.0.42",
     "@finos/legend-server-depot": "6.0.77",
     "@finos/legend-shared": "11.0.0",
     "@finos/legend-storage": "3.0.119",

package/src/graph/QueryBuilderMetaModelConst.ts

@@ -121,7 +121,11 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   // Relation
   RELATION_PROJECT = 'meta::pure::functions::relation::project',
   RELATION_LIMIT = 'meta::pure::functions::relation::limit',
-
+  RELATION_ASC = 'meta::pure::functions::relation::ascending',
+  RELATION_DESC = 'meta::pure::functions::relation::descending',
+  RELATION_DISTINCT = 'meta::pure::functions::relation::distinct',
+  RELATION_SORT = 'meta::pure::functions::relation::sort',
+  RELATION_SLICE = 'meta::pure::functions::relation::slice',
   // filter
   CONTAINS = 'meta::pure::functions::string::contains',
   ENDS_WITH = 'meta::pure::functions::string::endsWith',

package/src/stores/QueryBuilderStateBuilder.ts

@@ -54,6 +54,7 @@ import {
   RuntimePointer,
   PackageableElementExplicitReference,
   MILESTONING_STEREOTYPE,
+  type ColSpecInstanceValue,
 } from '@finos/legend-graph';
 import { processTDSPostFilterExpression } from './fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js';
 import { processFilterExpression } from './filter/QueryBuilderFilterStateBuilder.js';
@@ -69,6 +70,7 @@ import {
   processInternalizeExpression,
 } from './fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.js';
 import {
+  processRelationSortDirectionExpression,
   processTDSColExpression,
   processTDSDistinctExpression,
   processTDSProjectExpression,
@@ -669,10 +671,10 @@ export class QueryBuilderValueSpecificationProcessor
       processTDSColExpression(valueSpecification, this.queryBuilderState);
       return;
     } else if (
-      matchFunctionName(
-        functionName,
+      matchFunctionName(functionName, [
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE,
-      )
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_LIMIT,
+      ])
     ) {
       processTDSTakeExpression(
         valueSpecification,
@@ -725,6 +727,18 @@ export class QueryBuilderValueSpecificationProcessor
         this.queryBuilderState,
       );
       return;
+    } else if (
+      matchFunctionName(functionName, [
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_ASC,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_DESC,
+      ])
+    ) {
+      processRelationSortDirectionExpression(
+        valueSpecification,
+        this.parentExpression,
+        this.queryBuilderState,
+      );
+      return;
     } else if (
       matchFunctionName(
         functionName,
@@ -994,6 +1008,10 @@ export class QueryBuilderValueSpecificationProcessor
       `Can't process col spec array expression with parent expression of function ${this.parentExpression.functionName}()`,
     );
   }
+
+  visit_ColSpecInstance(valueSpeciciation: ColSpecInstanceValue): void {
+    throw new Error('Method not implemented.');
+  }
 }
 
 export const processParameters = (

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -29,6 +29,7 @@ import {
   VariableExpression,
   PrimitiveInstanceValue,
   LambdaFunctionInstanceValue,
+  ColSpecInstanceValue,
 } from '@finos/legend-graph';
 import {
   assertNonNullable,
@@ -603,7 +604,7 @@ export const processTDSSortDirectionExpression = (
   // check parameters
   assertTrue(
     expression.parametersValues.length === 1,
-    `Can't process ${functionName}() expression: ${functionName}() expects no argument`,
+    `Can't process ${functionName}() expression: ${functionName}() expects one argument`,
   );
 
   // build state
@@ -633,3 +634,65 @@ export const processTDSSortDirectionExpression = (
     }
   }
 };
+
+export const processRelationSortDirectionExpression = (
+  expression: SimpleFunctionExpression,
+  parentExpression: SimpleFunctionExpression | undefined,
+  queryBuilderState: QueryBuilderState,
+): void => {
+  const functionName = expression.functionName;
+
+  // check parent expression
+  assertTrue(
+    Boolean(
+      parentExpression &&
+        matchFunctionName(
+          parentExpression.functionName,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT,
+        ),
+    ),
+    `Can't process ${functionName}() expression: only support ${functionName}() used within a sort() expression`,
+  );
+
+  // check parameters
+  assertTrue(
+    expression.parametersValues.length === 1,
+    `Can't process ${functionName}() expression: ${functionName}() expects one argument`,
+  );
+
+  // build state
+  if (
+    queryBuilderState.fetchStructureState.implementation instanceof
+    QueryBuilderTDSState
+  ) {
+    const projectionState =
+      queryBuilderState.fetchStructureState.implementation;
+    const value = guaranteeType(
+      expression.parametersValues[0],
+      ColSpecInstanceValue,
+    );
+    assertTrue(
+      value.values.length === 1,
+      `Can't process ${functionName}() expression: Col Spec Instance Value expects one value`,
+    );
+    const sortColumnName = guaranteeNonNullable(
+      value.values[0],
+      `Col Spec value expected in Col Spec Instance Value`,
+    ).name;
+    const queryBuilderProjectionColumnState = projectionState.tdsColumns.find(
+      (e) => e.columnName === sortColumnName,
+    );
+    if (queryBuilderProjectionColumnState) {
+      const sortColumnState = new SortColumnState(
+        queryBuilderProjectionColumnState,
+      );
+      sortColumnState.sortType = matchFunctionName(
+        functionName,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_ASC,
+      )
+        ? COLUMN_SORT_TYPE.ASC
+        : COLUMN_SORT_TYPE.DESC;
+      projectionState.resultSetModifierState.addSortColumn(sortColumnState);
+    }
+  }
+};

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -27,7 +27,6 @@ import {
   V1_serializeRawValueSpecification,
   V1_transformRawLambda,
   V1_GraphTransformerContextBuilder,
-  matchFunctionName,
   PrimitiveType,
   LambdaFunctionInstanceValue,
 } from '@finos/legend-graph';
@@ -42,10 +41,6 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from './QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import {
-  type QueryResultSetModifierState,
-  type SortColumnState,
-} from '../QueryResultSetModifierState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import {
@@ -54,139 +49,9 @@ import {
 } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
 import { appendOLAPGroupByState } from '../window/QueryBuilderWindowValueSpecificationBuilder.js';
 import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
-import { buildTDSSortTypeExpression } from '../QueryBuilderTDSHelper.js';
 import { buildRelationProjection } from './QueryBuilderRelationProjectValueSpecBuidler.js';
 import { QueryBuilderAggregateOperator_Wavg } from '../aggregation/operators/QueryBuilderAggregateOperator_Wavg.js';
-
-const buildSortExpression = (
-  sortColumnState: SortColumnState,
-): SimpleFunctionExpression =>
-  buildTDSSortTypeExpression(
-    sortColumnState.sortType,
-    sortColumnState.columnState.columnName,
-  );
-
-const appendResultSetModifier = (
-  resultModifierState: QueryResultSetModifierState,
-  lambdaFunction: LambdaFunction,
-  options?:
-    | {
-        overridingLimit?: number | undefined;
-        withDataOverflowCheck?: boolean | undefined;
-      }
-    | undefined,
-): LambdaFunction => {
-  if (lambdaFunction.expressionSequence.length === 1) {
-    const func = lambdaFunction.expressionSequence[0];
-    if (func instanceof SimpleFunctionExpression) {
-      if (
-        matchFunctionName(func.functionName, [
-          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
-          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
-          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
-          QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
-        ])
-      ) {
-        let currentExpression = func;
-
-        // build distinct()
-        if (resultModifierState.distinct) {
-          const distinctFunction = new SimpleFunctionExpression(
-            extractElementNameFromPath(
-              QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DISTINCT,
-            ),
-          );
-          distinctFunction.parametersValues[0] = currentExpression;
-          currentExpression = distinctFunction;
-        }
-
-        // build sort()
-        if (resultModifierState.sortColumns.length) {
-          const sortFunction = new SimpleFunctionExpression(
-            extractElementNameFromPath(
-              QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT,
-            ),
-          );
-          const multiplicity =
-            resultModifierState.tdsState.queryBuilderState.graphManagerState.graph.getMultiplicity(
-              resultModifierState.sortColumns.length,
-              resultModifierState.sortColumns.length,
-            );
-          const collection = new CollectionInstanceValue(
-            multiplicity,
-            undefined,
-          );
-          collection.values =
-            resultModifierState.sortColumns.map(buildSortExpression);
-          sortFunction.parametersValues[0] = currentExpression;
-          sortFunction.parametersValues[1] = collection;
-          currentExpression = sortFunction;
-        }
-
-        // build take()
-        if (resultModifierState.limit || options?.overridingLimit) {
-          const limit = new PrimitiveInstanceValue(
-            GenericTypeExplicitReference.create(
-              new GenericType(PrimitiveType.INTEGER),
-            ),
-          );
-          limit.values = [
-            Math.min(
-              resultModifierState.limit
-                ? options?.withDataOverflowCheck
-                  ? resultModifierState.limit + 1
-                  : resultModifierState.limit
-                : Number.MAX_SAFE_INTEGER,
-              options?.overridingLimit
-                ? options.withDataOverflowCheck
-                  ? options.overridingLimit + 1
-                  : options.overridingLimit
-                : Number.MAX_SAFE_INTEGER,
-            ),
-          ];
-          const takeFunction = new SimpleFunctionExpression(
-            extractElementNameFromPath(
-              QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE,
-            ),
-          );
-          takeFunction.parametersValues[0] = currentExpression;
-          takeFunction.parametersValues[1] = limit;
-          currentExpression = takeFunction;
-        }
-        // build slice()
-        if (resultModifierState.slice) {
-          const sliceStart = resultModifierState.slice[0];
-          const sliceEnd = resultModifierState.slice[1];
-          const startVal = new PrimitiveInstanceValue(
-            GenericTypeExplicitReference.create(
-              new GenericType(PrimitiveType.INTEGER),
-            ),
-          );
-          const endVal = new PrimitiveInstanceValue(
-            GenericTypeExplicitReference.create(
-              new GenericType(PrimitiveType.INTEGER),
-            ),
-          );
-          startVal.values = [sliceStart];
-          endVal.values = [sliceEnd];
-          const sliceFunction = new SimpleFunctionExpression(
-            extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SLICE),
-          );
-          sliceFunction.parametersValues = [
-            currentExpression,
-            startVal,
-            endVal,
-          ];
-          currentExpression = sliceFunction;
-        }
-
-        lambdaFunction.expressionSequence[0] = currentExpression;
-        return lambdaFunction;
-      }
-    }
-  }
-  return lambdaFunction;
-};
+import { appendResultSetModifier } from '../result-modifier/ResultModifierValueSpecificationBuilder.js';
 
 const buildProjectColFunc = (
   tdsState: QueryBuilderTDSState,
@@ -542,14 +407,19 @@ export const appendProjection = (
   appendPostFilter(tdsState.postFilterState, lambdaFunction);
 
   // build result set modifiers
-  appendResultSetModifier(tdsState.resultSetModifierState, lambdaFunction, {
-    overridingLimit:
-      options?.isBuildingExecutionQuery && !options.isExportingResult
-        ? queryBuilderState.resultState.previewLimit
-        : undefined,
-    withDataOverflowCheck:
-      options?.isBuildingExecutionQuery && !options.isExportingResult
-        ? options.withDataOverflowCheck
-        : undefined,
-  });
+  appendResultSetModifier(
+    tdsState.resultSetModifierState,
+    lambdaFunction,
+    tdsState.queryBuilderState.isFetchStructureTyped,
+    {
+      overridingLimit:
+        options?.isBuildingExecutionQuery && !options.isExportingResult
+          ? queryBuilderState.resultState.previewLimit
+          : undefined,
+      withDataOverflowCheck:
+        options?.isBuildingExecutionQuery && !options.isExportingResult
+          ? options.withDataOverflowCheck
+          : undefined,
+    },
+  );
 };