@septkit/ui 0.0.49 → 0.0.51

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

@@ -1,59 +1,63 @@
-import { commitMerge as e, findScopeRoot as t, getAttributes as n, getPresentationScope as r, previewApply as i, reportLifecycle as a, snapshotTree as o, snapshotXml as s } from "./merge.service.js";
-import { buildChangeIndex as c, buildStructuralTree as l } from "./build-view-model.js";
-import { reactive as u, shallowRef as d } from "vue";
+import { collectTemplateUuidWarnings as e, commitMerge as t, findScopeRoot as n, getAttributes as r, getPresentationScope as i, previewApply as a, reportLifecycle as o, snapshotTree as s, snapshotXml as c } from "./merge.service.js";
+import { allGroups as l, buildChangeIndex as u, buildStructuralTree as d } from "./build-view-model.js";
+import { correlate as f } from "./merge-correlate.js";
+import { reactive as p, shallowRef as m } from "vue";
 //#region lib/merge/use-merge-session.ts
-function f(f) {
-	let p = d(), m = u(/* @__PURE__ */ new Map()), h = d("target"), g = d(), _ = d({
+function h(h) {
+	let g = m(), _ = p(/* @__PURE__ */ new Map()), v = m("target"), y = m(), b = m({
 		items: [],
 		meta: {},
 		index: {},
 		expanded: []
-	}), v = d(), y = d(), b = d(!1);
-	function x() {
+	}), x = m(), S = m(), C = m(!1), w = m([]);
+	function T() {
 		return {
-			verb: f.verb,
-			scenario: f.scenario,
-			sourceQuery: f.sourceQuery,
-			ref: f.sourceRef,
-			anchor: f.anchor
+			verb: h.verb,
+			scenario: h.scenario,
+			sourceQuery: h.sourceQuery,
+			ref: h.sourceRef,
+			anchor: h.anchor
 		};
 	}
-	function S(e) {
+	function E(e) {
 		return e === void 0 ? "accept" : typeof e == "string" ? e : e.action;
 	}
-	function C(e) {
+	function D(e) {
 		return typeof e == "object" ? e.values : void 0;
 	}
-	async function w() {
-		p.value = await a(f.targetDocument, x()), await I();
+	async function O() {
+		let t = await o(h.targetDocument, T());
+		g.value = t, w.value = await e([h.sourceQuery, h.targetDocument.query]);
+		for (let e of l(t)) e.suggestedAction && e.suggestedAction !== "accept" && _.set(e.id, e.suggestedAction);
+		await z();
 	}
-	function T(e, t) {
-		let n = C(m.get(e));
-		m.set(e, n ? {
+	function k(e, t) {
+		let n = D(_.get(e));
+		_.set(e, n ? {
 			action: t,
 			values: n
-		} : t), F();
+		} : t), R();
 	}
-	function E(e, t, n) {
-		let r = m.get(e), i = {
-			...C(r),
+	function A(e, t, n) {
+		let r = _.get(e), i = {
+			...D(r),
 			[t]: n
 		};
-		m.set(e, {
-			action: S(r),
+		_.set(e, {
+			action: E(r),
 			values: i
-		}), F();
+		}), R();
 	}
-	function D(e) {
-		return S(m.get(e));
+	function j(e) {
+		return E(_.get(e));
 	}
-	function O(e, t) {
-		return C(m.get(e))?.[t];
+	function M(e, t) {
+		return D(_.get(e))?.[t];
 	}
-	function k() {
+	function N() {
 		let e = /* @__PURE__ */ new Map();
-		for (let [t, n] of m) {
-			let r = C(n);
+		for (let [t, n] of _) {
+			let r = D(n);
 			r && e.set(t, {
 				action: "accept",
 				values: r
@@ -61,50 +65,58 @@ function f(f) {
 		}
 		return e;
 	}
-	function A(e) {
-		g.value = e, R();
-	}
-	let j, M = /* @__PURE__ */ new Map(), N, P = 0;
-	function F() {
-		N && clearTimeout(N), N = setTimeout(() => void I(), 150);
-	}
-	async function I() {
-		if (!p.value) return;
-		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
+	function P(e) {
+		y.value = e, V();
+	}
+	let F, I, L = 0;
+	function R() {
+		I && clearTimeout(I), I = setTimeout(() => void z(), 150);
+	}
+	async function z() {
+		if (!g.value) return;
+		let e = ++L;
+		C.value = !0;
+		let t = N(), { prepared: o, applied: c } = await a({
+			doc: h.targetDocument,
+			target: T(),
+			report: g.value,
+			decisions: t,
+			keepNameTypesFrom: v.value,
+			afterApply: h.afterApply
 		});
-		if (e !== P) {
-			s.discard();
+		if (e !== L) {
+			o.discard();
 			return;
 		}
-		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(j.query, t);
-			r && M.set(r, t);
+		F?.discard(), F = o;
+		let p = i(h.verb), m = await n(F.query, h.anchor, p.rootTag), _ = await s(F.query, m), x = c.verb === "fsd" ? c.functions : [...c.applications, ...c.functions], S = /* @__PURE__ */ new Map();
+		for (let e of l(g.value)) for (let t of e.companions) {
+			if (t.instanceRef?.id || !t.sourceRef) continue;
+			let { name: e } = await r(h.sourceQuery, t.sourceRef);
+			if (!e) continue;
+			let [n] = await F.query.any.findByAttributes({
+				tagName: t.tagName,
+				attributes: { name: e }
+			});
+			n && S.set(t, n.id);
 		}
-		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: M,
-			sourceQuery: f.sourceQuery
+		let w = f({
+			report: g.value,
+			snapshot: _,
+			appliedRoots: x,
+			companionAnchors: S
+		}), E = u({
+			report: g.value,
+			correlation: w
 		});
-		_.value = await l({
-			tree: m,
-			changeByStagedId: v,
-			query: j.query
-		}), g.value &&= L(g.value, _.value), b.value = !1, await R();
-	}
-	function L(e, t) {
+		b.value = await d({
+			tree: _,
+			changeByStagedId: E,
+			query: F.query,
+			instances: g.value.instances
+		}), y.value &&= B(y.value, b.value), C.value = !1, await V();
+	}
+	function B(e, t) {
 		let n = Object.values(t.index);
 		if (e.node) {
 			let t = n.find((t) => t.node === e.node);
@@ -116,55 +128,57 @@ function f(f) {
 		}
 		return (e.previewRef.id ? t.index[e.previewRef.id] : void 0) ?? e;
 	}
-	async function R() {
-		let e = g.value;
-		if (!e || !j) {
-			v.value = void 0, y.value = void 0;
+	async function V() {
+		let e = y.value;
+		if (!e || !F) {
+			x.value = void 0, S.value = void 0;
 			return;
 		}
-		v.value = await s(j.query, e.previewRef), y.value = e.change === "added" ? "" : await B(e.previewRef);
+		let t = e.change === "target-only" && !!e.groupId && E(_.get(e.groupId)) === "accept";
+		x.value = t ? "" : await c(F.query, e.previewRef), S.value = e.change === "added" ? "" : await U(e.previewRef);
 	}
-	async function z(e) {
-		return j ? n(j.query, e) : {};
+	async function H(e) {
+		return F ? r(F.query, e) : {};
 	}
-	async function B(e) {
+	async function U(e) {
 		try {
-			return await s(f.targetDocument.query, e);
+			return await c(h.targetDocument.query, e);
 		} catch {
 			return;
 		}
 	}
-	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
+	async function W() {
+		g.value && (F?.discard(), F = void 0, await t({
+			doc: h.targetDocument,
+			target: T(),
+			report: g.value,
+			decisions: new Map(_),
+			keepNameTypesFrom: v.value,
+			afterApply: h.afterApply
 		}));
 	}
-	function H(e) {
-		h.value = e, F();
+	function G(e) {
+		v.value = e, R();
 	}
 	return {
-		report: p,
-		decisions: m,
-		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
+		report: g,
+		decisions: _,
+		keepNameTypesFrom: v,
+		structuralTree: b,
+		previewXml: x,
+		previewBeforeXml: S,
+		previewLoading: C,
+		warnings: w,
+		load: O,
+		setDecision: k,
+		setValue: A,
+		decisionOf: j,
+		editedValue: M,
+		select: P,
+		stagedAttributes: H,
+		setKeepNameTypesFrom: G,
+		commit: W
 	};
 }
 //#endregion
-export { f as useMergeSession };
+export { h as useMergeSession };