@dialecte/scl 0.3.6 → 0.3.8

package/dist/{hooks-BLN_sx9P.js → hooks-DJJN-WU2.js}

@@ -25714,7 +25714,7 @@ var ot = /* @__PURE__ */ c({
 });
 //#endregion
 //#region src/v2019C1/extensions/reference/transaction/apply-type-id-remap.ts
-async function st(e, t) {
+async function k(e, t) {
 	let { records: n, idRemap: r } = t;
 	if (r.size !== 0) for (let t of n) {
 		let n = Ge.get(t.tagName);
@@ -25733,12 +25733,12 @@ async function st(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/reference/transaction/write-provenance.ts
-var ct = {
+var st = {
 	FSD: "FunctionSclRef",
 	ASD: "ApplicationSclRef"
 };
-async function lt(e, t) {
-	let { sourceQuery: n, targetRoot: r, fileType: i } = t, [a] = await n.getRecordsByTagName("Header"), o = a ? await n.getAttributes(a) : void 0, s = await e.addChild(r, { tagName: ct[i] }), { name: c } = await n.getDocumentInfo();
+async function ct(e, t) {
+	let { sourceQuery: n, targetRoot: r, fileType: i } = t, [a] = await n.getRecordsByTagName("Header"), o = a ? await n.getAttributes(a) : void 0, s = await e.addChild(r, { tagName: st[i] }), { name: c } = await n.getDocumentInfo();
 	await e.addChild(s, {
 		tagName: "SclFileReference",
 		attributes: {
@@ -25752,16 +25752,16 @@ async function lt(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/reference/index.ts
-var k = {
+var A = {
 	query: ot,
 	transaction: /* @__PURE__ */ c({
-		applyTypeIdRemap: () => st,
-		writeProvenance: () => lt
+		applyTypeIdRemap: () => k,
+		writeProvenance: () => ct
 	})
 };
 //#endregion
 //#region src/v2019C1/extensions/clean-up/transaction/prune-empty-containers.ts
-async function ut(e) {
+async function lt(e) {
 	let t = [...Object.values(Ye).flat(), "Private"];
 	for (let n of t) {
 		let t = await e.getRecordsByTagName(n);
@@ -25770,7 +25770,7 @@ async function ut(e) {
 }
 //#endregion
 //#region src/v2019C1/extensions/clean-up/transaction/orphan-uuid-refs.ts
-async function dt(e) {
+async function ut(e) {
 	let t = Object.keys(T);
 	for (let n of t) {
 		let t = T[n], r = await e.getRecordsByTagName(n);
@@ -25778,7 +25778,7 @@ async function dt(e) {
 			let r = !1, a = !1, o = {};
 			for (let n of t) {
 				let t = await e.getAttribute(i, { name: n.attribute.uuid });
-				if (t) if (r = !0, await ft(e, t, n.target)) a = !0;
+				if (t) if (r = !0, await dt(e, t, n.target)) a = !0;
 				else {
 					o[n.attribute.uuid] = void 0, o[n.attribute.path] = void 0;
 					for (let e of n.companions) o[e.name] = void 0;
@@ -25790,7 +25790,7 @@ async function dt(e) {
 		}
 	}
 }
-async function ft(e, t, n) {
+async function dt(e, t, n) {
 	for (let r of n) {
 		let [n] = await e.findByAttributes({
 			tagName: r,
@@ -25802,14 +25802,14 @@ async function ft(e, t, n) {
 }
 //#endregion
 //#region src/v2019C1/extensions/clean-up/index.ts
-var A = { transaction: /* @__PURE__ */ c({
-	orphanUuidRefs: () => dt,
-	pruneEmptyContainers: () => ut,
+var j = { transaction: /* @__PURE__ */ c({
+	orphanUuidRefs: () => ut,
+	pruneEmptyContainers: () => lt,
 	resetLNode: () => ee
 }) };
 //#endregion
 //#region src/v2019C1/extensions/data-model/query/resolve.ts
-async function pt(e, n) {
+async function ft(e, n) {
 	let { records: r } = n, i = {
 		lnodeTypes: /* @__PURE__ */ new Map(),
 		doTypes: /* @__PURE__ */ new Map(),
@@ -25826,7 +25826,7 @@ async function pt(e, n) {
 		if (o(a, {
 			key: "ELEMENT_NOT_FOUND",
 			detail: `LNodeType not found for lnType="${r}"`
-		}), !j(i.lnodeTypes, r, a)) continue;
+		}), !M(i.lnodeTypes, r, a)) continue;
 		let s = a.children.filter((e) => t(e, "DO")), c = await e.getRecords(s);
 		for (let t of c) {
 			if (!t) continue;
@@ -25836,7 +25836,7 @@ async function pt(e, n) {
 				tagName: "DOType",
 				attributes: { id: n }
 			});
-			r && j(i.doTypes, n, r) && await mt({
+			r && M(i.doTypes, n, r) && await pt({
 				query: e,
 				parent: r,
 				dataModelMap: i
@@ -25850,10 +25850,10 @@ async function pt(e, n) {
 		enumTypes: Array.from(i.enumTypes.values())
 	};
 }
-function j(e, t, n) {
+function M(e, t, n) {
 	return e.has(t) ? !1 : (e.set(t, n), !0);
 }
-async function mt(e) {
+async function pt(e) {
 	let { query: n, parent: r, dataModelMap: i } = e, a = r.tagName === "DOType" ? await n.getRecords(r.children.filter((e) => t(e, "DA"))) : await n.getRecords(r.children.filter((e) => t(e, "BDA")));
 	for (let e of a) {
 		if (!e) continue;
@@ -25864,13 +25864,13 @@ async function mt(e) {
 					tagName: "EnumType",
 					attributes: { id: r }
 				});
-				e && j(i.enumTypes, r, e);
+				e && M(i.enumTypes, r, e);
 			} else if (t === "Struct") {
 				let [e] = await n.findByAttributes({
 					tagName: "DAType",
 					attributes: { id: r }
 				});
-				e && j(i.daTypes, r, e) && await mt({
+				e && M(i.daTypes, r, e) && await pt({
 					query: n,
 					parent: e,
 					dataModelMap: i
@@ -25887,7 +25887,7 @@ async function mt(e) {
 				tagName: "DOType",
 				attributes: { id: t }
 			});
-			r && j(i.doTypes, t, r) && await mt({
+			r && M(i.doTypes, t, r) && await pt({
 				query: n,
 				parent: r,
 				dataModelMap: i
@@ -25897,76 +25897,76 @@ async function mt(e) {
 }
 //#endregion
 //#region src/v2019C1/extensions/data-model/query/index.ts
-var ht = /* @__PURE__ */ c({ resolve: () => pt }), gt = ["id", "uuid"];
+var mt = /* @__PURE__ */ c({ resolve: () => ft }), ht = ["id", "uuid"];
 //#endregion
 //#region src/v2019C1/extensions/signature/query/element-signature.ts
-async function _t(e, t) {
+async function gt(e, t) {
 	let n = {
 		query: e,
 		resolveReferences: t.resolveReferences ?? !1,
-		ignore: new Set(t.ignoreAttributes ?? gt),
+		ignore: new Set(t.ignoreAttributes ?? ht),
 		memo: /* @__PURE__ */ new Map(),
 		seen: /* @__PURE__ */ new Set()
 	};
-	return bt(t.ref, n);
+	return yt(t.ref, n);
 }
-var vt = /* @__PURE__ */ new Set();
-function yt(e, t) {
+var _t = /* @__PURE__ */ new Set();
+function vt(e, t) {
 	return g[e]?.attributes?.details?.[t]?.default;
 }
-async function bt(e, t) {
+async function yt(e, t) {
 	let n = `${e.tagName}:${e.id}`, r = t.memo.get(n);
 	if (r !== void 0) return r;
 	if (t.seen.has(n)) return `@cycle:${e.tagName}`;
 	t.seen.add(n);
-	let i = await t.query.getTree(e), a = i ? await xt(i, t) : "";
+	let i = await t.query.getTree(e), a = i ? await bt(i, t) : "";
 	return t.seen.delete(n), t.memo.set(n, a), a;
 }
-async function xt(e, t) {
-	let n = t.resolveReferences ? Et(e.tagName) : vt, r = [];
+async function bt(e, t) {
+	let n = t.resolveReferences ? Tt(e.tagName) : _t, r = [];
 	for (let i of e.attributes) {
-		if (t.ignore.has(i.name) || n.has(i.name) || i.value === yt(e.tagName, i.name)) continue;
+		if (t.ignore.has(i.name) || n.has(i.name) || i.value === vt(e.tagName, i.name)) continue;
 		let a = i.value;
 		if (t.resolveReferences) {
-			let n = await St(e, i.name, i.value, t);
+			let n = await xt(e, i.name, i.value, t);
 			n !== null && (a = `@sig:${n}`);
 		}
 		r.push(`${JSON.stringify(i.name)}:${JSON.stringify(a)}`);
 	}
 	r.sort();
 	let i = [];
-	for (let n of e.tree ?? []) i.push(await xt(n, t));
+	for (let n of e.tree ?? []) i.push(await bt(n, t));
 	i.sort();
 	let a = e.value?.trim(), o = a ? `,value:${JSON.stringify(a)}` : "";
 	return `{tag:${JSON.stringify(e.tagName)},attrs:[${r.join(",")}]${o},children:[${i.join(",")}]}`;
 }
-async function St(e, t, n, r) {
-	let i = Ct(e, t);
+async function xt(e, t, n, r) {
+	let i = St(e, t);
 	if (i) {
-		let e = await Dt(r.query, i.target, n);
-		return e ? bt(e, r) : `@missing:${n}`;
+		let e = await Et(r.query, i.target, n);
+		return e ? yt(e, r) : `@missing:${n}`;
 	}
-	let a = Tt(e.tagName, t);
+	let a = wt(e.tagName, t);
 	if (a) {
-		let e = await Ot(r.query, a.target, n);
-		return e ? bt(e, r) : `@missing:${n}`;
+		let e = await Dt(r.query, a.target, n);
+		return e ? yt(e, r) : `@missing:${n}`;
 	}
 	return null;
 }
-function Ct(e, t) {
-	return D[e.tagName]?.find((n) => n.attribute === t && wt(e, n));
+function St(e, t) {
+	return D[e.tagName]?.find((n) => n.attribute === t && Ct(e, n));
 }
-function wt(e, t) {
+function Ct(e, t) {
 	return t.when ? e.attributes.find((e) => e.name === t.when.attribute)?.value === t.when.equals : !0;
 }
-function Tt(e, t) {
+function wt(e, t) {
 	return T[e]?.find((e) => e.attribute.uuid === t);
 }
-function Et(e) {
+function Tt(e) {
 	let t = T[e];
-	return t ? new Set(t.map((e) => e.attribute.path)) : vt;
+	return t ? new Set(t.map((e) => e.attribute.path)) : _t;
 }
-async function Dt(e, t, n) {
+async function Et(e, t, n) {
 	let [r] = await e.findByAttributes({
 		tagName: t,
 		attributes: { id: n }
@@ -25976,7 +25976,7 @@ async function Dt(e, t, n) {
 		id: r.id
 	} : null;
 }
-async function Ot(e, t, n) {
+async function Dt(e, t, n) {
 	for (let r of t) {
 		let [t] = await e.findByAttributes({
 			tagName: r,
@@ -25991,67 +25991,72 @@ async function Ot(e, t, n) {
 }
 //#endregion
 //#region src/v2019C1/extensions/signature/query/index.ts
-var kt = /* @__PURE__ */ c({ elementSignature: () => _t });
+var Ot = /* @__PURE__ */ c({ elementSignature: () => gt });
 //#endregion
 //#region src/v2019C1/extensions/data-model/transaction/import-types.ts
-async function At(e, t) {
-	let { sourceQuery: n, records: r, cloneMappings: i = [], forkPrefix: a = "" } = t, o = jt(await pt(n, { records: r })), s = await e.ensureChild(await e.getRoot(), {
+async function kt(e, t) {
+	let { sourceQuery: n, records: r, cloneMappings: i = [], forkPrefix: a = "", keepNameTypesFrom: o = "target" } = t, s = At(await ft(n, { records: r })), c = await e.ensureChild(await e.getRoot(), {
 		tagName: "DataTypeTemplates",
 		attributes: {}
-	}), c = await Nt(e), l = /* @__PURE__ */ new Map(), u = [], d = [], f = {
+	}), l = await Mt(e), u = /* @__PURE__ */ new Map(), d = [], f = [], p = {
 		reused: 0,
 		preserved: 0,
 		forked: 0,
 		reclaimed: 0
 	};
-	for (let t of o) {
+	for (let t of s) {
 		let r = await n.getAttribute(t, { name: "id" });
 		if (!r) continue;
-		let i = await _t(n, {
+		let i = await gt(n, {
 			ref: {
 				tagName: t.tagName,
 				id: t.id
 			},
 			resolveReferences: !0
-		}), o = c.get(i);
-		if (o !== void 0) {
-			l.set(r, o), f.reused++;
+		}), s = l.get(i);
+		if (s !== void 0) {
+			let n = o === "source" ? await Nt(e, {
+				tagName: t.tagName,
+				currentId: s,
+				desiredId: r
+			}) : s;
+			u.set(r, n), n !== s && l.set(i, n), p.reused++;
 			continue;
 		}
-		let p = await n.getTree(t);
-		if (!p) continue;
-		let [m] = await e.findByAttributes({
+		let m = await n.getTree(t);
+		if (!m) continue;
+		let [h] = await e.findByAttributes({
 			tagName: t.tagName,
 			attributes: { id: r }
-		}), h = r, g = p;
-		m ? (h = await Bt(e, t.tagName, `${a}${r}_${Vt(i)}`), g = Pt(p, h), f.forked++) : f.preserved++;
-		let _ = await e.deepClone(s, g);
-		l.set(r, h), _?.record && (u.push(M(_.record.tagName, _.record.id)), m && d.push({
+		}), g = r, _ = m;
+		h ? (g = await Bt(e, t.tagName, `${a}${r}_${Vt(i)}`), _ = Pt(m, g), p.forked++) : p.preserved++;
+		let v = await e.deepClone(c, _);
+		u.set(r, g), v?.record && (d.push(N(v.record.tagName, v.record.id)), h && f.push({
 			oldId: r,
-			oldRef: M(m.tagName, m.id),
-			forkRef: M(_.record.tagName, _.record.id),
-			forkedId: h
+			oldRef: N(h.tagName, h.id),
+			forkRef: N(v.record.tagName, v.record.id),
+			forkedId: g
 		}));
 	}
-	let p = i.map((e) => e.target);
-	for (let t of u) {
+	let m = i.map((e) => e.target);
+	for (let t of d) {
 		let n = await e.getTree(t);
-		n && Ft(n, p);
+		n && Ft(n, m);
 	}
-	return await st(e, {
-		records: p,
-		idRemap: l
-	}), d.length > 0 && await It(e, {
-		collisions: d,
-		idRemap: l,
-		referrerRecords: p,
-		stats: f
+	return await k(e, {
+		records: m,
+		idRemap: u
+	}), f.length > 0 && await It(e, {
+		collisions: f,
+		idRemap: u,
+		referrerRecords: m,
+		stats: p
 	}), {
-		idRemap: l,
-		stats: f
+		idRemap: u,
+		stats: p
 	};
 }
-function jt(e) {
+function At(e) {
 	return [
 		...e.enumTypes,
 		...e.daTypes,
@@ -26059,20 +26064,20 @@ function jt(e) {
 		...e.lnodeTypes
 	];
 }
-var Mt = [
+var jt = [
 	"EnumType",
 	"DAType",
 	"DOType",
 	"LNodeType"
 ];
-async function Nt(e) {
+async function Mt(e) {
 	let t = /* @__PURE__ */ new Map();
-	for (let n of Mt) {
+	for (let n of jt) {
 		let r = await e.getRecordsByTagName(n);
 		for (let i of r) {
 			let r = i.attributes.find((e) => e.name === "id")?.value;
 			if (!r) continue;
-			let a = await _t(e, {
+			let a = await gt(e, {
 				ref: {
 					tagName: n,
 					id: i.id
@@ -26084,6 +26089,25 @@ async function Nt(e) {
 	}
 	return t;
 }
+async function Nt(e, t) {
+	let { tagName: n, currentId: r, desiredId: i } = t;
+	if (r === i) return r;
+	let [a] = await e.findByAttributes({
+		tagName: n,
+		attributes: { id: r }
+	});
+	if (!a) return r;
+	let [o] = await e.findByAttributes({
+		tagName: n,
+		attributes: { id: i }
+	});
+	if (o && o.id !== a.id) return r;
+	let s = N(a.tagName, a.id), c = await O(e, { target: s });
+	return await e.update(s, { attributes: { id: i } }), await k(e, {
+		records: c.map((e) => N(e.ref.tagName, e.ref.id)),
+		idRemap: new Map([[r, i]])
+	}), i;
+}
 function Pt(e, t) {
 	let n = structuredClone(e), r = n.attributes, i = r.find((e) => e.name === "id");
 	return i ? i.value = t : r.push({
@@ -26091,17 +26115,17 @@ function Pt(e, t) {
 		value: t
 	}), n;
 }
-function M(e, t) {
+function N(e, t) {
 	return {
 		tagName: e,
 		id: t
 	};
 }
 function Ft(e, t) {
-	t.push(M(e.tagName, e.id));
+	t.push(N(e.tagName, e.id));
 	for (let n of e.tree ?? []) Ft(n, t);
 }
-var N = (e) => `${e.tagName}#${e.id}`;
+var P = (e) => `${e.tagName}#${e.id}`;
 async function It(e, t) {
 	let { collisions: n, idRemap: r, referrerRecords: i, stats: a } = t, o = await Lt(e, n), s = /* @__PURE__ */ new Map(), c = [];
 	for (let t of n) if (o.has(t.oldId)) {
@@ -26114,24 +26138,24 @@ async function It(e, t) {
 		let n = await e.getTree(t);
 		n && Ft(n, l);
 	}
-	await st(e, {
+	await k(e, {
 		records: l,
 		idRemap: s
 	});
 }
 async function Lt(e, t) {
-	let n = /* @__PURE__ */ new Set(), r = new Map(t.map((e) => [N(e.oldRef), e.oldId])), i = t.map((e) => e.oldRef), a = new Set(i.map(N)), o = /* @__PURE__ */ new Set(), s = !0;
+	let n = /* @__PURE__ */ new Set(), r = new Map(t.map((e) => [P(e.oldRef), e.oldId])), i = t.map((e) => e.oldRef), a = new Set(i.map(P)), o = /* @__PURE__ */ new Set(), s = !0;
 	for (; s;) {
 		s = !1;
 		for (let t of i) {
-			let c = N(t);
+			let c = P(t);
 			if (o.has(c) || (await O(e, { target: t })).length > 0) continue;
 			let l = await e.getTree(t), u = l ? await Rt(e, l) : [];
 			await e.delete(t), o.add(c), s = !0;
 			let d = r.get(c);
 			d !== void 0 && n.add(d);
 			for (let e of u) {
-				let t = N(e);
+				let t = P(e);
 				a.has(t) || (i.push(e), a.add(t));
 			}
 		}
@@ -26151,7 +26175,7 @@ async function Rt(e, t) {
 				attributes: { id: a }
 			});
 			if (!o) continue;
-			let s = M(i.target, o.id), c = N(s);
+			let s = N(i.target, o.id), c = P(s);
 			r.has(c) || (r.add(c), n.push(s));
 		}
 		for (let e of t.tree ?? []) await i(e);
@@ -26177,8 +26201,8 @@ function Vt(e) {
 //#endregion
 //#region src/v2019C1/extensions/data-model/index.ts
 var Ht = {
-	query: ht,
-	transaction: /* @__PURE__ */ c({ importTypes: () => At })
+	query: mt,
+	transaction: /* @__PURE__ */ c({ importTypes: () => kt })
 };
 //#endregion
 //#region src/v2019C1/extensions/history/query/get-sorted-hitem.ts
@@ -26251,7 +26275,7 @@ var qt = {
 };
 //#endregion
 //#region src/v2019C1/extensions/identity/transaction/write-identity.ts
-async function P(e, t) {
+async function F(e, t) {
 	let { mappings: n, mode: r } = t;
 	if (r !== "keep") for (let t of n) {
 		let n = r === "strip" ? Jt() : Yt(t);
@@ -26281,7 +26305,7 @@ function Zt(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/identity/index.ts
-var Qt = { transaction: /* @__PURE__ */ c({ writeIdentity: () => P }) };
+var Qt = { transaction: /* @__PURE__ */ c({ writeIdentity: () => F }) };
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/engine/group.ts
 function $t(e, t) {
@@ -26335,7 +26359,7 @@ var rn = new Set([
 	"templateUuid",
 	"originUuid"
 ]), an = new Set(Object.values(T).flatMap((e) => e.flatMap((e) => [e.attribute.path, e.attribute.uuid])));
-function F(e) {
+function I(e) {
 	let t = {};
 	for (let [n, r] of Object.entries(e)) rn.has(n) || n === "name" || an.has(n) || (t[n] = r);
 	return t;
@@ -26431,7 +26455,7 @@ function un(e) {
 	};
 }
 async function dn(e, t) {
-	let { targetQuery: n, sourceNode: r, instanceNode: i } = t, a = F(await e.any.getAttributes(r)), o = F(await n.any.getAttributes(i)), s = [];
+	let { targetQuery: n, sourceNode: r, instanceNode: i } = t, a = I(await e.any.getAttributes(r)), o = I(await n.any.getAttributes(i)), s = [];
 	for (let e of new Set([...Object.keys(a), ...Object.keys(o)])) {
 		let t = o[e], n = a[e];
 		t !== n && s.push({
@@ -26502,7 +26526,7 @@ function yn(e) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/constraints/classify-attribute.ts
-function I(e, t) {
+function L(e, t) {
 	return gn.has(t) ? "identity" : Sn(e).has(t) ? "reference" : t === "name" ? "rename" : ne.has(t) || yn(e).has(t) ? "identity" : "free";
 }
 function bn(e) {
@@ -26511,7 +26535,7 @@ function bn(e) {
 function xn(e) {
 	let t = Object.keys(h[e] ?? {}), n = [];
 	for (let r of t) {
-		let t = I(e, r);
+		let t = L(e, r);
 		bn(t) && n.push({
 			attr: r,
 			mode: t
@@ -26529,7 +26553,7 @@ function Sn(e) {
 var Cn = /* @__PURE__ */ new Set();
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/constraints/find-constraint-violation.ts
-async function L(e, t) {
+async function R(e, t) {
 	let { parentRef: n, childTag: r, candidate: i, excludeId: a } = t, o = Tn(n.tagName).filter((e) => (e.kind === "unique" || e.kind === "key") && En(e, r));
 	if (o.length === 0) return null;
 	let s = (await e.any.getTree(n))?.tree ?? [];
@@ -26566,7 +26590,7 @@ function Dn(e) {
 var On = 1e3;
 async function kn(e, t) {
 	let { parentRef: n, childTag: r, candidate: i, attr: a, decorate: o, excludeId: s } = t, c = i[a] ?? "";
-	if (!await L(e, {
+	if (!await R(e, {
 		parentRef: n,
 		childTag: r,
 		candidate: i,
@@ -26579,7 +26603,7 @@ async function kn(e, t) {
 			attr: a,
 			childTag: r
 		}) : `${c}_${t}`;
-		if (!await L(e, {
+		if (!await R(e, {
 			parentRef: n,
 			childTag: r,
 			candidate: {
@@ -26593,18 +26617,18 @@ async function kn(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/constraints/resolve-placement-collision.ts
-async function R(e, t) {
+async function z(e, t) {
 	let { ref: n, decorate: r, overrides: i } = t, a = t.parentRef ?? (await e.getRecord(n))?.parent;
 	if (!a) return { status: "ok" };
 	let o = await e.getAttributes(n);
 	if (i) for (let [t, r] of Object.entries(i)) {
-		let i = I(n.tagName, t);
+		let i = L(n.tagName, t);
 		(i === "rename" || i === "free") && o[t] !== r && (await e.update(n, { attributes: { [t]: r } }), o = {
 			...o,
 			[t]: r
 		});
 	}
-	let s = await L(e, {
+	let s = await R(e, {
 		parentRef: a,
 		childTag: n.tagName,
 		candidate: o,
@@ -26612,7 +26636,7 @@ async function R(e, t) {
 	});
 	if (!s) return { status: "ok" };
 	let c = s.fields.find((e) => {
-		let t = I(n.tagName, e);
+		let t = L(n.tagName, e);
 		return t === "rename" || t === "free";
 	});
 	if (!c) return {
@@ -26640,8 +26664,11 @@ var An = {
 	scope: "tree",
 	attributes: ["templateUuid", "originUuid"]
 };
-async function z(e, t) {
-	let { sourceQuery: n, ref: i, targetParent: a, omit: o, retagRoot: s, strip: c = An } = t, l = await n.getTree(i, { omit: o });
+async function B(e, t) {
+	let { sourceQuery: n, ref: i, targetParent: a, omit: o, retagRoot: s, strip: c = An } = t, l = await n.getTree(i, {
+		omit: o,
+		unwrap: []
+	});
 	if (!l) return;
 	let u = s && l.tagName === s.from ? {
 		...l,
@@ -26654,12 +26681,12 @@ async function z(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/transplant/transaction/primitives/add-children-to.ts
-async function B(e, t) {
+async function V(e, t) {
 	let { sourceQuery: n, source: r, target: i, omit: a, strip: o } = t, s = await n.any.getRecord(r);
 	if (!s) return [];
 	let c = [];
 	for (let t of s.children) {
-		let r = await z(e, {
+		let r = await B(e, {
 			sourceQuery: n,
 			ref: {
 				tagName: t.tagName,
@@ -26675,14 +26702,14 @@ async function B(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/transplant/transaction/deep.ts
-async function V(e, t) {
+async function H(e, t) {
 	let { sourceQuery: n, ref: r, targetParent: i, withTypes: a = !0, omit: o, strip: s = !1, retagRoot: c } = t, l = await jn(e, {
 		sourceQuery: n,
 		ref: r,
 		targetParent: i
 	}), u, d;
 	if (l) {
-		d = await B(e, {
+		d = await V(e, {
 			sourceQuery: n,
 			source: r,
 			target: l,
@@ -26693,7 +26720,7 @@ async function V(e, t) {
 		if (!t) throw Error(`transplant.deep: merge target vanished: ${l.id}`);
 		u = t;
 	} else {
-		let t = await z(e, {
+		let t = await B(e, {
 			sourceQuery: n,
 			ref: r,
 			targetParent: i,
@@ -26707,11 +26734,15 @@ async function V(e, t) {
 	let f = /* @__PURE__ */ new Map();
 	if (a) {
 		let t = await Mn(n, r);
-		t.length > 0 && (f = (await At(e, {
-			sourceQuery: n,
-			records: t,
-			cloneMappings: d
-		})).idRemap);
+		if (t.length > 0) {
+			let r = typeof a == "object" ? a.keepNameFrom : void 0;
+			f = (await kt(e, {
+				sourceQuery: n,
+				records: t,
+				cloneMappings: d,
+				keepNameTypesFrom: r
+			})).idRemap;
+		}
 	}
 	return {
 		record: u,
@@ -26777,7 +26808,7 @@ async function Pn(e, t) {
 		alreadyCloned: s
 	}), u = [];
 	for (let t of l) {
-		let r = await z(e, {
+		let r = await B(e, {
 			sourceQuery: n,
 			ref: t,
 			targetParent: await o(t),
@@ -26805,7 +26836,7 @@ async function Fn(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/transplant/transaction/resolve-structure-ref.ts
-async function H(e, t, n) {
+async function U(e, t, n) {
 	let r = (await e.findAncestors(t, { stopAtTagName: "Substation" })).find((e) => e.tagName in n);
 	o(r, {
 		key: "ELEMENT_NOT_FOUND",
@@ -26844,77 +26875,80 @@ function In(e) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/engine/reconcile.ts
 var Ln = new Set(Object.keys(T));
-async function U(e, t) {
-	let { sourceQuery: n, sourceRootRef: r, instanceRootRef: i, accepted: a, overrides: o } = t, s = await n.any.getTree(r), c = await e.any.getTree(i);
-	if (!s || !c) return;
-	let l = /* @__PURE__ */ new Map();
+async function W(e, t) {
+	let { sourceQuery: n, sourceRootRef: r, instanceRootRef: i, accepted: a, overrides: o, keepNameTypesFrom: s } = t, c = await n.any.getTree(r), l = await e.any.getTree(i);
+	if (!c || !l) return;
+	let u = /* @__PURE__ */ new Map();
 	await Hn(e, {
-		node: c,
-		index: l
+		node: l,
+		index: u
 	});
-	let u = /* @__PURE__ */ new Set();
+	let d = /* @__PURE__ */ new Set();
 	await Un(n, {
-		node: s,
-		out: u
+		node: c,
+		out: d
 	}), await Vn(e, {
 		sourceQuery: n,
-		instanceRecord: c,
-		sourceNode: s,
+		instanceRecord: l,
+		sourceNode: c,
 		accepted: a,
 		overrides: o
 	}), await Rn(e, {
 		sourceQuery: n,
-		sourceNode: s,
-		instanceParent: c,
-		index: l,
+		sourceNode: c,
+		instanceParent: l,
+		index: u,
 		accepted: a,
-		overrides: o
+		overrides: o,
+		keepNameTypesFrom: s
 	}), await zn(e, {
-		instanceNode: c,
-		sourceUuids: u,
+		instanceNode: l,
+		sourceUuids: d,
 		accepted: a
 	});
 }
 async function Rn(e, t) {
-	let { sourceQuery: n, sourceNode: r, instanceParent: i, index: o, accepted: s, overrides: c } = t, l = /* @__PURE__ */ new Set();
+	let { sourceQuery: n, sourceNode: r, instanceParent: i, index: o, accepted: s, overrides: c, keepNameTypesFrom: l } = t, u = /* @__PURE__ */ new Set();
 	for (let t of r.tree) {
-		let r = await n.any.getAttribute(t, { name: "uuid" }), u = (r ? o.get(r) : void 0) ?? (r ? void 0 : i.tree.find((e) => e.tagName === t.tagName && !l.has(e.id)));
-		if (u) {
-			l.add(u.id), await Vn(e, {
+		let r = await n.any.getAttribute(t, { name: "uuid" }), d = (r ? o.get(r) : void 0) ?? (r ? void 0 : i.tree.find((e) => e.tagName === t.tagName && !u.has(e.id)));
+		if (d) {
+			u.add(d.id), await Vn(e, {
 				sourceQuery: n,
-				instanceRecord: u,
+				instanceRecord: d,
 				sourceNode: t,
 				accepted: s,
 				overrides: c
 			}), await Rn(e, {
 				sourceQuery: n,
 				sourceNode: t,
-				instanceParent: u,
+				instanceParent: d,
 				index: o,
 				accepted: s,
-				overrides: c
+				overrides: c,
+				keepNameTypesFrom: l
 			});
 			continue;
 		}
 		if (s && !s.sourceIds.has(t.id)) continue;
-		let { recordMappings: d } = await V(e, {
+		let { recordMappings: f } = await H(e, {
 			sourceQuery: n,
 			ref: a(t),
 			targetParent: a(i),
-			strip: !1
+			strip: !1,
+			withTypes: { keepNameFrom: l }
 		});
-		await P(e, {
-			mappings: d,
+		await F(e, {
+			mappings: f,
 			mode: "stamp-template"
 		});
-		let f = d.find((e) => e.source.id === t.id);
-		f && await R(e, {
-			ref: f.target,
+		let p = f.find((e) => e.source.id === t.id);
+		p && await z(e, {
+			ref: p.target,
 			parentRef: a(i),
 			overrides: c?.get(t.id)
 		});
 	}
-	for (let t of i.tree) l.has(t.id) || Ln.has(t.tagName) && (await e.any.getAttribute(t, { name: "templateUuid" }) || s && !s.instanceIds.has(t.id) || await e.any.getRecord(t) && await e.any.delete(t));
+	for (let t of i.tree) u.has(t.id) || Ln.has(t.tagName) && (await e.any.getAttribute(t, { name: "templateUuid" }) || s && !s.instanceIds.has(t.id) || await e.any.getRecord(t) && await e.any.delete(t));
 }
 async function zn(e, t) {
 	let { instanceNode: n, sourceUuids: r, accepted: i } = t, a = [];
@@ -26943,9 +26977,9 @@ async function Vn(e, t) {
 	let { sourceQuery: n, instanceRecord: r, sourceNode: i, accepted: a, overrides: o } = t;
 	if (a && !a.sourceIds.has(i.id)) return;
 	let s = {
-		...F(await n.any.getAttributes(i)),
+		...I(await n.any.getAttributes(i)),
 		...o?.get(i.id)
-	}, c = F(await e.any.getAttributes(r)), l = {};
+	}, c = I(await e.any.getAttributes(r)), l = {};
 	for (let [e, t] of Object.entries(s)) c[e] !== t && (l[e] = t);
 	Object.keys(l).length > 0 && await e.any.update(r, { attributes: l });
 }
@@ -26976,7 +27010,7 @@ function Gn(e) {
 function Kn(e) {
 	return Wn(e.decisions.get(e.groupId)) !== "skip";
 }
-function W(e) {
+function G(e) {
 	let { groups: t, decisions: n } = e, r = /* @__PURE__ */ new Map();
 	for (let e of t) {
 		let t = n.get(e.id);
@@ -26996,7 +27030,7 @@ function qn(e) {
 		decisions: n
 	}), { detail: `decision accepts group "${e.id}" but its dependency "${t}" is skipped` });
 }
-function G(e) {
+function K(e) {
 	let { groups: t, decisions: n } = e, r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
 	for (let e of t) if (Kn({
 		groupId: e.id,
@@ -27057,10 +27091,10 @@ async function Qn(e, t) {
 	});
 }
 async function $n(e, t) {
-	let [n] = await K(e, t);
+	let [n] = await q(e, t);
 	return n;
 }
-async function K(e, t) {
+async function q(e, t) {
 	let { tagName: n, sourceUuid: r } = t;
 	if (!r) return [];
 	let i = await e.any.getRecordsByTagName(n), a = [];
@@ -27077,7 +27111,7 @@ async function er(e, t) {
 			sourceUuid: r
 		});
 		if (i) {
-			await U(e, {
+			await W(e, {
 				sourceQuery: n,
 				sourceRootRef: t,
 				instanceRootRef: i,
@@ -27086,13 +27120,13 @@ async function er(e, t) {
 			continue;
 		}
 		if (o && t.id && !o.sourceIds.has(t.id)) continue;
-		let s = await z(e, {
+		let s = await B(e, {
 			sourceQuery: n,
 			ref: t,
-			targetParent: await H(n, t, a),
+			targetParent: await U(n, t, a),
 			strip: !1
 		});
-		s && await P(e, {
+		s && await F(e, {
 			mappings: s.mappings,
 			mode: "stamp-template"
 		});
@@ -27112,7 +27146,7 @@ async function er(e, t) {
 var tr = ["Variable", "BehaviorDescription"];
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/cross-cutting/applied-satellites.ts
-async function q(e, t) {
+async function J(e, t) {
 	let { primaryRef: n } = t, r = await e.any.getTree(n);
 	if (!r) return [];
 	let i = /* @__PURE__ */ new Set(), o = [];
@@ -27123,7 +27157,7 @@ async function q(e, t) {
 	});
 	let s = /* @__PURE__ */ new Set(), c = [];
 	for (let t of o) for (let n of tr) {
-		let r = await k.query.findRefsPointingTo(e, {
+		let r = await A.query.findRefsPointingTo(e, {
 			target: a(t),
 			containerTagName: n
 		});
@@ -27146,15 +27180,15 @@ async function rr(e, t) {
 	let { sourceQuery: n, primaryRef: r, instancePrimaryRef: i, structure: a, accepted: o } = t;
 	await er(e, {
 		sourceQuery: n,
-		satelliteRefs: await q(n, { primaryRef: r }),
-		instanceSatelliteRefs: i ? await q(e, { primaryRef: i }) : [],
+		satelliteRefs: await J(n, { primaryRef: r }),
+		instanceSatelliteRefs: i ? await J(e, { primaryRef: i }) : [],
 		structure: a,
 		accepted: o
 	});
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/instantiate/transaction/resolve-target-structure.ts
-async function J(e, t) {
+async function Y(e, t) {
 	let n = await e.getRecord(t);
 	o(n, {
 		key: "ELEMENT_NOT_FOUND",
@@ -27166,11 +27200,11 @@ async function J(e, t) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/cross-cutting/clone-applied-satellites.ts
 async function ir(e, t) {
-	let { sourceQuery: n, primaryRef: r, structure: i, strip: a = !0 } = t, o = await q(n, { primaryRef: r }), s = [];
+	let { sourceQuery: n, primaryRef: r, structure: i, strip: a = !0 } = t, o = await J(n, { primaryRef: r }), s = [];
 	for (let t of o) {
 		let r = await ar(e, n, t);
 		if (r) {
-			let i = await B(e, {
+			let i = await V(e, {
 				sourceQuery: n,
 				source: t,
 				target: r,
@@ -27179,10 +27213,10 @@ async function ir(e, t) {
 			s.push(...i);
 			continue;
 		}
-		let o = await z(e, {
+		let o = await B(e, {
 			sourceQuery: n,
 			ref: t,
-			targetParent: await H(n, t, i),
+			targetParent: await U(n, t, i),
 			...a ? {} : { strip: !1 }
 		});
 		o && s.push(...o.mappings);
@@ -27206,7 +27240,7 @@ async function ar(e, t, n) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/layers/function/clone-function.ts
 async function or(e, t) {
-	let { sourceQuery: n, functionRef: r, targetParentRef: i, omit: a, stripRootAttributes: o } = t, { recordMappings: s } = await V(e, {
+	let { sourceQuery: n, functionRef: r, targetParentRef: i, omit: a, stripRootAttributes: o, keepNameTypesFrom: s } = t, { recordMappings: c } = await H(e, {
 		sourceQuery: n,
 		ref: r,
 		targetParent: i,
@@ -27219,11 +27253,11 @@ async function or(e, t) {
 			from: "SubFunction",
 			to: "Function"
 		},
-		withTypes: !0
+		withTypes: { keepNameFrom: s }
 	});
-	return s;
+	return c;
 }
-async function Y(e, t) {
+async function X(e, t) {
 	let { sourceQuery: n, functionRef: r, structure: i, stripCategoriesUuid: a = !0 } = t, o = await sr(n, r), s = [];
 	for (let t of o) {
 		let r = {
@@ -27231,7 +27265,7 @@ async function Y(e, t) {
 			id: t
 		}, o = await lr(e, n, t);
 		if (o) {
-			let t = await B(e, {
+			let t = await V(e, {
 				sourceQuery: n,
 				source: r,
 				target: o,
@@ -27240,10 +27274,10 @@ async function Y(e, t) {
 			s.push(...t);
 			continue;
 		}
-		let c = await z(e, {
+		let c = await B(e, {
 			sourceQuery: n,
 			ref: r,
-			targetParent: await H(n, r, i),
+			targetParent: await U(n, r, i),
 			...a ? {} : { strip: !1 }
 		});
 		c && s.push(...c.mappings);
@@ -27256,12 +27290,12 @@ async function sr(e, t) {
 	return r;
 }
 async function cr(e, t) {
-	let n = await k.query.findRefsPointingTo(e, {
+	let n = await A.query.findRefsPointingTo(e, {
 		target: t,
 		containerTagName: "FunctionCategory"
 	}), { SubFunction: r = [] } = await e.findDescendants(t, { collect: "SubFunction" });
 	for (let t of r) {
-		let r = await k.query.findRefsPointingTo(e, {
+		let r = await A.query.findRefsPointingTo(e, {
 			target: {
 				tagName: "SubFunction",
 				id: t.id
@@ -27294,7 +27328,7 @@ async function lr(e, t, n) {
 var ur = ["FunctionCategory"];
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/layers/function/satellites.ts
-async function X(e, t) {
+async function Z(e, t) {
 	let { primaryRef: n } = t, r = [n], { SubFunction: i = [] } = await e.findDescendants(n, { collect: "SubFunction" });
 	for (let e of i) r.push({
 		tagName: "SubFunction",
@@ -27302,7 +27336,7 @@ async function X(e, t) {
 	});
 	let o = /* @__PURE__ */ new Set(), s = [];
 	for (let t of r) for (let n of ur) {
-		let r = await k.query.findRefsPointingTo(e, {
+		let r = await A.query.findRefsPointingTo(e, {
 			target: t,
 			containerTagName: n
 		});
@@ -27313,7 +27347,7 @@ async function X(e, t) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/instantiate/transaction/fsd.ts
 async function dr(e, t) {
-	let { sourceQuery: n, functionRef: r, targetParent: i, overrides: a } = t, { recordMappings: o } = await V(e, {
+	let { sourceQuery: n, functionRef: r, targetParent: i, overrides: a, keepNameTypesFrom: o } = t, { recordMappings: s } = await H(e, {
 		sourceQuery: n,
 		ref: r,
 		targetParent: i,
@@ -27321,97 +27355,99 @@ async function dr(e, t) {
 		retagRoot: i.tagName === "Function" || i.tagName === "SubFunction" ? {
 			from: "Function",
 			to: "SubFunction"
-		} : void 0
-	}), s = await J(e, i), c = await Y(e, {
+		} : void 0,
+		withTypes: { keepNameFrom: o }
+	}), c = await Y(e, i), l = await X(e, {
 		sourceQuery: n,
 		functionRef: r,
-		structure: s,
+		structure: c,
 		stripCategoriesUuid: !1
-	}), l = await ir(e, {
+	}), u = await ir(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		structure: s,
+		structure: c,
 		strip: !1
 	});
-	await P(e, {
+	await F(e, {
 		mappings: [
-			...o,
-			...c,
-			...l
+			...s,
+			...l,
+			...u
 		],
 		mode: "stamp-template"
 	});
-	let u = o.find((e) => e.source.id === r.id);
-	if (!u) throw Error(`instantiate.fsd: cloned root not found for ${r.tagName}#${r.id}`);
-	let d = u.target;
-	return await R(e, {
-		ref: d,
+	let d = s.find((e) => e.source.id === r.id);
+	if (!d) throw Error(`instantiate.fsd: cloned root not found for ${r.tagName}#${r.id}`);
+	let f = d.target;
+	return await z(e, {
+		ref: f,
 		parentRef: i,
 		overrides: a?.get(r.id)
-	}), await lt(e, {
+	}), await ct(e, {
 		sourceQuery: n,
-		targetRoot: d,
+		targetRoot: f,
 		fileType: "FSD"
 	}), {
-		functionRef: d,
-		recordMappings: o
+		functionRef: f,
+		recordMappings: s
 	};
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/layers/application/clone-application.ts
 async function fr(e, t) {
-	let { sourceQuery: n, applicationRef: r, structure: i, omit: a } = t, o = /* @__PURE__ */ new Map(), s = [], c = await Nn(e, {
+	let { sourceQuery: n, applicationRef: r, structure: i, omit: a, keepNameTypesFrom: o } = t, s = /* @__PURE__ */ new Map(), c = [], l = await Nn(e, {
 		sourceQuery: n,
 		scopeRef: r,
 		refTagName: "FunctionRef",
 		targetTagName: "Function"
 	});
-	for (let t of c) {
+	for (let t of l) {
 		let r = await or(e, {
 			sourceQuery: n,
 			functionRef: t,
-			targetParentRef: await H(n, t, i),
-			omit: a
+			targetParentRef: await U(n, t, i),
+			omit: a,
+			keepNameTypesFrom: o
 		});
-		s.push(...r);
-		for (let e of r) e.source.id && o.set(e.source.id, e.target);
+		c.push(...r);
+		for (let e of r) e.source.id && s.set(e.source.id, e.target);
 	}
-	for (let t of c) {
-		let r = await Y(e, {
+	for (let t of l) {
+		let r = await X(e, {
 			sourceQuery: n,
 			functionRef: t,
 			structure: i,
 			stripCategoriesUuid: !1
 		});
-		s.push(...r);
+		c.push(...r);
 	}
-	let l = await pr(e, {
+	let u = await pr(e, {
 		sourceQuery: n,
 		applicationRef: r
 	});
-	for (let e of l) o.set(e.sourceId, e.existingRef);
-	let u = new Set(["FunctionRef", "FunctionCategoryRef"]), d = await Fn(e, {
+	for (let e of u) s.set(e.sourceId, e.existingRef);
+	let d = new Set(["FunctionRef", "FunctionCategoryRef"]), f = await Fn(e, {
 		sourceQuery: n,
 		scopeTagName: "Application",
 		scopeRef: r,
 		resolveTargetParent: In({
 			sourceQuery: n,
 			structure: i,
-			cloneIndex: o
+			cloneIndex: s
 		}),
-		alreadyCloned: new Set(o.keys()),
-		skip: u,
+		alreadyCloned: new Set(s.keys()),
+		skip: d,
 		omit: a
 	});
-	s.push(...d);
-	let f = await z(e, {
+	c.push(...f);
+	let p = await B(e, {
 		sourceQuery: n,
 		ref: r,
-		targetParent: await H(n, r, i),
+		targetParent: await U(n, r, i),
 		omit: a
 	});
-	f && s.push(...f.mappings);
-	for (let t of l) {
+	p && c.push(...p.mappings);
+	for (let t of u) {
 		let n = await e.findByAttributes({
 			tagName: "AllocationRoleRef",
 			attributes: { allocationRoleUuid: t.sourceUuid }
@@ -27421,7 +27457,7 @@ async function fr(e, t) {
 			id: r.id
 		}, { attributes: { allocationRoleUuid: t.existingUuid } });
 	}
-	return s;
+	return c;
 }
 async function pr(e, t) {
 	let { sourceQuery: n, applicationRef: r } = t, { AllocationRoleRef: i = [] } = await n.findDescendants(r, { collect: "AllocationRoleRef" }), a = [], o = /* @__PURE__ */ new Set();
@@ -27447,7 +27483,7 @@ async function pr(e, t) {
 			tagName: "AllocationRole",
 			id: c.id
 		};
-		await B(e, {
+		await V(e, {
 			sourceQuery: n,
 			source: {
 				tagName: "AllocationRole",
@@ -27473,7 +27509,7 @@ var mr = [{
 }];
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/layers/application/satellites.ts
-async function Z(e, t) {
+async function Q(e, t) {
 	let { applicationRef: n } = t, r = await e.any.getTree(n);
 	if (!r) return [];
 	let i = /* @__PURE__ */ new Set(), o = [];
@@ -27511,58 +27547,59 @@ async function hr(e, t) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/instantiate/transaction/asd.ts
 async function gr(e, t) {
-	let { sourceQuery: n, applicationRef: r, targetParent: i, overrides: a } = t, o = await J(e, i), s = await Nn(e, {
+	let { sourceQuery: n, applicationRef: r, targetParent: i, overrides: a, keepNameTypesFrom: o } = t, s = await Y(e, i), c = await Nn(e, {
 		sourceQuery: n,
 		scopeRef: r,
 		refTagName: "FunctionRef",
 		targetTagName: "Function"
-	}), c = await fr(e, {
+	}), l = await fr(e, {
 		sourceQuery: n,
 		applicationRef: r,
-		structure: o
-	}), l = await ir(e, {
+		structure: s,
+		keepNameTypesFrom: o
+	}), u = await ir(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		structure: o,
+		structure: s,
 		strip: !1
 	});
-	await P(e, {
-		mappings: [...c, ...l],
+	await F(e, {
+		mappings: [...l, ...u],
 		mode: "stamp-template"
 	});
-	for (let t of s) {
-		let r = c.find((e) => e.source.id === t.id);
+	for (let t of c) {
+		let r = l.find((e) => e.source.id === t.id);
 		if (!r) continue;
-		let i = await H(n, t, o);
-		await R(e, {
+		let i = await U(n, t, s);
+		await z(e, {
 			ref: r.target,
 			parentRef: i,
 			overrides: a?.get(t.id)
 		});
 	}
-	let u = c.find((e) => e.source.id === r.id);
-	if (!u) throw Error(`instantiate.asd: cloned Application not found for ${r.id}`);
-	let d = await H(n, r, o);
-	await R(e, {
-		ref: u.target,
-		parentRef: d,
+	let d = l.find((e) => e.source.id === r.id);
+	if (!d) throw Error(`instantiate.asd: cloned Application not found for ${r.id}`);
+	let f = await U(n, r, s);
+	await z(e, {
+		ref: d.target,
+		parentRef: f,
 		overrides: a?.get(r.id)
-	}), await lt(e, {
+	}), await ct(e, {
 		sourceQuery: n,
-		targetRoot: u.target,
+		targetRoot: d.target,
 		fileType: "ASD"
 	});
-	let f = s.map((e) => c.find((t) => t.source.id === e.id)?.target).filter((e) => !!e);
+	let p = c.map((e) => l.find((t) => t.source.id === e.id)?.target).filter((e) => !!e);
 	return {
-		applicationRef: u.target,
-		composedFunctionRefs: f,
-		recordMappings: c
+		applicationRef: d.target,
+		composedFunctionRefs: p,
+		recordMappings: l
 	};
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/update/transaction/function-satellites.ts
 async function _r(e, t) {
-	let { sourceQuery: n, functionRef: r, instanceRef: i, targetParent: a, accepted: o } = t, s = await X(n, { primaryRef: r }), c = !1;
+	let { sourceQuery: n, functionRef: r, instanceRef: i, targetParent: a, accepted: o } = t, s = await Z(n, { primaryRef: r }), c = !1;
 	for (let t of s) {
 		let { uuid: r } = await n.any.getAttributes(t), i = await $n(e, {
 			tagName: t.tagName,
@@ -27572,23 +27609,23 @@ async function _r(e, t) {
 			c = !0;
 			continue;
 		}
-		await U(e, {
+		await W(e, {
 			sourceQuery: n,
 			sourceRootRef: t,
 			instanceRootRef: i,
 			accepted: o
 		});
 	}
-	c && (!o || o.sourceIds.has(r.id)) && await P(e, {
-		mappings: await Y(e, {
+	c && (!o || o.sourceIds.has(r.id)) && await F(e, {
+		mappings: await X(e, {
 			sourceQuery: n,
 			functionRef: r,
-			structure: await J(e, a),
+			structure: await Y(e, a),
 			stripCategoriesUuid: !1
 		}),
 		mode: "stamp-template"
 	});
-	let l = await X(e, { primaryRef: {
+	let l = await Z(e, { primaryRef: {
 		tagName: "Function",
 		id: i.id
 	} });
@@ -27605,17 +27642,17 @@ async function _r(e, t) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/update/transaction/fsd.ts
 async function vr(e, t) {
-	let { sourceQuery: n, functionRef: r, targetParent: i, scenario: a, report: o, decisions: s } = t, { uuid: c } = await n.getAttributes(r), l = a === "instantiate" ? [] : await Zn(e, {
+	let { sourceQuery: n, functionRef: r, targetParent: i, scenario: a, report: o, decisions: s, keepNameTypesFrom: c } = t, { uuid: l } = await n.getAttributes(r), u = a === "instantiate" ? [] : await Zn(e, {
 		targetParent: i,
 		tagName: "Function",
-		sourceUuid: c
-	}), u = o?.groups ?? [];
-	if (l.length === 0) {
-		let t = s ? G({
-			groups: u,
+		sourceUuid: l
+	}), d = o?.groups ?? [];
+	if (u.length === 0) {
+		let t = s ? K({
+			groups: d,
 			decisions: s
-		}) : void 0, a = s ? W({
-			groups: u,
+		}) : void 0, a = s ? G({
+			groups: d,
 			decisions: s
 		}) : void 0;
 		if (t && !t.sourceIds.has(r.id)) return [];
@@ -27623,23 +27660,25 @@ async function vr(e, t) {
 			sourceQuery: n,
 			functionRef: r,
 			targetParent: i,
-			overrides: a
+			overrides: a,
+			keepNameTypesFrom: c
 		});
 		return [o];
 	}
-	let d = await J(e, i);
-	for (let t of l) {
+	let f = await Y(e, i);
+	for (let t of u) {
 		let { instanceAccepted: a, instanceOverrides: o } = yr({
 			instanceId: t.id,
-			groups: u,
+			groups: d,
 			decisions: s
 		});
-		await U(e, {
+		await W(e, {
 			sourceQuery: n,
 			sourceRootRef: r,
 			instanceRootRef: t,
 			accepted: a,
-			overrides: o
+			overrides: o,
+			keepNameTypesFrom: c
 		}), await _r(e, {
 			sourceQuery: n,
 			functionRef: r,
@@ -27653,11 +27692,11 @@ async function vr(e, t) {
 				tagName: "Function",
 				id: t.id
 			},
-			structure: d,
+			structure: f,
 			accepted: a
 		});
 	}
-	return l.map((e) => ({
+	return u.map((e) => ({
 		tagName: "Function",
 		id: e.id
 	}));
@@ -27670,11 +27709,11 @@ function yr(e) {
 	};
 	let i = n.filter((e) => e.instanceScopeId === t);
 	return {
-		instanceAccepted: G({
+		instanceAccepted: K({
 			groups: i,
 			decisions: r
 		}),
-		instanceOverrides: W({
+		instanceOverrides: G({
 			groups: i,
 			decisions: r
 		})
@@ -27683,56 +27722,58 @@ function yr(e) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/update/transaction/asd.ts
 async function br(e, t) {
-	let { sourceQuery: n, applicationRef: r, targetParent: i, scenario: a, report: o, decisions: s } = t, { uuid: c } = await n.getAttributes(r), l = a === "instantiate" ? [] : await K(e, {
+	let { sourceQuery: n, applicationRef: r, targetParent: i, scenario: a, report: o, decisions: s, keepNameTypesFrom: c } = t, { uuid: l } = await n.getAttributes(r), u = a === "instantiate" ? [] : await q(e, {
 		tagName: "Application",
-		sourceUuid: c
-	}), u = o?.groups ?? [];
-	if (l.length === 0) {
-		let t = s ? G({
-			groups: u,
+		sourceUuid: l
+	}), d = o?.groups ?? [];
+	if (u.length === 0) {
+		let t = s ? K({
+			groups: d,
 			decisions: s
-		}) : void 0, a = s ? W({
-			groups: u,
+		}) : void 0, a = s ? G({
+			groups: d,
 			decisions: s
 		}) : void 0;
 		if (t && !t.sourceIds.has(r.id)) return {
 			applications: [],
 			functions: []
 		};
-		let { applicationRef: o, composedFunctionRefs: c } = await gr(e, {
+		let { applicationRef: o, composedFunctionRefs: l } = await gr(e, {
 			sourceQuery: n,
 			applicationRef: r,
 			targetParent: i,
-			overrides: a
+			overrides: a,
+			keepNameTypesFrom: c
 		});
 		return {
 			applications: [o],
-			functions: c
+			functions: l
 		};
 	}
-	let d = await J(e, i), f = await Z(n, { applicationRef: r });
-	for (let t of l) {
-		let i = u.filter((e) => e.instanceScopeId === t.id), a = s ? G({
+	let f = await Y(e, i), p = await Q(n, { applicationRef: r });
+	for (let t of u) {
+		let i = d.filter((e) => e.instanceScopeId === t.id), a = s ? K({
 			groups: i,
 			decisions: s
-		}) : void 0, o = s ? W({
+		}) : void 0, o = s ? G({
 			groups: i,
 			decisions: s
-		}) : void 0, c = await Z(e, { applicationRef: {
+		}) : void 0, l = await Q(e, { applicationRef: {
 			tagName: "Application",
 			id: t.id
 		} });
-		await U(e, {
+		await W(e, {
 			sourceQuery: n,
 			sourceRootRef: r,
 			instanceRootRef: t,
 			accepted: a,
-			overrides: o
+			overrides: o,
+			keepNameTypesFrom: c
 		}), await er(e, {
 			sourceQuery: n,
-			satelliteRefs: f,
-			instanceSatelliteRefs: c,
-			structure: d,
+			satelliteRefs: p,
+			instanceSatelliteRefs: l,
+			structure: f,
 			accepted: a
 		}), await rr(e, {
 			sourceQuery: n,
@@ -27741,31 +27782,32 @@ async function br(e, t) {
 				tagName: "Application",
 				id: t.id
 			},
-			structure: d,
+			structure: f,
 			accepted: a
 		});
 	}
-	let p = await xr(e, {
+	let m = await xr(e, {
 		sourceQuery: n,
 		applicationRef: r,
 		targetParent: i,
 		scenario: a,
 		report: o,
-		decisions: s
+		decisions: s,
+		keepNameTypesFrom: c
 	});
 	return {
-		applications: l.map((e) => ({
+		applications: u.map((e) => ({
 			tagName: "Application",
 			id: e.id
 		})),
-		functions: p
+		functions: m
 	};
 }
 async function xr(e, t) {
-	let { sourceQuery: n, applicationRef: r, targetParent: i, scenario: a, report: o, decisions: s } = t, c = await Yn(n, r);
-	if (c.size === 0) return [];
-	let l = await J(e, i), u = [];
-	for (let t of c) {
+	let { sourceQuery: n, applicationRef: r, targetParent: i, scenario: a, report: o, decisions: s, keepNameTypesFrom: c } = t, l = await Yn(n, r);
+	if (l.size === 0) return [];
+	let u = await Y(e, i), d = [];
+	for (let t of l) {
 		let [r] = await n.any.findByAttributes({
 			tagName: "Function",
 			attributes: { uuid: t }
@@ -27774,17 +27816,18 @@ async function xr(e, t) {
 		let i = {
 			tagName: "Function",
 			id: r.id
-		}, c = await vr(e, {
+		}, l = await vr(e, {
 			sourceQuery: n,
 			functionRef: i,
-			targetParent: await H(n, i, l),
+			targetParent: await U(n, i, u),
 			scenario: a,
 			report: o,
-			decisions: s
+			decisions: s,
+			keepNameTypesFrom: c
 		});
-		u.push(...c);
+		d.push(...l);
 	}
-	return u;
+	return d;
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/update/index.ts
@@ -27829,7 +27872,8 @@ async function Tr(e, t, n, r) {
 			targetParent: t.anchor,
 			scenario: t.scenario,
 			report: n,
-			decisions: r
+			decisions: r,
+			keepNameTypesFrom: t.keepNameTypesFrom
 		})
 	};
 	let { applications: i, functions: a } = await br(e, {
@@ -27838,7 +27882,8 @@ async function Tr(e, t, n, r) {
 		targetParent: t.anchor,
 		scenario: t.scenario,
 		report: n,
-		decisions: r
+		decisions: r,
+		keepNameTypesFrom: t.keepNameTypesFrom
 	});
 	return {
 		verb: "asd",
@@ -27868,7 +27913,7 @@ async function Er(e) {
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/extract/transaction/post-extraction-cleanup.ts
 async function Dr(e) {
-	await A.transaction.orphanUuidRefs(e), await A.transaction.resetLNode(e), await A.transaction.pruneEmptyContainers(e);
+	await j.transaction.orphanUuidRefs(e), await j.transaction.resetLNode(e), await j.transaction.pruneEmptyContainers(e);
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/layers/omit-filters.ts
@@ -27941,7 +27986,7 @@ async function jr(e, t) {
 		targetParentRef: c,
 		omit: Ar,
 		stripRootAttributes: ["templateUuid"]
-	}), await Y(e, {
+	}), await X(e, {
 		sourceQuery: n,
 		functionRef: r,
 		structure: s
@@ -27956,7 +28001,7 @@ var Mr = /* @__PURE__ */ c({
 }), Nr = /* @__PURE__ */ c({
 	asd: () => gr,
 	fsd: () => dr,
-	resolveTargetStructure: () => J
+	resolveTargetStructure: () => Y
 });
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/mark-placement-conflicts.ts
@@ -27967,7 +28012,7 @@ async function Pr(e, t, n) {
 		if (!i) continue;
 		let a = await t.sourceQuery.getAttributes(i), o = a.uuid;
 		if (!o) continue;
-		let s = r.primary.tagName, [c] = await K(e, {
+		let s = r.primary.tagName, [c] = await q(e, {
 			tagName: s,
 			sourceUuid: o
 		});
@@ -27980,7 +28025,7 @@ async function Pr(e, t, n) {
 			let n = {
 				tagName: t.tagName,
 				id: t.id
-			}, r = await L(e, {
+			}, r = await R(e, {
 				parentRef: n,
 				childTag: s,
 				candidate: a
@@ -27991,7 +28036,7 @@ async function Pr(e, t, n) {
 			}
 		}
 		if (!d || !u) continue;
-		let f = d.fields.find((e) => bn(I(s, e)));
+		let f = d.fields.find((e) => bn(L(s, e)));
 		if (f) {
 			let t = await kn(e, {
 				parentRef: u,
@@ -28046,8 +28091,8 @@ async function Ir(e, t) {
 	return Fr(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		satelliteRefs: await q(n, { primaryRef: r }),
-		instanceSatelliteRefs: i ? await q(e, { primaryRef: i }) : [],
+		satelliteRefs: await J(n, { primaryRef: r }),
+		instanceSatelliteRefs: i ? await J(e, { primaryRef: i }) : [],
 		report: a
 	});
 }
@@ -28058,8 +28103,8 @@ async function Lr(e, t) {
 	return Fr(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		satelliteRefs: await X(n, { primaryRef: r }),
-		instanceSatelliteRefs: i ? await X(e, { primaryRef: {
+		satelliteRefs: await Z(n, { primaryRef: r }),
+		instanceSatelliteRefs: i ? await Z(e, { primaryRef: {
 			tagName: "Function",
 			id: i.id
 		} }) : [],
@@ -28068,33 +28113,31 @@ async function Lr(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/query/report-function.ts
-async function Q(e, t) {
-	let { sourceQuery: n, functionRef: r, instance: i } = t, a = await sn({
-		sourceQuery: n,
-		targetQuery: e,
-		sourceRootRef: r,
-		instanceRootRef: i
-	});
-	if (!i) return a;
-	let o = await Lr(e, {
+async function Rr(e, t) {
+	let { sourceQuery: n, functionRef: r, instance: i } = t, a = await Lr(e, {
 		sourceQuery: n,
 		functionRef: r,
 		instance: i,
-		report: a
+		report: await sn({
+			sourceQuery: n,
+			targetQuery: e,
+			sourceRootRef: r,
+			instanceRootRef: i
+		})
 	});
 	return Ir(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		instancePrimaryRef: {
+		instancePrimaryRef: i ? {
 			tagName: "Function",
 			id: i.id
-		},
-		report: o
+		} : void 0,
+		report: a
 	});
 }
 //#endregion
 //#region src/v2019C1/extensions/presentation/constants/title.ts
-var Rr = {
+var zr = {
 	LNode: {
 		compact: [
 			"prefix",
@@ -28188,23 +28231,23 @@ async function $(e, t, n = {}) {
 		title: "",
 		labels: {}
 	} : "";
-	let i = r.tagName, a = n.mode ?? "compact", o = await e.any.getAttributes(r), s = Rr[i], c = zr({
+	let i = r.tagName, a = n.mode ?? "compact", o = await e.any.getAttributes(r), s = zr[i], c = Br({
 		tag: i,
 		spec: s,
 		mode: a,
 		attributes: o,
-		specAttributes: s?.attributesFrom ? await Br(e, r, s.attributesFrom) : o,
+		specAttributes: s?.attributesFrom ? await Vr(e, r, s.attributesFrom) : o,
 		value: r.value
 	});
 	return n.withLabels ? {
 		title: c,
-		labels: await Vr(e, r)
+		labels: await Hr(e, r)
 	} : c;
 }
-function zr(e) {
+function Br(e) {
 	let { tag: t, spec: n, mode: r, attributes: i, specAttributes: a, value: o } = e;
 	if (n) {
-		let e = Wr(n, a, r);
+		let e = Gr(n, a, r);
 		if (e) return e;
 	}
 	let s = (o ?? "").trim();
@@ -28212,14 +28255,14 @@ function zr(e) {
 	let c = g[t]?.attributes?.identityFields, l = c?.find((e) => e === "name" || e === "id") ?? c?.[0];
 	return l && i[l] ? i[l] : i.name || t;
 }
-async function Br(e, t, n) {
+async function Vr(e, t, n) {
 	let [r] = await e.any.getChildren(t, n);
 	return r ? e.any.getAttributes(r) : {};
 }
-async function Vr(e, t) {
-	return Ur(await Hr(e, t));
-}
 async function Hr(e, t) {
+	return Wr(await Ur(e, t));
+}
+async function Ur(e, t) {
 	let n = [], r = await e.any.getChildren(t, "Labels");
 	for (let t of r) {
 		let r = await e.any.getChildren(t, "Label");
@@ -28234,48 +28277,48 @@ async function Hr(e, t) {
 	}
 	return n;
 }
-function Ur(e) {
+function Wr(e) {
 	let t = {};
 	for (let { lang: n, id: r, text: i } of e) (t[n] ??= {})[r] = i;
 	return t;
 }
-function Wr(e, t, n) {
+function Gr(e, t, n) {
 	let r = n === "full" && e.full !== void 0, i = r ? e.full : e.compact, a = r ? e.fullSeparator ?? e.separator ?? "" : e.separator ?? "";
-	if (typeof i == "string") return Gr(i, t);
+	if (typeof i == "string") return Kr(i, t);
 	let o = i.map((e) => t[e]).filter(Boolean);
 	return o.length > 0 ? o.join(a) : "";
 }
-function Gr(e, t) {
+function Kr(e, t) {
 	return e.replace(/\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g, (e, n) => t[n] ?? "").replace(/\[\]/g, "").replace(/\(\)/g, "").split("/").map((e) => e.split(".").filter((e) => e !== "").join(".")).filter((e) => e !== "").join("/");
 }
 //#endregion
 //#region src/v2019C1/extensions/presentation/query/index.ts
-var Kr = /* @__PURE__ */ c({ extractElementTitle: () => $ });
+var qr = /* @__PURE__ */ c({ extractElementTitle: () => $ });
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/query/report-asd.ts
-async function qr(e, t) {
-	let { sourceQuery: n, applicationRef: r, scenario: i } = t, { uuid: a } = await n.getAttributes(r), o = i === "instantiate" ? [] : await K(e, {
+async function Jr(e, t) {
+	let { sourceQuery: n, applicationRef: r, scenario: i } = t, { uuid: a } = await n.getAttributes(r), o = i === "instantiate" ? [] : await q(e, {
 		tagName: "Application",
 		sourceUuid: a
 	}), s = [];
-	if (o.length === 0) s.push(await Jr(e, {
+	if (o.length === 0) s.push(await Yr(e, {
 		sourceQuery: n,
 		applicationRef: r,
 		instance: void 0
 	}));
-	else for (let t of o) s.push(await Jr(e, {
+	else for (let t of o) s.push(await Yr(e, {
 		sourceQuery: n,
 		applicationRef: r,
 		instance: t
 	}));
-	let c = await Yr(e, {
+	let c = await Xr(e, {
 		sourceQuery: n,
 		applicationRef: r,
 		scenario: i
 	});
 	return mn([...s, ...c]);
 }
-async function Jr(e, t) {
+async function Yr(e, t) {
 	let { sourceQuery: n, applicationRef: r, instance: i } = t, a = await sn({
 		sourceQuery: n,
 		targetQuery: e,
@@ -28285,8 +28328,8 @@ async function Jr(e, t) {
 	if (await Fr(e, {
 		sourceQuery: n,
 		primaryRef: r,
-		satelliteRefs: await Z(n, { applicationRef: r }),
-		instanceSatelliteRefs: i ? await Z(e, { applicationRef: {
+		satelliteRefs: await Q(n, { applicationRef: r }),
+		instanceSatelliteRefs: i ? await Q(e, { applicationRef: {
 			tagName: "Application",
 			id: i.id
 		} }) : [],
@@ -28305,7 +28348,7 @@ async function Jr(e, t) {
 	}
 	return a;
 }
-async function Yr(e, t) {
+async function Xr(e, t) {
 	let { sourceQuery: n, applicationRef: r, scenario: i } = t, a = await Yn(n, r), o = [];
 	for (let t of a) {
 		let [r] = await n.any.findByAttributes({
@@ -28316,12 +28359,12 @@ async function Yr(e, t) {
 		let a = {
 			tagName: "Function",
 			id: r.id
-		}, s = i === "instantiate" ? [] : await K(e, {
+		}, s = i === "instantiate" ? [] : await q(e, {
 			tagName: "Function",
 			sourceUuid: t
 		});
 		if (s.length === 0) {
-			o.push(await Q(e, {
+			o.push(await Rr(e, {
 				sourceQuery: n,
 				functionRef: a,
 				instance: void 0
@@ -28329,7 +28372,7 @@ async function Yr(e, t) {
 			continue;
 		}
 		for (let t of s) {
-			let r = await Q(e, {
+			let r = await Rr(e, {
 				sourceQuery: n,
 				functionRef: a,
 				instance: t
@@ -28342,20 +28385,20 @@ async function Yr(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/query/report-fsd.ts
-async function Xr(e, t) {
+async function Zr(e, t) {
 	let { sourceQuery: n, functionRef: r, targetParent: i, scenario: a } = t, { uuid: o } = await n.getAttributes(r), s = a === "instantiate" ? [] : await Zn(e, {
 		targetParent: i,
 		tagName: "Function",
 		sourceUuid: o
 	});
-	if (s.length === 0) return Q(e, {
+	if (s.length === 0) return Rr(e, {
 		sourceQuery: n,
 		functionRef: r,
 		instance: void 0
 	});
 	let c = [];
 	for (let t of s) {
-		let i = await Q(e, {
+		let i = await Rr(e, {
 			sourceQuery: n,
 			functionRef: r,
 			instance: t
@@ -28367,13 +28410,13 @@ async function Xr(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/report.ts
-async function Zr(e, t) {
-	let n = t.verb === "fsd" ? await Xr(e, {
+async function Qr(e, t) {
+	let n = t.verb === "fsd" ? await Zr(e, {
 		sourceQuery: t.sourceQuery,
 		functionRef: t.ref,
 		targetParent: t.anchor,
 		scenario: t.scenario
-	}) : await qr(e, {
+	}) : await Jr(e, {
 		sourceQuery: t.sourceQuery,
 		applicationRef: t.ref,
 		scenario: t.scenario
@@ -28383,7 +28426,7 @@ async function Zr(e, t) {
 }
 //#endregion
 //#region src/v2019C1/extensions/lifecycle/report/presentation-scope.ts
-function Qr(e) {
+function $r(e) {
 	switch (e.verb) {
 		case "fsd":
 		case "asd": return {
@@ -28395,28 +28438,28 @@ function Qr(e) {
 }
 //#endregion
 //#region src/v2019C1/extensions/index.ts
-var $r = {
-	cleanUp: A,
+var ei = {
+	cleanUp: j,
 	dataModel: Ht,
 	history: qt,
 	identity: Qt,
 	lifecycle: {
-		query: { report: Zr },
+		query: { report: Qr },
 		transaction: {
 			extract: Mr,
 			instantiate: Nr,
-			transplant: { deep: V },
+			transplant: { deep: H },
 			update: Sr,
 			apply: Cr
 		}
 	},
-	reference: k,
-	signature: { query: kt },
-	presentation: { query: Kr }
+	reference: A,
+	signature: { query: Ot },
+	presentation: { query: qr }
 };
 //#endregion
 //#region src/v2019C1/hooks/after-created/private-wrapper.ts
-async function ei(e) {
+async function ti(e) {
 	let { childRecord: t, parentRecord: n, query: r } = e;
 	if (t.namespace.prefix === b.namespaces.default.prefix) return [];
 	let i = n.tagName === "Private", a = n.namespace.prefix === b.namespaces.default.prefix;
@@ -28425,26 +28468,26 @@ async function ei(e) {
 		...n,
 		children: n.children.filter((e) => e.id !== t.id)
 	};
-	return i ? ti({
+	return i ? ni({
 		parentRecord: n,
 		childRecord: t,
 		query: r
-	}) : o ? ni({
+	}) : o ? ri({
 		existingPrivateRef: o,
 		parentRecord: n,
 		updatedParentRecord: s,
 		childRecord: t,
 		query: r
-	}) : (await r.findAncestors(n)).some((e) => e.tagName === "Private" && e.attributes.some((e) => e.name === "type" && e.value === t.namespace.prefix)) ? [] : ri({
+	}) : (await r.findAncestors(n)).some((e) => e.tagName === "Private" && e.attributes.some((e) => e.name === "type" && e.value === t.namespace.prefix)) ? [] : ii({
 		parentRecord: n,
 		updatedParentRecord: s,
 		childRecord: t
 	});
 }
-async function ti(e) {
+async function ni(e) {
 	let { parentRecord: t, childRecord: n, query: r } = e, a = t;
 	if (n.parent?.id === a.id && n.parent?.tagName === "Private") return [];
-	let s = await ii({
+	let s = await ai({
 		privateId: a.id,
 		query: r
 	});
@@ -28452,7 +28495,7 @@ async function ti(e) {
 		detail: "Latest private record not found",
 		key: "ELEMENT_NOT_FOUND"
 	});
-	let { childRecord: c, privateRecord: l } = ai({
+	let { childRecord: c, privateRecord: l } = oi({
 		privateRecord: s,
 		childRecord: n
 	});
@@ -28466,8 +28509,8 @@ async function ti(e) {
 		newRecord: i(l)
 	}];
 }
-async function ni(e) {
-	let { existingPrivateRef: t, parentRecord: n, updatedParentRecord: r, childRecord: a, query: s } = e, c = await ii({
+async function ri(e) {
+	let { existingPrivateRef: t, parentRecord: n, updatedParentRecord: r, childRecord: a, query: s } = e, c = await ai({
 		privateId: t.id,
 		query: s
 	});
@@ -28475,7 +28518,7 @@ async function ni(e) {
 		detail: "Latest private record not found",
 		key: "ELEMENT_NOT_FOUND"
 	}), !c.attributes.some((e) => e.name === "type" && e.value === a.namespace.prefix)) return [];
-	let { childRecord: l, privateRecord: u } = ai({
+	let { childRecord: l, privateRecord: u } = oi({
 		privateRecord: c,
 		childRecord: a
 	});
@@ -28497,7 +28540,7 @@ async function ni(e) {
 		}
 	];
 }
-function ri(e) {
+function ii(e) {
 	let { parentRecord: t, updatedParentRecord: n, childRecord: r } = e, a = {
 		id: crypto.randomUUID(),
 		tagName: "Private",
@@ -28546,14 +28589,14 @@ function ri(e) {
 		}
 	];
 }
-async function ii(e) {
+async function ai(e) {
 	let { privateId: t, query: n } = e;
 	return await n.getRecord({
 		id: t,
 		tagName: "Private"
 	});
 }
-function ai(e) {
+function oi(e) {
 	let { privateRecord: t, childRecord: n } = e;
 	return {
 		childRecord: {
@@ -28574,7 +28617,7 @@ function ai(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/shared/ref-entry-ops.ts
-async function oi(e) {
+async function si(e) {
 	let { uuid: t, entry: r, target: a, query: o } = e;
 	if (!n(r.refTagName, b)) return [];
 	let s = await o.getRecordsByTagName(r.refTagName), c = [];
@@ -28583,7 +28626,7 @@ async function oi(e) {
 		let n = {
 			tagName: e.tagName,
 			id: e.id
-		}, s = await k.query.buildReferencePath(o, {
+		}, s = await A.query.buildReferencePath(o, {
 			reference: n,
 			target: a
 		});
@@ -28603,7 +28646,7 @@ async function oi(e) {
 	}
 	return c;
 }
-function si(e) {
+function ci(e) {
 	let t = [];
 	for (let n of He) {
 		let r = Be[n]?.get(e);
@@ -28613,22 +28656,22 @@ function si(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-created/ref-paths.ts
-async function ci(e) {
-	let { childRecord: t, query: n } = e, r = await li({
+async function li(e) {
+	let { childRecord: t, query: n } = e, r = await ui({
 		childRecord: t,
 		query: n
-	}), i = await fi({
+	}), i = await pi({
 		childRecord: t,
 		query: n
 	});
 	return [...r, ...i];
 }
-async function li(e) {
+async function ui(e) {
 	let { childRecord: t, query: n } = e, r = Ue.get(t.tagName);
 	if (!r?.length) return [];
 	let i = [];
 	for (let e of r) {
-		let r = await ui({
+		let r = await di({
 			childRecord: t,
 			pair: e,
 			query: n
@@ -28637,10 +28680,10 @@ async function li(e) {
 	}
 	return i;
 }
-async function ui(e) {
+async function di(e) {
 	let { childRecord: t, pair: n, query: r } = e, i = t.attributes.find((e) => e.name === n.uuidAttr)?.value;
 	if (!i) return null;
-	let a = await di({
+	let a = await fi({
 		uuidValue: i,
 		targetTagNames: n.targetTagNames,
 		query: r
@@ -28670,7 +28713,7 @@ async function ui(e) {
 		}
 	};
 }
-async function di(e) {
+async function fi(e) {
 	let { uuidValue: t, targetTagNames: r, query: i } = e;
 	for (let e of r) {
 		if (!n(e, b)) continue;
@@ -28682,17 +28725,17 @@ async function di(e) {
 	}
 	return null;
 }
-async function fi(e) {
+async function pi(e) {
 	let { childRecord: t, query: n } = e, r = t.attributes.find((e) => e.name === "uuid")?.value;
 	if (!r) return [];
-	let i = si(t.tagName);
+	let i = ci(t.tagName);
 	if (i.length === 0) return [];
 	let a = {
 		tagName: t.tagName,
 		id: t.id
 	}, o = [];
 	for (let e of i) {
-		let t = await oi({
+		let t = await si({
 			uuid: r,
 			entry: e,
 			target: a,
@@ -28704,12 +28747,12 @@ async function fi(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-created/after-created.ts
-async function pi(e) {
-	let { childRecord: t, parentRecord: n, query: r } = e, i = await ei({
+async function mi(e) {
+	let { childRecord: t, parentRecord: n, query: r } = e, i = await ti({
 		childRecord: t,
 		parentRecord: n,
 		query: r
-	}), a = await ci({
+	}), a = await li({
 		childRecord: t,
 		query: r
 	});
@@ -28717,12 +28760,12 @@ async function pi(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-deep-clone/ref-paths.ts
-async function mi(e) {
-	let { cumulativeCloneMappings: t, query: n } = e, { uuidMap: r, uuidToRef: i } = await hi(t, n);
+async function hi(e) {
+	let { cumulativeCloneMappings: t, query: n } = e, { uuidMap: r, uuidToRef: i } = await gi(t, n);
 	if (r.size === 0) return [];
 	let a = [];
 	for (let { target: e } of t) {
-		let t = await _i({
+		let t = await vi({
 			target: e,
 			uuidMap: r,
 			uuidToRef: i,
@@ -28732,9 +28775,9 @@ async function mi(e) {
 	}
 	return a;
 }
-async function hi(e, t) {
+async function gi(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map();
-	for (let { source: i, target: a } of e) await gi({
+	for (let { source: i, target: a } of e) await _i({
 		source: i,
 		target: a,
 		query: t,
@@ -28746,7 +28789,7 @@ async function hi(e, t) {
 		uuidToRef: r
 	};
 }
-async function gi(e) {
+async function _i(e) {
 	let { source: t, target: n, query: r, uuidMap: i, uuidToRef: a } = e, o = await r.getRecord(n);
 	if (!o) return;
 	let s = t.attributes.find((e) => e.name === "uuid")?.value, c = o.attributes.find((e) => e.name === "uuid")?.value;
@@ -28755,14 +28798,14 @@ async function gi(e) {
 		id: o.id
 	}));
 }
-async function _i(e) {
+async function vi(e) {
 	let { target: t, uuidMap: n, uuidToRef: r, query: a } = e, o = t.tagName;
 	if (!(o in T)) return null;
 	let s = await a.getRecord(t);
 	if (!s) return null;
 	let c = T[o], l = [...s.attributes], u = !1;
 	for (let e of c) {
-		let t = await vi({
+		let t = await yi({
 			pair: e,
 			tagName: o,
 			refId: s.id,
@@ -28782,14 +28825,14 @@ async function _i(e) {
 		})
 	} : null;
 }
-async function vi(e) {
+async function yi(e) {
 	let { pair: t, tagName: n, refId: r, uuidMap: i, uuidToRef: a, query: o } = e, s = [...e.updatedAttributes], c = s.find((e) => e.name === t.attribute.uuid)?.value;
 	if (!c) return null;
 	let l = i.get(c);
 	if (!l) return null;
-	let u = !1, d = yi(s, t.attribute.uuid, c, l);
+	let u = !1, d = bi(s, t.attribute.uuid, c, l);
 	d && (s = d, u = !0);
-	let f = await bi({
+	let f = await xi({
 		attributes: s,
 		pathAttrName: t.attribute.path,
 		newUuid: l,
@@ -28800,16 +28843,16 @@ async function vi(e) {
 	});
 	return f && (s = f, u = !0), u ? s : null;
 }
-function yi(e, t, n, r) {
+function bi(e, t, n, r) {
 	return r === n ? null : e.map((e) => e.name === t ? {
 		...e,
 		value: r
 	} : e);
 }
-async function bi(e) {
+async function xi(e) {
 	let { attributes: t, pathAttrName: n, newUuid: r, uuidToRef: i, tagName: a, refId: o, query: s } = e, c = i.get(r);
 	if (!c) return null;
-	let l = await k.query.buildReferencePath(s, {
+	let l = await A.query.buildReferencePath(s, {
 		reference: {
 			tagName: a,
 			id: o
@@ -28826,12 +28869,12 @@ async function bi(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-deep-clone/after-deep-clone.ts
-async function xi(e) {
-	return mi(e);
+async function Si(e) {
+	return hi(e);
 }
 //#endregion
 //#region src/v2019C1/hooks/after-standardized-record/uuid-attribute.ts
-function Si(e) {
+function Ci(e) {
 	let { record: t } = e, { tagName: n, attributes: r } = t, i = b.definition[n];
 	if (!("uuid" in i.attributes.details) || r.find((e) => e.name === "uuid")?.value) return t;
 	let a = i.attributes.details.uuid?.namespace, o = r.filter((e) => e.name !== "uuid");
@@ -28846,20 +28889,20 @@ function Si(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-standardized-record/after-standardized-record.ts
-function Ci(e) {
-	return Si(e);
+function wi(e) {
+	return Ci(e);
 }
 //#endregion
 //#region src/v2019C1/hooks/after-updated/ref-paths.ts
-async function wi(e) {
+async function Ti(e) {
 	let { oldRecord: t, newRecord: n, query: r } = e, i = [], a = n.attributes.find((e) => e.name === "uuid")?.value;
 	if (a) {
-		let e = si(n.tagName), t = {
+		let e = ci(n.tagName), t = {
 			tagName: n.tagName,
 			id: n.id
 		};
 		for (let n of e) {
-			let e = await oi({
+			let e = await si({
 				uuid: a,
 				entry: n,
 				target: t,
@@ -28868,8 +28911,8 @@ async function wi(e) {
 			i.push(...e);
 		}
 	}
-	if (Ti(t, n)) {
-		let e = await Ei({
+	if (Ei(t, n)) {
+		let e = await Di({
 			newRecord: n,
 			query: r
 		});
@@ -28877,11 +28920,11 @@ async function wi(e) {
 	}
 	return i;
 }
-function Ti(e, t) {
+function Ei(e, t) {
 	for (let n of ne) if (e.attributes.find((e) => e.name === n)?.value !== t.attributes.find((e) => e.name === n)?.value) return !0;
 	return !1;
 }
-async function Ei(e) {
+async function Di(e) {
 	let { newRecord: t, query: n } = e, r = {
 		tagName: t.tagName,
 		id: t.id
@@ -28890,14 +28933,14 @@ async function Ei(e) {
 		if (r.id === t.id) continue;
 		let e = await n.any.getAttribute(r, { name: "uuid" });
 		if (!e) continue;
-		let i = si(r.tagName);
+		let i = ci(r.tagName);
 		if (i.length === 0) continue;
 		let o = {
 			tagName: r.tagName,
 			id: r.id
 		};
 		for (let t of i) {
-			let r = await oi({
+			let r = await si({
 				uuid: e,
 				entry: t,
 				target: o,
@@ -28910,28 +28953,28 @@ async function Ei(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/after-updated/after-updated.ts
-async function Di(e) {
-	return wi(e);
+async function Oi(e) {
+	return Ti(e);
 }
 //#endregion
 //#region src/v2019C1/hooks/before-clone/before-clone.ts
-function Oi(e) {
-	let { record: t } = e, n = !0;
-	t.tagName === "Private" && !t.tree.length && (n = !1);
-	let r = t.attributes.filter((e) => e.name !== "uuid");
+function ki(e) {
+	let { record: t } = e, n = !0, r = !!t.value?.trim(), i = t.attributes.some((e) => e.name === "type");
+	t.tagName === "Private" && !t.tree.length && !r && !i && (n = !1);
+	let a = t.attributes.filter((e) => e.name !== "uuid");
 	return {
 		shouldBeCloned: n,
 		transformedRecord: {
 			...t,
-			attributes: r
+			attributes: a
 		}
 	};
 }
 //#endregion
 //#region src/v2019C1/hooks/before-delete/orphaned-refs.ts
-async function ki(e) {
+async function Ai(e) {
 	let { record: t, query: n } = e, r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
-	if (await Fi({
+	if (await Ii({
 		record: t,
 		query: n,
 		ids: r,
@@ -28939,7 +28982,7 @@ async function ki(e) {
 	}), i.size === 0) return [];
 	let a = [], o = Object.keys(T);
 	for (let e of o) {
-		let t = await Ai({
+		let t = await ji({
 			refTagName: e,
 			subtreeIds: r,
 			subtreeUuids: i,
@@ -28949,11 +28992,11 @@ async function ki(e) {
 	}
 	return a;
 }
-async function Ai(e) {
+async function ji(e) {
 	let { refTagName: t, subtreeIds: n, subtreeUuids: r, query: i } = e, a = T[t], o = await i.getRecordsByTagName(t), s = [];
 	for (let e of o) {
 		if (n.has(e.id)) continue;
-		let o = await ji({
+		let o = await Mi({
 			refTagName: t,
 			refRecord: e,
 			refPairs: a,
@@ -28964,15 +29007,15 @@ async function Ai(e) {
 	}
 	return s;
 }
-async function ji(e) {
-	let { refTagName: t, refRecord: n, refPairs: r, subtreeUuids: i, query: a } = e, o = Mi({
+async function Mi(e) {
+	let { refTagName: t, refRecord: n, refPairs: r, subtreeUuids: i, query: a } = e, o = Ni({
 		refPairs: r,
 		refRecord: n,
 		subtreeUuids: i
 	});
-	return o.size === 0 ? [] : Je.has(t) ? [Ni(n, o)] : Pi(n, a);
+	return o.size === 0 ? [] : Je.has(t) ? [Pi(n, o)] : Fi(n, a);
 }
-function Mi(e) {
+function Ni(e) {
 	let { refPairs: t, refRecord: n, subtreeUuids: r } = e, i = /* @__PURE__ */ new Set();
 	for (let e of t) {
 		let t = n.attributes.find((t) => t.name === e.attribute.uuid)?.value;
@@ -28983,7 +29026,7 @@ function Mi(e) {
 	}
 	return i;
 }
-function Ni(e, t) {
+function Pi(e, t) {
 	let n = e.attributes.filter((e) => !t.has(e.name));
 	return {
 		status: "updated",
@@ -28994,7 +29037,7 @@ function Ni(e, t) {
 		})
 	};
 }
-async function Pi(e, t) {
+async function Fi(e, t) {
 	let n = [{
 		status: "deleted",
 		oldRecord: i(e),
@@ -29016,14 +29059,14 @@ async function Pi(e, t) {
 	}
 	return n;
 }
-async function Fi(e) {
+async function Ii(e) {
 	let { record: t, query: n, ids: r, uuids: i } = e;
 	r.add(t.id);
 	let a = t.attributes.find((e) => e.name === "uuid")?.value;
 	a && i.add(a);
 	for (let e of t.children) {
 		let t = await n.getRecord(e);
-		t && await Fi({
+		t && await Ii({
 			record: t,
 			query: n,
 			ids: r,
@@ -29033,24 +29076,24 @@ async function Fi(e) {
 }
 //#endregion
 //#region src/v2019C1/hooks/before-delete/before-delete.ts
-async function Ii(e) {
-	return ki(e);
+async function Li(e) {
+	return Ai(e);
 }
 //#endregion
 //#region src/v2019C1/hooks/io/io-hooks.ts
-function Li() {
+function Ri() {
 	let e = /* @__PURE__ */ new Map(), t = [], n = [];
 	return {
 		beforeImportRecord: (r) => {
 			let { record: i, ancestry: a } = r, { tagName: o } = i, s = i.attributes.find((e) => e.name === "uuid")?.value;
-			if (s && zi.has(o)) {
+			if (s && Bi.has(o)) {
 				let t = ae({
 					record: i,
 					ancestry: a
 				});
 				t && e.set(t.path, s);
 			}
-			if (!Ri.has(o)) return;
+			if (!zi.has(o)) return;
 			let c = T[o];
 			for (let e of c) {
 				let r = i.attributes.find((t) => t.name === e.attribute.path)?.value;
@@ -29111,13 +29154,13 @@ function Li() {
 		}
 	};
 }
-var Ri = new Set(Object.keys(T)), zi = new Set(Object.values(T).flatMap((e) => e.flatMap((e) => e.target))), Bi = {
-	beforeClone: Oi,
-	afterStandardizedRecord: Ci,
-	afterCreated: pi,
-	afterDeepClone: xi,
-	afterUpdated: Di,
-	beforeDelete: Ii
+var zi = new Set(Object.keys(T)), Bi = new Set(Object.values(T).flatMap((e) => e.flatMap((e) => e.target))), Vi = {
+	beforeClone: ki,
+	afterStandardizedRecord: wi,
+	afterCreated: mi,
+	afterDeepClone: Si,
+	afterUpdated: Oi,
+	beforeDelete: Li
 };
 //#endregion
-export { b as C, v as S, y as T, D as _, gt as a, ne as b, Ye as c, Ue as d, Be as f, qe as g, Ge as h, Qr as i, We as l, Ke as m, Li as n, Xe as o, Ve as p, $r as r, Je as s, Bi as t, He as u, E as v, _ as w, S as x, T as y };
+export { b as C, v as S, y as T, D as _, ht as a, ne as b, Ye as c, Ue as d, Be as f, qe as g, Ge as h, $r as i, We as l, Ke as m, Ri as n, Xe as o, Ve as p, ei as r, Je as s, Vi as t, He as u, E as v, _ as w, S as x, T as y };