@finos/legend-cube-builder 0.0.3 → 0.0.5

package/lib/stores/editors/CubeGroupDraft.js

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2026-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 { GROUP_AGGREGATION_USE, } from '@finos/legend-cube';
+import { action, makeObservable, observable } from 'mobx';
+import { aggregationRowsOf, aggregationsOfRows, blankAggregationRow, isBuiltAggregationRow, isSameAggregations, isSameList, toggledColumns, withRowColumn, withRowFunction, withRowName, } from './CubeAggregationRows.js';
+import { CubeNodeDraft } from './CubeNodeDraft.js';
+/**
+ * Whether a row builds an aggregation of a Group: it has a column, or it is
+ * Count rows, or it holds a function this version doesn't know with no column
+ * (a newer client's, or a window function such as Rank), kept as saved (Q4).
+ * A blank row, or a column function whose column isn't picked yet, is left
+ * out.
+ */
+export const isBuiltGroupRow = (row) => isBuiltAggregationRow(row, GROUP_AGGREGATION_USE);
+/**
+ * The Group editor's draft (spec §17.6: a multi-select of keys, then rows of
+ * column, function and output name; PLAN §11.5). Picks of keys are stored in
+ * the input's order, but a saved order is kept until the picks change (Q2).
+ * A row's name follows its column and function until typed (Q3). Picking a
+ * column first sets Count; switching to Count rows clears the column, which
+ * it can't hold, and back to a column function leaves one to pick. Which
+ * rows build is `isBuiltGroupRow`.
+ */
+export class CubeGroupDraft extends CubeNodeDraft {
+    columns;
+    rows;
+    /** Anything was changed; until then, `build()` gives the original back */
+    touched = false;
+    constructor(original) {
+        super(original);
+        makeObservable(this, {
+            columns: observable.ref,
+            rows: observable.ref,
+            touched: observable,
+            toggleColumn: action,
+            clearColumns: action,
+            addRow: action,
+            removeRow: action,
+            setColumn: action,
+            setFunction: action,
+            setName: action,
+        });
+        this.columns = original.columns;
+        this.rows = aggregationRowsOf(original.aggregations, GROUP_AGGREGATION_USE);
+    }
+    /** The aggregations the rows build, in order (`isBuiltGroupRow`) */
+    get aggregations() {
+        return aggregationsOfRows(this.rows, GROUP_AGGREGATION_USE);
+    }
+    /** Ticks or unticks a key; the keys then follow the input's order (Q2) */
+    toggleColumn(name, schema) {
+        this.columns = toggledColumns(this.columns, name, schema);
+        this.touched = true;
+    }
+    /** Unticks every key: one group of all the rows */
+    clearColumns() {
+        this.columns = [];
+        this.touched = true;
+    }
+    addRow() {
+        this.rows = [...this.rows, blankAggregationRow()];
+        this.touched = true;
+    }
+    removeRow(key) {
+        this.rows = this.rows.filter((row) => row.key !== key);
+        this.touched = true;
+    }
+    update(key, change) {
+        this.rows = this.rows.map((row) => (row.key === key ? change(row) : row));
+        this.touched = true;
+    }
+    /** Picks the row's column; with no function yet, Count */
+    setColumn(key, column) {
+        this.update(key, (row) => withRowColumn(row, column, GROUP_AGGREGATION_USE));
+    }
+    /** Picks the row's function: Count rows takes no column, the others one */
+    setFunction(key, fn) {
+        this.update(key, (row) => withRowFunction(row, fn, GROUP_AGGREGATION_USE));
+    }
+    /** Types the row's name, kept exactly; the auto-name itself follows again */
+    setName(key, name) {
+        this.update(key, (row) => withRowName(row, name, GROUP_AGGREGATION_USE));
+    }
+    build() {
+        const { original, columns, aggregations } = this;
+        return !this.touched ||
+            (isSameList(columns, original.columns) &&
+                isSameAggregations(aggregations, original.aggregations))
+            ? original
+            : original.withColumns(columns).withAggregations(aggregations);
+    }
+}
+//# sourceMappingURL=CubeGroupDraft.js.map

package/lib/stores/editors/CubeGroupDraft.js.map

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

package/lib/stores/editors/CubeJoinDraft.d.ts

@@ -15,20 +15,14 @@
  */
 import { Join, JoinType, type Query, RelationalTableSource, type SchemaInferenceResult } from '@finos/legend-cube';
 import type { CubeModelOutline } from '../../graph-manager/CubeEngine.js';
+import { type CubeJoinKeyPair, type CubeJoinKeysDraft } from './CubeJoinKeyPairs.js';
 import { CubeNodeDraft } from './CubeNodeDraft.js';
-/** One pair of key columns, matched by position; `''` until a column is picked */
-export interface CubeJoinKeyPair {
-    /** Identifies the row in the editor */
-    readonly key: number;
-    readonly left: string;
-    readonly right: string;
-}
 /**
  * The Join editor's draft (spec §17.6): the join type and the key column
  * pairs. A pair with no column picked on either side is left out when built,
  * as a Filter's blank rows are (user's choice, 2026-10-07).
  */
-export declare class CubeJoinDraft extends CubeNodeDraft<Join> {
+export declare class CubeJoinDraft extends CubeNodeDraft<Join> implements CubeJoinKeysDraft {
     joinType: JoinType;
     pairs: CubeJoinKeyPair[];
     /** Anything was changed; until then, `build()` gives the original back */
@@ -56,8 +50,13 @@ export interface CubeColumnOrigin {
  * through the inputs whose output has it, and through a Rename to its old
  * name. A join key of the same name on both sides comes from the side the
  * join keeps (the left for INNER and LEFT OUTER, the right for RIGHT OUTER),
- * and from both for FULL OUTER, which merges them. A column the node's output
- * doesn't have, e.g. one a Restrict dropped, comes from nowhere.
+ * and from both for FULL OUTER, which merges them. A Group's key comes from
+ * its column, and a Distinct Value, Min or Max from the column it aggregates,
+ * as a Partition's do; a Partition's input columns come from its input. A
+ * Difference's `x_1` and `x_2` come from `x` on their side. A column the node's
+ * output doesn't have, e.g. one a Restrict dropped, or a Group's or
+ * Partition's count, sum, average or rank, or a Difference's difference,
+ * comes from nowhere.
  */
 export declare const findColumnOrigins: (query: Query, analysis: SchemaInferenceResult, nodeId: string, columnName: string) => CubeColumnOrigin[];
 /** The table sources a column of a node's output comes from (`findColumnOrigins`) */

package/lib/stores/editors/CubeJoinDraft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CubeJoinDraft.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeJoinDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,IAAI,EACJ,QAAQ,EACR,KAAK,KAAK,EACV,qBAAqB,EAErB,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,kFAAkF;AAClF,MAAM,WAAW,eAAe;IAC9B,uCAAuC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAeD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,aAAa,CAAC,IAAI,CAAC;IACpD,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,0EAA0E;IAC1E,OAAO,CAAC,OAAO,CAAS;IACxB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAE3C,QAAQ,EAAE,IAAI;IA6B1B,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAKrC,OAAO,IAAI,IAAI;IAKf,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK7B,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAO9C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhD,KAAK,IAAI,IAAI;CAed;AAED,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC5B,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,gBAAgB,EA8BlB,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,GAC5B,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,qBAAqB,EAGrB,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,gBAAgB,GAAG,SAAS,EACrC,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,OASA,CAAC"}
+{"version":3,"file":"CubeJoinDraft.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeJoinDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAOL,IAAI,EACJ,QAAQ,EAER,KAAK,KAAK,EACV,qBAAqB,EAErB,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAGvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,aACX,SAAQ,aAAa,CAAC,IAAI,CAC1B,YAAW,iBAAiB;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,0EAA0E;IAC1E,OAAO,CAAC,OAAO,CAAS;IACxB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAE3C,QAAQ,EAAE,IAAI;IAiB1B,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAKrC,OAAO,IAAI,IAAI;IAKf,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK7B,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAO9C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAOhD,KAAK,IAAI,IAAI;CAed;AA8ED,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,iBAAiB,GAC5B,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,gBAAgB,EAsDlB,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,GAC5B,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,qBAAqB,EAGrB,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,gBAAgB,GAAG,SAAS,EACrC,OAAO,KAAK,EACZ,UAAU,qBAAqB,EAC/B,QAAQ,MAAM,EACd,YAAY,MAAM,KACjB,OASA,CAAC"}

package/lib/stores/editors/CubeJoinDraft.js

@@ -13,16 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getSameNamedJoinKeys, Join, JoinType, RelationalTableSource, Rename, } from '@finos/legend-cube';
+import { AggregationFunction, Difference, DifferenceSuffix, getSameNamedJoinKeys, Group, isWindowRowFunction, Join, JoinType, Partition, RelationalTableSource, Rename, } from '@finos/legend-cube';
 import { action, makeObservable, observable } from 'mobx';
+import { isSameList } from './CubeAggregationRows.js';
+import { blankJoinKeyPair, joinKeyListsOf, joinKeyPairsOf, } from './CubeJoinKeyPairs.js';
 import { CubeNodeDraft } from './CubeNodeDraft.js';
-let nextPairKey = 1;
-const isSameList = (a, b) => a.length === b.length && a.every((name, index) => name === b[index]);
-/** The key lists pairs build: a pair with no column picked is left out */
-const toKeyLists = (pairs) => {
-    const kept = pairs.filter((pair) => pair.left || pair.right);
-    return [kept.map((pair) => pair.left), kept.map((pair) => pair.right)];
-};
 /**
  * The Join editor's draft (spec §17.6): the join type and the key column
  * pairs. A pair with no column picked on either side is left out when built,
@@ -51,21 +46,15 @@ export class CubeJoinDraft extends CubeNodeDraft {
             setRightColumn: action,
         });
         this.joinType = original.joinType;
-        this.pairs = Array.from({
-            length: Math.max(original.leftColumns.length, original.rightColumns.length),
-        }, (_, index) => ({
-            key: nextPairKey++,
-            left: original.leftColumns[index] ?? '',
-            right: original.rightColumns[index] ?? '',
-        }));
-        this.initialKeyLists = toKeyLists(this.pairs);
+        this.pairs = joinKeyPairsOf(original.leftColumns, original.rightColumns);
+        this.initialKeyLists = joinKeyListsOf(this.pairs);
     }
     setJoinType(joinType) {
         this.joinType = joinType;
         this.touched = true;
     }
     addPair() {
-        this.pairs = [...this.pairs, { key: nextPairKey++, left: '', right: '' }];
+        this.pairs = [...this.pairs, blankJoinKeyPair()];
         this.touched = true;
     }
     removePair(key) {
@@ -81,7 +70,7 @@ export class CubeJoinDraft extends CubeNodeDraft {
         this.touched = true;
     }
     build() {
-        const [leftColumns, rightColumns] = toKeyLists(this.pairs);
+        const [leftColumns, rightColumns] = joinKeyListsOf(this.pairs);
         const [initialLeft, initialRight] = this.initialKeyLists;
         const { original } = this;
         return !this.touched ||
@@ -96,13 +85,74 @@ export class CubeJoinDraft extends CubeNodeDraft {
             });
     }
 }
+/** The aggregations whose output is one of their column's values, so typed as it (PLAN §11.5) */
+const VALUE_AGGREGATIONS = [
+    AggregationFunction.DISTINCT_VALUE,
+    AggregationFunction.MIN,
+    AggregationFunction.MAX,
+];
+/**
+ * The input column a Group's output column comes from: a key by its name, a
+ * Distinct Value, Min or Max by its aggregated column; a count, a sum or an
+ * average is no column's value, so it comes from none
+ */
+const groupInputName = (group, columnName) => {
+    if (group.columns.includes(columnName)) {
+        return columnName;
+    }
+    const aggregation = group.aggregations.find(({ name }) => name === columnName);
+    return aggregation && VALUE_AGGREGATIONS.includes(aggregation.function)
+        ? aggregation.column
+        : undefined;
+};
+/**
+ * The input column a Partition's output column comes from: an input column by
+ * its name, a Distinct Value, Min or Max, or a Lag, Lead, First or Last (PLAN
+ * §11.9), by its column, whose values it holds; a count, a sum, an average or
+ * a rank is no column's value, so it comes from none
+ */
+const partitionInputName = (partition, columnName) => {
+    const aggregation = partition.aggregations.find(({ name }) => name === columnName);
+    if (!aggregation) {
+        return columnName;
+    }
+    return VALUE_AGGREGATIONS.includes(aggregation.function) ||
+        isWindowRowFunction(aggregation.function)
+        ? aggregation.column
+        : undefined;
+};
+/**
+ * Where a Difference's output column comes from: `x_1` from the Left input's
+ * `x`, `x_2` from the Right input's, a key or another column from the inputs
+ * that have it (both for a key of the same name, which the full outer join
+ * merges); `x_valueDifference` is no column's value, so it comes from none
+ */
+const differenceInputOf = (difference, columnName) => {
+    const of = (suffix) => difference.differenceColumns.find((name) => `${name}${suffix}` === columnName);
+    const left = of(DifferenceSuffix.LEFT);
+    if (left !== undefined) {
+        return { name: left, side: 'left' };
+    }
+    const right = of(DifferenceSuffix.RIGHT);
+    if (right !== undefined) {
+        return { name: right, side: 'right' };
+    }
+    return of(DifferenceSuffix.DIFFERENCE) === undefined
+        ? { name: columnName }
+        : undefined;
+};
 /**
  * The table columns a column of a node's output comes from: followed back
  * through the inputs whose output has it, and through a Rename to its old
  * name. A join key of the same name on both sides comes from the side the
  * join keeps (the left for INNER and LEFT OUTER, the right for RIGHT OUTER),
- * and from both for FULL OUTER, which merges them. A column the node's output
- * doesn't have, e.g. one a Restrict dropped, comes from nowhere.
+ * and from both for FULL OUTER, which merges them. A Group's key comes from
+ * its column, and a Distinct Value, Min or Max from the column it aggregates,
+ * as a Partition's do; a Partition's input columns come from its input. A
+ * Difference's `x_1` and `x_2` come from `x` on their side. A column the node's
+ * output doesn't have, e.g. one a Restrict dropped, or a Group's or
+ * Partition's count, sum, average or rank, or a Difference's difference,
+ * comes from nowhere.
  */
 export const findColumnOrigins = (query, analysis, nodeId, columnName) => {
     const node = query.getNode(nodeId);
@@ -117,9 +167,30 @@ export const findColumnOrigins = (query, analysis, nodeId, columnName) => {
     }
     const inputIds = query.getInputIds(nodeId);
     const [leftId, rightId] = inputIds;
+    if (node instanceof Difference) {
+        const input = differenceInputOf(node, columnName);
+        if (!input) {
+            return [];
+        }
+        const sides = input.side === 'left'
+            ? [leftId]
+            : input.side === 'right'
+                ? [rightId]
+                : inputIds;
+        return sides.flatMap((inputId) => inputId !== undefined && analysis.schemas.get(inputId)?.lookup(input.name)
+            ? findColumnOrigins(query, analysis, inputId, input.name)
+            : []);
+    }
     const inputName = node instanceof Rename
         ? (node.mappings.find(({ to }) => to === columnName)?.from ?? columnName)
-        : columnName;
+        : node instanceof Group
+            ? groupInputName(node, columnName)
+            : node instanceof Partition
+                ? partitionInputName(node, columnName)
+                : columnName;
+    if (inputName === undefined) {
+        return [];
+    }
     const followed = node instanceof Join &&
         node.joinType !== JoinType.FULL_OUTER &&
         getSameNamedJoinKeys(node.leftColumns, node.rightColumns).includes(columnName)

package/lib/stores/editors/CubeJoinDraft.js.map

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

package/lib/stores/editors/CubeJoinKeyPairs.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2026-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 { QueryNode } from '@finos/legend-cube';
+/** One pair of key columns, matched by position; `''` until a column is picked */
+export interface CubeJoinKeyPair {
+    /** Identifies the row in the editor */
+    readonly key: number;
+    readonly left: string;
+    readonly right: string;
+}
+export declare const blankJoinKeyPair: () => CubeJoinKeyPair;
+/** The pairs of saved key lists, by position; a list longer than the other pairs its extra columns with `''` */
+export declare const joinKeyPairsOf: (leftColumns: readonly string[], rightColumns: readonly string[]) => CubeJoinKeyPair[];
+/** The key lists pairs build: a pair with no column picked is left out */
+export declare const joinKeyListsOf: (pairs: readonly CubeJoinKeyPair[]) => [string[], string[]];
+/** A draft whose node joins its inputs on pairs of key columns: a Join's or a Difference's */
+export interface CubeJoinKeysDraft {
+    readonly original: QueryNode;
+    readonly pairs: readonly CubeJoinKeyPair[];
+    addPair(): void;
+    removePair(key: number): void;
+    setLeftColumn(key: number, left: string): void;
+    setRightColumn(key: number, right: string): void;
+}
+//# sourceMappingURL=CubeJoinKeyPairs.d.ts.map

package/lib/stores/editors/CubeJoinKeyPairs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CubeJoinKeyPairs.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeJoinKeyPairs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAKpD,kFAAkF;AAClF,MAAM,WAAW,eAAe;IAC9B,uCAAuC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAID,eAAO,MAAM,gBAAgB,QAAO,eAIlC,CAAC;AAEH,gHAAgH;AAChH,eAAO,MAAM,cAAc,GACzB,aAAa,SAAS,MAAM,EAAE,EAC9B,cAAc,SAAS,MAAM,EAAE,KAC9B,eAAe,EAQf,CAAC;AAEJ,0EAA0E;AAC1E,eAAO,MAAM,cAAc,GACzB,OAAO,SAAS,eAAe,EAAE,KAChC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAGrB,CAAC;AAEF,8FAA8F;AAC9F,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAC;IAC3C,OAAO,IAAI,IAAI,CAAC;IAChB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClD"}

package/lib/stores/editors/CubeJoinKeyPairs.js

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2026-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.
+ */
+let nextPairKey = 1;
+export const blankJoinKeyPair = () => ({
+    key: nextPairKey++,
+    left: '',
+    right: '',
+});
+/** The pairs of saved key lists, by position; a list longer than the other pairs its extra columns with `''` */
+export const joinKeyPairsOf = (leftColumns, rightColumns) => Array.from({ length: Math.max(leftColumns.length, rightColumns.length) }, (_, index) => ({
+    key: nextPairKey++,
+    left: leftColumns[index] ?? '',
+    right: rightColumns[index] ?? '',
+}));
+/** The key lists pairs build: a pair with no column picked is left out */
+export const joinKeyListsOf = (pairs) => {
+    const kept = pairs.filter((pair) => pair.left || pair.right);
+    return [kept.map((pair) => pair.left), kept.map((pair) => pair.right)];
+};
+//# sourceMappingURL=CubeJoinKeyPairs.js.map

package/lib/stores/editors/CubeJoinKeyPairs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CubeJoinKeyPairs.js","sourceRoot":"","sources":["../../../src/stores/editors/CubeJoinKeyPairs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAeH,IAAI,WAAW,GAAG,CAAC,CAAC;AAEpB,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAoB,EAAE,CAAC,CAAC;IACtD,GAAG,EAAE,WAAW,EAAE;IAClB,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;CACV,CAAC,CAAC;AAEH,gHAAgH;AAChH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,WAA8B,EAC9B,YAA+B,EACZ,EAAE,CACrB,KAAK,CAAC,IAAI,CACR,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,EAC7D,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACb,GAAG,EAAE,WAAW,EAAE;IAClB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE;IAC9B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;CACjC,CAAC,CACH,CAAC;AAEJ,0EAA0E;AAC1E,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAiC,EACX,EAAE;IACxB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC"}

package/lib/stores/editors/CubeNodeDraft.d.ts

@@ -15,14 +15,15 @@
  */
 import type { QueryNode } from '@finos/legend-cube';
 /**
- * The edits of one node in the side panel, kept until Apply (PLAN §7.4,
- * spec §17.5). A node type's editor edits its draft, never the document:
- * only the panel's Apply stores `build()`, as one undo step. A draft is
- * made once each time the panel opens on a node, and again after an Apply.
+ * The edits of one node in the node editor, kept until Apply or closing it
+ * (PLAN §7.4, §11.8, spec §17.5). A node type's editor edits its draft,
+ * never the document: only Apply, or closing the editor any way but Cancel,
+ * stores `build()`, as one undo step. A draft is made once each time the
+ * editor opens on a node, and again after an Apply.
  */
 export declare abstract class CubeNodeDraft<N extends QueryNode = QueryNode> {
-    /** The node the draft was made from */
-    readonly original: N;
+    /** The node the draft was made from; `follow` may move it on */
+    original: N;
     constructor(original: N);
     /**
      * The node Apply would store. Return `original` itself while nothing was
@@ -30,6 +31,19 @@ export declare abstract class CubeNodeDraft<N extends QueryNode = QueryNode> {
      * as no change.
      */
     abstract build(): N;
+    /**
+     * Why Apply waits, if it does: the panel disables it with this reason and
+     * shows it in place of the problems, e.g. an Extend whose expressions
+     * aren't validated yet (PLAN §11.7)
+     */
+    get applyDisabledReason(): string | undefined;
+    /**
+     * Whether the draft goes on, made from this node, when the node it was
+     * made from is replaced underneath it by one that differs in nothing the
+     * draft edits, e.g. an Extend the engine typed in the background; else
+     * the panel drops the edits (PLAN §7.4)
+     */
+    follow(node: QueryNode): boolean;
 }
 /** A node with nothing to edit in the panel, such as a source or an Unknown node */
 export declare class CubeReadOnlyNodeDraft extends CubeNodeDraft {

package/lib/stores/editors/CubeNodeDraft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CubeNodeDraft.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;GAKG;AACH,8BAAsB,aAAa,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACjE,uCAAuC;IACvC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAET,QAAQ,EAAE,CAAC;IAIvB;;;;OAIG;IACH,QAAQ,CAAC,KAAK,IAAI,CAAC;CACpB;AAED,oFAAoF;AACpF,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,KAAK,IAAI,SAAS;CAGnB"}
+{"version":3,"file":"CubeNodeDraft.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;GAMG;AACH,8BAAsB,aAAa,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACjE,gEAAgE;IAChE,QAAQ,EAAE,CAAC,CAAC;gBAEA,QAAQ,EAAE,CAAC;IAIvB;;;;OAIG;IACH,QAAQ,CAAC,KAAK,IAAI,CAAC;IAEnB;;;;OAIG;IACH,IAAI,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAE5C;IAED;;;;;OAKG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO;CAGjC;AAED,oFAAoF;AACpF,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,KAAK,IAAI,SAAS;CAGnB"}

package/lib/stores/editors/CubeNodeDraft.js

@@ -14,17 +14,35 @@
  * limitations under the License.
  */
 /**
- * The edits of one node in the side panel, kept until Apply (PLAN §7.4,
- * spec §17.5). A node type's editor edits its draft, never the document:
- * only the panel's Apply stores `build()`, as one undo step. A draft is
- * made once each time the panel opens on a node, and again after an Apply.
+ * The edits of one node in the node editor, kept until Apply or closing it
+ * (PLAN §7.4, §11.8, spec §17.5). A node type's editor edits its draft,
+ * never the document: only Apply, or closing the editor any way but Cancel,
+ * stores `build()`, as one undo step. A draft is made once each time the
+ * editor opens on a node, and again after an Apply.
  */
 export class CubeNodeDraft {
-    /** The node the draft was made from */
+    /** The node the draft was made from; `follow` may move it on */
     original;
     constructor(original) {
         this.original = original;
     }
+    /**
+     * Why Apply waits, if it does: the panel disables it with this reason and
+     * shows it in place of the problems, e.g. an Extend whose expressions
+     * aren't validated yet (PLAN §11.7)
+     */
+    get applyDisabledReason() {
+        return undefined;
+    }
+    /**
+     * Whether the draft goes on, made from this node, when the node it was
+     * made from is replaced underneath it by one that differs in nothing the
+     * draft edits, e.g. an Extend the engine typed in the background; else
+     * the panel drops the edits (PLAN §7.4)
+     */
+    follow(node) {
+        return false;
+    }
 }
 /** A node with nothing to edit in the panel, such as a source or an Unknown node */
 export class CubeReadOnlyNodeDraft extends CubeNodeDraft {

package/lib/stores/editors/CubeNodeDraft.js.map

@@ -1 +1 @@
-{"version":3,"file":"CubeNodeDraft.js","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH;;;;;GAKG;AACH,MAAM,OAAgB,aAAa;IACjC,uCAAuC;IAC9B,QAAQ,CAAI;IAErB,YAAY,QAAW;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CAQF;AAED,oFAAoF;AACpF,MAAM,OAAO,qBAAsB,SAAQ,aAAa;IACtD,KAAK;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"CubeNodeDraft.js","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH;;;;;;GAMG;AACH,MAAM,OAAgB,aAAa;IACjC,gEAAgE;IAChE,QAAQ,CAAI;IAEZ,YAAY,QAAW;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IASD;;;;OAIG;IACH,IAAI,mBAAmB;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,IAAe;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,oFAAoF;AACpF,MAAM,OAAO,qBAAsB,SAAQ,aAAa;IACtD,KAAK;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}

package/lib/stores/editors/CubeNodeDraftRegistry.d.ts

@@ -20,8 +20,10 @@ import { type CubeNodeDraft } from './CubeNodeDraft.js';
 export type CubeNodeDraftFactory = (node: QueryNode, editorState: CubeEditorState) => CubeNodeDraft;
 /**
  * The draft of each node type the panel edits, by type (PLAN §7.4). A
- * transform with an editor in `CUBE_NODE_EDITORS` has its factory here; a
- * source, which has nothing to edit, has none, and so no Apply or Cancel.
+ * transform with an editor in `CUBE_NODE_EDITORS` has its factory here, as
+ * has a function source, whose parameter values are edited (PLAN §6.5);
+ * another source, which has nothing to edit, has none, and so no Apply or
+ * Cancel.
  */
 export declare const CUBE_NODE_DRAFT_FACTORIES: ReadonlyMap<string, CubeNodeDraftFactory>;
 /**

package/lib/stores/editors/CubeNodeDraftRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CubeNodeDraftRegistry.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraftRegistry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAML,KAAK,SAAS,EAKf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,EAAE,KAAK,aAAa,EAAyB,MAAM,oBAAoB,CAAC;AAO/E,4CAA4C;AAC5C,MAAM,MAAM,oBAAoB,GAAG,CACjC,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,eAAe,KACzB,aAAa,CAAC;AAEnB;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,WAAW,CACjD,MAAM,EACN,oBAAoB,CAapB,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,EAAE,SAAS,MAAM,EAE7D,CAAC;AAEF,yEAAyE;AACzE,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,aAAa,eAAe,KAC3B,aAE8B,CAAC"}
+{"version":3,"file":"CubeNodeDraftRegistry.d.ts","sourceRoot":"","sources":["../../../src/stores/editors/CubeNodeDraftRegistry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAcL,KAAK,SAAS,EAKf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAU7D,OAAO,EAAE,KAAK,aAAa,EAAyB,MAAM,oBAAoB,CAAC;AAQ/E,4CAA4C;AAC5C,MAAM,MAAM,oBAAoB,GAAG,CACjC,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,eAAe,KACzB,aAAa,CAAC;AAEnB;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,EAAE,WAAW,CACjD,MAAM,EACN,oBAAoB,CA6CpB,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,EAAE,SAAS,MAAM,EAE7D,CAAC;AAEF,yEAAyE;AACzE,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,aAAa,eAAe,KAC3B,aAE8B,CAAC"}

package/lib/stores/editors/CubeNodeDraftRegistry.js

@@ -13,11 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Distinct, Drop, Filter, Join, Limit, Rename, Restrict, Slice, Sort, } from '@finos/legend-cube';
+import { Concat, Difference, Distinct, Drop, ExpressionFilter, Pivot, Extend, Filter, FunctionSource, Group, Join, Limit, Partition, Rename, Restrict, Slice, Sort, } from '@finos/legend-cube';
 import { guaranteeType } from '@finos/legend-shared';
+import { CubeConcatDraft } from './CubeConcatDraft.js';
+import { CubeDifferenceDraft } from './CubeDifferenceDraft.js';
+import { CubeExpressionFilterDraft } from './CubeExpressionFilterDraft.js';
+import { CubePivotDraft } from './CubePivotDraft.js';
+import { CubeExtendDraft } from './CubeExtendDraft.js';
 import { CubeFilterDraft } from './CubeFilterDraft.js';
+import { CubeFunctionDraft } from './CubeFunctionDraft.js';
+import { CubeGroupDraft } from './CubeGroupDraft.js';
 import { CubeJoinDraft } from './CubeJoinDraft.js';
 import { CubeReadOnlyNodeDraft } from './CubeNodeDraft.js';
+import { CubePartitionDraft } from './CubePartitionDraft.js';
 import { CubeRenameDraft } from './CubeRenameDraft.js';
 import { CubeRestrictDraft } from './CubeRestrictDraft.js';
 import { CubeRowCountDraft } from './CubeRowCountDraft.js';
@@ -25,11 +33,18 @@ import { CubeSliceDraft } from './CubeSliceDraft.js';
 import { CubeSortDraft } from './CubeSortDraft.js';
 /**
  * The draft of each node type the panel edits, by type (PLAN §7.4). A
- * transform with an editor in `CUBE_NODE_EDITORS` has its factory here; a
- * source, which has nothing to edit, has none, and so no Apply or Cancel.
+ * transform with an editor in `CUBE_NODE_EDITORS` has its factory here, as
+ * has a function source, whose parameter values are edited (PLAN §6.5);
+ * another source, which has nothing to edit, has none, and so no Apply or
+ * Cancel.
  */
 export const CUBE_NODE_DRAFT_FACTORIES = new Map([
+    [
+        FunctionSource.TYPE,
+        (node) => new CubeFunctionDraft(guaranteeType(node, FunctionSource)),
+    ],
     [Sort.TYPE, (node) => new CubeSortDraft(guaranteeType(node, Sort))],
+    [Group.TYPE, (node) => new CubeGroupDraft(guaranteeType(node, Group))],
     [Filter.TYPE, (node) => new CubeFilterDraft(guaranteeType(node, Filter))],
     [
         Restrict.TYPE,
@@ -40,6 +55,27 @@ export const CUBE_NODE_DRAFT_FACTORIES = new Map([
     [Drop.TYPE, (node) => new CubeRowCountDraft(guaranteeType(node, Drop))],
     [Limit.TYPE, (node) => new CubeRowCountDraft(guaranteeType(node, Limit))],
     [Slice.TYPE, (node) => new CubeSliceDraft(guaranteeType(node, Slice))],
+    [Concat.TYPE, (node) => new CubeConcatDraft(guaranteeType(node, Concat))],
+    [
+        Difference.TYPE,
+        (node) => new CubeDifferenceDraft(guaranteeType(node, Difference)),
+    ],
+    [
+        Partition.TYPE,
+        (node) => new CubePartitionDraft(guaranteeType(node, Partition)),
+    ],
+    [
+        Extend.TYPE,
+        (node, editorState) => new CubeExtendDraft(guaranteeType(node, Extend), editorState),
+    ],
+    [
+        ExpressionFilter.TYPE,
+        (node, editorState) => new CubeExpressionFilterDraft(guaranteeType(node, ExpressionFilter), editorState),
+    ],
+    [
+        Pivot.TYPE,
+        (node, editorState) => new CubePivotDraft(guaranteeType(node, Pivot), editorState),
+    ],
 ]);
 /**
  * The transforms with nothing to set (spec §17.6: Distinct is "description