@septkit/ui 0.0.50 → 0.0.52

package/dist/merge/merge-tree.vue_vue_type_script_setup_true_lang.js

@@ -2,9 +2,11 @@ import e from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_
 import t from "../explorer/explorer.js";
 import "../explorer/index.js";
 import n from "./decision-toggle.js";
-import { computed as r, createBlock as i, createCommentVNode as a, createElementBlock as o, createElementVNode as s, createVNode as c, defineComponent as l, normalizeClass as u, openBlock as d, ref as f, toDisplayString as p, unref as m, watch as h, withCtx as g } from "vue";
+import { willBeGone as r } from "./merge-decision.js";
+import { coupledNodeIds as i, focusForNode as a, primaryIdOf as o } from "./merge-highlight.js";
+import { computed as s, createBlock as c, createCommentVNode as l, createElementBlock as u, createElementVNode as d, createTextVNode as f, createVNode as p, defineComponent as m, normalizeClass as h, openBlock as g, ref as _, toDisplayString as v, unref as y, watch as b, withCtx as x } from "vue";
 //#region lib/merge/merge-tree.vue?vue&type=script&setup=true&lang.ts
-var _ = ["title"], v = { class: "max-w-40 truncate" }, y = /*@__PURE__*/ l({
+var S = ["title"], C = ["title"], w = { class: "max-w-40 truncate" }, T = "badge-sm h-[21px]", E = /*@__PURE__*/ m({
 	__name: "merge-tree",
 	props: {
 		items: {},
@@ -13,91 +15,98 @@ var _ = ["title"], v = { class: "max-w-40 truncate" }, y = /*@__PURE__*/ l({
 		expandedItems: {}
 	},
 	emits: ["select", "update:decision"],
-	setup(l, { emit: y }) {
-		let b = l, x = y, S = f(), C = f({
-			scoped: [...b.expandedItems ?? []],
+	setup(m, { emit: E }) {
+		let D = m, O = E, k = _();
+		b(() => D.meta, () => {
+			let e = k.value;
+			if (!e) return;
+			let t = o(D.meta, e.groupId);
+			k.value = t ? {
+				groupId: e.groupId,
+				rootId: t
+			} : void 0;
+		});
+		let A = _({
+			scoped: [...D.expandedItems ?? []],
 			all: !1
 		});
-		h(() => b.expandedItems, (e) => {
-			let t = new Set(C.value.scoped);
+		b(() => D.expandedItems, (e) => {
+			let t = new Set(A.value.scoped);
 			for (let n of e ?? []) t.add(n);
-			C.value = {
+			A.value = {
 				scoped: [...t],
 				all: !1
 			};
 		});
-		let w = r(() => {
-			if (!S.value) return;
-			let e = /* @__PURE__ */ new Set();
-			for (let [t, n] of Object.entries(b.meta)) n.groupId === S.value && e.add(t);
-			return e;
-		}), T = {
-			added: "text-success",
-			removed: "text-error",
-			modified: "text-warning",
-			unchanged: "text-base-content/60",
-			"target-only": "text-info"
-		}, E = {
-			added: "badge-success badge-outline",
-			removed: "badge-error badge-outline",
-			modified: "badge-warning badge-outline",
-			unchanged: "badge-ghost",
-			"target-only": "badge-info badge-outline"
+		let j = s(() => k.value ? i(D.items, D.meta, k.value) : void 0), M = {
+			added: "badge-soft badge-success",
+			removed: "badge-soft badge-error",
+			modified: "badge-soft badge-warning",
+			unchanged: "badge-soft badge-neutral",
+			"target-only": "badge-soft badge-info"
 		};
-		function D(e) {
-			return b.meta[e.id];
+		function N(e) {
+			return D.meta[e.id];
 		}
-		function O(e) {
-			let t = w.value;
+		function P(e) {
+			let t = j.value;
 			return t ? !t.has(e.id) : !1;
 		}
-		function k(e) {
-			let t = w.value;
+		function F(e) {
+			let t = j.value;
 			return t ? t.has(e.id) : !1;
 		}
-		function A(e) {
-			let t = D(e);
-			return !!t?.groupId && b.decisions[t.groupId] === "skip";
+		function I(e) {
+			let t = N(e);
+			return !!t?.groupId && D.decisions[t.groupId] === "skip";
 		}
-		function j(e) {
-			let t = D(e), n = t?.change ?? "unchanged", r = O(e), i = k(e), a = t?.groupId ? b.decisions[t.groupId] : void 0, o, s;
-			return n === "target-only" ? (s = a === "accept", o = s ? "text-error line-through" : "text-info") : (s = !!t?.groupId && a === "skip", o = s ? "text-base-content/40 line-through" : T[n]), [
-				o,
-				r && "opacity-30",
-				!r && i && "font-semibold",
-				!r && i && !s && "bg-primary/10"
+		function L(e) {
+			let t = N(e), n = t?.change ?? "unchanged", i = P(e), a = F(e), o = r(n, t?.groupId ? D.decisions[t.groupId] : void 0);
+			return [
+				o ? "text-base-content/40" : n === "unchanged" ? "text-base-content/60" : "text-base-content",
+				i && "opacity-30",
+				!i && a && "font-semibold",
+				!i && a && !o && "bg-base-content/10"
 			];
 		}
-		function M(e) {
-			S.value = D(e)?.groupId, x("select", e);
+		function R(e) {
+			k.value = a(D.items, D.meta, e.id), O("select", e);
 		}
-		function N(e, t) {
-			x("update:decision", e, t);
+		function z(e, t) {
+			O("update:decision", e, t);
 		}
-		return (r, f) => (d(), i(m(t), {
-			items: l.items,
-			expanded: C.value,
+		return (r, i) => (g(), c(y(t), {
+			items: m.items,
+			expanded: A.value,
 			"aria-label": "Merge changes",
-			onSelect: M,
-			"onUpdate:expanded": f[0] ||= (e) => C.value = e
+			onSelect: R,
+			"onUpdate:expanded": i[0] ||= (e) => A.value = e
 		}, {
-			"node-label": g(({ node: e }) => [s("span", { class: u(["truncate rounded px-2 transition-all", j(e)]) }, p(e.name), 3)]),
-			"node-suffix": g(({ node: t }) => [s("div", { class: u(["flex items-center gap-2 transition-opacity", { "opacity-30": O(t) }]) }, [D(t)?.role === "companion" && D(t)?.path ? (d(), o("span", {
-				key: 0,
-				class: "flex items-center gap-1 text-xs opacity-60",
-				title: D(t)?.path
-			}, [c(m(e), { class: "size-3" }), s("span", v, p(D(t)?.path), 1)], 8, _)) : a("", !0), D(t)?.role === "primary" && D(t)?.groupId ? (d(), i(n, {
-				key: 1,
-				size: "xs",
-				"model-value": l.decisions[D(t).groupId] ?? "accept",
-				"onUpdate:modelValue": (e) => N(D(t).groupId, e)
-			}, null, 8, ["model-value", "onUpdate:modelValue"])) : D(t)?.role !== "primary" && D(t)?.regionHead ? (d(), o("span", {
-				key: 2,
-				class: u(["badge badge-xs", A(t) ? "badge-ghost line-through opacity-60" : E[D(t)?.change ?? "unchanged"]])
-			}, p(D(t)?.change), 3)) : a("", !0)], 2)]),
+			"node-label": x(({ node: e }) => [d("span", { class: h(["ml-1 truncate rounded px-2 py-0.5 transition-all", L(e)]) }, v(e.name), 3)]),
+			"node-suffix": x(({ node: t }) => [d("div", { class: h(["flex items-center gap-2 transition-opacity", { "opacity-30": P(t) }]) }, [
+				N(t)?.instance?.linked ? (g(), u("span", {
+					key: 0,
+					class: h(["badge gap-1 font-medium", [T, N(t)?.instance?.upToDate ? "badge-soft badge-success" : "badge-soft badge-warning"]]),
+					title: N(t)?.instance?.upToDate ? "Linked to the loaded template — up to date" : "Linked to the loaded template — has pending updates"
+				}, [p(y(e), { class: "size-3" }), f(" " + v(N(t)?.instance?.upToDate ? "up to date" : "outdated"), 1)], 10, S)) : l("", !0),
+				N(t)?.role === "companion" && N(t)?.path ? (g(), u("span", {
+					key: 1,
+					class: "flex items-center gap-1 text-xs opacity-60",
+					title: N(t)?.path
+				}, [p(y(e), { class: "size-3" }), d("span", w, v(N(t)?.path), 1)], 8, C)) : l("", !0),
+				N(t)?.role === "primary" && N(t)?.groupId ? (g(), c(n, {
+					key: 2,
+					size: "xs",
+					"model-value": m.decisions[N(t).groupId] ?? "accept",
+					"onUpdate:modelValue": (e) => z(N(t).groupId, e)
+				}, null, 8, ["model-value", "onUpdate:modelValue"])) : N(t)?.role !== "primary" && N(t)?.regionHead ? (g(), u("span", {
+					key: 3,
+					class: h(["badge font-medium", [T, I(t) ? "badge-soft badge-neutral line-through opacity-70" : M[N(t)?.change ?? "unchanged"]]])
+				}, v(N(t)?.change), 3)) : l("", !0)
+			], 2)]),
 			_: 1
 		}, 8, ["items", "expanded"]));
 	}
 });
 //#endregion
-export { y as default };
+export { E as default };

package/dist/merge/merge.service.js

@@ -1,24 +1,28 @@
-import { i as e } from "../external/.pnpm/@dialecte_scl@0.3.9/node_modules/@dialecte/scl/dist/hooks-DO4gUiix.js";
-import "../external/.pnpm/@dialecte_scl@0.3.9/node_modules/@dialecte/scl/dist/v2019C1/index.js";
+import { i as e } from "../external/.pnpm/@dialecte_scl@0.3.12/node_modules/@dialecte/scl/dist/hooks-Cm_UYBBt.js";
+import "../external/.pnpm/@dialecte_scl@0.3.12/node_modules/@dialecte/scl/dist/v2019C1/index.js";
 //#region lib/merge/merge.service.ts
 async function t(e, t) {
 	return e.query.lifecycle.report(t);
 }
 async function n({ doc: e, target: t, report: n, decisions: r, keepNameTypesFrom: i, afterApply: a }) {
-	return e.prepare(async (e) => {
-		let o = await e.lifecycle.apply({
-			...t,
-			report: n,
-			decisions: r,
-			keepNameTypesFrom: i
-		});
-		await a?.(e, {
-			target: t,
-			report: n,
-			decisions: r,
-			result: o
-		});
-	});
+	let o;
+	return {
+		prepared: await e.prepare(async (e) => {
+			let s = await e.lifecycle.apply({
+				...t,
+				report: n,
+				decisions: r,
+				keepNameTypesFrom: i
+			});
+			o = s.instances, await a?.(e, {
+				target: t,
+				report: n,
+				decisions: r,
+				result: s
+			});
+		}),
+		applied: o
+	};
 }
 async function r({ doc: e, target: t, report: n, decisions: r, keepNameTypesFrom: i, afterApply: a }) {
 	await e.transaction(async (e) => {
@@ -39,7 +43,15 @@ async function r({ doc: e, target: t, report: n, decisions: r, keepNameTypesFrom
 function i(t) {
 	return e({ verb: t });
 }
-async function a(e, t, n) {
+async function a(e) {
+	let t = (await Promise.all(e.map((e) => e.lifecycle.checkTemplateUuids()))).flat(), n = /* @__PURE__ */ new Set(), r = [];
+	for (let e of t) {
+		let t = `${e.code}:${e.value}`;
+		n.has(t) || (n.add(t), r.push(e));
+	}
+	return r;
+}
+async function o(e, t, n) {
 	if (t.tagName === n) return t;
 	let r = (await e.findAncestors(t)).find((e) => e.tagName === n);
 	return r ? {
@@ -47,25 +59,26 @@ async function a(e, t, n) {
 		id: r.id
 	} : t;
 }
-async function o(e, t) {
+async function s(e, t) {
 	return await e.getSnapshot({
 		ref: t,
 		as: "tree"
 	});
 }
-async function s(e, t) {
+async function c(e, t) {
 	return e.getSnapshot({
 		ref: t,
 		as: "xml",
 		unwrap: ["Private"],
-		declareNamespaces: !1
+		declareNamespaces: !1,
+		includeXmlDeclaration: !1
 	});
 }
-async function c(e, t) {
+async function l(e, t) {
 	return await e.getAttributes(t, { defaults: "none" });
 }
-async function l(e, t) {
+async function u(e, t) {
 	return e.presentation.extractElementTitle(t);
 }
 //#endregion
-export { r as commitMerge, l as extractTitle, a as findScopeRoot, c as getAttributes, i as getPresentationScope, n as previewApply, t as reportLifecycle, o as snapshotTree, s as snapshotXml };
+export { a as collectTemplateUuidWarnings, r as commitMerge, u as extractTitle, o as findScopeRoot, l as getAttributes, i as getPresentationScope, n as previewApply, t as reportLifecycle, s as snapshotTree, c as snapshotXml };

package/dist/merge/use-document-progress.js

@@ -1,26 +1,25 @@
 import { onScopeDispose as e, ref as t } from "vue";
 //#region lib/merge/use-document-progress.ts
 function n(n) {
-	let r = t(!1), i = t(null), a = t([]), o;
-	function s() {
+	let r = t(!1), i = t(null), a;
+	function o() {
 		let e = n();
-		r.value = e.loading, i.value = e.progress ? { ...e.progress } : null, a.value = e.history.slice(-6);
+		r.value = e.loading, i.value = e.progress ? { ...e.progress } : null;
 	}
-	async function c(e) {
-		s(), o = setInterval(s, 80);
+	async function s(e) {
+		o(), a = setInterval(o, 80);
 		try {
 			return await e;
 		} finally {
-			o && clearInterval(o), o = void 0, s();
+			a && clearInterval(a), a = void 0, o();
 		}
 	}
 	return e(() => {
-		o && clearInterval(o);
+		a && clearInterval(a);
 	}), {
 		loading: r,
 		progress: i,
-		history: a,
-		track: c
+		track: s
 	};
 }
 //#endregion

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

@@ -1,62 +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() {
-		let e = await a(f.targetDocument, x());
-		p.value = e;
-		for (let t of e.groups) t.suggestedAction && t.suggestedAction !== "accept" && m.set(t.id, t.suggestedAction);
-		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
@@ -64,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);
@@ -119,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 };