@finos/legend-data-cube 0.1.31 → 0.2.0

package/lib/stores/view/grid/DataCubeGridState.js

@@ -15,7 +15,7 @@
  */
 import { debounce, guaranteeNonNullable, StopWatch, } from '@finos/legend-shared';
 import { action, makeObservable, observable, runInAction } from 'mobx';
-import { DataCubeGridClientServerSideDataSource, INTERNAL__GRID_CLIENT_DEFAULT_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID, INTERNAL__GRID_CLIENT_MAX_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_PAGINATION, computeHashCodeForDataFetchManualTrigger, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_CACHING, } from './DataCubeGridClientEngine.js';
+import { DataCubeGridClientServerSideDataSource, INTERNAL__GRID_CLIENT_DEFAULT_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID, INTERNAL__GRID_CLIENT_MAX_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_PAGINATION, computeHashCodeForDataFetchManualTrigger, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_CACHING, fetchDimensionalQueryRows, } from './DataCubeGridClientEngine.js';
 import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
 import { generateGridOptionsFromSnapshot } from './DataCubeGridConfigurationBuilder.js';
 import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
@@ -24,8 +24,9 @@ import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine
 import { DataCubeSettingKey } from '../../../__lib__/DataCubeSetting.js';
 import { DEFAULT_ALERT_WINDOW_CONFIG } from '../../services/DataCubeLayoutService.js';
 import { AlertType } from '../../services/DataCubeAlertService.js';
-import { DataCubeGridMode } from '../../core/DataCubeQueryEngine.js';
+import { DataCubeClientModelOption, DataCubeGridMode, } from '../../core/DataCubeQueryEngine.js';
 import { DataCubeEvent } from '../../../__lib__/DataCubeEvent.js';
+import { hydrateDataCubeDimensionalTree } from './DataCubeGridDimensionalTree.js';
 /**
  * This query editor state is responsible for syncing the internal state of ag-grid
  * server-side row model data source with the data cube query state. When new snapshot
@@ -188,6 +189,27 @@ export class DataCubeGridState extends DataCubeSnapshotController {
             await this.applySnapshot(latestSnapshot, undefined);
         }
     }
+    async configureDimensionGridClient(val) {
+        this._client = val;
+        this.debouncedAutoResizeColumns = debounce(() => val?.autoSizeAllColumns(), 100);
+        const latestSnapshot = this.getLatestSnapshot();
+        if (latestSnapshot) {
+            latestSnapshot.data.tree = hydrateDataCubeDimensionalTree(DataCubeConfiguration.serialization.fromJson(latestSnapshot.data.configuration));
+            await this._applyDimensionalSnapshot(latestSnapshot);
+        }
+    }
+    async retrieveDrilldownData(data) {
+        const latestSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
+        latestSnapshot.data.tree = hydrateDataCubeDimensionalTree(DataCubeConfiguration.serialization.fromJson(latestSnapshot.data.configuration), data, latestSnapshot.data.tree);
+        await this._applyDimensionalSnapshot(latestSnapshot);
+    }
+    async _applyDimensionalSnapshot(snapshot) {
+        //TODO: only trigger when there is an actual change in tree
+        const result = await fetchDimensionalQueryRows(snapshot, this._view);
+        this._client?.setGridOption(DataCubeClientModelOption.ROW_DATA, result.rowData);
+        this._client?.setGridOption(DataCubeClientModelOption.COLUMN_DEFS, result.columnDefs);
+        this.publishSnapshot(snapshot);
+    }
     getSnapshotSubscriberName() {
         return 'grid';
     }

package/lib/stores/view/grid/DataCubeGridState.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridState.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataCubeGridState.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-data-cube",
-  "version": "0.1.31",
+  "version": "0.2.0",
   "description": "Legend DataCube",
   "keywords": [
     "legend",
@@ -42,9 +42,9 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-art": "7.1.95",
-    "@finos/legend-code-editor": "2.0.68",
-    "@finos/legend-graph": "32.1.26",
+    "@finos/legend-art": "7.1.96",
+    "@finos/legend-code-editor": "2.0.69",
+    "@finos/legend-graph": "32.1.27",
     "@finos/legend-shared": "11.0.11",
     "@types/react": "19.0.10",
     "ag-grid-community": "33.1.1",

package/src/components/DataCubeStatusBar.tsx

@@ -20,7 +20,10 @@ import type { DataCubeViewState } from '../stores/view/DataCubeViewState.js';
 import type { TaskManager } from '../stores/services/DataCubeTaskService.js';
 import { at } from '@finos/legend-shared';
 import { DataCubeEvent } from '../__lib__/DataCubeEvent.js';
-import { DataCubeOpenEditorSource } from '../stores/core/DataCubeQueryEngine.js';
+import {
+  DataCubeOpenEditorSource,
+  isDimensionalGridMode,
+} from '../stores/core/DataCubeQueryEngine.js';
 
 export const DataCubeStatusBar = observer(
   (props: {
@@ -71,7 +74,11 @@ export const DataCubeStatusBar = observer(
                 view?.filter.display.open();
                 logOpeningFilterEditor();
               }}
-              disabled={!view}
+              disabled={
+                !view ||
+                // TODO: add support for filtering in dimensional grid mode
+                isDimensionalGridMode(view.info.configuration.gridMode)
+              }
             >
               <DataCubeIcon.TableFilter className="text-lg" />
               <div className="pl-0.5 underline">Filter</div>

package/src/components/view/editor/DataCubeEditor.tsx

@@ -28,6 +28,7 @@ import { FormButton } from '../../core/DataCubeFormUtils.js';
 import { useDataCube } from '../../DataCubeProvider.js';
 import { DataCubeEditorDimensionsPanel } from './DataCubeEditorDimensionsPanel.js';
 import { DataCubeEvent } from '../../../__lib__/DataCubeEvent.js';
+import { isDimensionalGridMode } from '../../../stores/core/DataCubeQueryEngine.js';
 
 export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
   const dataCube = useDataCube();
@@ -45,6 +46,8 @@ export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
     DataCubeEditorTab.GENERAL_PROPERTIES,
     DataCubeEditorTab.COLUMN_PROPERTIES,
   ];
+  //TODO: Add support to make changes to other tabs for dimensional grid mode
+  const dimensionTabs = [DataCubeEditorTab.DIMENSIONS];
 
   const logApplyChangesFromPropertiesEditor = (): void => {
     view.dataCube.telemetryService.sendTelemetry(
@@ -61,8 +64,12 @@ export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
             <button
               key={tab}
               onClick={() => editor.setCurrentTab(tab)}
+              disabled={
+                isDimensionalGridMode(view.info.configuration.gridMode) &&
+                !dimensionTabs.includes(tab)
+              }
               className={cn(
-                'relative flex h-6 items-center justify-center whitespace-nowrap border border-b-0 border-l-0 border-neutral-300 px-2 first:border-l focus:z-10',
+                'relative flex h-6 items-center justify-center whitespace-nowrap border border-b-0 border-l-0 border-neutral-300 px-2 first:border-l focus:z-10 disabled:text-neutral-400',
                 {
                   '-top-0.5 h-[27px] border-b-0 bg-white': tab === selectedTab,
                 },

package/src/components/view/grid/DataCubeMultidimensionalGrid.tsx

@@ -16,11 +16,73 @@
 
 import { observer } from 'mobx-react-lite';
 import type { DataCubeViewState } from '../../../stores/view/DataCubeViewState.js';
+import { DataCubeGridStyleController } from './DataCubeGrid.js';
+import { AgGridReact } from 'ag-grid-react';
+import { generateDimensionalBaseGridOptions } from '../../../stores/view/grid/DataCubeGridConfigurationBuilder.js';
+import { AllCommunityModule } from 'ag-grid-community';
+import { AllEnterpriseModule } from 'ag-grid-enterprise';
+
+const __INTERNAL__original_console_error = console.error; // eslint-disable-line no-console
+
+const DataCubeMultidimensionalGridClient = observer(
+  (props: { view: DataCubeViewState }) => {
+    const { view } = props;
+    const grid = view.grid;
+
+    // eslint-disable-next-line no-process-env
+    if (process.env.NODE_ENV !== 'production' && !grid.isClientConfigured) {
+      // eslint-disable-next-line no-console
+      console.error = (message?: unknown) => {
+        console.debug(`%c ${message}`, 'color: silver'); // eslint-disable-line no-console
+      };
+    }
+
+    // We use the client row model to showcase multi-dimensionality;
+    // Tree Data cannot be used in this case as the aggregation works on multiple columns
+    // https://www.ag-grid.com/javascript-data-grid/row-models/#client-side
+    return (
+      <div className="relative h-[calc(100%_-_20px)] w-full">
+        <AgGridReact
+          theme="legacy"
+          className="data-cube-grid ag-theme-quartz"
+          context={{
+            view,
+          }}
+          columnDefs={[]}
+          rowData={[]}
+          onCellDoubleClicked={(event) => {
+            grid
+              .retrieveDrilldownData(event)
+              .catch((error) => view.alertService.alertUnhandledError(error));
+          }}
+          onGridReady={(params) => {
+            grid
+              .configureDimensionGridClient(params.api)
+              .catch((error) => view.alertService.alertUnhandledError(error));
+            // eslint-disable-next-line no-process-env
+            if (process.env.NODE_ENV !== 'production') {
+              // restore original error logging
+              console.error = __INTERNAL__original_console_error; // eslint-disable-line no-console
+            }
+          }}
+          modules={[AllCommunityModule, AllEnterpriseModule]}
+          {...generateDimensionalBaseGridOptions(view)}
+        />
+      </div>
+    );
+  },
+);
 
 export const DataCubeMultidimensionalGrid = observer(
   (props: { view: DataCubeViewState }) => {
+    const view = props.view;
+    const configuration = props.view.grid.configuration;
+
     return (
-      <div className="border-t-1 border-b-1 h-[calc(100%_-_48px)] w-full border border-neutral-200 bg-neutral-50" />
+      <div className="h-[calc(100%_-_48px)] w-full">
+        <DataCubeGridStyleController configuration={configuration} />
+        <DataCubeMultidimensionalGridClient view={view} />
+      </div>
     );
   },
 );

package/src/stores/DataCubeAPI.ts

@@ -18,6 +18,7 @@ import type { DataCubeSpecification } from './core/model/DataCubeSpecification.j
 import type { DataCubeSource } from './core/model/DataCubeSource.js';
 import type { DataCubeState } from './DataCubeState.js';
 import type { DataCubeViewState } from './view/DataCubeViewState.js';
+import type { DataCubeGridMode } from './core/DataCubeQueryEngine.js';
 
 /**
  * This is the API exposed externally by DataCube to restrict access to certain
@@ -58,6 +59,10 @@ export interface DataCubeAPI {
    * Get the caching enabled state of the underlying grid.
    */
   isCachingEnabled(): boolean;
+  /**
+   * Get mode for grid
+   */
+  getGridMode(): DataCubeGridMode;
 }
 
 /**
@@ -112,4 +117,9 @@ export class INTERNAL__DataCubeAPI implements DataCubeAPI {
   isCachingEnabled() {
     return this._dataCube.view.grid.isCachingEnabled;
   }
+
+  // TODO: remove this method once saving is enabled for dimensional mode
+  getGridMode() {
+    return this._dataCube.view.info.configuration.gridMode;
+  }
 }

package/src/stores/core/DataCubeQueryBuilder.ts

@@ -23,13 +23,21 @@
 
 import {
   PRIMITIVE_TYPE,
+  V1_AppliedProperty,
+  V1_CString,
   V1_Lambda,
+  V1_Variable,
   type V1_AppliedFunction,
 } from '@finos/legend-graph';
-import { type DataCubeSnapshot } from './DataCubeSnapshot.js';
+import {
+  type DataCubeSnapshot,
+  type DataCubeSnapshotExtendedColumn,
+  type DataCubeSnapshotGroupBy,
+} from './DataCubeSnapshot.js';
 import { at, guaranteeType } from '@finos/legend-shared';
 import {
   DataCubeFunction,
+  DataCubeQueryFilterGroupOperator,
   DataCubeQuerySortDirection,
   type DataCubeQueryFunctionMap,
 } from './DataCubeQueryEngine.js';
@@ -49,10 +57,15 @@ import {
   _var,
   _functionCompositionProcessor,
   _extendRootAggregation,
+  _flattenFilterSnapshot,
 } from './DataCubeQueryBuilderUtils.js';
 import type { DataCubeSource } from './model/DataCubeSource.js';
-import { _findCol } from './model/DataCubeColumn.js';
+import { _findCol, _toCol } from './model/DataCubeColumn.js';
 import type { DataCubeEngine } from './DataCubeEngine.js';
+import {
+  DIMENSIONAL_L0_COLUMN,
+  type DataCubeDimensionalNode,
+} from '../view/grid/DataCubeGridDimensionalTree.js';
 
 export function buildExecutableQuery(
   snapshot: DataCubeSnapshot,
@@ -312,3 +325,244 @@ export function buildExecutableQuery(
   }
   return at(sequence, sequence.length - 1);
 }
+
+export function buildDimensionalExecutableQuery(
+  snapshot: DataCubeSnapshot,
+  source: DataCubeSource,
+  engine: DataCubeEngine,
+  nodes: DataCubeDimensionalNode[],
+  options?: {
+    postProcessor?: (
+      snapshot: DataCubeSnapshot,
+      sequence: V1_AppliedFunction[],
+      funcMap: DataCubeQueryFunctionMap,
+      configuration: DataCubeConfiguration,
+      engine: DataCubeEngine,
+    ) => void;
+    rootAggregation?:
+      | {
+          columnName: string;
+        }
+      | undefined;
+    pagination?:
+      | {
+          start: number;
+          end: number;
+        }
+      | undefined;
+    skipExecutionContext?: boolean;
+  },
+) {
+  const data = snapshot.data;
+  const configuration = DataCubeConfiguration.serialization.fromJson(
+    data.configuration,
+  );
+  const sequence: V1_AppliedFunction[] = [];
+  const funcMap: DataCubeQueryFunctionMap = {};
+  const _process = _functionCompositionProcessor(sequence, funcMap);
+
+  // ------------------------------ DIMENSIONS -------------------------------------
+
+  if (data.tree && nodes.length > 0) {
+    const dimensionColNames = configuration.dimensions.dimensions.flatMap(
+      (col) => col.columns,
+    );
+
+    // removing columns which have been added to represent diimensions
+    configuration.columns = configuration.columns.map((col) => {
+      if (dimensionColNames.includes(col.name)) {
+        col.isSelected = false;
+      }
+      return col;
+    });
+
+    // Adding dimensions to the extended column
+    nodes.forEach((node) => {
+      const lambda = new V1_Lambda();
+      const parameter = new V1_Variable();
+      parameter.name = 'temp';
+      if (node.column === DIMENSIONAL_L0_COLUMN) {
+        const defaultValue = new V1_CString();
+        defaultValue.value = node.column;
+        lambda.body = [defaultValue];
+      } else {
+        const defaultValue = new V1_AppliedProperty();
+        defaultValue.parameters = [parameter];
+        defaultValue.property = node.column;
+        lambda.body = [defaultValue];
+      }
+      lambda.parameters = [parameter];
+      data.leafExtendedColumns.unshift({
+        name: node.dimension,
+        type: PRIMITIVE_TYPE.STRING,
+        mapFn: engine.serializeValueSpecification(lambda),
+      } satisfies DataCubeSnapshotExtendedColumn);
+    });
+
+    // Adding dimensions to selected list
+    data.selectColumns = data.selectColumns.filter(
+      (col) => !dimensionColNames.includes(col.name),
+    );
+
+    const dimensionCols = nodes.map((col) =>
+      _toCol({ name: col.dimension, type: PRIMITIVE_TYPE.STRING }),
+    );
+    data.selectColumns.unshift(...dimensionCols);
+
+    // Adding filter based on group by nodes
+    const groupByNodes = nodes.flatMap((x) => x.groupByNodes);
+    if (groupByNodes.length > 0) {
+      const filter = [
+        _flattenFilterSnapshot(nodes.flatMap((x) => x.groupByNodes)),
+      ];
+      if (data.filter) {
+        filter.push(data.filter);
+        data.filter = {
+          groupOperator: DataCubeQueryFilterGroupOperator.AND,
+          conditions: filter,
+        };
+      } else {
+        data.filter = filter.at(0);
+      }
+    }
+
+    // Adding dimensions to groupby
+    if (data.groupBy) {
+      data.groupBy.columns.unshift(...dimensionCols);
+    } else {
+      data.groupBy = {
+        columns: dimensionCols,
+      } satisfies DataCubeSnapshotGroupBy;
+    }
+  }
+
+  // --------------------------------- LEAF-LEVEL EXTEND ---------------------------------
+
+  if (data.leafExtendedColumns.length) {
+    _process(
+      'leafExtend',
+      data.leafExtendedColumns.map((col) =>
+        _function(DataCubeFunction.EXTEND, [
+          _cols([
+            _colSpec(
+              col.name,
+              guaranteeType(
+                engine.deserializeValueSpecification(col.mapFn),
+                V1_Lambda,
+              ),
+              col.reduceFn
+                ? guaranteeType(
+                    engine.deserializeValueSpecification(col.reduceFn),
+                    V1_Lambda,
+                  )
+                : undefined,
+            ),
+          ]),
+        ]),
+      ),
+    );
+  }
+
+  // --------------------------------- FILTER ---------------------------------
+
+  if (data.filter) {
+    _process(
+      'filter',
+      _function(DataCubeFunction.FILTER, [
+        _lambda([_var()], [_filter(data.filter, engine.filterOperations)]),
+      ]),
+    );
+  }
+
+  // --------------------------------- SELECT ---------------------------------
+
+  if (data.selectColumns.length) {
+    _process(
+      'select',
+      _function(DataCubeFunction.SELECT, [
+        _cols(data.selectColumns.map((col) => _colSpec(col.name))),
+      ]),
+    );
+  }
+
+  // --------------------------------- PIVOT ---------------------------------
+
+  // TODO: rethink pivots for dimensional grid mode
+
+  // --------------------------------- GROUP BY ---------------------------------
+
+  if (data.groupBy) {
+    const groupBy = data.groupBy;
+    if (configuration.showRootAggregation && options?.rootAggregation) {
+      sequence.push(_extendRootAggregation(options.rootAggregation.columnName));
+    }
+    _process(
+      'groupBy',
+      _function(DataCubeFunction.GROUP_BY, [
+        _cols(groupBy.columns.map((col) => _colSpec(col.name))),
+        _cols(
+          _groupByAggCols(
+            groupBy.columns,
+            snapshot,
+            configuration,
+            engine.aggregateOperations,
+          ),
+        ),
+      ]),
+    );
+    _process(
+      'groupBySort',
+      _function(DataCubeFunction.SORT, [
+        _collection(
+          groupBy.columns.map((col) =>
+            _function(
+              configuration.treeColumnSortDirection ===
+                DataCubeQuerySortDirection.ASCENDING
+                ? DataCubeFunction.ASCENDING
+                : DataCubeFunction.DESCENDING,
+              [_col(col.name)],
+            ),
+          ),
+        ),
+      ]),
+    );
+  }
+
+  // --------------------------------- GROUP-LEVEL EXTEND ---------------------------------
+
+  // TODO: implement group level extends for dimensional grid mode
+
+  // --------------------------------- SORT ---------------------------------
+
+  // TODO: implement sort for dimensional grid mode
+
+  // --------------------------------- LIMIT ---------------------------------
+
+  // TODO: rethink limits for dimensional grid mode
+
+  // --------------------------------- SLICE ---------------------------------
+
+  // TODO: rethink slice for dimensional grid mode
+  // slice can lead to incorrect view of data for dimensionality
+
+  // --------------------------------- FINALIZE ---------------------------------
+
+  if (!options?.skipExecutionContext) {
+    const executionContext = engine.buildExecutionContext(source);
+    if (executionContext) {
+      sequence.push(executionContext);
+    }
+  }
+
+  options?.postProcessor?.(snapshot, sequence, funcMap, configuration, engine);
+
+  if (sequence.length === 0) {
+    return source.query;
+  }
+  for (let i = 0; i < sequence.length; i++) {
+    at(sequence, i).parameters.unshift(
+      i === 0 ? source.query : at(sequence, i - 1),
+    );
+  }
+  return at(sequence, sequence.length - 1);
+}

package/src/stores/core/DataCubeQueryBuilderUtils.ts

@@ -81,6 +81,7 @@ import {
   isPivotResultColumnName,
   getPivotResultColumnBaseColumnName,
   DEFAULT_ROOT_AGGREGATION_COLUMN_VALUE,
+  DataCubeQueryFilterOperator,
 } from './DataCubeQueryEngine.js';
 import type { DataCubeQueryFilterOperation } from './filter/DataCubeQueryFilterOperation.js';
 import type { DataCubeQueryAggregateOperation } from './aggregation/DataCubeQueryAggregateOperation.js';
@@ -88,6 +89,7 @@ import {
   DataCubeColumnConfiguration,
   type DataCubeConfiguration,
 } from './model/DataCubeConfiguration.js';
+import type { DataCubeDimensionalGroupByNode } from '../view/grid/DataCubeGridDimensionalTree.js';
 
 // --------------------------------- UTILITIES ---------------------------------
 
@@ -645,3 +647,23 @@ export function _filter(
     return filterCondition.not ? _not(condition) : condition;
   }
 }
+
+export function _flattenFilterSnapshot(
+  groupByNodes: DataCubeDimensionalGroupByNode[],
+): DataCubeSnapshotFilter {
+  const filterConditions = groupByNodes.map((node) => {
+    return {
+      name: node.column,
+      type: 'String', // Assuming all filters are strings — update if needed
+      operator: DataCubeQueryFilterOperator.EQUAL,
+      value: {
+        type: 'String',
+        value: node.filter,
+      } satisfies DataCubeOperationValue,
+    } satisfies DataCubeSnapshotFilterCondition;
+  });
+  return {
+    groupOperator: DataCubeQueryFilterGroupOperator.AND,
+    conditions: filterConditions,
+  } satisfies DataCubeSnapshotFilter;
+}

package/src/stores/core/DataCubeQueryEngine.ts

@@ -273,6 +273,11 @@ export enum DataCubeGridMode {
   MULTIDIMENSIONAL = 'Multidimensional',
 }
 
+export enum DataCubeClientModelOption {
+  ROW_DATA = 'rowData',
+  COLUMN_DEFS = 'columnDefs',
+}
+
 export enum DataCubeTitleBarMenuItems {
   VIEW_SOURCE = 'View Source',
   RESET_TO_LATEST_SAVE = 'Reset to Latest Save',
@@ -409,6 +414,10 @@ export function ofDataType(
   return dataTypes.includes(getDataType(type));
 }
 
+export function isDimensionalGridMode(gridMode: DataCubeGridMode) {
+  return gridMode === DataCubeGridMode.MULTIDIMENSIONAL;
+}
+
 export function isPrimitiveType(type: string) {
   return (
     [

package/src/stores/core/DataCubeSnapshot.ts

@@ -29,6 +29,7 @@ import type {
   DataCubeQuerySortDirection,
 } from './DataCubeQueryEngine.js';
 import type { DataCubeColumn } from './model/DataCubeColumn.js';
+import type { DataCubeDimensionalTree } from '../view/grid/DataCubeGridDimensionalTree.js';
 
 export type DataCubeSnapshotFilterCondition = DataCubeColumn & {
   value: DataCubeOperationValue;
@@ -85,6 +86,7 @@ export type DataCubeSnapshotData = {
   groupExtendedColumns: DataCubeSnapshotExtendedColumn[];
   sortColumns: DataCubeSnapshotSortColumn[];
   limit: number | undefined;
+  tree?: DataCubeDimensionalTree | undefined;
 };
 
 export class DataCubeSnapshot {

package/src/stores/core/DataCubeSnapshotBuilder.ts

@@ -415,6 +415,7 @@ export async function validateAndBuildSnapshot(
       funcMap.leafExtend,
       Array.from(colsMap.values()),
       engine,
+      source,
     );
 
     // validate
@@ -548,6 +549,7 @@ export async function validateAndBuildSnapshot(
       funcMap.groupExtend,
       Array.from(colsMap.values()),
       engine,
+      source,
     );
 
     // validate

package/src/stores/core/DataCubeSnapshotBuilderUtils.ts

@@ -81,7 +81,10 @@ import {
   _lambda,
   _synthesizeMinimalSourceQuery,
 } from './DataCubeQueryBuilderUtils.js';
-import { INTERNAL__DataCubeSource } from './model/DataCubeSource.js';
+import {
+  INTERNAL__DataCubeSource,
+  type DataCubeSource,
+} from './model/DataCubeSource.js';
 import type { DataCubeQueryAggregateOperation } from './aggregation/DataCubeQueryAggregateOperation.js';
 
 // --------------------------------- UTILITIES ---------------------------------
@@ -305,6 +308,7 @@ export async function _extractExtendedColumns(
   funcs: V1_AppliedFunction[],
   currentColumns: DataCubeColumn[],
   engine: DataCubeEngine,
+  source?: DataCubeSource,
 ) {
   const colSpecs = funcs.map((extendFunc) => {
     // TODO: support extend() with window (OLAP), this assertion will no longer work
@@ -343,7 +347,7 @@ export async function _extractExtendedColumns(
     columns = (
       await engine.getQueryRelationReturnType(
         _lambda([], [query]),
-        new INTERNAL__DataCubeSource(),
+        source ? source : new INTERNAL__DataCubeSource(),
       )
     ).columns;
   } catch (error) {