@finos/legend-data-cube 0.0.9 → 0.0.11

package/src/stores/view/editor/DataCubeEditorGeneralPropertiesPanelState.ts

@@ -20,7 +20,7 @@ import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js'
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableConfiguration } from './DataCubeEditorMutableConfiguration.js';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 
 export class DataCubeEditorGeneralPropertiesPanelState
   implements DataCubeQueryEditorPanelState
@@ -28,7 +28,6 @@ export class DataCubeEditorGeneralPropertiesPanelState
   readonly view!: DataCubeViewState;
   readonly editor!: DataCubeEditorState;
 
-  name = '';
   limit = -1;
   configuration = new DataCubeEditorMutableConfiguration();
 
@@ -36,9 +35,6 @@ export class DataCubeEditorGeneralPropertiesPanelState
     makeObservable(this, {
       configuration: observable,
 
-      name: observable,
-      setName: action,
-
       limit: observable,
       setLimit: action,
 
@@ -49,10 +45,6 @@ export class DataCubeEditorGeneralPropertiesPanelState
     this.view = editor.view;
   }
 
-  setName(val: string) {
-    this.name = val;
-  }
-
   setLimit(val: number) {
     this.limit = val;
   }
@@ -61,7 +53,6 @@ export class DataCubeEditorGeneralPropertiesPanelState
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
   ) {
-    this.setName(snapshot.data.name);
     this.setLimit(
       snapshot.data.limit !== undefined && snapshot.data.limit >= 0
         ? snapshot.data.limit
@@ -77,7 +68,6 @@ export class DataCubeEditorGeneralPropertiesPanelState
     baseSnapshot: DataCubeQuerySnapshot,
   ) {
     const data = newSnapshot.data;
-    data.name = this.name;
     data.limit = this.limit < 0 ? undefined : this.limit;
     data.configuration = this.configuration.serialize();
   }

package/src/stores/view/editor/DataCubeEditorHorizontalPivotsPanelState.ts

@@ -16,16 +16,16 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import {
   DataCubeColumnKind,
   isPivotResultColumnName,
 } from '../../core/DataCubeQueryEngine.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import {
   _toCol,
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotColumn,
-} from '../../core/DataCubeQuerySnapshot.js';
+  type DataCubeColumn,
+} from '../../core/models/DataCubeColumn.js';
 import {
   DataCubeEditorColumnSelectorColumnState,
   DataCubeEditorColumnSelectorState,
@@ -68,7 +68,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
   readonly editor!: DataCubeEditorState;
   readonly selector!: DataCubeEditorHorizontalPivotColumnSelectorState;
 
-  castColumns: DataCubeQuerySnapshotColumn[] = [];
+  castColumns: DataCubeColumn[] = [];
 
   constructor(editor: DataCubeEditorState) {
     makeObservable(this, {
@@ -86,13 +86,13 @@ export class DataCubeEditorHorizontalPivotsPanelState
     );
   }
 
-  get pivotResultColumns(): DataCubeQuerySnapshotColumn[] {
+  get pivotResultColumns(): DataCubeColumn[] {
     return this.castColumns
       .filter((col) => isPivotResultColumnName(col.name))
       .map(_toCol);
   }
 
-  setCastColumns(value: DataCubeQuerySnapshotColumn[]) {
+  setCastColumns(value: DataCubeColumn[]) {
     this.castColumns = value;
   }
 

package/src/stores/view/editor/DataCubeEditorMutableConfiguration.ts

@@ -45,7 +45,7 @@ import {
   DataCubeColumnConfiguration,
   DataCubeConfiguration,
   DataCubePivotLayoutConfiguration,
-} from '../../core/DataCubeConfiguration.js';
+} from '../../core/models/DataCubeConfiguration.js';
 import { buildDefaultColumnConfiguration } from '../../core/DataCubeConfigurationBuilder.js';
 import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import {
@@ -428,6 +428,9 @@ export class DataCubeEditorMutableConfiguration extends DataCubeConfiguration {
     configuration.columns = [];
 
     makeObservable(configuration, {
+      name: observable,
+      setName: action,
+
       description: observable,
       setDescription: action,
 
@@ -569,6 +572,10 @@ export class DataCubeEditorMutableConfiguration extends DataCubeConfiguration {
     this.errorBackgroundColor = DEFAULT_BACKGROUND_COLOR;
   }
 
+  setName(value: string) {
+    this.name = value;
+  }
+
   setDescription(value: string | undefined) {
     this.description = value;
   }

package/src/stores/view/editor/DataCubeEditorPanelState.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 
 export interface DataCubeQueryEditorPanelState {

package/src/stores/view/editor/DataCubeEditorPivotLayoutPanelState.ts

@@ -20,7 +20,7 @@ import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js'
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutablePivotLayoutConfiguration } from './DataCubeEditorMutableConfiguration.js';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import type { PlainObject } from '@finos/legend-shared';
 import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 

package/src/stores/view/editor/DataCubeEditorSortsPanelState.ts

@@ -16,10 +16,8 @@
 
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import {
-  _toCol,
-  type DataCubeQuerySnapshot,
-} from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { _toCol } from '../../core/models/DataCubeColumn.js';
 import {
   DataCubeColumnKind,
   DataCubeQuerySortDirection,
@@ -30,7 +28,7 @@ import {
   DataCubeEditorColumnSelectorState,
 } from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import { uniqBy } from '@finos/legend-shared';
 
 export class DataCubeEditorSortColumnState extends DataCubeEditorColumnSelectorColumnState {

package/src/stores/view/editor/DataCubeEditorState.tsx

@@ -19,11 +19,13 @@ import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { DataCubeEditorSortsPanelState } from './DataCubeEditorSortsPanelState.js';
 import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
 import {
-  _toCol,
   type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotColumn,
   type DataCubeQuerySnapshotExtendedColumn,
 } from '../../core/DataCubeQuerySnapshot.js';
+import {
+  _toCol,
+  type DataCubeColumn,
+} from '../../core/models/DataCubeColumn.js';
 import {
   ActionState,
   assertErrorThrown,
@@ -34,14 +36,14 @@ import {
 import { DataCubeEditorGeneralPropertiesPanelState } from './DataCubeEditorGeneralPropertiesPanelState.js';
 import { DataCubeEditorColumnPropertiesPanelState } from './DataCubeEditorColumnPropertiesPanelState.js';
 import { DataCubeEditorColumnsPanelState } from './DataCubeEditorColumnsPanelState.js';
-import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import { DataCubeEditorVerticalPivotsPanelState } from './DataCubeEditorVerticalPivotsPanelState.js';
 import type { DisplayState } from '../../core/DataCubeLayoutManagerState.js';
 import { DataCubeEditor } from '../../../components/view/editor/DataCubeEditor.js';
 import { DataCubeEditorHorizontalPivotsPanelState } from './DataCubeEditorHorizontalPivotsPanelState.js';
 import { DataCubeEditorPivotLayoutPanelState } from './DataCubeEditorPivotLayoutPanelState.js';
 import type { DataCubeQueryBuilderError } from '../../core/DataCubeEngine.js';
-import { V1_deserializeValueSpecification } from '@finos/legend-graph';
+import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
 
 export enum DataCubeEditorTab {
   GENERAL_PROPERTIES = 'General Properties',
@@ -54,7 +56,7 @@ export enum DataCubeEditorTab {
 
 /**
  * This query editor state backs the main form editor of data cube. It supports
- * batching changes before application, i.e. allowing user to make multiple edits before
+ * batching changes before engine, i.e. allowing user to make multiple edits before
  * applying and propgating them.
  *
  * NOTE: It allows almost FULL 1-1 control over the data cube query state.
@@ -76,7 +78,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
 
   currentTab = DataCubeEditorTab.GENERAL_PROPERTIES;
 
-  sourceColumns: DataCubeQuerySnapshotColumn[] = [];
+  sourceColumns: DataCubeColumn[] = [];
   leafExtendColumns: DataCubeQuerySnapshotExtendedColumn[] = [];
   groupExtendColumns: DataCubeQuerySnapshotExtendedColumn[] = [];
 
@@ -95,7 +97,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
       applyChanges: action,
     });
 
-    this.display = this.view.application.layout.newDisplay('Properties', () => (
+    this.display = this.view.engine.layout.newDisplay('Properties', () => (
       <DataCubeEditor view={this.view} />
     ));
     this.generalProperties = new DataCubeEditorGeneralPropertiesPanelState(
@@ -189,7 +191,8 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
       try {
         await this.view.engine.getQueryCodeRelationReturnType(
           codePrefix + code,
-          V1_deserializeValueSpecification(tempSnapshot.data.sourceQuery, []),
+          _lambda([], [this.view.source.query]),
+          this.view.source,
         );
       } catch (error) {
         assertErrorThrown(error);
@@ -197,7 +200,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
           error instanceof NetworkClientError &&
           error.response.status === HttpStatus.BAD_REQUEST
         ) {
-          this.view.application.alertCodeCheckError(
+          this.view.engine.alertCodeCheckError(
             error.payload as DataCubeQueryBuilderError,
             code,
             codePrefix,
@@ -207,7 +210,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
             },
           );
         } else {
-          this.view.application.alertError(error, {
+          this.view.engine.alertError(error, {
             message: `Query Validation Failure: Can't safely apply changes.`,
             text: `Error: ${error.message}`,
           });

package/src/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.ts

@@ -16,12 +16,10 @@
 
 import { uniqBy } from '@finos/legend-shared';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import { DataCubeColumnKind } from '../../core/DataCubeQueryEngine.js';
-import {
-  _toCol,
-  type DataCubeQuerySnapshot,
-} from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { _toCol } from '../../core/models/DataCubeColumn.js';
 import {
   DataCubeEditorColumnSelectorColumnState,
   DataCubeEditorColumnSelectorState,

package/src/stores/view/extend/DataCubeColumnEditorState.tsx

@@ -49,8 +49,9 @@ import {
   V1_serializeValueSpecification,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import type { DataCubeColumnConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeColumnConfiguration } from '../../core/models/DataCubeConfiguration.js';
 import type { DataCubeQuerySnapshotExtendedColumn } from '../../core/DataCubeQuerySnapshot.js';
+import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
 
 export abstract class DataCubeColumnBaseEditorState {
   readonly uuid = uuid();
@@ -215,15 +216,21 @@ export abstract class DataCubeColumnBaseEditorState {
     snapshot.data.groupExtendedColumns = [];
     snapshot.data.sortColumns = [];
     snapshot.data.limit = undefined;
-    return buildExecutableQuery(
-      snapshot,
-      this.manager.view.engine.filterOperations,
-      this.manager.view.engine.aggregateOperations,
+    return _lambda(
+      [],
+      [
+        buildExecutableQuery(
+          snapshot,
+          this.manager.view.source,
+          () => undefined,
+          this.manager.view.engine.filterOperations,
+          this.manager.view.engine.aggregateOperations,
+        ),
+      ],
     );
   }
 
   async getReturnType() {
-    const baseQuery = this.buildExtendBaseQuery();
     this.validationState.inProgress();
 
     // properly reset the error state before revalidating
@@ -234,7 +241,8 @@ export abstract class DataCubeColumnBaseEditorState {
       const returnRelationType =
         await this.view.engine.getQueryCodeRelationReturnType(
           this.codePrefix + this.code + this.codeSuffix,
-          baseQuery,
+          this.buildExtendBaseQuery(),
+          this.view.source,
         );
       let returnType = returnRelationType.columns.find(
         (col) => col.name === this._name,
@@ -281,7 +289,7 @@ export abstract class DataCubeColumnBaseEditorState {
         this.showError(err.payload as DataCubeQueryBuilderError);
         return undefined;
       }
-      this.view.application.alertError(err, {
+      this.view.engine.alertError(err, {
         message: `Expression Validation Failure: ${err.message}`,
       });
     } finally {
@@ -329,7 +337,7 @@ export class DataCubeNewColumnState extends DataCubeColumnBaseEditorState {
   }
 
   override newDisplay(state: DataCubeColumnBaseEditorState): DisplayState {
-    return this.view.application.layout.newDisplay(
+    return this.view.engine.layout.newDisplay(
       'Add New Column',
       () => <DataCubeColumnCreator state={this} />,
       {
@@ -359,12 +367,12 @@ export class DataCubeNewColumnState extends DataCubeColumnBaseEditorState {
     let returnType: string | undefined;
     try {
       [query, returnType] = await Promise.all([
-        this.view.engine.parseQuery(this.code, false),
+        this.view.engine.parseValueSpecification(this.code, false),
         this.getReturnType(), // recompile to get the return type
       ]);
     } catch (error) {
       assertErrorThrown(error);
-      this.view.application.alertError(error, {
+      this.view.engine.alertError(error, {
         message: `Expression Validation Failure: ${error.message}`,
       });
       return;
@@ -373,14 +381,14 @@ export class DataCubeNewColumnState extends DataCubeColumnBaseEditorState {
     }
 
     if (!(query instanceof V1_Lambda)) {
-      this.view.application.alertError(new Error(), {
+      this.view.engine.alertError(new Error(), {
         message: `Expression Validation Failure: Expression must be a lambda.`,
       });
       return;
     }
 
     if (!returnType) {
-      this.view.application.alertError(new Error(), {
+      this.view.engine.alertError(new Error(), {
         message: `Expression Validation Failure: Can't compute expression return type.`,
       });
       return;
@@ -439,14 +447,14 @@ export class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorS
   }
 
   override async getInitialCode(): Promise<string> {
-    return this.view.engine.getQueryCode(
+    return this.view.engine.getValueSpecificationCode(
       V1_deserializeValueSpecification(this.initialData.mapFn, []),
       true,
     );
   }
 
   override newDisplay(state: DataCubeColumnBaseEditorState): DisplayState {
-    return this.view.application.layout.newDisplay(
+    return this.view.engine.layout.newDisplay(
       'Edit Column',
       () => <DataCubeColumnCreator state={this} />,
       {
@@ -484,12 +492,12 @@ export class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorS
     let returnType: string | undefined;
     try {
       [query, returnType] = await Promise.all([
-        this.view.engine.parseQuery(this.code, false),
+        this.view.engine.parseValueSpecification(this.code, false),
         this.getReturnType(), // recompile to get the return type
       ]);
     } catch (error) {
       assertErrorThrown(error);
-      this.view.application.alertError(error, {
+      this.view.engine.alertError(error, {
         message: `Expression Validation Failure: ${error.message}`,
       });
       return;
@@ -498,14 +506,14 @@ export class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorS
     }
 
     if (!(query instanceof V1_Lambda)) {
-      this.view.application.alertError(new Error(), {
+      this.view.engine.alertError(new Error(), {
         message: `Expression Validation Failure: Expression must be a lambda.`,
       });
       return;
     }
 
     if (!returnType) {
-      this.view.application.alertError(new Error(), {
+      this.view.engine.alertError(new Error(), {
         message: `Expression Validation Failure: Can't compute expression return type.`,
       });
       return;

package/src/stores/view/extend/DataCubeExtendManagerState.tsx

@@ -16,11 +16,13 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import {
-  _toCol,
   type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotColumn,
   type DataCubeQuerySnapshotExtendedColumn,
 } from '../../core/DataCubeQuerySnapshot.js';
+import {
+  _toCol,
+  type DataCubeColumn,
+} from '../../core/models/DataCubeColumn.js';
 import {
   assertErrorThrown,
   deleteEntry,
@@ -35,7 +37,7 @@ import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager
 import {
   DataCubeConfiguration,
   type DataCubeColumnConfiguration,
-} from '../../core/DataCubeConfiguration.js';
+} from '../../core/models/DataCubeConfiguration.js';
 import {
   DataCubeExistingColumnEditorState,
   DataCubeNewColumnState,
@@ -46,8 +48,8 @@ import {
   getDataType,
 } from '../../core/DataCubeQueryEngine.js';
 import { buildDefaultColumnConfiguration } from '../../core/DataCubeConfigurationBuilder.js';
-import { V1_deserializeValueSpecification } from '@finos/legend-graph';
 import type { DataCubeQueryBuilderError } from '../../core/DataCubeEngine.js';
+import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
 
 class DataCubeQueryExtendedColumnState {
   name: string;
@@ -71,9 +73,9 @@ class DataCubeQueryExtendedColumnState {
  */
 export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController {
   columnConfigurations: DataCubeColumnConfiguration[] = [];
-  selectColumns: DataCubeQuerySnapshotColumn[] = [];
-  sourceColumns: DataCubeQuerySnapshotColumn[] = [];
-  horizontalPivotCastColumns: DataCubeQuerySnapshotColumn[] = [];
+  selectColumns: DataCubeColumn[] = [];
+  sourceColumns: DataCubeColumn[] = [];
+  horizontalPivotCastColumns: DataCubeColumn[] = [];
 
   leafExtendedColumns: DataCubeQueryExtendedColumnState[] = [];
   groupExtendedColumns: DataCubeQueryExtendedColumnState[] = [];
@@ -250,7 +252,8 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
     try {
       await this.view.engine.getQueryCodeRelationReturnType(
         codePrefix + code,
-        V1_deserializeValueSpecification(tempSnapshot.data.sourceQuery, []),
+        _lambda([], [this.view.source.query]),
+        this.view.source,
       );
     } catch (error) {
       assertErrorThrown(error);
@@ -258,7 +261,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
         error instanceof NetworkClientError &&
         error.response.status === HttpStatus.BAD_REQUEST
       ) {
-        this.view.application.alertCodeCheckError(
+        this.view.engine.alertCodeCheckError(
           error.payload as DataCubeQueryBuilderError,
           code,
           codePrefix,
@@ -268,7 +271,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
           },
         );
       } else {
-        this.view.application.alertError(error, {
+        this.view.engine.alertError(error, {
           message: `Column Update Check Failure: Can't safely update column '${columnName}'.`,
           text: `Error: ${error.message}`,
         });
@@ -362,7 +365,8 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
     try {
       await this.view.engine.getQueryCodeRelationReturnType(
         codePrefix + code,
-        V1_deserializeValueSpecification(tempSnapshot.data.sourceQuery, []),
+        _lambda([], [this.view.source.query]),
+        this.view.source,
       );
     } catch (error) {
       assertErrorThrown(error);
@@ -370,7 +374,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
         error instanceof NetworkClientError &&
         error.response.status === HttpStatus.BAD_REQUEST
       ) {
-        this.view.application.alertCodeCheckError(
+        this.view.engine.alertCodeCheckError(
           error.payload as DataCubeQueryBuilderError,
           code,
           codePrefix,
@@ -380,7 +384,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
           },
         );
       } else {
-        this.view.application.alertError(error, {
+        this.view.engine.alertError(error, {
           message: `Column Delete Check Failure: Can't safely delete column '${columnName}'.`,
           text: `Error: ${error.message}`,
         });

package/src/stores/view/filter/DataCubeFilterEditorState.tsx

@@ -38,7 +38,7 @@ import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager
 import {
   DataCubeConfiguration,
   type DataCubeColumnConfiguration,
-} from '../../core/DataCubeConfiguration.js';
+} from '../../core/models/DataCubeConfiguration.js';
 import type { DisplayState } from '../../core/DataCubeLayoutManagerState.js';
 import { DataCubeFilterEditor } from '../../../components/view/filter/DataCubeFilterEditor.js';
 
@@ -73,7 +73,7 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
       layerFilterNode: action,
     });
 
-    this.display = this.view.application.layout.newDisplay(
+    this.display = this.view.engine.layout.newDisplay(
       'Filter',
       () => <DataCubeFilterEditor view={this.view} />,
       {