@ryuzaki13/react-foundation-lib 2.21.0 → 2.23.0

package/dist/analytical-table/index.js

@@ -1,11 +1,11 @@
-import { Dt as e, Et as t, Mt as n, Nt as r, Ot as i, Pt as a, jt as o, kt as s } from "../chunks/formatters-CEltML3y.js";
+import { ct as e, dt as t, ft as n, lt as r, mt as i, ot as a, pt as o, st as s } from "../chunks/formatters-D1ob2OkI.js";
 import { a as c, y as l } from "../chunks/array-D-_yMMUK.js";
-import { buildTreeTableRows as u } from "../tree-table/index.js";
+import { compileTableFormula as u } from "../formulas/index.js";
 import { stableStringify as d } from "../utils/index.js";
-import { compileTableFormula as f } from "../formulas/index.js";
-import { Bt as p, hn as m, kn as h, pn as g } from "../chunks/odata-service-CWkHASdw.js";
-import { t as _ } from "../chunks/string-comparison-BKT7PXmq.js";
-//#region src/analytical-table/aggregation.ts
+import { Vt as f, dn as p, en as m, ln as h } from "../chunks/odata-service-tp2U5yIr.js";
+import { t as g } from "../chunks/string-comparison-BKT7PXmq.js";
+import { buildTreeTableRows as _ } from "../tree-table/index.js";
+//#region src/analytical-table/runtime/aggregation.ts
 function v(e, t) {
 	let n = e.filter((e) => e != null && e !== "");
 	if (t === "count") return n.length;
@@ -20,7 +20,7 @@ function v(e, t) {
 	}
 }
 //#endregion
-//#region src/analytical-table/calculations.ts
+//#region src/analytical-table/definition/calculations.ts
 function y(e, t = e.map((e) => e.id)) {
 	let n = new Map(e.map((e) => [e.id, e]));
 	if (n.size !== e.length) throw Error("Идентификаторы аналитических столбцов должны быть уникальны.");
@@ -34,7 +34,7 @@ function y(e, t = e.map((e) => e.id)) {
 		let l = c(t.formula?.dependencies ?? t.calculate?.dependencies ?? []);
 		for (let e of l) s(e);
 		if (t.formula) {
-			let n = f({
+			let n = u({
 				formulaId: t.formula.formulaId,
 				keys: t.formula.dependencies
 			});
@@ -43,7 +43,7 @@ function y(e, t = e.map((e) => e.id)) {
 				columnId: e,
 				dependencies: l,
 				compute: (t) => {
-					let r = n.execute({ ...t });
+					let r = n.execute(t);
 					if (!r.ok) throw Error(`Ошибка формулы столбца ${e}: ${r.reason}`);
 					return r.value;
 				}
@@ -67,8 +67,117 @@ function b(e, t) {
 	return n;
 }
 //#endregion
-//#region src/analytical-table/valueComparison.ts
-function x(e, t) {
+//#region src/analytical-table/definition/compileAnalyticalTableDefinition.ts
+function x(e) {
+	let t = [...e.columns, ...e.dataFields ?? []], n = y(t);
+	return {
+		columns: e.columns,
+		fieldsById: new Map(t.map((e) => [e.id, e])),
+		calculations: n,
+		aggregateFields: t.filter((e) => e.aggregate !== void 0),
+		isAggregateRow: e.isAggregateRow,
+		aggregate: e.aggregate,
+		grandTotals: e.grandTotals !== !1,
+		grandTotalsScope: e.grandTotalsScope ?? "filtered"
+	};
+}
+//#endregion
+//#region src/analytical-table/definition/validateAnalyticalView.ts
+function S(e, t) {
+	for (let n of [...t.sorting ?? [], ...t.filters ?? []]) if (!e.fieldsById.has(n.id)) throw Error(`Неизвестный аналитический столбец: ${n.id}`);
+	let n = /* @__PURE__ */ new Set();
+	for (let e of t.grouping ?? []) {
+		if (n.has(e.id)) throw Error("Идентификаторы уровней группировки должны быть уникальны.");
+		if (e.keyColumnIds.length === 0) throw Error(`Уровень ${e.id} не содержит ключей группировки.`);
+		n.add(e.id);
+	}
+}
+//#endregion
+//#region src/analytical-table/projections/indexAnalyticalRows.ts
+function C(e) {
+	let t = [], n = [], r = /* @__PURE__ */ new Map(), i = [{
+		rows: e,
+		visible: !0,
+		nextIndex: 0
+	}];
+	for (; i.length > 0;) {
+		let e = i[i.length - 1];
+		if (e.nextIndex === e.rows.length) {
+			i.pop();
+			continue;
+		}
+		let a = e.rows[e.nextIndex++];
+		t.push(a), r.set(a.id, a), e.visible && n.push(a), a.children.length > 0 && i.push({
+			rows: a.children,
+			visible: e.visible && a.isExpanded,
+			nextIndex: 0
+		});
+	}
+	return {
+		flatRows: t,
+		visibleRows: n,
+		rowById: r
+	};
+}
+//#endregion
+//#region src/analytical-table/projections/resolveRowsProjection.ts
+function w(e, t) {
+	return t === e.rows ? e : {
+		...e,
+		rows: t,
+		...C(t)
+	};
+}
+//#endregion
+//#region src/analytical-table/projections/expansion.ts
+function T(e, t) {
+	let n;
+	for (let r = 0; r < e.length; r++) {
+		let i = t.get(e[r]);
+		i && (n ??= e.slice(), n[r] = i);
+	}
+	return n ?? e;
+}
+function E(e, t) {
+	let n = t === "all", r = new Set(n ? [] : t), i = /* @__PURE__ */ new Map();
+	for (let t = e.flatRows.length - 1; t >= 0; t--) {
+		let a = e.flatRows[t], o = T(a.children, i), s = a.isExpandable && (n || r.has(a.id));
+		(s !== a.isExpanded || o !== a.children) && i.set(a, {
+			...a,
+			isExpanded: s,
+			children: o
+		});
+	}
+	return i.size === 0 ? e : w(e, T(e.rows, i));
+}
+//#endregion
+//#region src/analytical-table/runtime/totals.ts
+function D(e, t) {
+	let n = [], r = (e) => {
+		e.sourceRow && t.has(e.id) && n.push(e.sourceRow);
+		for (let t of e.children) r(t);
+	};
+	for (let t of e) r(t);
+	return n;
+}
+function O(e) {
+	let { definition: t, nodes: n, aggregateRowIds: r, scope: i, groupingPath: a = {} } = e, o = {
+		scope: i,
+		rows: D(n, r),
+		groupingPath: a
+	}, s = { ...a };
+	for (let e of t.aggregateFields) {
+		let t = e.aggregate;
+		t !== void 0 && (s[e.id] = typeof t == "function" ? t(o) : v(o.rows.map((t) => t.values[e.id]), t));
+	}
+	return Object.assign(s, t.aggregate?.(o)), b(s, {
+		...t.calculations,
+		steps: t.calculations.steps.filter((e) => !Object.hasOwn(s, e.columnId))
+	});
+}
+//#endregion
+//#region src/analytical-table/runtime/valueComparison.ts
+function k(e, t) {
 	return d(t.map((t) => {
 		let n = e[t];
 		return [
@@ -78,23 +187,97 @@ function x(e, t) {
 		];
 	}));
 }
-function S(e, t, n) {
+function A(e, t, n) {
 	if (Object.is(e, t)) return 0;
 	if (e == null) return 1;
 	if (t == null) return -1;
 	if (n?.compare) return n.compare(e, t);
 	if (n?.valueType === "date") {
-		let n = g(e), r = g(t);
+		let n = h(e), r = h(t);
 		if (n && r) return n.getTime() - r.getTime();
 	}
-	return typeof e == "number" && typeof t == "number" ? e - t : typeof e == "boolean" && typeof t == "boolean" ? Number(e) - Number(t) : _(String(e), String(t));
+	return typeof e == "number" && typeof t == "number" ? e - t : typeof e == "boolean" && typeof t == "boolean" ? Number(e) - Number(t) : g(String(e), String(t));
+}
+//#endregion
+//#region src/analytical-table/runtime/grouping.ts
+function j(e) {
+	let { grouping: t, definition: n, source: r } = e, i = (e, a, o, s) => {
+		let c = t[a];
+		if (!c) return e;
+		let l = /* @__PURE__ */ new Map();
+		for (let t of e) {
+			let e = k(t.values, c.keyColumnIds), n = l.get(e);
+			n ? n.push(t) : l.set(e, [t]);
+		}
+		return Array.from(l, ([e, t]) => {
+			let l = [
+				...s,
+				c.id,
+				e
+			], u = `analytical-group:${d(l)}`;
+			if (r.sourceRowIds.has(u)) throw Error(`Идентификатор исходной строки совпал с группой: ${u}`);
+			let f = { ...o };
+			for (let e of [...c.keyColumnIds, ...c.displayColumnIds ?? []]) f[e] = t[0].values[e];
+			return {
+				id: u,
+				kind: "group",
+				groupingLevelId: c.id,
+				values: O({
+					definition: n,
+					nodes: t,
+					aggregateRowIds: r.aggregateRowIds,
+					scope: "group",
+					groupingPath: f
+				}),
+				children: i(t, a + 1, f, l)
+			};
+		});
+	};
+	return i(e.rows, 0, {}, []);
+}
+//#endregion
+//#region src/analytical-table/runtime/buildGroupedModel.ts
+function M(e, t = null, n = 0) {
+	return e.map((e) => ({
+		id: e.id,
+		parentId: t,
+		kind: e.kind,
+		sourceRow: e.sourceRow,
+		original: e.sourceRow?.original,
+		values: e.values,
+		level: n,
+		children: M(e.children, e.id, n + 1),
+		isExpandable: e.children.length > 0,
+		isExpanded: !1,
+		groupingLevelId: e.groupingLevelId
+	}));
+}
+function N(e) {
+	let { definition: t, source: n, filteredRows: r, grouping: i } = e, a = M(j({
+		rows: r,
+		grouping: i,
+		definition: t,
+		source: n
+	})), o = t.grandTotals ? O({
+		definition: t,
+		nodes: t.grandTotalsScope === "all" ? n.rows : r,
+		aggregateRowIds: n.aggregateRowIds,
+		scope: "grand"
+	}) : null;
+	return {
+		columns: t.columns,
+		rows: a,
+		...C(a),
+		grandTotals: o,
+		diagnostics: n.diagnostics
+	};
 }
 //#endregion
-//#region src/analytical-table/filtering.ts
-function C(e, t, n) {
+//#region src/analytical-table/runtime/filtering.ts
+function P(e, t, n) {
 	let r = e.values[t.id];
 	if (n?.filter) return n.filter(r, t, e);
-	let i = t.value, a = (e) => S(r, e, n), o = r == null || r === "";
+	let i = t.value, a = (e) => A(r, e, n), o = r == null || r === "";
 	switch (t.operator ?? "equals") {
 		case "equals": return a(i) === 0;
 		case "notEquals": return a(i) !== 0;
@@ -110,194 +293,176 @@ function C(e, t, n) {
 		case "notEmpty": return !o;
 	}
 }
-//#endregion
-//#region src/analytical-table/indexAnalyticalRows.ts
-function w(e) {
-	let t = [], n = [], r = /* @__PURE__ */ new Map(), i = (e, a) => {
-		for (let o of e) t.push(o), r.set(o.id, o), a && n.push(o), i(o.children, a && o.isExpanded);
-	};
-	return i(e, !0), {
-		flatRows: t,
-		visibleRows: n,
-		rowById: r
-	};
+function F(e, t, n) {
+	if (t.length === 0) return e;
+	let r = [];
+	for (let i of e) {
+		let e = i.sourceRow;
+		if (e && t.every((t) => P(e, t, n.get(t.id)))) {
+			r.push(i);
+			continue;
+		}
+		let a = F(i.children, t, n);
+		a.length > 0 && r.push({
+			...i,
+			children: a
+		});
+	}
+	return r;
 }
 //#endregion
-//#region src/analytical-table/buildAnalyticalTableModel.ts
-function T(e) {
-	let { snapshot: t, columns: n, state: r = {} } = e, i = y(n), a = new Map(n.map((e) => [e.id, e])), o = r.grouping ?? [], s = r.sorting ?? [], l = r.filters ?? [];
-	for (let e of [...s.map((e) => e.id), ...l.map((e) => e.id)]) if (!a.has(e)) throw Error(`Неизвестный аналитический столбец: ${e}`);
-	if (c(o.map((e) => e.id)).length !== o.length) throw Error("Идентификаторы уровней группировки должны быть уникальны.");
-	for (let e of o) if (e.keyColumnIds.length === 0) throw Error(`Уровень ${e.id} не содержит ключей группировки.`);
-	let f = t.rows.map((e) => ({
+//#region src/analytical-table/runtime/hierarchy.ts
+function I(e, t) {
+	if (e.rows.some((e) => e.id.length === 0)) throw Error("Идентификатор аналитической строки не может быть пустым.");
+	let n = e.rows.map((e) => ({
 		...e,
-		values: b(e.values, i)
-	}));
-	if (f.some((e) => e.id.length === 0)) throw Error("Идентификатор аналитической строки не может быть пустым.");
-	let p = u(f, {
+		values: b(e.values, t.calculations)
+	})), r = _(n, {
 		getRowId: (e) => e.id,
 		getParentRowId: (e) => e.parentId
-	}), m = new Set(p.rootRowIds), h = e.isAggregateRow ?? ((e) => m.has(e.id)), g = (e) => ({
+	}), i = (e) => ({
 		id: e.id,
 		kind: "data",
-		sourceRow: p.rowById.get(e.id),
+		sourceRow: r.rowById.get(e.id),
 		values: e.values,
-		children: (e.children ?? []).map(g)
-	}), _ = p.rows.map(g), T = (e) => {
-		let t = [], n = (e) => {
-			e.sourceRow && h(e.sourceRow) && t.push(e.sourceRow);
-			for (let t of e.children) n(t);
-		};
-		for (let t of e) n(t);
-		return t;
-	}, E = (t, r, a) => {
-		let o = {
-			scope: r,
-			rows: T(t),
-			groupingPath: a
-		}, s = { ...a };
-		for (let e of n) e.aggregate && (s[e.id] = typeof e.aggregate == "function" ? e.aggregate(o) : v(o.rows.map((t) => t.values[e.id]), e.aggregate));
-		return Object.assign(s, e.aggregate?.(o)), b(s, {
-			...i,
-			steps: i.steps.filter((e) => !Object.hasOwn(s, e.columnId))
-		});
-	}, D = (e) => e.flatMap((e) => {
-		let t = e.sourceRow;
-		if (t && l.every((e) => C(t, e, a.get(e.id)))) return [e];
-		let n = D(e.children);
-		return n.length > 0 ? [{
-			...e,
-			children: n
-		}] : [];
-	}), O = l.length > 0 ? D(_) : _, k = (e, t, n, r) => {
-		let i = o[t];
-		if (!i) return e;
-		let a = /* @__PURE__ */ new Map();
-		for (let t of e) {
-			let e = x(t.values, i.keyColumnIds), n = a.get(e);
-			n ? n.push(t) : a.set(e, [t]);
-		}
-		return Array.from(a, ([e, a]) => {
-			let o = [
-				...r,
-				i.id,
-				e
-			], s = `analytical-group:${d(o)}`;
-			if (p.rowById.has(s)) throw Error(`Идентификатор исходной строки совпал с группой: ${s}`);
-			let c = { ...n };
-			for (let e of [...i.keyColumnIds, ...i.displayColumnIds ?? []]) c[e] = a[0].values[e];
-			return {
-				id: s,
-				kind: "group",
-				groupingLevelId: i.id,
-				values: E(a, "group", c),
-				children: k(a, t + 1, c, o)
-			};
-		});
-	}, A = k(O, 0, {}, []), j = new Set(r.expandedRowIds === "all" ? [] : r.expandedRowIds ?? []), M = (e) => [...e].sort((e, t) => {
-		for (let n of s) {
-			let r = S(e.values[n.id], t.values[n.id], a.get(n.id));
-			if (r !== 0) return n.desc ? -r : r;
-		}
-		return 0;
-	}), N = (e, t, n) => M(e).map((e) => ({
-		id: e.id,
-		parentId: t,
-		kind: e.kind,
-		sourceRow: e.sourceRow,
-		original: e.sourceRow?.original,
-		values: e.values,
-		level: n,
-		children: N(e.children, e.id, n + 1),
-		isExpandable: e.children.length > 0,
-		isExpanded: e.children.length > 0 && (r.expandedRowIds === "all" || j.has(e.id)),
-		groupingLevelId: e.groupingLevelId
-	})), P = N(A, null, 0);
+		children: (e.children ?? []).map(i)
+	}), a = t.isAggregateRow ? Array.from(r.rowById.values()).filter(t.isAggregateRow).map((e) => e.id) : r.rootRowIds;
 	return {
-		columns: n,
-		rows: P,
-		...w(P),
-		grandTotals: e.grandTotals === !1 ? null : E(e.grandTotalsScope === "all" ? _ : O, "grand", {}),
+		rows: r.rows.map(i),
+		sourceRowIds: new Set(r.allRowIds),
+		aggregateRowIds: new Set(a),
 		diagnostics: {
-			orphanRowIds: p.orphanRowIds,
-			duplicateRowIds: p.duplicateRowIds,
-			cyclicRowIds: p.cyclicRowIds
+			orphanRowIds: r.orphanRowIds,
+			duplicateRowIds: r.duplicateRowIds,
+			cyclicRowIds: r.cyclicRowIds
 		}
 	};
 }
 //#endregion
-//#region src/analytical-table/dateColumns.ts
-var E = h("yyyy-MM-dd"), D = h("dd.MM.yyyy");
-function O(e) {
+//#region src/analytical-table/runtime/sorting.ts
+function L(e, t, n) {
+	if (t.length === 0) return e;
+	let r = (e, r) => {
+		for (let i of t) {
+			let t = A(e.values[i.id], r.values[i.id], n.get(i.id));
+			if (t !== 0) return i.desc ? -t : t;
+		}
+		return 0;
+	}, i = (e) => {
+		if (e.length === 0) return e;
+		let t = e.map((e) => {
+			let t = i(e.children);
+			return t === e.children ? e : {
+				...e,
+				children: t
+			};
+		});
+		return t.sort(r), t.every((t, n) => t === e[n]) ? e : t;
+	};
+	return w(e, i(e.rows));
+}
+//#endregion
+//#region src/analytical-table/runtime/createAnalyticalTableRuntime.ts
+var R = {}, z = Object.freeze([]);
+function B(e) {
+	let { definition: t, snapshot: n } = e, r = I(n, t), i = R, a = r.rows, o, s, c;
+	return { getModel(e = R) {
+		S(t, e);
+		let n = e.filters ?? z, l = e.grouping ?? z, u = e.sorting ?? z, d = e.expandedRowIds ?? z, f = !o || n !== (i.filters ?? z), p = !o || l !== (i.grouping ?? z), m = u !== (i.sorting ?? z), h = d !== (i.expandedRowIds ?? z), g = f ? F(r.rows, n, t.fieldsById) : a, _ = !o || f || p, v = _ ? N({
+			definition: t,
+			source: r,
+			filteredRows: g,
+			grouping: l
+		}) : o, y = !s || _ || m, b = y ? L(v, u, t.fieldsById) : s, x = !c || y || h ? E(y ? b : c ?? b, d) : c;
+		return a = g, o = v, s = b, c = x, i = {
+			filters: n,
+			grouping: l,
+			sorting: u,
+			expandedRowIds: d
+		}, c;
+	} };
+}
+//#endregion
+//#region src/analytical-table/buildAnalyticalTableModel.ts
+function V(e) {
+	return B({
+		definition: x(e),
+		snapshot: e.snapshot
+	}).getModel(e.state);
+}
+//#endregion
+//#region src/analytical-table/dynamic-columns/dateColumns.ts
+function H(e) {
 	if (typeof e != "string" || e.length !== 10) return null;
-	let t = m(e, "yyyy-MM-dd");
+	let t = p(e, "yyyy-MM-dd");
 	return t?.kind === "date-time" ? t.date : null;
 }
-function k(e) {
-	return p(e, E);
-}
-function A(e, t) {
-	switch (t) {
-		case "day": return o(e);
-		case "week": return r(e, 1);
+function U(e, a) {
+	switch (a) {
+		case "day": return t(e);
+		case "week": return o(e, 1);
 		case "month": return n(e);
-		case "quarter": return s(e.getFullYear(), Math.floor(e.getMonth() / 3) * 3, 1);
-		case "year": return a(e);
+		case "quarter": return r(e.getFullYear(), Math.floor(e.getMonth() / 3) * 3, 1);
+		case "year": return i(e);
 	}
 }
-function j(n, r) {
-	switch (r) {
-		case "day": return t(n, 1);
-		case "week": return t(n, 7);
-		case "month": return e(n, 1);
-		case "quarter": return e(n, 3);
-		case "year": return i(n, 1);
+function W(t, n) {
+	switch (n) {
+		case "day": return a(t, 1);
+		case "week": return a(t, 7);
+		case "month": return s(t, 1);
+		case "quarter": return s(t, 3);
+		case "year": return e(t, 1);
 	}
 }
-function M(e) {
-	let n = O(e.from), r = O(e.to);
-	if (!n || !r || k(n) !== e.from || k(r) !== e.to || e.from > e.to) throw Error("Некорректный календарный диапазон аналитических столбцов.");
-	let i = e.maxColumns ?? 366;
-	if (!Number.isSafeInteger(i) || i < 1) throw Error("Лимит динамических столбцов должен быть положительным целым числом.");
+function G(e) {
+	let t = H(e.from), n = H(e.to);
+	if (!t || !n || m(t) !== e.from || m(n) !== e.to || e.from > e.to) throw Error("Некорректный календарный диапазон аналитических столбцов.");
+	let r = e.maxColumns ?? 366;
+	if (!Number.isSafeInteger(r) || r < 1) throw Error("Лимит динамических столбцов должен быть положительным целым числом.");
 	if (!e.id || e.identityColumnIds.length === 0) throw Error("Динамическим столбцам нужны идентификатор и ключи сопоставления фактов.");
-	let a = [];
-	for (let o = A(n, e.granularity); o <= r; o = j(o, e.granularity)) {
-		if (a.length >= i) throw Error(`Превышен лимит динамических столбцов: ${i}`);
-		let n = k(o), r = k(t(j(o, e.granularity), -1));
-		a.push({
+	let i = [], o = U(t, e.granularity);
+	for (; o <= n;) {
+		if (i.length >= r) throw Error(`Превышен лимит динамических столбцов: ${r}`);
+		let t = W(o, e.granularity), n = m(o), s = m(a(t, -1));
+		i.push({
 			id: `${e.id}:${e.granularity}:${n}`,
-			label: e.granularity === "day" ? p(o, D) : `${n} — ${r}`,
+			label: e.granularity === "day" ? f(o) : `${n} — ${s}`,
 			from: n < e.from ? e.from : n,
-			to: r > e.to ? e.to : r
-		});
+			to: s > e.to ? e.to : s
+		}), o = t;
 	}
 	return {
 		options: {
 			...e,
 			identityColumnIds: [...e.identityColumnIds]
 		},
-		columns: a
+		columns: i
 	};
 }
-function N(e, t) {
+function K(e, t) {
 	if (t.options.identityColumnIds.some((t) => e[t] === void 0 || e[t] === null)) return;
-	let n = O(e[t.options.dateColumnId]);
+	let n = H(e[t.options.dateColumnId]);
 	if (!n) return;
-	let r = k(n);
-	if (!(r < t.options.from || r > t.options.to)) return `${t.options.id}:${t.options.granularity}:${k(A(n, t.options.granularity))}`;
-}
-function P(e) {
-	let { rows: t, facts: n, plan: r } = e, i = /* @__PURE__ */ new Map();
-	for (let e of n) {
-		let t = N(e, r);
-		if (!t) continue;
-		let n = x(e, r.options.identityColumnIds), a = i.get(n);
-		a || (a = /* @__PURE__ */ new Map(), i.set(n, a));
-		let o = a.get(t);
-		o ? o.push(e[r.options.measureColumnId]) : a.set(t, [e[r.options.measureColumnId]]);
+	let r = m(n);
+	if (!(r < t.options.from || r > t.options.to)) return `${t.options.id}:${t.options.granularity}:${m(U(n, t.options.granularity))}`;
+}
+function q(e, t) {
+	let n = /* @__PURE__ */ new Map();
+	for (let r of e) {
+		let e = K(r, t);
+		if (!e) continue;
+		let i = k(r, t.options.identityColumnIds), a = n.get(i);
+		a || (a = /* @__PURE__ */ new Map(), n.set(i, a));
+		let o = a.get(e);
+		o ? o.push(r[t.options.measureColumnId]) : a.set(e, [r[t.options.measureColumnId]]);
 	}
+	return n;
+}
+function J(e) {
+	let { rows: t, facts: n, plan: r } = e, i = q(n, r);
 	return t.map((e) => {
-		let t = i.get(x(e.values, r.options.identityColumnIds)), n = { ...e.values };
+		let t = i.get(k(e.values, r.options.identityColumnIds)), n = { ...e.values };
 		for (let e of r.columns) {
 			if (Object.hasOwn(n, e.id)) throw Error(`Динамический столбец перезаписывает исходное поле: ${e.id}`);
 			let i = t?.get(e.id);
@@ -309,56 +474,52 @@ function P(e) {
 		};
 	});
 }
-function F(e, t) {
+function Y(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let r of e) {
-		let e = N(r, t);
+		let e = K(r, t);
 		if (!e) continue;
 		let i = n.get(e);
 		i ? i.push(r[t.options.measureColumnId]) : n.set(e, [r[t.options.measureColumnId]]);
 	}
-	return Object.fromEntries(t.columns.map((e) => [e.id, n.has(e.id) ? v(n.get(e.id) ?? [], t.options.aggregation) : null]));
+	return Object.fromEntries(t.columns.map((e) => {
+		let r = n.get(e.id);
+		return [e.id, r ? v(r, t.options.aggregation) : null];
+	}));
 }
 //#endregion
-//#region src/analytical-table/expansion.ts
-function I(e, t) {
-	let n = new Set(t === "all" ? [] : t), r = (e) => e.map((e) => ({
-		...e,
-		isExpanded: e.isExpandable && (t === "all" || n.has(e.id)),
-		children: r(e.children)
-	})), i = r(e.rows);
-	return {
-		...e,
-		rows: i,
-		...w(i)
-	};
+//#region src/analytical-table/projections/exportProjection.ts
+function X(e) {
+	let t = "analytical-grand-total", n = t, r = 1;
+	for (; e.rowById.has(n);) n = `${t}:${r++}`;
+	return n;
 }
-//#endregion
-//#region src/analytical-table/exportProjection.ts
-function L(e) {
-	let { model: t } = e, n = e.columns ?? t.columns, r = new Set(e.selectedRowIds ?? []), i = (e.scope === "visible" ? t.visibleRows : t.flatRows).filter((t) => (e.includeGroups !== !1 || t.kind !== "group") && (e.scope !== "selected" || r.has(t.id))).map((e) => ({
+function Z(e) {
+	let { model: t, scope: n = "all", includeGroups: r = !0, includeGrandTotals: i = !1 } = e, a = e.columns ?? t.columns, o = new Set(e.selectedRowIds ?? []), s = n === "visible" ? t.visibleRows : t.flatRows, c = [];
+	for (let e of s) !r && e.kind === "group" || n === "selected" && !o.has(e.id) || c.push({
 		id: e.id,
 		level: e.level,
 		kind: e.kind,
-		values: n.map((t) => t.format ? t.format(e.values[t.id], e) : e.values[t.id])
-	}));
-	return e.includeGrandTotals && t.grandTotals && i.push({
-		id: "analytical-grand-total",
-		level: 0,
-		kind: "grand",
-		values: n.map((e) => {
-			let n = t.grandTotals?.[e.id];
-			return e.formatTotal ? e.formatTotal(n) : n;
-		})
-	}), {
-		columns: n.map((e) => ({
+		values: a.map((t) => t.format ? t.format(e.values[t.id], e) : e.values[t.id])
+	});
+	if (i && t.grandTotals) {
+		let e = t.grandTotals;
+		c.push({
+			id: X(t),
+			level: 0,
+			kind: "grand",
+			values: a.map((t) => t.formatTotal ? t.formatTotal(e[t.id]) : e[t.id])
+		});
+	}
+	return {
+		columns: a.map((e) => ({
 			id: e.id,
 			label: e.label ?? e.id
 		})),
-		rows: i
+		rows: c
 	};
 }
 //#endregion
-export { F as aggregateAnalyticalDateFacts, v as aggregateAnalyticalValues, T as buildAnalyticalTableModel, b as calculateAnalyticalValues, y as createAnalyticalCalculationPlan, M as createAnalyticalDateColumnsPlan, P as projectAnalyticalDateFacts, I as projectAnalyticalTableExpansion, L as projectAnalyticalTableExport };
+export { Y as aggregateAnalyticalDateFacts, v as aggregateAnalyticalValues, V as buildAnalyticalTableModel, b as calculateAnalyticalValues, x as compileAnalyticalTableDefinition, y as createAnalyticalCalculationPlan, G as createAnalyticalDateColumnsPlan, B as createAnalyticalTableRuntime, J as projectAnalyticalDateFacts, E as projectAnalyticalTableExpansion, Z as projectAnalyticalTableExport };
 
 //# sourceMappingURL=index.js.map