@septkit/ui 0.0.45 → 0.0.47

package/dist/merge/use-merge-session.js

@@ -3,13 +3,13 @@ import { buildChangeIndex as c, buildStructuralTree as l } from "./build-view-mo
 import { reactive as u, shallowRef as d } from "vue";
 //#region lib/merge/use-merge-session.ts
 function f(f) {
-	let p = d(), m = u(/* @__PURE__ */ new Map()), h = d(), g = d({
+	let p = d(), m = u(/* @__PURE__ */ new Map()), h = d("target"), g = d(), _ = d({
 		items: [],
 		meta: {},
 		index: {},
 		expanded: []
-	}), _ = d(), v = d(), y = d(!1);
-	function b() {
+	}), v = d(), y = d(), b = d(!1);
+	function x() {
 		return {
 			verb: f.verb,
 			scenario: f.scenario,
@@ -18,42 +18,42 @@ function f(f) {
 			anchor: f.anchor
 		};
 	}
-	function x(e) {
+	function S(e) {
 		return e === void 0 ? "accept" : typeof e == "string" ? e : e.action;
 	}
-	function S(e) {
+	function C(e) {
 		return typeof e == "object" ? e.values : void 0;
 	}
-	async function C() {
-		p.value = await a(f.targetDocument, b()), await F();
+	async function w() {
+		p.value = await a(f.targetDocument, x()), await I();
 	}
-	function w(e, t) {
-		let n = S(m.get(e));
+	function T(e, t) {
+		let n = C(m.get(e));
 		m.set(e, n ? {
 			action: t,
 			values: n
-		} : t), P();
+		} : t), F();
 	}
-	function T(e, t, n) {
+	function E(e, t, n) {
 		let r = m.get(e), i = {
-			...S(r),
+			...C(r),
 			[t]: n
 		};
 		m.set(e, {
-			action: x(r),
+			action: S(r),
 			values: i
-		}), P();
+		}), F();
 	}
-	function E(e) {
-		return x(m.get(e));
+	function D(e) {
+		return S(m.get(e));
 	}
-	function D(e, t) {
-		return S(m.get(e))?.[t];
+	function O(e, t) {
+		return C(m.get(e))?.[t];
 	}
-	function O() {
+	function k() {
 		let e = /* @__PURE__ */ new Map();
 		for (let [t, n] of m) {
-			let r = S(n);
+			let r = C(n);
 			r && e.set(t, {
 				action: "accept",
 				values: r
@@ -61,43 +61,50 @@ function f(f) {
 		}
 		return e;
 	}
-	function k(e) {
-		h.value = e, L();
+	function A(e) {
+		g.value = e, R();
 	}
-	let A, j = /* @__PURE__ */ new Map(), M, N = 0;
-	function P() {
-		M && clearTimeout(M), M = setTimeout(() => void F(), 150);
+	let j, M = /* @__PURE__ */ new Map(), N, P = 0;
+	function F() {
+		N && clearTimeout(N), N = setTimeout(() => void I(), 150);
 	}
-	async function F() {
+	async function I() {
 		if (!p.value) return;
-		let e = ++N;
-		y.value = !0;
-		let a = O(), s = await i(f.targetDocument, b(), p.value, a, f.afterApply);
-		if (e !== N) {
+		let e = ++P;
+		b.value = !0;
+		let a = k(), s = await i({
+			doc: f.targetDocument,
+			target: x(),
+			report: p.value,
+			decisions: a,
+			keepNameTypesFrom: h.value,
+			afterApply: f.afterApply
+		});
+		if (e !== P) {
 			s.discard();
 			return;
 		}
-		A?.discard(), A = s, j = /* @__PURE__ */ new Map();
-		for (let e of A.operations) {
+		j?.discard(), j = s, M = /* @__PURE__ */ new Map();
+		for (let e of j.operations) {
 			if (e.status !== "created") continue;
 			let t = {
 				tagName: e.newRecord.tagName,
 				id: e.newRecord.id
-			}, { templateUuid: r } = await n(A.query, t);
-			r && j.set(r, t);
+			}, { templateUuid: r } = await n(j.query, t);
+			r && M.set(r, t);
 		}
-		let u = r(f.verb), d = await t(A.query, f.anchor, u.rootTag), m = await o(A.query, d), _ = await c({
+		let u = r(f.verb), d = await t(j.query, f.anchor, u.rootTag), m = await o(j.query, d), v = await c({
 			report: p.value,
-			createdBySourceUuid: j,
+			createdBySourceUuid: M,
 			sourceQuery: f.sourceQuery
 		});
-		g.value = await l({
+		_.value = await l({
 			tree: m,
-			changeByStagedId: _,
-			query: A.query
-		}), h.value &&= I(h.value, g.value), y.value = !1, await L();
+			changeByStagedId: v,
+			query: j.query
+		}), g.value &&= L(g.value, _.value), b.value = !1, await R();
 	}
-	function I(e, t) {
+	function L(e, t) {
 		let n = Object.values(t.index);
 		if (e.node) {
 			let t = n.find((t) => t.node === e.node);
@@ -109,42 +116,54 @@ function f(f) {
 		}
 		return (e.previewRef.id ? t.index[e.previewRef.id] : void 0) ?? e;
 	}
-	async function L() {
-		let e = h.value;
-		if (!e || !A) {
-			_.value = void 0, v.value = void 0;
+	async function R() {
+		let e = g.value;
+		if (!e || !j) {
+			v.value = void 0, y.value = void 0;
 			return;
 		}
-		_.value = await s(A.query, e.previewRef), v.value = e.change === "added" ? "" : await z(e.previewRef);
-	}
-	async function R(e) {
-		return A ? n(A.query, e) : {};
+		v.value = await s(j.query, e.previewRef), y.value = e.change === "added" ? "" : await B(e.previewRef);
 	}
 	async function z(e) {
+		return j ? n(j.query, e) : {};
+	}
+	async function B(e) {
 		try {
 			return await s(f.targetDocument.query, e);
 		} catch {
 			return;
 		}
 	}
-	async function B() {
-		p.value && (A?.discard(), A = void 0, await e(f.targetDocument, b(), p.value, new Map(m), f.afterApply));
+	async function V() {
+		p.value && (j?.discard(), j = void 0, await e({
+			doc: f.targetDocument,
+			target: x(),
+			report: p.value,
+			decisions: new Map(m),
+			keepNameTypesFrom: h.value,
+			afterApply: f.afterApply
+		}));
+	}
+	function H(e) {
+		h.value = e, F();
 	}
 	return {
 		report: p,
 		decisions: m,
-		structuralTree: g,
-		previewXml: _,
-		previewBeforeXml: v,
-		previewLoading: y,
-		load: C,
-		setDecision: w,
-		setValue: T,
-		decisionOf: E,
-		editedValue: D,
-		select: k,
-		stagedAttributes: R,
-		commit: B
+		keepNameTypesFrom: h,
+		structuralTree: _,
+		previewXml: v,
+		previewBeforeXml: y,
+		previewLoading: b,
+		load: w,
+		setDecision: T,
+		setValue: E,
+		decisionOf: D,
+		editedValue: O,
+		select: A,
+		stagedAttributes: z,
+		setKeepNameTypesFrom: H,
+		commit: V
 	};
 }
 //#endregion