@septkit/ui 0.0.57 → 0.0.59

package/dist/index.d.ts

@@ -23,6 +23,7 @@ import { Ref } from 'vue';
 import { Scl } from '@dialecte/scl/v2019C1';
 import { ShallowRef } from 'vue';
 import { TemplateUuidWarning } from '@dialecte/scl/v2019C1';
+import { TopologyStructuralTag } from '@dialecte/scl/v2019C1';
 
 declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLButtonElement>;
 
@@ -540,6 +541,11 @@ export declare function createDocumentStore<GenericBaseDocument, GenericAugmente
     clear: () => void;
 };
 
+/** Create an ELK-backed `LayoutEngine`. Each instance owns its own ELK
+ * worker/instance so callers/tests stay isolated. `defaults` are applied to
+ * every `layout()` call and can be overridden per call via its `options`. */
+export declare function createElkLayoutEngine(defaults?: LayoutOptions): LayoutEngine;
+
 /** A user's binary choice on a decision group. */
 export declare type DecisionAction = 'accept' | 'skip';
 
@@ -746,6 +752,77 @@ export declare function highlightCode(code: string, options?: {
     lineStatuses?: readonly LineStatus[];
 }): Promise<string>;
 
+export declare type LayoutDirection = 'UP' | 'DOWN' | 'LEFT' | 'RIGHT';
+
+/** A connection between nodes. Arrays mirror ELK's hyperedge model, so a
+ * single logical edge can bundle multiple sources/targets (for example
+ * ELK's `mergeEdges` bus-style routing). */
+export declare type LayoutEdge = {
+    id: string;
+    sources: string[];
+    targets: string[];
+};
+
+/** A swappable diagram layout algorithm. */
+export declare type LayoutEngine = {
+    layout(input: LayoutGraphInput, options?: LayoutOptions): Promise<LayoutGraphResult>;
+};
+
+export declare type LayoutGraphInput = {
+    nodes: LayoutNode[];
+    edges: LayoutEdge[];
+};
+
+export declare type LayoutGraphResult = {
+    /** Computed position per node id. */
+    positions: Record<string, LayoutPoint>;
+    /**
+     * Computed route points per edge id (start, optional bend points, end),
+     * when the engine produces routed edges. Absent/empty for engines that
+     * don't route edges explicitly.
+     */
+    edgeRoutes: Record<string, LayoutPoint[]>;
+};
+
+/**
+ * Normalized, engine-agnostic diagram layout contract. No Vue, Pinia, SCL,
+ * Dialecte, or VueFlow types may appear here — see ADR-0024 (shared
+ * swappable diagram layout engine).
+ */
+/** A single node to be positioned. */
+export declare type LayoutNode = {
+    id: string;
+    width: number;
+    height: number;
+    /**
+     * Rank used to order siblings left-to-right during layout (for example
+     * to keep expansion order stable). Engines that don't support ordering
+     * hints may ignore this.
+     */
+    orderHint?: number;
+    /** Nested child nodes, for engines/consumers that lay out containment. */
+    children?: LayoutNode[];
+};
+
+export declare type LayoutOptions = {
+    direction?: LayoutDirection;
+    /** Minimum spacing between sibling nodes. */
+    nodeSpacing?: number;
+    /** Minimum spacing between layers/ranks. */
+    layerSpacing?: number;
+    /**
+     * Engine-specific escape hatch. `ElkLayoutEngine` forwards these
+     * verbatim as ELK layout options; other engines may ignore it.
+     */
+    elkOptions?: Record<string, string>;
+};
+
+/** An absolute point on an edge's route. */
+export declare type LayoutPoint = {
+    x: number;
+    y: number;
+};
+
 export declare type LineStatus = 'added' | 'removed' | 'unchanged';
 
 /**
@@ -803,8 +880,8 @@ export declare type MergeSessionParams = {
     verb: LifecycleVerb;
     /** Operation to perform: place a new instance, or reconcile the existing one. */
     scenario: LifecycleScenario;
-    /** Source (template) element: a Function (fsd) or Application (asd). */
-    sourceRef: Scl.Ref<'Function'> | Scl.Ref<'Application'>;
+    /** Source (template) element: a Function (fsd), Application (asd) or topology scope (ssd). */
+    sourceRef: Scl.Ref<'Function'> | Scl.Ref<'Application'> | Scl.Ref<TopologyStructuralTag>;
     /** Target parent the instance lives under / is placed into. */
     anchor: Scl.Ref<Scl.ElementsOf>;
     /** Optional consumer post-step run inside the merge tx (preview + commit). */

package/dist/index.js

@@ -37,4 +37,6 @@ import P from "./context-menu/context-menu.js";
 import "./context-menu/index.js";
 import F from "./split-layout/split-layout.js";
 import "./split-layout/index.js";
-export { s as Button, y as CATEGORY_ELEMENTS, T as CodeBlock, l as Combobox, P as ContextMenu, O as DecisionToggle, d as Dialog, _ as DialogHost, v as DocumentProgressBar, c as Dropdown, b as ELEMENT_TO_COLOR, x as ELEMENT_TO_ICON, k as ElementDetail, f as FeedbackDialog, N as MergeReview, A as MergeTree, u as MultiSelect, C as SclExplorer, F as SplitLayout, j as TypeNameAuthority, D as XmlDiff, S as collectExpandableNodeIds, p as createDialogHost, e as createDocumentStore, m as dialogHostKey, E as diffLines, w as highlightCode, h as provideDialogHost, i as useActiveDocument, t as useDialecteChannel, g as useDialog, a as useDocumentProgress, o as useDocumentState, n as useLiveData, M as useMergeSession, r as useProjectLiveData };
+import { createElkLayoutEngine as I } from "./diagram-layout/elk-layout-engine.js";
+import "./diagram-layout/index.js";
+export { s as Button, y as CATEGORY_ELEMENTS, T as CodeBlock, l as Combobox, P as ContextMenu, O as DecisionToggle, d as Dialog, _ as DialogHost, v as DocumentProgressBar, c as Dropdown, b as ELEMENT_TO_COLOR, x as ELEMENT_TO_ICON, k as ElementDetail, f as FeedbackDialog, N as MergeReview, A as MergeTree, u as MultiSelect, C as SclExplorer, F as SplitLayout, j as TypeNameAuthority, D as XmlDiff, S as collectExpandableNodeIds, p as createDialogHost, e as createDocumentStore, I as createElkLayoutEngine, m as dialogHostKey, E as diffLines, w as highlightCode, h as provideDialogHost, i as useActiveDocument, t as useDialecteChannel, g as useDialog, a as useDocumentProgress, o as useDocumentState, n as useLiveData, M as useMergeSession, r as useProjectLiveData };

package/dist/merge/build-view-model.js

@@ -4,42 +4,42 @@ function n(e) {
 	return e.instances.flatMap((e) => e.groups);
 }
 function r(e) {
-	let { report: t, correlation: r } = e, i = /* @__PURE__ */ new Map();
-	for (let e of n(t)) i.set(e.primary, {
+	let { report: t } = e, r = /* @__PURE__ */ new Map();
+	for (let e of n(t)) r.set(e.primary, {
 		role: "primary",
 		groupId: e.id
 	});
-	let a = /* @__PURE__ */ new Map();
-	function o(e) {
-		let t = r.get(e);
+	let i = /* @__PURE__ */ new Map();
+	function a(e) {
+		let t = e.appliedRef?.id;
 		if (!t) return;
-		let n = i.get(e);
-		a.set(t, {
+		let n = r.get(e);
+		i.set(t, {
 			change: e.change,
 			role: n?.role ?? "plain",
 			groupId: n?.groupId,
 			node: e
 		});
 	}
-	function s(e) {
-		o(e);
-		for (let t of e.children) s(t);
+	function o(e) {
+		a(e);
+		for (let t of e.children) o(t);
 	}
-	function c(e, t) {
+	function s(e, t) {
 		if (e.change !== "unchanged") {
-			let n = r.get(e);
-			n && a.set(n, {
+			let n = e.appliedRef?.id;
+			n && i.set(n, {
 				change: e.change,
 				role: "companion",
 				groupId: t,
 				node: e
 			});
 		}
-		for (let n of e.children) c(n, t);
+		for (let n of e.children) s(n, t);
 	}
-	for (let e of t.instances) s(e.tree);
-	for (let e of n(t)) for (let t of e.companions) c(t, e.id);
-	return a;
+	for (let e of t.instances) o(e.tree);
+	for (let e of n(t)) for (let t of e.companions) s(t, e.id);
+	return i;
 }
 async function i(t) {
 	let { tree: n, changeByStagedId: r, query: i } = t, a = {

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

@@ -1,5 +1,5 @@
 import e from "../external/.pnpm/@lucide_vue@1.23.0_vue@3.5.39_typescript@5.8.3_/node_modules/@lucide/vue/dist/esm/icons/triangle-alert.js";
-import { TEMPLATE_UUID_WARNING_INFO as t } from "../external/.pnpm/@dialecte_scl@0.3.15/node_modules/@dialecte/scl/dist/v2019C1/index.js";
+import { TEMPLATE_UUID_WARNING_INFO as t } from "../external/.pnpm/@dialecte_scl@0.3.17/node_modules/@dialecte/scl/dist/v2019C1/index.js";
 import { Fragment as n, computed as r, createCommentVNode as i, createElementBlock as a, createElementVNode as o, createVNode as s, defineComponent as c, openBlock as l, renderList as u, toDisplayString as d, unref as f } from "vue";
 //#region lib/merge/merge-preflight.vue?vue&type=script&setup=true&lang.ts
 var p = { class: "flex h-full min-h-0 flex-col" }, m = { class: "min-h-0 flex-1 overflow-auto p-4" }, h = { class: "mx-auto max-w-2xl space-y-4" }, g = { class: "flex items-start gap-3" }, _ = { class: "border-b border-warning/25 px-3 py-2" }, v = { class: "flex items-center gap-2" }, y = { class: "badge badge-soft badge-warning badge-sm font-medium" }, b = { class: "font-semibold" }, x = { class: "mt-1 text-sm text-base-content/80" }, S = { class: "mt-1 text-sm" }, C = { class: "text-base-content/80" }, w = { class: "divide-y divide-warning/15" }, T = { class: "font-mono break-all" }, E = { class: "text-base-content/70" }, D = {

package/dist/merge/merge.service.js

@@ -1,28 +1,24 @@
-import { i as e } from "../external/.pnpm/@dialecte_scl@0.3.15/node_modules/@dialecte/scl/dist/hooks-CLIa7kxj.js";
-import "../external/.pnpm/@dialecte_scl@0.3.15/node_modules/@dialecte/scl/dist/v2019C1/index.js";
+import { i as e } from "../external/.pnpm/@dialecte_scl@0.3.17/node_modules/@dialecte/scl/dist/hooks-BBGXNK0x.js";
+import "../external/.pnpm/@dialecte_scl@0.3.17/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 }) {
-	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
-	};
+	return { prepared: await 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
+		});
+	}) };
 }
 async function r({ doc: e, target: t, report: n, decisions: r, keepNameTypesFrom: i, afterApply: a }) {
 	await e.transaction(async (e) => {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@septkit/ui",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "type": "module",
   "source": "lib/index.ts",
   "files": [
@@ -16,12 +16,13 @@
     "./uicss": "./dist/ui.css"
   },
   "dependencies": {
-    "@dialecte/core": "0.4.12",
-    "@dialecte/scl": "0.3.15",
+    "@dialecte/core": "0.4.16",
+    "@dialecte/scl": "0.3.17",
     "@lucide/vue": "^1.16.0",
     "@tailwindcss/vite": "4.2.2",
     "@vueuse/components": "^13.9.0",
     "@vueuse/core": "^14.2.1",
+    "elkjs": "^0.10.2",
     "pinia": "^3.0.4",
     "reka-ui": "^2.9.6",
     "shiki": "^3.0.0",

package/dist/external/.pnpm/@dialecte_core@0.4.12/node_modules/@dialecte/core/dist/index.js

@@ -1,3 +0,0 @@
-import "./utils-C5_11hqg.js";
-import { pt as e } from "./project-DkMkDgld.js";
-export { e as bindExtensions };

package/dist/merge/merge-correlate.js

@@ -1,46 +0,0 @@
-//#region lib/merge/merge-correlate.ts
-function e(e) {
-	let { report: i, snapshot: a, appliedRoots: o, companionAnchors: s } = e, c = r(a), l = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Set();
-	i.instances.forEach((e, n) => {
-		let r = e.rootRef?.id ?? o[n]?.id, i = r ? c.get(r) : void 0;
-		i && t(e.tree, i, l, u);
-	});
-	for (let e of i.instances) for (let r of e.groups) for (let e of r.companions) {
-		if (l.has(e)) continue;
-		let r = s?.get(e) ?? e.instanceRef?.id, i = r ? c.get(r) : n(a, e.tagName, u);
-		i && t(e, i, l, u);
-	}
-	return l;
-}
-function t(e, n, r, i) {
-	r.set(e, n.id), i.add(n.id);
-	let a = n.tree ?? [], o = /* @__PURE__ */ new Map();
-	for (let t of e.children) {
-		let e = t.instanceRef?.id;
-		if (!e) continue;
-		let n = a.find((t) => t.id === e && !i.has(t.id));
-		n && (o.set(t, n), i.add(n.id));
-	}
-	for (let t of e.children) {
-		if (o.has(t) || t.instanceRef || t.change === "removed") continue;
-		let e = a.find((e) => e.tagName === t.tagName && !i.has(e.id));
-		e && (o.set(t, e), i.add(e.id));
-	}
-	for (let [e, n] of o) t(e, n, r, i);
-}
-function n(e, t, r) {
-	if (e.tagName === t && !r.has(e.id)) return e;
-	for (let i of e.tree ?? []) {
-		let e = n(i, t, r);
-		if (e) return e;
-	}
-}
-function r(e) {
-	let t = /* @__PURE__ */ new Map(), n = (e) => {
-		t.set(e.id, e);
-		for (let t of e.tree ?? []) n(t);
-	};
-	return n(e), t;
-}
-//#endregion
-export { e as correlate };