@finos/legend-application-repl 0.0.21 → 0.0.23

package/lib/stores/dataCube/core/DataCubeQueryAnalyzer.js

@@ -0,0 +1,269 @@
+/**
+ * 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 { V1_AppliedFunction, V1_ClassInstance, V1_ColSpec, V1_Collection, V1_serializeValueSpecification, extractElementNameFromPath, matchFunctionName, } from '@finos/legend-graph';
+import { DATA_CUBE_FUNCTIONS, DATA_CUBE_COLUMN_SORT_DIRECTION, } from '../DataCubeMetaModelConst.js';
+import { DataCubeQuerySnapshotColumnOrigin, createSnapshot, } from './DataCubeQuerySnapshot.js';
+import { assertErrorThrown, assertTrue, assertType, guaranteeNonNullable, } from '@finos/legend-shared';
+const _SUPPORTED_TOP_LEVEL_FUNCTIONS = [
+    { func: DATA_CUBE_FUNCTIONS.EXTEND, parameters: 1 },
+    { func: DATA_CUBE_FUNCTIONS.FILTER, parameters: 1 },
+    { func: DATA_CUBE_FUNCTIONS.GROUP_BY, parameters: 3 },
+    { func: DATA_CUBE_FUNCTIONS.LIMIT, parameters: 1 },
+    { func: DATA_CUBE_FUNCTIONS.PIVOT, parameters: 3 },
+    { func: DATA_CUBE_FUNCTIONS.RENAME, parameters: 2 },
+    { func: DATA_CUBE_FUNCTIONS.SELECT, parameters: 1 },
+    { func: DATA_CUBE_FUNCTIONS.SORT, parameters: 1 },
+    { func: DATA_CUBE_FUNCTIONS.CAST, parameters: 1 },
+];
+// NOTE: this corresponds to the sequence:
+// extend()->rename()->filter()->groupBy()->select()->pivot()->cast()->extend()->sort()->limit()
+// which represents the ONLY query shape that we currently support
+const _FUNCTION_SEQUENCE_COMPOSITION_PATTERN = [
+    { func: DATA_CUBE_FUNCTIONS.EXTEND },
+    { func: DATA_CUBE_FUNCTIONS.RENAME, repeat: true }, // rename() can be repeated since each call only allow renaming one column
+    { func: DATA_CUBE_FUNCTIONS.FILTER },
+    { func: DATA_CUBE_FUNCTIONS.GROUP_BY },
+    { func: DATA_CUBE_FUNCTIONS.SELECT },
+    { func: DATA_CUBE_FUNCTIONS.PIVOT },
+    { func: DATA_CUBE_FUNCTIONS.CAST },
+    { func: DATA_CUBE_FUNCTIONS.EXTEND },
+    { func: DATA_CUBE_FUNCTIONS.SORT },
+    { func: DATA_CUBE_FUNCTIONS.LIMIT },
+];
+const _FUNCTION_SEQUENCE_COMPOSITION_PATTERN_REGEXP = new RegExp(`^${_FUNCTION_SEQUENCE_COMPOSITION_PATTERN
+    .map((entry) => `(?:<${extractElementNameFromPath(entry.func)}>)${entry.repeat ? '*' : !entry.required ? '?' : ''}`)
+    .join('')}$`);
+/**
+ * Since the query created by DataCube will be a chain call of various functions,
+ * this utility function will extract that sequence of function calls as well as
+ * do various basic checks for the validity, composition, and order of those functions.
+ */
+function extractQueryFunctionSequence(query) {
+    // Make sure this is a sequence of function calls
+    if (!(query instanceof V1_AppliedFunction)) {
+        throw new Error(`Query sequence must be a sequence of function calls (e.g. x()->y()->z())`);
+    }
+    const sequence = [];
+    let currentQuery = query;
+    while (currentQuery instanceof V1_AppliedFunction) {
+        const supportedFunc = _SUPPORTED_TOP_LEVEL_FUNCTIONS.find((spec) => matchFunctionName(currentQuery.function, spec.func));
+        // Check that all functions in sequence are supported
+        if (!supportedFunc) {
+            throw new Error(`Found unsupported function ${currentQuery.function}()`);
+        }
+        if (currentQuery.parameters.length > supportedFunc.parameters) {
+            const vs = currentQuery.parameters[0];
+            if (!(vs instanceof V1_AppliedFunction)) {
+                throw new Error(`Query sequence must be a sequence of function calls (e.g. x()->y()->z())`);
+            }
+            currentQuery.parameters = currentQuery.parameters.slice(1);
+            sequence.unshift(currentQuery);
+            currentQuery = vs;
+        }
+        else {
+            sequence.unshift(currentQuery);
+            break;
+        }
+    }
+    // Check that sequence follows the supported pattern
+    const sequenceFormText = sequence
+        .map((func) => `<${extractElementNameFromPath(func.function)}>`)
+        .join('');
+    if (!sequenceFormText.match(_FUNCTION_SEQUENCE_COMPOSITION_PATTERN_REGEXP)) {
+        throw new Error(`Unsupported function composition ${sequence.map((fn) => `${extractElementNameFromPath(fn.function)}()`).join('->')} (supported composition: ${_FUNCTION_SEQUENCE_COMPOSITION_PATTERN.map((entry) => `${extractElementNameFromPath(entry.func)}()`).join('->')})`);
+    }
+    // Special checks
+    // Check that the first and second extend() must be separated by either groupBy() or pivot() (i.e. aggregation)
+    const firstExtendIndex = sequence.findIndex((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.EXTEND));
+    const secondExtendIndex = sequence.findLastIndex((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.EXTEND));
+    if (firstExtendIndex !== -1 && firstExtendIndex !== secondExtendIndex) {
+        const seq = sequence.slice(firstExtendIndex + 1, secondExtendIndex);
+        if (!seq.some((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.GROUP_BY) ||
+            matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.PIVOT))) {
+            throw new Error(`Found invalid usage of group-level extend() for query without aggregation such as pivot() and groupBy()`);
+        }
+    }
+    // Check that pivot() and cast() must co-present and stand consecutively in the sequence
+    const pivotFunc = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.PIVOT));
+    const castFunc = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.CAST));
+    if (Boolean(pivotFunc) !== Boolean(castFunc)) {
+        throw new Error(`Found usage of dynamic function pivot() without casting`);
+    }
+    return sequence;
+}
+/**
+ * Turn the function sequence into a map of available functions
+ * for easier construction of the snapshot
+ */
+function extractFunctionMap(sequence) {
+    let leafExtend = undefined;
+    let groupExtend = undefined;
+    const aggregationFuncIndex = sequence.findLastIndex((func) => matchFunctionName(func.function, [
+        DATA_CUBE_FUNCTIONS.PIVOT,
+        DATA_CUBE_FUNCTIONS.GROUP_BY,
+    ]));
+    const firstExtendIndex = sequence.findIndex((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.EXTEND));
+    const secondExtendIndex = sequence.findLastIndex((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.EXTEND));
+    if (aggregationFuncIndex !== -1) {
+        if (firstExtendIndex !== secondExtendIndex) {
+            leafExtend = sequence[firstExtendIndex];
+            groupExtend = sequence[secondExtendIndex];
+        }
+    }
+    else {
+        if (firstExtendIndex !== -1) {
+            leafExtend = sequence[firstExtendIndex];
+        }
+    }
+    const rename = sequence.filter((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.RENAME));
+    const filter = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.FILTER));
+    const groupBy = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.GROUP_BY));
+    const select = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.SELECT));
+    const pivot = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.PIVOT));
+    const cast = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.CAST));
+    const sort = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.SORT));
+    const limit = sequence.find((func) => matchFunctionName(func.function, DATA_CUBE_FUNCTIONS.LIMIT));
+    return {
+        leafExtend,
+        rename,
+        filter,
+        groupBy,
+        select,
+        pivot,
+        cast,
+        groupExtend,
+        sort,
+        limit,
+    };
+}
+/**
+ * Analyze the partial query to build the base snapshot.
+ *
+ * NOTE: the base snapshot is almost, but not a complete snapshot.
+ * It has key information about the partial query filled in, these are the bits
+ * required to reconstruct the query just from the snapshot.
+ * However, it lacks analytics information, such as extended columns' lambda code,
+ * which might be useful for initializing the editors. These should get filled in
+ * at a later stage in the analysis/initialization flow.
+ *
+ * Implementation-wise, this extracts the function call sequence, then walk the
+ * sequence in order to fill in the information for the snapshot.
+ */
+export function validateAndBuildBaseSnapshot(baseQuery, analytics) {
+    // --------------------------------- BASE ---------------------------------
+    // Build the function call sequence and the function map to make the
+    // analysis more ergonomic
+    const { partialQuery, sourceQuery } = analytics;
+    const sequence = partialQuery
+        ? extractQueryFunctionSequence(partialQuery)
+        : [];
+    const funcMap = extractFunctionMap(sequence);
+    const snapshot = createSnapshot(baseQuery.name, baseQuery.source.runtime, V1_serializeValueSpecification(sourceQuery, []), baseQuery.configuration);
+    // --------------------------------- SOURCE ---------------------------------
+    snapshot.originalColumns = baseQuery.source.columns;
+    const columns = snapshot.originalColumns.map((col) => ({
+        ...col,
+        origin: DataCubeQuerySnapshotColumnOrigin.SOURCE,
+    }));
+    // leafExtendedColumns: DataCubeQueryExtendedColumnSnapshot[] = [];
+    // filter: ValueSpecification[0..1]; // TODO
+    // renamedColumns: DataCubeQuerySnapshotRenamedColumn[] = [];
+    // groupByColumns: DataCubeQuerySnapshotColumn[] = [];
+    // groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[] = [];
+    // selectedColumns: DataCubeQuerySnapshotColumn[] = [];
+    // pivotColumns: DataCubeQuerySnapshotColumn[] = [];
+    // pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[] = [];
+    // castColumns: DataCubeQuerySnapshotColumn[] = [];
+    // groupExtendedColumns: DataCubeQueryExtendedColumnSnapshot[] = [];
+    // limit: number | undefined = undefined;
+    // configuration: DataCubeConfiguration;
+    // --------------------------------- LEAF EXTEND ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- FILTER ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- RENAME ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- GROUP BY ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- SELECT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- PIVOT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- CAST ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- GROUP EXTEND ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- SORT ---------------------------------
+    if (funcMap.sort) {
+        const sortColumns = funcMap.sort.parameters[0];
+        assertType(sortColumns, V1_Collection, `Can't process ${extractElementNameFromPath(DATA_CUBE_FUNCTIONS.SORT)}(): columns cannot be extracted`);
+        snapshot.sortColumns = sortColumns.values.map((col) => {
+            try {
+                assertType(col, V1_AppliedFunction);
+                assertTrue(matchFunctionName(col.function, [
+                    DATA_CUBE_FUNCTIONS.ASC,
+                    DATA_CUBE_FUNCTIONS.DESC,
+                ]));
+                const direction = extractElementNameFromPath(col.function) === DATA_CUBE_FUNCTIONS.ASC
+                    ? DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
+                    : DATA_CUBE_COLUMN_SORT_DIRECTION.DESCENDING;
+                assertTrue(col.parameters.length === 1);
+                assertType(col.parameters[0], V1_ClassInstance);
+                assertType(col.parameters[0].value, V1_ColSpec);
+                const name = col.parameters[0].value.name;
+                const type = guaranteeNonNullable(columns.find((c) => c.name === name)).type;
+                return { name, type, direction };
+            }
+            catch {
+                throw new Error(`Can't process ${extractElementNameFromPath(DATA_CUBE_FUNCTIONS.SORT)}(): column sort information cannot be extracted`);
+            }
+        });
+    }
+    // --------------------------------- LIMIT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- FINALIZE ---------------------------------
+    snapshot.columns = columns;
+    return snapshot;
+}
+export async function buildSnapshotFromQuery(baseQuery, engine) {
+    let partialQuery;
+    if (baseQuery.partialQuery) {
+        try {
+            partialQuery = await engine.parseQuery(baseQuery.partialQuery);
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            throw new Error(`Can't parse partial query [${baseQuery.partialQuery}]: ${error.message}`);
+        }
+    }
+    else {
+        partialQuery = undefined;
+    }
+    let sourceQuery;
+    try {
+        sourceQuery = await engine.parseQuery(baseQuery.source.query);
+    }
+    catch (error) {
+        assertErrorThrown(error);
+        throw new Error(`Can't parse source query [${baseQuery.source.query}]: ${error.message}`);
+    }
+    const snapshot = validateAndBuildBaseSnapshot(baseQuery, {
+        partialQuery,
+        sourceQuery,
+    });
+    return snapshot;
+}
+//# sourceMappingURL=DataCubeQueryAnalyzer.js.map

package/lib/stores/dataCube/core/DataCubeQueryAnalyzer.js.map

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

package/lib/stores/dataCube/core/DataCubeQueryBuilder.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 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 { type V1_ValueSpecification } from '@finos/legend-graph';
+import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+export declare function buildExecutableQueryFromSnapshot(snapshot: DataCubeQuerySnapshot): V1_ValueSpecification;
+//# sourceMappingURL=DataCubeQueryBuilder.d.ts.map

package/lib/stores/dataCube/core/DataCubeQueryBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAWL,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAwBxE,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,qBAAqB,GAC9B,qBAAqB,CA+EvB"}

package/lib/stores/dataCube/core/DataCubeQueryBuilder.js

@@ -0,0 +1,98 @@
+/**
+ * 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 { V1_AppliedFunction, V1_ClassInstance, V1_ClassInstanceType, V1_ColSpec, V1_Collection, V1_Multiplicity, V1_PackageableElementPtr, V1_deserializeValueSpecification, extractElementNameFromPath, } from '@finos/legend-graph';
+import { guaranteeNonNullable } from '@finos/legend-shared';
+import { DATA_CUBE_COLUMN_SORT_DIRECTION, DATA_CUBE_FUNCTIONS, } from '../DataCubeMetaModelConst.js';
+function createColSpec(name, type, function1, function2) {
+    const instance = new V1_ClassInstance();
+    instance.type = V1_ClassInstanceType.COL_SPEC;
+    const colSpec = new V1_ColSpec();
+    colSpec.name = name;
+    colSpec.type = type;
+    colSpec.function1 = function1;
+    colSpec.function2 = function2;
+    instance.value = colSpec;
+    return instance;
+}
+export function buildExecutableQueryFromSnapshot(snapshot) {
+    const sourceQuery = V1_deserializeValueSpecification(snapshot.sourceQuery, []);
+    const sequence = [];
+    // --------------------------------- LEAF EXTEND ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- FILTER ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- RENAME ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- GROUP BY ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- SELECT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- PIVOT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- CAST ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- GROUP EXTEND ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- SORT ---------------------------------
+    if (snapshot.sortColumns.length) {
+        const sort = new V1_AppliedFunction();
+        sort.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.SORT);
+        const sortInfos = new V1_Collection();
+        sortInfos.multiplicity = new V1_Multiplicity(snapshot.sortColumns.length, snapshot.sortColumns.length);
+        snapshot.sortColumns.forEach((sortCol) => {
+            const sortInfo = new V1_AppliedFunction();
+            sortInfo.function = extractElementNameFromPath(sortCol.direction === DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
+                ? DATA_CUBE_FUNCTIONS.ASC
+                : DATA_CUBE_FUNCTIONS.DESC);
+            sortInfo.parameters.push(createColSpec(sortCol.name));
+            sortInfos.values.push(sortInfo);
+        });
+        sort.parameters.push(sortInfos);
+        sequence.push(sort);
+    }
+    // --------------------------------- LIMIT ---------------------------------
+    // TODO: @akphi - implement this
+    // --------------------------------- FROM ---------------------------------
+    const fromFunc = new V1_AppliedFunction();
+    fromFunc.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.FROM);
+    const runtimePtr = new V1_PackageableElementPtr();
+    runtimePtr.fullPath = snapshot.runtime;
+    fromFunc.parameters.push(runtimePtr);
+    sequence.push(fromFunc);
+    // --------------------------------- FINALIZE ---------------------------------
+    if (!sequence.length) {
+        return sourceQuery;
+    }
+    for (let i = 0; i < sequence.length; i++) {
+        guaranteeNonNullable(sequence[i]).parameters.unshift(i === 0 ? sourceQuery : guaranteeNonNullable(sequence[i - 1]));
+    }
+    return guaranteeNonNullable(sequence[sequence.length - 1]);
+}
+// export async function buildPersistentQueryFromSnapshot(
+//   snapshot: DataCubeQuerySnapshot,
+// ) {
+//   return new DataCubeQuery(
+//     snapshot.name,
+//     snapshot.sourceQuery,
+//     snapshot.configuration,
+//   );
+// }
+// name!: string;
+// query!: string;
+// partialQuery!: string;
+// source!: DataCubeQuerySource;
+// configuration!: DataCubeConfiguration;
+//# sourceMappingURL=DataCubeQueryBuilder.js.map

package/lib/stores/dataCube/core/DataCubeQueryBuilder.js.map

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

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.d.ts

@@ -0,0 +1,73 @@
+/**
+ * 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 type { V1_Lambda, V1_ValueSpecification } from '@finos/legend-graph';
+import type { DataCubeConfiguration } from '../../../server/models/DataCubeQuery.js';
+import { type PlainObject } from '@finos/legend-shared';
+import type { DATA_CUBE_AGGREGATE_FUNCTION, DATA_CUBE_COLUMN_SORT_DIRECTION } from '../DataCubeMetaModelConst.js';
+export type DataCubeQueryFilter = {};
+export declare enum DataCubeQuerySnapshotColumnOrigin {
+    SOURCE = 0,
+    LEAF_EXTENDED = 1,
+    RENAME = 2,
+    GROUP_BY = 3,
+    SELECT = 4,
+    PIVOT = 5,
+    GROUP_EXTENDED = 6
+}
+export type DataCubeQuerySnapshotColumn = {
+    name: string;
+    type: string;
+};
+export type DataCubeQuerySnapshotColumnWithOrigin = DataCubeQuerySnapshotColumn & {
+    origin: DataCubeQuerySnapshotColumnOrigin;
+};
+export type DataCubeQuerySnapshotExtendedColumn = DataCubeQuerySnapshotColumn & {
+    lambda: PlainObject<V1_Lambda>;
+    code: string;
+};
+export type DataCubeQuerySnapshotRenamedColumn = DataCubeQuerySnapshotColumn & {
+    oldName: string;
+};
+export type DataCubeQuerySnapshotSortColumn = DataCubeQuerySnapshotColumn & {
+    direction: DATA_CUBE_COLUMN_SORT_DIRECTION;
+};
+export type DataCubeQuerySnapshotAggregateColumn = DataCubeQuerySnapshotColumn & {
+    function: DATA_CUBE_AGGREGATE_FUNCTION;
+};
+export type DataCubeQuerySnapshot = {
+    readonly uuid: string;
+    name: string;
+    runtime: string;
+    sourceQuery: PlainObject<V1_ValueSpecification>;
+    configuration: DataCubeConfiguration;
+    originalColumns: DataCubeQuerySnapshotColumn[];
+    leafExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
+    filter?: DataCubeQueryFilter | undefined;
+    renamedColumns: DataCubeQuerySnapshotRenamedColumn[];
+    groupByColumns: DataCubeQuerySnapshotColumn[];
+    groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[];
+    selectedColumns: DataCubeQuerySnapshotColumn[];
+    pivotColumns: DataCubeQuerySnapshotColumn[];
+    pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[];
+    castColumns: DataCubeQuerySnapshotColumn[];
+    groupExtendedColumns: DataCubeQuerySnapshotExtendedColumn[];
+    sortColumns: DataCubeQuerySnapshotSortColumn[];
+    limit: number | undefined;
+    columns: DataCubeQuerySnapshotColumnWithOrigin[];
+};
+export declare function createSnapshot(name: string, runtime: string, sourceQuery: PlainObject<V1_ValueSpecification>, configuration: DataCubeConfiguration): DataCubeQuerySnapshot;
+export declare function cloneSnapshot(snapshot: DataCubeQuerySnapshot): DataCubeQuerySnapshot;
+//# sourceMappingURL=DataCubeQuerySnapshot.d.ts.map

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeQuerySnapshot.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAQ,KAAK,WAAW,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EACV,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,8BAA8B,CAAC;AA0EtC,MAAM,MAAM,mBAAmB,GAAG,EAEjC,CAAC;AAEF,oBAAY,iCAAiC;IAC3C,MAAM,IAAA;IACN,aAAa,IAAA;IACb,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,cAAc,IAAA;CACf;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAC/C,2BAA2B,GAAG;IAC5B,MAAM,EAAE,iCAAiC,CAAC;CAC3C,CAAC;AAEJ,MAAM,MAAM,mCAAmC,GAC7C,2BAA2B,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,kCAAkC,GAAG,2BAA2B,GAAG;IAC7E,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,2BAA2B,GAAG;IAC1E,SAAS,EAAE,+BAA+B,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAC9C,2BAA2B,GAAG;IAC5B,QAAQ,EAAE,4BAA4B,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAChD,aAAa,EAAE,qBAAqB,CAAC;IAErC,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,mBAAmB,EAAE,mCAAmC,EAAE,CAAC;IAC3D,MAAM,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACzC,cAAc,EAAE,kCAAkC,EAAE,CAAC;IACrD,cAAc,EAAE,2BAA2B,EAAE,CAAC;IAC9C,iBAAiB,EAAE,oCAAoC,EAAE,CAAC;IAC1D,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,YAAY,EAAE,2BAA2B,EAAE,CAAC;IAC5C,eAAe,EAAE,oCAAoC,EAAE,CAAC;IACxD,WAAW,EAAE,2BAA2B,EAAE,CAAC;IAC3C,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAC/C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,EAAE,qCAAqC,EAAE,CAAC;CAClD,CAAC;AAIF,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,CAAC,qBAAqB,CAAC,EAC/C,aAAa,EAAE,qBAAqB,GACnC,qBAAqB,CAuBvB;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,qBAAqB,GAC9B,qBAAqB,CAIvB"}

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.js

@@ -0,0 +1,56 @@
+/**
+ * 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 { uuid } from '@finos/legend-shared';
+export var DataCubeQuerySnapshotColumnOrigin;
+(function (DataCubeQuerySnapshotColumnOrigin) {
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["SOURCE"] = 0] = "SOURCE";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["LEAF_EXTENDED"] = 1] = "LEAF_EXTENDED";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["RENAME"] = 2] = "RENAME";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["GROUP_BY"] = 3] = "GROUP_BY";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["SELECT"] = 4] = "SELECT";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["PIVOT"] = 5] = "PIVOT";
+    DataCubeQuerySnapshotColumnOrigin[DataCubeQuerySnapshotColumnOrigin["GROUP_EXTENDED"] = 6] = "GROUP_EXTENDED";
+})(DataCubeQuerySnapshotColumnOrigin || (DataCubeQuerySnapshotColumnOrigin = {}));
+// ------------------------------------- UTILITIES -------------------------------------
+export function createSnapshot(name, runtime, sourceQuery, configuration) {
+    return {
+        uuid: uuid(),
+        name,
+        runtime,
+        sourceQuery,
+        configuration,
+        originalColumns: [],
+        leafExtendedColumns: [],
+        filter: undefined,
+        renamedColumns: [],
+        groupByColumns: [],
+        groupByAggColumns: [],
+        selectedColumns: [],
+        pivotColumns: [],
+        pivotAggColumns: [],
+        castColumns: [],
+        groupExtendedColumns: [],
+        sortColumns: [],
+        limit: undefined,
+        columns: [],
+    };
+}
+export function cloneSnapshot(snapshot) {
+    const clone = JSON.parse(JSON.stringify(snapshot));
+    clone.uuid = uuid();
+    return clone;
+}
+//# sourceMappingURL=DataCubeQuerySnapshot.js.map

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeQuerySnapshot.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,IAAI,EAAmC,MAAM,sBAAsB,CAAC;AAkF7E,MAAM,CAAN,IAAY,iCAQX;AARD,WAAY,iCAAiC;IAC3C,6FAAM,CAAA;IACN,2GAAa,CAAA;IACb,6FAAM,CAAA;IACN,iGAAQ,CAAA;IACR,6FAAM,CAAA;IACN,2FAAK,CAAA;IACL,6GAAc,CAAA;AAChB,CAAC,EARW,iCAAiC,KAAjC,iCAAiC,QAQ5C;AAsDD,wFAAwF;AAExF,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,OAAe,EACf,WAA+C,EAC/C,aAAoC;IAEpC,OAAO;QACL,IAAI,EAAE,IAAI,EAAE;QACZ,IAAI;QACJ,OAAO;QACP,WAAW;QACX,aAAa;QAEb,eAAe,EAAE,EAAE;QACnB,mBAAmB,EAAE,EAAE;QACvB,MAAM,EAAE,SAAS;QACjB,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,WAAW,EAAE,EAAE;QACf,oBAAoB,EAAE,EAAE;QACxB,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,QAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAA0B,CAAC;IAC3E,KAAyC,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/stores/dataCube/{DataCubePanelState.d.ts → core/DataCubeQuerySnapshotManager.d.ts}

@@ -13,11 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DataCubeState } from './DataCubeState.js';
-export declare abstract class DataCubePanelState {
-    readonly dataCubeState: DataCubeState;
+import type { DataCubeState } from '../DataCubeState.js';
+import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotSubscriber } from './DataCubeQuerySnapshotSubscriber.js';
+export declare class DataCubeQuerySnapshotManager {
+    private readonly dataCubeState;
+    private readonly subscribers;
+    private readonly snapshots;
     constructor(dataCubeState: DataCubeState);
-    abstract initialize(): void;
-    abstract applyChanges(): void;
+    get currentSnapshot(): DataCubeQuerySnapshot;
+    registerSubscriber(subscriber: DataCubeQuerySnapshotSubscriber): void;
+    broadcastSnapshot(snapshot: DataCubeQuerySnapshot): void;
 }
-//# sourceMappingURL=DataCubePanelState.d.ts.map
+//# sourceMappingURL=DataCubeQuerySnapshotManager.d.ts.map

package/lib/stores/dataCube/core/DataCubeQuerySnapshotManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeQuerySnapshotManager.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshotManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAU5F,qBAAa,4BAA4B;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;gBAE7C,aAAa,EAAE,aAAa;IAIxC,IAAI,eAAe,IAAI,qBAAqB,CAE3C;IAED,kBAAkB,CAAC,UAAU,EAAE,+BAA+B,GAAG,IAAI;IAIrE,iBAAiB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;CAoBzD"}

package/lib/stores/dataCube/core/DataCubeQuerySnapshotManager.js

@@ -0,0 +1,46 @@
+/**
+ * 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 { APPLICATION_EVENT } from '@finos/legend-application';
+import { LogEvent, assertErrorThrown, guaranteeNonNullable, } from '@finos/legend-shared';
+// TODO: use this when we implement undo/redo
+// const DATA_CUBE_MAX_SNAPSHOT_COUNT = 100;
+export class DataCubeQuerySnapshotManager {
+    dataCubeState;
+    subscribers = [];
+    snapshots = [];
+    constructor(dataCubeState) {
+        this.dataCubeState = dataCubeState;
+    }
+    get currentSnapshot() {
+        return guaranteeNonNullable(this.snapshots[this.snapshots.length - 1]);
+    }
+    registerSubscriber(subscriber) {
+        this.subscribers.push(subscriber);
+    }
+    broadcastSnapshot(snapshot) {
+        this.snapshots.push(snapshot);
+        this.subscribers.forEach((subscriber) => {
+            const currentSnapshot = subscriber.getLatestSnapshot();
+            if (currentSnapshot?.uuid !== snapshot.uuid) {
+                subscriber.receiveSnapshot(snapshot).catch((error) => {
+                    assertErrorThrown(error);
+                    this.dataCubeState.applicationStore.logService.error(LogEvent.create(APPLICATION_EVENT.ILLEGAL_APPLICATION_STATE_OCCURRED), `Error ocurred when subscribers receive and apply new snapshot should be handled gracefully`, error);
+                });
+            }
+        });
+    }
+}
+//# sourceMappingURL=DataCubeQuerySnapshotManager.js.map

package/lib/stores/dataCube/core/DataCubeQuerySnapshotManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeQuerySnapshotManager.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshotManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAI9D,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAE9B,6CAA6C;AAC7C,4CAA4C;AAE5C,MAAM,OAAO,4BAA4B;IACtB,aAAa,CAAgB;IAC7B,WAAW,GAAsC,EAAE,CAAC;IACpD,SAAS,GAA4B,EAAE,CAAC;IAEzD,YAAY,aAA4B;QACtC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,kBAAkB,CAAC,UAA2C;QAC5D,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,iBAAiB,CAAC,QAA+B;QAC/C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACtC,MAAM,eAAe,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACvD,IAAI,eAAe,EAAE,IAAI,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC5C,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;oBAC5D,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACzB,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAClD,QAAQ,CAAC,MAAM,CACb,iBAAiB,CAAC,kCAAkC,CACrD,EACD,4FAA4F,EAC5F,KAAK,CACN,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAGF"}