@septkit/ui 0.0.49 → 0.0.51

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

@@ -1,30 +1,42 @@
 import { Fragment as e, createCommentVNode as t, createElementBlock as n, createElementVNode as r, createTextVNode as i, defineComponent as a, openBlock as o, renderList as s, toDisplayString as c } from "vue";
 //#region lib/merge/merge-summary.vue?vue&type=script&setup=true&lang.ts
-var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacity-70" }, d = { class: "capitalize" }, f = { class: "uppercase" }, p = { class: "mb-4 flex flex-wrap gap-2" }, m = { class: "badge badge-success badge-sm" }, h = { class: "badge badge-warning badge-sm" }, g = { class: "badge badge-ghost badge-sm" }, _ = {
+var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacity-70" }, d = { class: "capitalize" }, f = { class: "uppercase" }, p = { class: "mb-4 flex flex-wrap gap-2" }, m = { class: "badge badge-success badge-sm" }, h = { class: "badge badge-warning badge-sm" }, g = {
 	key: 0,
 	class: "badge badge-info badge-sm"
-}, v = {
+}, _ = {
+	key: 1,
+	class: "badge badge-error badge-sm"
+}, v = { class: "badge badge-ghost badge-sm" }, y = {
+	key: 2,
+	class: "badge badge-info badge-sm"
+}, b = {
 	key: 0,
 	class: "mb-4"
-}, y = { class: "space-y-1" }, b = { class: "badge badge-ghost badge-xs" }, x = {
+}, x = { class: "space-y-1" }, S = { class: "badge badge-ghost badge-xs" }, C = {
 	key: 0,
 	class: "text-xs opacity-60"
-}, S = {
+}, w = {
 	key: 1,
 	class: "mb-4"
-}, C = { class: "space-y-1" }, w = { class: "badge badge-ghost badge-xs" }, T = {
+}, T = { class: "space-y-1" }, E = { class: "badge badge-ghost badge-xs" }, D = {
 	key: 0,
 	class: "text-xs opacity-60"
-}, E = {
+}, O = {
 	key: 2,
 	class: "mb-4"
-}, D = { class: "space-y-1" }, O = { class: "text-xs opacity-60" }, k = {
+}, k = { class: "space-y-1" }, A = { class: "text-xs opacity-60" }, j = {
 	key: 3,
 	class: "mb-4"
-}, A = { class: "space-y-1" }, j = { class: "badge badge-ghost badge-xs" }, M = {
+}, M = { class: "space-y-1" }, N = { class: "badge badge-ghost badge-xs" }, P = {
 	key: 4,
+	class: "mb-4"
+}, F = { class: "space-y-1" }, I = { class: "badge badge-ghost badge-xs" }, L = {
+	key: 5,
+	class: "mb-4"
+}, R = { class: "space-y-1" }, z = { class: "badge badge-ghost badge-xs" }, B = {
+	key: 6,
 	class: "opacity-60"
-}, N = /*@__PURE__*/ a({
+}, V = /*@__PURE__*/ a({
 	__name: "merge-summary",
 	props: {
 		summary: {},
@@ -32,45 +44,55 @@ var l = { class: "h-full overflow-auto p-4 text-sm" }, u = { class: "mb-3 opacit
 		verb: {}
 	},
 	setup(a) {
-		return (N, P) => (o(), n("div", l, [
+		return (V, H) => (o(), n("div", l, [
 			r("p", u, [
 				r("span", d, c(a.scenario), 1),
 				r("span", f, " (" + c(a.verb) + ")", 1),
-				P[0] ||= i(" — review before applying. ", -1)
+				H[0] ||= i(" — review before applying. ", -1)
 			]),
 			r("div", p, [
 				r("span", m, c(a.summary.added.length) + " added", 1),
 				r("span", h, c(a.summary.updated.length) + " updated", 1),
-				r("span", g, c(a.summary.skipped.length) + " skipped", 1),
-				a.summary.renamed.length ? (o(), n("span", _, c(a.summary.renamed.length) + " auto-renamed ", 1)) : t("", !0)
+				a.summary.preserved.length ? (o(), n("span", g, c(a.summary.preserved.length) + " kept ", 1)) : t("", !0),
+				a.summary.removed.length ? (o(), n("span", _, c(a.summary.removed.length) + " removed ", 1)) : t("", !0),
+				r("span", v, c(a.summary.skipped.length) + " skipped", 1),
+				a.summary.renamed.length ? (o(), n("span", y, c(a.summary.renamed.length) + " auto-renamed ", 1)) : t("", !0)
 			]),
-			a.summary.added.length ? (o(), n("section", v, [P[1] ||= r("h3", { class: "mb-1 font-medium text-success" }, "Will be added", -1), r("ul", y, [(o(!0), n(e, null, s(a.summary.added, (e, i) => (o(), n("li", {
+			a.summary.added.length ? (o(), n("section", b, [H[1] ||= r("h3", { class: "mb-1 font-medium text-success" }, "Will be added", -1), r("ul", x, [(o(!0), n(e, null, s(a.summary.added, (e, i) => (o(), n("li", {
 				key: `a${i}`,
 				class: "flex items-center gap-2"
 			}, [
-				r("span", b, c(e.tag), 1),
+				r("span", S, c(e.tag), 1),
 				r("span", null, c(e.title), 1),
-				e.detail ? (o(), n("span", x, c(e.detail), 1)) : t("", !0)
+				e.detail ? (o(), n("span", C, c(e.detail), 1)) : t("", !0)
 			]))), 128))])])) : t("", !0),
-			a.summary.updated.length ? (o(), n("section", S, [P[2] ||= r("h3", { class: "mb-1 font-medium text-warning" }, "Will be updated", -1), r("ul", C, [(o(!0), n(e, null, s(a.summary.updated, (e, i) => (o(), n("li", {
+			a.summary.updated.length ? (o(), n("section", w, [H[2] ||= r("h3", { class: "mb-1 font-medium text-warning" }, "Will be updated", -1), r("ul", T, [(o(!0), n(e, null, s(a.summary.updated, (e, i) => (o(), n("li", {
 				key: `u${i}`,
 				class: "flex items-center gap-2"
 			}, [
-				r("span", w, c(e.tag), 1),
+				r("span", E, c(e.tag), 1),
 				r("span", null, c(e.title), 1),
-				e.detail ? (o(), n("span", T, c(e.detail), 1)) : t("", !0)
+				e.detail ? (o(), n("span", D, c(e.detail), 1)) : t("", !0)
 			]))), 128))])])) : t("", !0),
-			a.summary.renamed.length ? (o(), n("section", E, [P[3] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Auto-renamed (naming collisions)", -1), r("ul", D, [(o(!0), n(e, null, s(a.summary.renamed, (e, t) => (o(), n("li", {
+			a.summary.renamed.length ? (o(), n("section", O, [H[3] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Auto-renamed (naming collisions)", -1), r("ul", k, [(o(!0), n(e, null, s(a.summary.renamed, (e, t) => (o(), n("li", {
 				key: `r${t}`,
 				class: "flex items-center gap-2"
-			}, [r("span", null, c(e.title), 1), r("span", O, c(e.field) + " → " + c(e.to), 1)]))), 128))])])) : t("", !0),
-			a.summary.skipped.length ? (o(), n("section", k, [P[4] ||= r("h3", { class: "mb-1 font-medium opacity-70" }, "Skipped", -1), r("ul", A, [(o(!0), n(e, null, s(a.summary.skipped, (e, t) => (o(), n("li", {
+			}, [r("span", null, c(e.title), 1), r("span", A, c(e.field) + " → " + c(e.to), 1)]))), 128))])])) : t("", !0),
+			a.summary.removed.length ? (o(), n("section", j, [H[4] ||= r("h3", { class: "mb-1 font-medium text-error" }, "Will be removed (your additions)", -1), r("ul", M, [(o(!0), n(e, null, s(a.summary.removed, (e, t) => (o(), n("li", {
+				key: `rm${t}`,
+				class: "flex items-center gap-2"
+			}, [r("span", N, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
+			a.summary.preserved.length ? (o(), n("section", P, [H[5] ||= r("h3", { class: "mb-1 font-medium text-info" }, "Kept (your additions)", -1), r("ul", F, [(o(!0), n(e, null, s(a.summary.preserved, (e, t) => (o(), n("li", {
+				key: `k${t}`,
+				class: "flex items-center gap-2"
+			}, [r("span", I, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
+			a.summary.skipped.length ? (o(), n("section", L, [H[6] ||= r("h3", { class: "mb-1 font-medium opacity-70" }, "Skipped", -1), r("ul", R, [(o(!0), n(e, null, s(a.summary.skipped, (e, t) => (o(), n("li", {
 				key: `s${t}`,
 				class: "flex items-center gap-2 line-through opacity-50"
-			}, [r("span", j, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
-			!a.summary.added.length && !a.summary.updated.length && !a.summary.skipped.length && !a.summary.renamed.length ? (o(), n("p", M, " Nothing to apply. ")) : t("", !0)
+			}, [r("span", z, c(e.tag), 1), r("span", null, c(e.title), 1)]))), 128))])])) : t("", !0),
+			!a.summary.added.length && !a.summary.updated.length && !a.summary.skipped.length && !a.summary.preserved.length && !a.summary.removed.length && !a.summary.renamed.length ? (o(), n("p", B, " Nothing to apply. ")) : t("", !0)
 		]));
 	}
 });
 //#endregion
-export { N as default };
+export { V as default };

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,89 +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"
-		}, E = {
-			added: "badge-success badge-outline",
-			removed: "badge-error badge-outline",
-			modified: "badge-warning badge-outline",
-			unchanged: "badge-ghost"
+		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 = A(e), n = O(e), r = k(e), i = D(e)?.change ?? "unchanged";
+		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 [
-				t ? "text-base-content/40 line-through" : T[i],
-				n && "opacity-30",
-				!n && r && "font-semibold",
-				!n && r && !t && "bg-primary/10"
+				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 === "companion" ? (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.8/node_modules/@dialecte/scl/dist/hooks-DJJN-WU2.js";
-import "../external/.pnpm/@dialecte_scl@0.3.8/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