@primmel/primmel 1.21.13 → 1.21.14

package/dist-browser/index.mjs

@@ -459,7 +459,8 @@ var te = [
 ], ne = /* @__PURE__ */ new Set([
 	"forAll",
 	"exists",
-	"select"
+	"select",
+	"collect"
 ]);
 function re(e) {
 	let t = [], n = 0;
@@ -600,6 +601,24 @@ var ie = [
 			return e;
 		}
 		if (e.kind === "name") {
+			if (e.value === "true" || e.value === "false") return {
+				type: "bool",
+				value: e.value === "true"
+			};
+			if (e.value === "if") {
+				let e = this.parseLevel(0), t = this.take();
+				if (t.kind !== "name" || t.value !== "then") throw Error("expression: expected \"then\" in the conditional");
+				let n = this.parseLevel(0), r = this.take();
+				if (r.kind !== "name" || r.value !== "else") throw Error("expression: expected \"else\" in the conditional");
+				let i = this.parseLevel(0), a = this.take();
+				if (a.kind !== "name" || a.value !== "endif") throw Error("expression: expected \"endif\" to close the conditional");
+				return {
+					type: "ifelse",
+					cond: e,
+					then: n,
+					else: i
+				};
+			}
 			let t = [e.value];
 			for (; this.peek()?.kind === "op" && this.peek().value === ".";) {
 				this.take();
@@ -637,7 +656,7 @@ var ie = [
 			if (r?.kind === "op" && r.value === "->") {
 				this.take();
 				let e = this.take();
-				if (e.kind !== "name" || !ne.has(e.value)) throw Error("expression: expected a collection iterator (forAll | exists | select)");
+				if (e.kind !== "name" || !ne.has(e.value)) throw Error("expression: expected a collection iterator (forAll | exists | select | collect)");
 				if (this.peek()?.kind !== "op" || this.peek().value !== "(") throw Error("expression: expected ( after the iterator");
 				this.take();
 				let n = this.take();
@@ -668,25 +687,27 @@ function se(e) {
 function ce(e) {
 	let t = e.trim();
 	if (t.length === 0) throw Error("expression: the block is empty");
-	return le(se(t));
+	return S(se(t));
 }
-function le(e) {
+function S(e) {
 	switch (e.type) {
 		case "num": return String(e.value);
 		case "str": return "'" + e.value + "'";
+		case "bool": return e.value ? "true" : "false";
+		case "ifelse": return "if " + S(e.cond) + " then " + S(e.then) + " else " + S(e.else) + " endif";
 		case "name": return e.path.join(".");
-		case "call": return e.callee + "(" + e.args.map(le).join(", ") + ")";
+		case "call": return e.callee + "(" + e.args.map(S).join(", ") + ")";
 		case "unop": {
-			let t = le(e.operand);
+			let t = S(e.operand);
 			return e.op + (e.operand.type === "binop" ? " (" + t + ")" : " " + t);
 		}
-		case "nav": return e.source + " -> " + e.op + "(" + e.var + " | " + le(e.body) + ")";
-		case "binop": return le(e.left) + " " + e.op + " " + le(e.right);
+		case "nav": return e.source + " -> " + e.op + "(" + e.var + " | " + S(e.body) + ")";
+		case "binop": return S(e.left) + " " + e.op + " " + S(e.right);
 	}
 }
 //#endregion
 //#region src/ser-des/expression-carrier.ts
-function ue(e, t) {
+function le(e, t) {
 	if (e.startsWith("{")) try {
 		return {
 			source: ce(i(e)),
@@ -703,30 +724,30 @@ function ue(e, t) {
 		inline: !1
 	};
 }
-function de(e, t, n) {
+function ue(e, t, n) {
 	let r = t.split("\n").map((e) => n + "  " + e).join("\n");
 	return n + e + " {\n" + r + "\n" + n + "}\n";
 }
-function fe(e) {
+function de(e) {
 	let t = n(e), r = [], i = 0;
 	for (; i < t.length;) {
-		let e = pe(t[i++]);
+		let e = fe(t[i++]);
 		if (i >= t.length) throw Error(`limit args: "${e}" binds to nothing`);
 		if (t[i] !== "<-") throw Error(`limit args: expected "<-" after "${e}" (name <- source)`);
 		if (i += 1, i >= t.length) throw Error(`limit args: "${e}" binds to nothing`);
 		r.push({
 			name: e,
-			source: pe(t[i++])
+			source: fe(t[i++])
 		});
 	}
 	return r;
 }
-function pe(e) {
+function fe(e) {
 	return e.length >= 2 && e.charAt(0) === "\"" && e.charAt(e.length - 1) === "\"" ? o(e.substr(1, e.length - 2)) : e;
 }
 //#endregion
 //#region src/ser-des/config/ref.ts
-function S(e, t, n, r) {
+function C(e, t, n, r) {
 	let i = {
 		predicate: n(e[t++] ?? ""),
 		target: n(e[t++] ?? "")
@@ -740,17 +761,17 @@ function S(e, t, n, r) {
 		next: t
 	};
 }
-function C(e, t, n, r) {
+function w(e, t, n, r) {
 	let i = [e(), e()], a = t();
-	return a && a.startsWith("{") && i.push(e()), S(i, 0, n, r).ref;
+	return a && a.startsWith("{") && i.push(e()), C(i, 0, n, r).ref;
 }
-function w(e, t, n) {
+function T(e, t, n) {
 	if (!e || e.length === 0) return "";
 	let r = "";
 	for (let i of e) r += `${t}ref ${i.predicate} "${n(i.target)}"`, r += i.note ? ` {\n${t}  note "${n(i.note)}"\n${t}}\n` : "\n";
 	return r;
 }
-function me(e) {
+function pe(e) {
 	let t = /^(urn:[^#]+)(?:#(.+))?$/.exec(e);
 	if (!t) return null;
 	let n = t[2];
@@ -774,14 +795,14 @@ function me(e) {
 		clause: ""
 	};
 }
-function T(e, t) {
+function E(e, t) {
 	if (t.predicate === "derives-from") {
 		let n = e.fieldReferences ?? e.formReferences, r = "source" in e || "sourceRef" in e || e.sourceRefs !== void 0;
 		if (n && !r) return n.push({
 			urn: t.target,
 			role: "source"
 		}), !0;
-		let i = me(t.target);
+		let i = pe(t.target);
 		return i ? ((e.sourceRefs ??= []).push(i), "source" in e && !e.source && (e.source = i), "sourceRef" in e && !e.sourceRef && (e.sourceRef = i), "reference" in e && !e.reference && (e.reference = i.doc), !0) : !1;
 	}
 	if (t.predicate === "cites") return e.fieldReferences ? e.fieldReferences.push({
@@ -806,12 +827,12 @@ function T(e, t) {
 	}
 	return !1;
 }
-function E(e, t, n) {
+function D(e, t, n) {
 	return e.doc && e.doc.startsWith("urn:") ? `${t}ref derives-from "${n(`${e.doc}${e.clause ? "#clause-" + e.clause : ""}${e.fragment ? "/" + e.fragment : ""}`)}"\n` : `${t}source { doc "${n(e.doc ?? "")}" clause "${n(String(e.clause ?? ""))}"` + (e.fragment ? ` fragment "${n(e.fragment)}"` : "") + " }\n";
 }
 //#endregion
 //#region src/ser-des/config/correspondence.ts
-function D(e, t, n) {
+function O(e, t, n) {
 	if (e[t] === void 0) throw Error("Parsing error: corresponds: Expecting value for corresponds (the scheme and the concept)");
 	let r = n(e[t++]);
 	if (e[t] === void 0) throw Error("Parsing error: corresponds: Expecting value for corresponds (the concept)");
@@ -843,11 +864,11 @@ function D(e, t, n) {
 		next: t
 	};
 }
-function O(e, t, n) {
+function k(e, t, n) {
 	let r = [e(), e()], i = t();
-	return i && i.startsWith("{") && r.push(e()), D(r, 0, n).corr;
+	return i && i.startsWith("{") && r.push(e()), O(r, 0, n).corr;
 }
-function k(e, t, n, r) {
+function A(e, t, n, r) {
 	if (!e || e.length === 0) return "";
 	let i = "";
 	for (let a of e) {
@@ -867,7 +888,7 @@ function k(e, t, n, r) {
 }
 //#endregion
 //#region src/ser-des/config/series.ts
-function he(e) {
+function me(e) {
 	let t = {
 		axes: [],
 		cellSymbol: "",
@@ -906,15 +927,15 @@ function he(e) {
 	}
 	return t;
 }
-function ge(e) {
+function he(e) {
 	let t = "series { ";
 	for (let n of e.axes) t += "axis " + n.id + " { ", n.unit && (t += "unit \"" + s(n.unit) + "\" "), n.type && (t += "type " + n.type + " "), n.role && (t += "role " + n.role + " "), t += "} ";
 	return t += "cell { ", e.cellSymbol && (t += "symbol " + e.cellSymbol + " "), e.cellUnit && (t += "unit \"" + s(e.cellUnit) + "\" "), t += "} }", t;
 }
 //#endregion
 //#region src/ser-des/config/sourceDiscrepancy.ts
-var _e = ["follows_clause_x", "annotated_only"];
-function A(e) {
+var ge = ["follows_clause_x", "annotated_only"];
+function j(e) {
 	let t = {
 		summary: "",
 		sources: [],
@@ -928,19 +949,19 @@ function A(e) {
 		else if (e === "sources") t.sources = n(a(r[o++])).map(a).filter((e) => e.length > 0);
 		else if (e === "resolution") {
 			let e = a(r[o++]);
-			if (!_e.includes(e)) throw Error(`Parsing error: source_discrepancy: Unknown resolution ${e} (valid: ${_e.join(", ")})`);
+			if (!ge.includes(e)) throw Error(`Parsing error: source_discrepancy: Unknown resolution ${e} (valid: ${ge.join(", ")})`);
 			t.resolution = e;
 		} else e === "rationale" ? t.rationale = a(r[o++]) : i(r[o++]);
 	}
 	return t;
 }
-function j(e, t) {
+function M(e, t) {
 	let n = t + "source_discrepancy { ";
 	return n += "summary \"" + s(e.summary) + "\" ", n += "sources { " + e.sources.map((e) => "\"" + s(e) + "\"").join(" ") + " } ", n += "resolution " + e.resolution + " ", n += "rationale \"" + s(e.rationale) + "\" ", n += "}", n;
 }
 //#endregion
 //#region src/ser-des/config/field-parser.ts
-function M(e, t) {
+function N(e, t) {
 	let n = e[t] ?? "";
 	if (!n.startsWith("ocl{")) return {
 		text: n,
@@ -956,7 +977,7 @@ function M(e, t) {
 		next: o
 	};
 }
-function ve(e) {
+function _e(e) {
 	let t = r(e.trim().replace(/^[[{]/, "").replace(/[\]}]$/, "")), n = [], o = 0;
 	for (; o < t.length;) {
 		let e = a(t[o++].replace(/,$/, ""));
@@ -973,16 +994,16 @@ function ve(e) {
 	}
 	return n;
 }
-function ye(e) {
+function ve(e) {
 	return typeof e == "string" ? e : e.value + " { label \"" + s(e.label) + "\" }";
 }
-function N(e) {
+function P(e) {
 	return /[\s{}"]/.test(e) || e.endsWith(":") || e.startsWith("#") || e.startsWith("//") ? "\"" + s(e) + "\"" : e;
 }
-function P(e) {
+function F(e) {
 	return e.endsWith(":") ? e.slice(0, -1) : e;
 }
-function be(e, t) {
+function ye(e, t) {
 	let n = e[t] ?? "";
 	if (!n.startsWith("[")) return {
 		text: n,
@@ -995,15 +1016,15 @@ function be(e, t) {
 		next: i
 	};
 }
-function xe(e) {
+function be(e) {
 	return r(e).map((e) => e.replace(/^;+|;+$/g, "")).filter((e) => e.length > 0);
 }
-function F(e) {
-	if (e.startsWith("{")) return xe(i(e)).flatMap((e) => e.split(",")).map((e) => a(e.trim())).filter((e) => e.length > 0);
+function I(e) {
+	if (e.startsWith("{")) return be(i(e)).flatMap((e) => e.split(",")).map((e) => a(e.trim())).filter((e) => e.length > 0);
 	let t = a(e);
 	return t === "" ? [] : [t];
 }
-function I(e) {
+function L(e) {
 	let t = {
 		doc: "",
 		clause: ""
@@ -1015,7 +1036,7 @@ function I(e) {
 	}
 	return t;
 }
-function Se(e, t) {
+function xe(e, t) {
 	let n = e[t++];
 	if (n === void 0) return null;
 	let r = "";
@@ -1028,7 +1049,7 @@ function Se(e, t) {
 		next: t
 	};
 }
-function Ce(e, t, o) {
+function Se(e, t, o) {
 	let s = {
 		name: e,
 		type: o || "string",
@@ -1086,22 +1107,22 @@ function Ce(e, t, o) {
 		else if (e === "bind") s.bind = a(c[l++]);
 		else if (e === "required") s.required = a(c[l++]) === "true";
 		else if (e === "required_when") {
-			let e = M(c, l);
+			let e = N(c, l);
 			s.requiredWhen = a(e.text), l = e.next;
 		} else if (e === "measurement_method") s.measurementMethod = a(c[l++]);
 		else if (e === "calculation") {
-			let e = M(c, l);
+			let e = N(c, l);
 			s.calculationId = a(e.text), l = e.next;
-		} else if (e === "calculation_bindings") s.calculationBindings = we(i(c[l++]));
+		} else if (e === "calculation_bindings") s.calculationBindings = Ce(i(c[l++]));
 		else if (e === "derivation") s.derivation = a(c[l++]);
-		else if (e === "evaluation") s.evaluation = Te(i(c[l++]));
+		else if (e === "evaluation") s.evaluation = we(i(c[l++]));
 		else if (e === "values") {
-			let e = be(c, l);
-			s.values = ve(e.text), l = e.next;
+			let e = ye(c, l);
+			s.values = _e(e.text), l = e.next;
 		} else if (e === "default") s.defaultValue = a(c[l++]), s.hasDefault = !0;
 		else if (e === "true_label") s.trueLabel = a(c[l++]);
 		else if (e === "false_label") s.falseLabel = a(c[l++]);
-		else if (e === "enum_values") s.enumValues = ve(c[l++]);
+		else if (e === "enum_values") s.enumValues = _e(c[l++]);
 		else if (e === "min_items") {
 			let e = a(c[l++]), t = parseInt(e, 10);
 			s.minItems = isNaN(t) ? e : t;
@@ -1111,26 +1132,26 @@ function Ce(e, t, o) {
 		} else if (e === "items") {
 			let e = n(i(c[l++])), t = [], r = 0;
 			for (; r < e.length && e[r] !== "fields";) e[r] === "unit" && r + 1 < e.length ? (s.itemsUnit = a(e[r + 1]), r += 2) : t.push(e[r++]);
-			s.itemsType = t.join(" "), e[r] === "fields" && (r++, r < e.length && (s.fields = Ee(i(e[r]))));
-		} else if (e === "series") s.series = he(i(c[l++]));
-		else if (e === "fields") s.fields = Ee(i(c[l++]));
-		else if (e === "subform_ref") s.subformRef = De(a(c[l++]), l < c.length ? i(c[l++]) : ""), (!s.type || s.type === "string") && (s.type = "array");
+			s.itemsType = t.join(" "), e[r] === "fields" && (r++, r < e.length && (s.fields = Te(i(e[r]))));
+		} else if (e === "series") s.series = me(i(c[l++]));
+		else if (e === "fields") s.fields = Te(i(c[l++]));
+		else if (e === "subform_ref") s.subformRef = Ee(a(c[l++]), l < c.length ? i(c[l++]) : ""), (!s.type || s.type === "string") && (s.type = "array");
 		else if (e === "reference") s.referenceIds = r(c[l++]).map(a);
-		else if (e === "references") s.fieldReferences = ke(i(c[l++]));
+		else if (e === "references") s.fieldReferences = Oe(i(c[l++]));
 		else if (e === "ref") {
-			let e = S(c, l, a, i);
-			T(s, e.ref) || s.refs.push(e.ref), l = e.next;
+			let e = C(c, l, a, i);
+			E(s, e.ref) || s.refs.push(e.ref), l = e.next;
 		} else if (e === "corresponds") {
-			let e = D(c, l, a);
+			let e = O(c, l, a);
 			(s.correspondences ??= []).push(e.corr), l = e.next;
-		} else e === "specification_reference" ? s.specificationReference = a(c[l++]) : e === "applicability" ? s.applicability = L(i(c[l++])) : e === "source_discrepancy" ? s.sourceDiscrepancy = A(i(c[l++])) : i(c[l++]);
+		} else e === "specification_reference" ? s.specificationReference = a(c[l++]) : e === "applicability" ? s.applicability = R(i(c[l++])) : e === "source_discrepancy" ? s.sourceDiscrepancy = j(i(c[l++])) : i(c[l++]);
 	}
 	return s;
 }
-function we(e) {
+function Ce(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (i >= r.length) break;
 		r[i] === ":" && i++, i < r.length && t.push({
 			inputName: e,
@@ -1139,7 +1160,7 @@ function we(e) {
 	}
 	return t;
 }
-function Te(e) {
+function we(e) {
 	let t = {
 		rule: "",
 		condition: "",
@@ -1148,30 +1169,30 @@ function Te(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "rule" ? t.rule = a(o[s++]) : e === "verdict" ? t.verdict = a(o[s++]) : e === "op" ? t.op = a(o[s++]) : e === "limit" ? t.limit = a(o[s++]) : e === "condition" ? t.condition = a(o[s++]) : e === "reference" ? t.referenceId = r(o[s++]).map(a)[0] ?? null : e === "specification_reference" ? t.specificationReference = a(o[s++]) : e === "source_discrepancy" ? t.sourceDiscrepancy = A(i(o[s++])) : i(o[s++]);
+		e === "rule" ? t.rule = a(o[s++]) : e === "verdict" ? t.verdict = a(o[s++]) : e === "op" ? t.op = a(o[s++]) : e === "limit" ? t.limit = a(o[s++]) : e === "condition" ? t.condition = a(o[s++]) : e === "reference" ? t.referenceId = r(o[s++]).map(a)[0] ?? null : e === "specification_reference" ? t.specificationReference = a(o[s++]) : e === "source_discrepancy" ? t.sourceDiscrepancy = j(i(o[s++])) : i(o[s++]);
 	}
 	return t;
 }
-function Ee(e) {
+function Te(e) {
 	let t = [], r = n(e), a = 0;
 	for (; a < r.length;) {
 		if (r[a++] !== "field") {
 			a < r.length && i(r[a - 1]);
 			continue;
 		}
-		let e = Se(r, a);
+		let e = xe(r, a);
 		if (!e) break;
-		t.push(Ce(e.name, e.block, e.type || void 0)), a = e.next;
+		t.push(Se(e.name, e.block, e.type || void 0)), a = e.next;
 	}
 	return t;
 }
-function L(e) {
+function R(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (i >= r.length) break;
 		if (r[i] === ":" && i++, i < r.length) {
-			let n = be(r, i);
+			let n = ye(r, i);
 			i = n.next;
 			let o = n.text.trim(), s;
 			if (o.startsWith("[")) s = {
@@ -1209,7 +1230,7 @@ function L(e) {
 	}
 	return t;
 }
-function De(e, t) {
+function Ee(e, t) {
 	let r = {
 		subformId: a(e),
 		parameters: {},
@@ -1223,16 +1244,16 @@ function De(e, t) {
 				if (t === "parameters") {
 					let t = n(i(e[o++])), s = 0;
 					for (; s < t.length;) {
-						let e = P(t[s++]);
+						let e = F(t[s++]);
 						s < t.length && (t[s] === ":" && s++, s < t.length && (r.parameters[e] = a(t[s++])));
 					}
-				} else t === "applicability" ? r.applicability = L(i(e[o++])) : i(e[o++]);
+				} else t === "applicability" ? r.applicability = R(i(e[o++])) : i(e[o++]);
 			}
 		}
 	}
 	return r;
 }
-function Oe(e, t) {
+function De(e, t) {
 	let n = "";
 	if (e.subformRef && !e.name) {
 		let r = e.subformRef;
@@ -1243,7 +1264,7 @@ function Oe(e, t) {
 			for (let e of i) n += e + ": " + r.parameters[e] + " ";
 			n += "} ";
 		}
-		return r.applicability.length > 0 && (n += "applicability { " + R(r.applicability) + "} "), n += "}\n", n;
+		return r.applicability.length > 0 && (n += "applicability { " + z(r.applicability) + "} "), n += "}\n", n;
 	}
 	let r = [];
 	if (e.subformRef) {
@@ -1253,24 +1274,24 @@ function Oe(e, t) {
 			for (let e of i) n += e + ": " + t.parameters[e] + " ";
 			n += "} ";
 		}
-		t.applicability.length > 0 && (n += "applicability { " + R(t.applicability) + "} "), r.push(n + "}");
+		t.applicability.length > 0 && (n += "applicability { " + z(t.applicability) + "} "), r.push(n + "}");
 	}
-	if (e.label && r.push("label \"" + s(e.label) + "\""), e.definition && r.push("definition \"" + s(e.definition) + "\""), e.description && r.push("description \"" + s(e.description) + "\""), e.unit && r.push("unit \"" + s(e.unit) + "\""), e.symbol && r.push("symbol " + e.symbol), e.verdict && r.push("verdict " + e.verdict), e.dimension && r.push("dimension " + e.dimension), e.enumRef && r.push("enum " + e.enumRef), e.pattern && r.push("pattern \"" + s(e.pattern) + "\""), e.scope && r.push("scope " + e.scope), e.examples && r.push("examples \"" + s(e.examples) + "\""), e.bind && r.push("bind " + N(e.bind)), e.required && r.push("required true"), e.requiredWhen && r.push("required_when " + N(e.requiredWhen)), e.measurementMethod && r.push("measurement_method " + e.measurementMethod), e.calculationId && r.push("calculation " + N(e.calculationId)), e.calculationBindings.length > 0 && r.push("calculation_bindings { " + e.calculationBindings.map((e) => e.inputName + ": " + e.pathExpr).join(" ") + "}"), e.derivation && r.push("derivation \"" + s(e.derivation) + "\""), e.evaluation) {
+	if (e.label && r.push("label \"" + s(e.label) + "\""), e.definition && r.push("definition \"" + s(e.definition) + "\""), e.description && r.push("description \"" + s(e.description) + "\""), e.unit && r.push("unit \"" + s(e.unit) + "\""), e.symbol && r.push("symbol " + e.symbol), e.verdict && r.push("verdict " + e.verdict), e.dimension && r.push("dimension " + e.dimension), e.enumRef && r.push("enum " + e.enumRef), e.pattern && r.push("pattern \"" + s(e.pattern) + "\""), e.scope && r.push("scope " + e.scope), e.examples && r.push("examples \"" + s(e.examples) + "\""), e.bind && r.push("bind " + P(e.bind)), e.required && r.push("required true"), e.requiredWhen && r.push("required_when " + P(e.requiredWhen)), e.measurementMethod && r.push("measurement_method " + e.measurementMethod), e.calculationId && r.push("calculation " + P(e.calculationId)), e.calculationBindings.length > 0 && r.push("calculation_bindings { " + e.calculationBindings.map((e) => e.inputName + ": " + e.pathExpr).join(" ") + "}"), e.derivation && r.push("derivation \"" + s(e.derivation) + "\""), e.evaluation) {
 		let t = "evaluation { rule \"" + s(e.evaluation.rule) + "\"";
-		e.evaluation.verdict && (t += " verdict " + e.evaluation.verdict), e.evaluation.op && (t += " op " + e.evaluation.op), e.evaluation.limit && (t += " limit \"" + s(e.evaluation.limit) + "\""), e.evaluation.condition && (t += " condition \"" + s(e.evaluation.condition) + "\""), e.evaluation.referenceId && (t += " reference { " + e.evaluation.referenceId + " }"), e.evaluation.specificationReference && (t += " specification_reference \"" + s(e.evaluation.specificationReference) + "\""), e.evaluation.sourceDiscrepancy && (t += " " + j(e.evaluation.sourceDiscrepancy, "")), r.push(t + " }");
+		e.evaluation.verdict && (t += " verdict " + e.evaluation.verdict), e.evaluation.op && (t += " op " + e.evaluation.op), e.evaluation.limit && (t += " limit \"" + s(e.evaluation.limit) + "\""), e.evaluation.condition && (t += " condition \"" + s(e.evaluation.condition) + "\""), e.evaluation.referenceId && (t += " reference { " + e.evaluation.referenceId + " }"), e.evaluation.specificationReference && (t += " specification_reference \"" + s(e.evaluation.specificationReference) + "\""), e.evaluation.sourceDiscrepancy && (t += " " + M(e.evaluation.sourceDiscrepancy, "")), r.push(t + " }");
 	}
-	if (e.values.length > 0 && r.push("values { " + e.values.map(ye).join(" ") + " }"), e.hasDefault && r.push("default " + N(e.defaultValue)), e.trueLabel && r.push("true_label \"" + s(e.trueLabel) + "\""), e.falseLabel && r.push("false_label \"" + s(e.falseLabel) + "\""), e.enumValues.length > 0 && r.push("enum_values { " + e.enumValues.map(ye).join(" ") + " }"), e.itemsType) {
+	if (e.values.length > 0 && r.push("values { " + e.values.map(ve).join(" ") + " }"), e.hasDefault && r.push("default " + P(e.defaultValue)), e.trueLabel && r.push("true_label \"" + s(e.trueLabel) + "\""), e.falseLabel && r.push("false_label \"" + s(e.falseLabel) + "\""), e.enumValues.length > 0 && r.push("enum_values { " + e.enumValues.map(ve).join(" ") + " }"), e.itemsType) {
 		let t = "items { " + e.itemsType;
 		e.itemsUnit && (t += " unit \"" + s(e.itemsUnit) + "\""), r.push(t + " }");
 	}
-	if (e.minItems !== void 0 && e.minItems !== null && r.push("min_items " + N(String(e.minItems))), e.maxItems !== void 0 && e.maxItems !== null && r.push("max_items " + N(String(e.maxItems))), e.series && r.push(ge(e.series)), e.applicability.length > 0 && r.push("applicability { " + R(e.applicability) + "}"), e.targets.length > 0 && r.push("targets { " + e.targets.join(" ") + " }"), e.sourceRefs && e.sourceRefs.length > 0) for (let t of e.sourceRefs) r.push(E(t, "", s).trimEnd());
-	if (e.fieldReferences.length > 0) for (let t of e.fieldReferences) r.push("ref " + Ae(t.role) + " \"" + s(t.urn) + "\"");
+	if (e.minItems !== void 0 && e.minItems !== null && r.push("min_items " + P(String(e.minItems))), e.maxItems !== void 0 && e.maxItems !== null && r.push("max_items " + P(String(e.maxItems))), e.series && r.push(he(e.series)), e.applicability.length > 0 && r.push("applicability { " + z(e.applicability) + "}"), e.targets.length > 0 && r.push("targets { " + e.targets.join(" ") + " }"), e.sourceRefs && e.sourceRefs.length > 0) for (let t of e.sourceRefs) r.push(D(t, "", s).trimEnd());
+	if (e.fieldReferences.length > 0) for (let t of e.fieldReferences) r.push("ref " + ke(t.role) + " \"" + s(t.urn) + "\"");
 	if (e.refs && e.refs.length > 0) for (let t of e.refs) r.push("ref " + t.predicate + " \"" + s(t.target) + "\"" + (t.note ? " { note \"" + s(t.note) + "\" }" : ""));
-	e.correspondences && e.correspondences.length > 0 && r.push(k(e.correspondences, "", s, N).trimEnd()), e.specificationReference && r.push("specification_reference \"" + s(e.specificationReference) + "\""), e.sourceDiscrepancy && r.push(j(e.sourceDiscrepancy, "")), e.fields.length > 0 && r.push("fields {\n" + e.fields.map((e) => Oe(e, t + "    ")).join("") + t + "  }"), e.referenceIds.length > 0 && r.push("reference { " + e.referenceIds.join(" ") + " }");
+	e.correspondences && e.correspondences.length > 0 && r.push(A(e.correspondences, "", s, P).trimEnd()), e.specificationReference && r.push("specification_reference \"" + s(e.specificationReference) + "\""), e.sourceDiscrepancy && r.push(M(e.sourceDiscrepancy, "")), e.fields.length > 0 && r.push("fields {\n" + e.fields.map((e) => De(e, t + "    ")).join("") + t + "  }"), e.referenceIds.length > 0 && r.push("reference { " + e.referenceIds.join(" ") + " }");
 	let i = e.type && (e.type !== "string" || e.typeDeclared) ? " : " + e.type : "";
 	return r.length === 0 ? t + "field " + e.name + i + " { }\n" : r.every((e) => !e.includes("\n")) ? t + "field " + e.name + i + " { " + r.join(" ") + " }\n" : t + "field " + e.name + i + " {\n" + r.map((e) => t + "  " + e + "\n").join("") + t + "}\n";
 }
-function R(e) {
+function z(e) {
 	let t = "";
 	for (let n of e) if (n.mapping) {
 		t += n.dimension + ": { ";
@@ -1280,10 +1301,10 @@ function R(e) {
 	} else t += n.dimension + ": [" + n.values.join(", ") + "] ", n.match && (t += "match " + n.match + " ");
 	return t;
 }
-function ke(e) {
+function Oe(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o] === ":" && o++, o < r.length && r[o].startsWith("{")) {
 			let s = n(i(r[o++])).map(a).filter((e) => e.length > 0);
@@ -1295,66 +1316,66 @@ function ke(e) {
 	}
 	return t;
 }
-function Ae(e) {
+function ke(e) {
 	return e === "source" ? "derives-from" : e === "reference" ? "cites" : e;
 }
 //#endregion
 //#region src/ser-des/config/quantity.ts
-var je = /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/;
-function z(e) {
-	return e.startsWith("\"") ? a(e) : je.test(e) ? Number(e) : a(e);
+var Ae = /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/;
+function B(e) {
+	return e.startsWith("\"") ? a(e) : Ae.test(e) ? Number(e) : a(e);
 }
-function Me(e) {
+function je(e) {
 	let t = { value: "" }, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "value" ? t.value = z(r[o++]) : e === "unit" ? t.unit = a(r[o++]) : e === "kind" || e === "quantity_kind" ? t.quantityKind = a(r[o++]) : e === "uncertainty" ? t.uncertainty = z(r[o++]) : e === "tolerance" ? t.tolerance = z(r[o++]) : e === "provenance" ? t.provenance = Pe(i(r[o++])) : i(r[o++]);
+		e === "value" ? t.value = B(r[o++]) : e === "unit" ? t.unit = a(r[o++]) : e === "kind" || e === "quantity_kind" ? t.quantityKind = a(r[o++]) : e === "uncertainty" ? t.uncertainty = B(r[o++]) : e === "tolerance" ? t.tolerance = B(r[o++]) : e === "provenance" ? t.provenance = Ne(i(r[o++])) : i(r[o++]);
 	}
 	return t;
 }
-function Ne(e) {
+function Me(e) {
 	return e.quantityKind !== void 0 || e.uncertainty !== void 0 || e.tolerance !== void 0 || e.provenance !== void 0;
 }
-function Pe(e) {
+function Ne(e) {
 	let t = { source: "" }, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "source" ? t.source = a(r[o++]) : e === "page" ? t.page = String(z(r[o++])) : e === "entry_wording" ? t.entryWording = a(r[o++]) : e === "read_at" ? t.readAt = P(a(r[o++])) : e === "declaration" ? t.declaration = P(a(r[o++])) : e === "verdict" ? t.verdict = P(a(r[o++])) : i(r[o++]);
+		e === "source" ? t.source = a(r[o++]) : e === "page" ? t.page = String(B(r[o++])) : e === "entry_wording" ? t.entryWording = a(r[o++]) : e === "read_at" ? t.readAt = F(a(r[o++])) : e === "declaration" ? t.declaration = F(a(r[o++])) : e === "verdict" ? t.verdict = F(a(r[o++])) : i(r[o++]);
 	}
 	return t;
 }
-function Fe(e) {
+function Pe(e) {
 	let t = ["source \"" + s(e.source) + "\""];
-	return e.page !== void 0 && t.push("page " + B(e.page)), e.entryWording !== void 0 && t.push("entry_wording \"" + s(e.entryWording) + "\""), e.readAt !== void 0 && t.push("read_at " + B(e.readAt)), e.declaration !== void 0 && t.push("declaration " + B(e.declaration)), e.verdict !== void 0 && t.push("verdict " + B(e.verdict)), "{ " + t.join(" ") + " }";
+	return e.page !== void 0 && t.push("page " + V(e.page)), e.entryWording !== void 0 && t.push("entry_wording \"" + s(e.entryWording) + "\""), e.readAt !== void 0 && t.push("read_at " + V(e.readAt)), e.declaration !== void 0 && t.push("declaration " + V(e.declaration)), e.verdict !== void 0 && t.push("verdict " + V(e.verdict)), "{ " + t.join(" ") + " }";
 }
-function B(e) {
-	return typeof e == "number" ? String(e) : e === "" ? "\"\"" : je.test(e) || /[\s{}"]/.test(e) || e.endsWith(":") ? "\"" + s(e) + "\"" : e;
+function V(e) {
+	return typeof e == "number" ? String(e) : e === "" ? "\"\"" : Ae.test(e) || /[\s{}"]/.test(e) || e.endsWith(":") ? "\"" + s(e) + "\"" : e;
 }
-function Ie(e) {
-	if (!Ne(e)) {
-		let t = B(e.value);
-		return e.unit === void 0 ? t : t + " " + N(e.unit);
+function Fe(e) {
+	if (!Me(e)) {
+		let t = V(e.value);
+		return e.unit === void 0 ? t : t + " " + P(e.unit);
 	}
-	return Le(e);
+	return Ie(e);
 }
-function Le(e) {
-	let t = ["value " + B(e.value)];
-	return e.unit !== void 0 && t.push("unit \"" + s(e.unit) + "\""), e.quantityKind !== void 0 && t.push("kind " + N(e.quantityKind)), e.uncertainty !== void 0 && t.push("uncertainty " + B(e.uncertainty)), e.tolerance !== void 0 && t.push("tolerance " + B(e.tolerance)), e.provenance !== void 0 && t.push("provenance " + Fe(e.provenance)), "{ " + t.join(" ") + " }";
+function Ie(e) {
+	let t = ["value " + V(e.value)];
+	return e.unit !== void 0 && t.push("unit \"" + s(e.unit) + "\""), e.quantityKind !== void 0 && t.push("kind " + P(e.quantityKind)), e.uncertainty !== void 0 && t.push("uncertainty " + V(e.uncertainty)), e.tolerance !== void 0 && t.push("tolerance " + V(e.tolerance)), e.provenance !== void 0 && t.push("provenance " + Pe(e.provenance)), "{ " + t.join(" ") + " }";
 }
 //#endregion
 //#region src/ser-des/config/process.ts
-function Re(e) {
+function Le(e) {
 	return e.trim() !== "" && !isNaN(Number(e)) ? Number(e) : e;
 }
-function ze(e) {
+function Re(e) {
 	return !e.startsWith("\"") && e.endsWith(":") && e.length > 1;
 }
-function V(e, t = !1) {
+function ze(e, t = !1) {
 	let r = [], o = n(e), s = 0;
 	for (; s < o.length;) {
-		let e = o[s++], n = P(e);
+		let e = o[s++], n = F(e);
 		if (!n) break;
 		let c = e.endsWith(":");
 		s < o.length && o[s] === ":" && (c = !0, s++);
@@ -1368,12 +1389,12 @@ function V(e, t = !1) {
 			if (!t) throw Error(`Parsing error: parameter "${n}" declares an initial value — initial values are a registers facet (signature parameters and call bindings take their values at the call)`);
 			s++;
 			let e = [];
-			for (; s < o.length && o[s + 1] !== ":" && !ze(o[s]);) e.push(o[s++]);
+			for (; s < o.length && o[s + 1] !== ":" && !Re(o[s]);) e.push(o[s++]);
 			if (e.length === 0) throw Error(`Parsing error: register "${n}" declares "=" with no value (shape: name : type = value [unit])`);
 			if (e.length > 2) throw Error(`Parsing error: register "${n}" initial value has ${e.length} tokens (shape: name : type = value [unit]) — quote multi-word values`);
-			if (e.length === 1 && e[0].startsWith("{")) u.initial = Me(i(e[0]));
+			if (e.length === 1 && e[0].startsWith("{")) u.initial = je(i(e[0]));
 			else {
-				let [t, n] = e, r = z(t);
+				let [t, n] = e, r = B(t);
 				u.initial = n === void 0 ? { value: r } : {
 					value: r,
 					unit: a(n)
@@ -1387,7 +1408,7 @@ function V(e, t = !1) {
 function Be(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = M(r, i), n = a(e.text);
+		let e = N(r, i), n = a(e.text);
 		i = e.next, n && t.push(n);
 	}
 	return t;
@@ -1414,7 +1435,7 @@ function Ve(e) {
 				let n = t[s++];
 				if (s >= t.length) break;
 				if (n === "check") {
-					let n = M(t, s);
+					let n = N(t, s);
 					e.check = a(n.text), s = n.next;
 				} else n === "description" ? e.description = a(t[s++]) : n === "on_violation" ? e.onViolation = a(t[s++]) : i(t[s++]);
 			}
@@ -1444,7 +1465,7 @@ function He(e) {
 			for (; s < t.length;) {
 				let r = t[s++];
 				if (s >= t.length) break;
-				r === "kind" ? e.kind = a(t[s++]) : r === "clause" ? e.clause = a(t[s++]) : r === "pair" ? e.pair.push(...n(a(t[s++])).map(P).map(a).filter((e) => e.length > 0)) : r === "period" ? e.period = a(t[s++]) : r === "barred" ? e.barred.push(...n(a(t[s++])).map(P).map(a).filter((e) => e.length > 0)) : r === "statement" ? e.statement = a(t[s++]) : i(t[s++]);
+				r === "kind" ? e.kind = a(t[s++]) : r === "clause" ? e.clause = a(t[s++]) : r === "pair" ? e.pair.push(...n(a(t[s++])).map(F).map(a).filter((e) => e.length > 0)) : r === "period" ? e.period = a(t[s++]) : r === "barred" ? e.barred.push(...n(a(t[s++])).map(F).map(a).filter((e) => e.length > 0)) : r === "statement" ? e.statement = a(t[s++]) : i(t[s++]);
 			}
 		}
 		t.push(e);
@@ -1552,14 +1573,14 @@ function qe(e) {
 		else if (e === "values") {
 			let e = n(i(r[o++])), s = 0;
 			for (; s < e.length;) {
-				let r = P(e[s++]);
+				let r = F(e[s++]);
 				if (s >= e.length) break;
 				if (e[s] === ":" && s++, s < e.length && e[s].startsWith("{")) {
 					let o = n(i(e[s++])), c = {}, l = 0;
 					for (; l < o.length;) {
-						let e = P(o[l++]);
+						let e = F(o[l++]);
 						if (l >= o.length) break;
-						o[l] === ":" && l++, l < o.length && (c[e] = Re(a(o[l++])));
+						o[l] === ":" && l++, l < o.length && (c[e] = Le(a(o[l++])));
 					}
 					t.values[r] = c;
 				}
@@ -1579,7 +1600,7 @@ var Je = /* @__PURE__ */ new Set([
 	"signal_event"
 ]);
 function Ye(e) {
-	return V(i(e)).map((e) => ({
+	return ze(i(e)).map((e) => ({
 		param: e.name,
 		bind: e.type
 	}));
@@ -1615,15 +1636,15 @@ function Xe(e, t, r) {
 			o.executor = t;
 		} else if (t === "role") o.role = a(s[c++]);
 		else if (t === "capture") o.capture = a(s[c++]);
-		else if (t === "read") o.reads.push(...n(a(s[c++])).map(P).map(a).filter((e) => e.length > 0));
-		else if (t === "write") o.writes.push(...n(a(s[c++])).map(P).map(a).filter((e) => e.length > 0));
+		else if (t === "read") o.reads.push(...n(a(s[c++])).map(F).map(a).filter((e) => e.length > 0));
+		else if (t === "write") o.writes.push(...n(a(s[c++])).map(F).map(a).filter((e) => e.length > 0));
 		else if (t === "wait") o.wait = a(s[c++]);
 		else if (t === "period") o.period = a(s[c++]);
 		else if (t === "signal") o.signal = a(s[c++]);
 		else if (t === "fires") o.fires = a(s[c++]);
 		else if (t === "calls") {
 			if (o.calls = a(s[c++]), c < s.length && s[c].startsWith("{")) {
-				let e = (e) => V(i(e)).map((e) => ({
+				let e = (e) => ze(i(e)).map((e) => ({
 					param: e.name,
 					bind: e.type
 				})), t = n(i(s[c++])), r = 0;
@@ -1659,7 +1680,7 @@ function Ze(e) {
 					let n = e[t++];
 					if (t >= e.length) break;
 					if (n === "when" || n === "condition") {
-						let n = M(e, t);
+						let n = N(e, t);
 						c = a(n.text), t = n.next;
 					} else i(e[t++]);
 				}
@@ -1759,7 +1780,7 @@ var $e = function(e, t) {
 		if (t === "modality") o.modality = s();
 		else if (t === "phase") o.phase = a(s());
 		else if (t === "guard") o.guards.push(x(s));
-		else if (t === "machine_steps") o.machineSteps = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
+		else if (t === "machine_steps") o.machineSteps = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
 		else if (t === "name") o.name = x(s);
 		else if (t === "overlay") o.overlay = s() === "true";
 		else if (t === "actor") o._relations.actor = s();
@@ -1794,7 +1815,7 @@ var $e = function(e, t) {
 					let e = l[u++];
 					if (u >= l.length) break;
 					if (e === "inputs" || e === "outputs") {
-						let t = V(i(l[u++])).map((e) => e.name);
+						let t = ze(i(l[u++])).map((e) => e.name);
 						e === "inputs" ? s.sigInputs = t : s.sigOutputs = t;
 					} else if (e === "requires") {
 						let e = r(i(l[u++])).map(a).filter((e) => e.length > 0);
@@ -1807,12 +1828,12 @@ var $e = function(e, t) {
 								let n = e[t++];
 								if (t >= e.length) break;
 								if (n === "expression") {
-									let n = ue(e[t++], "step completion");
+									let n = le(e[t++], "step completion");
 									s.completion = n.source, s.completionBound = n.inline || void 0;
 								} else t = H(e, t);
 							}
 						} else {
-							let e = ue(l[u++], "step completion");
+							let e = le(l[u++], "step completion");
 							s.completion = e.source, s.completionBound = e.inline || void 0;
 						}
 					} else if (e === "calls") {
@@ -1845,26 +1866,26 @@ var $e = function(e, t) {
 			for (; r < t.length;) {
 				let n = t[r++];
 				if (r >= t.length) break;
-				n === "in" ? e.inputs.push(...V(i(t[r++]))) : n === "out" ? e.outputs.push(...V(i(t[r++]))) : i(t[r++]);
+				n === "in" ? e.inputs.push(...ze(i(t[r++]))) : n === "out" ? e.outputs.push(...ze(i(t[r++]))) : i(t[r++]);
 			}
 			o.signature = e;
 		} else if (t === "invariants") o.invariants = Be(i(s()));
-		else if (t === "activity_kind") o.activityKinds = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
+		else if (t === "activity_kind") o.activityKinds = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
 		else if (t === "summary") o.summary = x(s);
-		else if (t === "roles") o.roles = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
-		else if (t === "organs") o.organs = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
-		else if (t === "participant_kinds") o.participantKinds = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
+		else if (t === "roles") o.roles = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
+		else if (t === "organs") o.organs = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
+		else if (t === "participant_kinds") o.participantKinds = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
 		else if (t === "evidence") o.evidence = Ue(i(s()));
 		else if (t === "decision") o.decision = We(i(s()));
 		else if (t === "declaration") o.declaration = Ge(i(s()));
 		else if (t === "discharges_gate") o.dischargesGate = a(s());
-		else if (t === "realized_by") o.realizedBy = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
-		else if (t === "approved_by") o.approvedBy = n(a(s())).map(P).map(a).filter((e) => e.length > 0);
+		else if (t === "realized_by") o.realizedBy = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
+		else if (t === "approved_by") o.approvedBy = n(a(s())).map(F).map(a).filter((e) => e.length > 0);
 		else if (t === "windows") o.windows = Ke(i(s()));
 		else if (t === "segregation") o.segregation = He(i(s()));
 		else if (t === "preconditions") o.preconditions = Ve(i(s()));
 		else if (t === "executor") o.executor = a(s());
-		else if (t === "registers") o.registers = V(i(s()), !0);
+		else if (t === "registers") o.registers = ze(i(s()), !0);
 		else if (t === "state") o.state = a(s());
 		else if (t === "instances") o.instances = qe(i(s()));
 		else if (t === "child_composition") {
@@ -1873,12 +1894,12 @@ var $e = function(e, t) {
 			o.childComposition = t;
 		} else if (t === "does") o.does = Qe(i(s()));
 		else if (t === "source") {
-			let e = I(i(s()));
+			let e = L(i(s()));
 			o.source ||= e, (o.sourceRefs ??= []).push(e);
 		} else if (t === "ref") {
-			let e = C(s, c, a, i);
-			T(o, e) || (o.refs ??= []).push(e);
-		} else if (t === "corresponds") (o.correspondences ??= []).push(O(s, c, a));
+			let e = w(s, c, a, i);
+			E(o, e) || (o.refs ??= []).push(e);
+		} else if (t === "corresponds") (o.correspondences ??= []).push(k(s, c, a));
 		else return !1;
 		return !0;
 	}, {
@@ -1932,7 +1953,7 @@ function nt(e, t, n = !1) {
 	return r;
 }
 function rt(e) {
-	return e.map((e) => e.name + (e.type ? " : " + e.type : "") + (e.initial === void 0 ? "" : " = " + Ie(e.initial))).join(" ");
+	return e.map((e) => e.name + (e.type ? " : " + e.type : "") + (e.initial === void 0 ? "" : " = " + Fe(e.initial))).join(" ");
 }
 function it(e) {
 	let t = "  signature {\n";
@@ -1940,10 +1961,10 @@ function it(e) {
 }
 function at(e) {
 	let t = [];
-	if (e.executor && t.push("executor " + e.executor), e.role && t.push("role " + N(e.role)), e.capture && t.push("capture " + N(e.capture)), e.reads.length > 0 && t.push("read { " + e.reads.map(N).join(" ") + " }"), e.writes.length > 0 && t.push("write { " + e.writes.map(N).join(" ") + " }"), e.wait && t.push("wait " + N(e.wait)), e.period && t.push("period " + N(e.period)), e.signal && t.push("signal " + N(e.signal)), e.fires && t.push("fires " + N(e.fires)), e.calls) {
-		let n = "calls " + N(e.calls);
+	if (e.executor && t.push("executor " + e.executor), e.role && t.push("role " + P(e.role)), e.capture && t.push("capture " + P(e.capture)), e.reads.length > 0 && t.push("read { " + e.reads.map(P).join(" ") + " }"), e.writes.length > 0 && t.push("write { " + e.writes.map(P).join(" ") + " }"), e.wait && t.push("wait " + P(e.wait)), e.period && t.push("period " + P(e.period)), e.signal && t.push("signal " + P(e.signal)), e.fires && t.push("fires " + P(e.fires)), e.calls) {
+		let n = "calls " + P(e.calls);
 		if (e.callIn.length > 0 || e.callOut.length > 0) {
-			let t = (e) => e.map((e) => N(e.param) + " : " + N(e.bind)).join(" ");
+			let t = (e) => e.map((e) => P(e.param) + " : " + P(e.bind)).join(" ");
 			n += " { with {", e.callIn.length > 0 && (n += " in { " + t(e.callIn) + " }"), e.callOut.length > 0 && (n += " out { " + t(e.callOut) + " }"), n += " } }";
 		}
 		t.push(n);
@@ -1964,8 +1985,8 @@ var st = function(e, t) {
 	let n = "process " + e.id + " {\n";
 	n += "  name \"" + s(e.name) + "\"\n", e.overlay && (n += "  overlay true\n"), e.summary && (n += "  summary \"" + s(e.summary) + "\"\n");
 	let r = e.actorRef || e.actor?.id || "";
-	if (r !== "" && (n += "  actor " + N(r) + "\n"), e.modality !== "" && (n += "  modality " + e.modality + "\n"), e.phase && (n += "  phase " + N(e.phase) + "\n"), e.guards && e.guards.length > 0) for (let t of e.guards) n += "  guard \"" + s(t) + "\"\n";
-	e.machineSteps && e.machineSteps.length > 0 && (n += "  machine_steps { " + e.machineSteps.map(N).join(" ") + " }\n");
+	if (r !== "" && (n += "  actor " + P(r) + "\n"), e.modality !== "" && (n += "  modality " + e.modality + "\n"), e.phase && (n += "  phase " + P(e.phase) + "\n"), e.guards && e.guards.length > 0) for (let t of e.guards) n += "  guard \"" + s(t) + "\"\n";
+	e.machineSteps && e.machineSteps.length > 0 && (n += "  machine_steps { " + e.machineSteps.map(P).join(" ") + " }\n");
 	for (let t of e.steps ?? []) if (t.signatureBlock) {
 		let e = t.signatureBlock.split("\n").map((e) => e.trim()).filter((e) => e !== "");
 		n += "  step " + t.id + " {\n";
@@ -1981,7 +2002,7 @@ var st = function(e, t) {
 	let i = e.inputRefs && e.inputRefs.length > 0 ? e.inputRefs : e.input.map((e) => e.id);
 	if (i.length > 0) {
 		n += "  reference_data_registry {\n";
-		for (let e of i) n += "    " + N(e) + "\n";
+		for (let e of i) n += "    " + P(e) + "\n";
 		n += "  }\n";
 	}
 	if (e.provisionRefs.length > 0) {
@@ -1997,7 +2018,7 @@ var st = function(e, t) {
 	let a = e.outputRefs && e.outputRefs.length > 0 ? e.outputRefs : e.output.map((e) => e.id);
 	if (a.length > 0) {
 		n += "  output {\n";
-		for (let e of a) n += "    " + N(e) + "\n";
+		for (let e of a) n += "    " + P(e) + "\n";
 		n += "  }\n";
 	}
 	if (e.page !== null && (n += "  canvas " + e.page.id + "\n"), e.signature !== null && e.signature !== void 0 && (n += it(e.signature)), e.invariants && e.invariants.length > 0) {
@@ -2005,19 +2026,19 @@ var st = function(e, t) {
 		for (let t of e.invariants) n += "    \"" + s(t) + "\"\n";
 		n += "  }\n";
 	}
-	if (e.activityKinds && e.activityKinds.length > 0 && (n += "  activity_kind { " + e.activityKinds.map(N).join(" ") + " }\n"), e.roles && e.roles.length > 0 && (n += "  roles { " + e.roles.map(N).join(" ") + " }\n"), e.organs && e.organs.length > 0 && (n += "  organs { " + e.organs.map(N).join(" ") + " }\n"), e.participantKinds && e.participantKinds.length > 0 && (n += "  participant_kinds { " + e.participantKinds.map(N).join(" ") + " }\n"), e.evidence && e.evidence.length > 0) {
+	if (e.activityKinds && e.activityKinds.length > 0 && (n += "  activity_kind { " + e.activityKinds.map(P).join(" ") + " }\n"), e.roles && e.roles.length > 0 && (n += "  roles { " + e.roles.map(P).join(" ") + " }\n"), e.organs && e.organs.length > 0 && (n += "  organs { " + e.organs.map(P).join(" ") + " }\n"), e.participantKinds && e.participantKinds.length > 0 && (n += "  participant_kinds { " + e.participantKinds.map(P).join(" ") + " }\n"), e.evidence && e.evidence.length > 0) {
 		n += "  evidence {\n";
-		for (let t of e.evidence) n += "    " + N(t.id) + " {", t.description && (n += " description \"" + s(t.description) + "\""), t.required && (n += " required true"), n += " }\n";
+		for (let t of e.evidence) n += "    " + P(t.id) + " {", t.description && (n += " description \"" + s(t.description) + "\""), t.required && (n += " required true"), n += " }\n";
 		n += "  }\n";
 	}
-	if (e.decision && (n += "  decision {", e.decision.rule && (n += " rule " + N(e.decision.rule)), e.decision.clause && (n += " clause \"" + s(e.decision.clause) + "\""), n += " }\n"), e.declaration && (n += "  declaration {", e.declaration.kind && (n += " kind " + N(e.declaration.kind)), e.declaration.action && (n += " action " + N(e.declaration.action)), n += " }\n"), e.dischargesGate && (n += "  discharges_gate " + N(e.dischargesGate) + "\n"), e.realizedBy && e.realizedBy.length > 0 && (n += "  realized_by { " + e.realizedBy.map(N).join(" ") + " }\n"), e.approvedBy && e.approvedBy.length > 0 && (n += "  approved_by { " + e.approvedBy.map(N).join(" ") + " }\n"), e.windows && e.windows.length > 0) {
+	if (e.decision && (n += "  decision {", e.decision.rule && (n += " rule " + P(e.decision.rule)), e.decision.clause && (n += " clause \"" + s(e.decision.clause) + "\""), n += " }\n"), e.declaration && (n += "  declaration {", e.declaration.kind && (n += " kind " + P(e.declaration.kind)), e.declaration.action && (n += " action " + P(e.declaration.action)), n += " }\n"), e.dischargesGate && (n += "  discharges_gate " + P(e.dischargesGate) + "\n"), e.realizedBy && e.realizedBy.length > 0 && (n += "  realized_by { " + e.realizedBy.map(P).join(" ") + " }\n"), e.approvedBy && e.approvedBy.length > 0 && (n += "  approved_by { " + e.approvedBy.map(P).join(" ") + " }\n"), e.windows && e.windows.length > 0) {
 		n += "  windows {\n";
-		for (let t of e.windows) n += "    window " + N(t.id) + " {\n", t.kind && (n += "      kind " + N(t.kind) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.anchor && (n += "      anchor " + N(t.anchor) + "\n"), t.applies_to && (n += "      applies_to " + N(t.applies_to) + "\n"), (t.windowYears > 0 || t.windowMonths > 0) && (n += "      window {", t.windowYears > 0 && (n += " years " + t.windowYears), t.windowMonths > 0 && (n += " months " + t.windowMonths), n += " }\n"), t.breach && (n += "      breach " + N(t.breach) + "\n"), t.description && (n += "      description \"" + s(t.description) + "\"\n"), n += "    }\n";
+		for (let t of e.windows) n += "    window " + P(t.id) + " {\n", t.kind && (n += "      kind " + P(t.kind) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.anchor && (n += "      anchor " + P(t.anchor) + "\n"), t.applies_to && (n += "      applies_to " + P(t.applies_to) + "\n"), (t.windowYears > 0 || t.windowMonths > 0) && (n += "      window {", t.windowYears > 0 && (n += " years " + t.windowYears), t.windowMonths > 0 && (n += " months " + t.windowMonths), n += " }\n"), t.breach && (n += "      breach " + P(t.breach) + "\n"), t.description && (n += "      description \"" + s(t.description) + "\"\n"), n += "    }\n";
 		n += "  }\n";
 	}
 	if (e.segregation && e.segregation.length > 0) {
 		n += "  segregation {\n";
-		for (let t of e.segregation) n += "    constraint " + t.id + " {\n", t.kind && (n += "      kind " + N(t.kind) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.pair.length > 0 && (n += "      pair { " + t.pair.map(N).join(" ") + " }\n"), t.period && (n += "      period " + N(t.period) + "\n"), t.barred.length > 0 && (n += "      barred { " + t.barred.map(N).join(" ") + " }\n"), t.statement && (n += "      statement \"" + s(t.statement) + "\"\n"), n += "    }\n";
+		for (let t of e.segregation) n += "    constraint " + t.id + " {\n", t.kind && (n += "      kind " + P(t.kind) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.pair.length > 0 && (n += "      pair { " + t.pair.map(P).join(" ") + " }\n"), t.period && (n += "      period " + P(t.period) + "\n"), t.barred.length > 0 && (n += "      barred { " + t.barred.map(P).join(" ") + " }\n"), t.statement && (n += "      statement \"" + s(t.statement) + "\"\n"), n += "    }\n";
 		n += "  }\n";
 	}
 	if (e.preconditions && e.preconditions.length > 0) {
@@ -2028,18 +2049,18 @@ var st = function(e, t) {
 		}
 		n += "  }\n";
 	}
-	if (e.executor && (n += "  executor " + N(e.executor) + "\n"), e.registers && e.registers.length > 0 && (n += "  registers { " + rt(e.registers) + " }\n"), e.state && (n += "  state " + N(e.state) + "\n"), e.instances) {
+	if (e.executor && (n += "  executor " + P(e.executor) + "\n"), e.registers && e.registers.length > 0 && (n += "  registers { " + rt(e.registers) + " }\n"), e.state && (n += "  state " + P(e.state) + "\n"), e.instances) {
 		let t = "  instances { by " + e.instances.by + " values { ";
 		for (let [n, r] of Object.entries(e.instances.values)) {
 			t += n + " { ";
-			for (let [e, n] of Object.entries(r)) t += e + ": " + N(String(n)) + " ";
+			for (let [e, n] of Object.entries(r)) t += e + ": " + P(String(n)) + " ";
 			t += "} ";
 		}
 		n += t + "} }\n";
 	}
 	e.childComposition === "gateway" && (n += "  child_composition gateway\n"), e.does && (n += ot(e.does));
-	for (let t of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) n += E(t, "  ", s);
-	return n += w(e.refs, "  ", s), n += k(e.correspondences, "  ", s, N), e.parent && (e.children.length === 0 || !t?.nested) && (n += "  parent " + e.parent + "\n"), n += "}\n", n;
+	for (let t of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) n += D(t, "  ", s);
+	return n += T(e.refs, "  ", s), n += A(e.correspondences, "  ", s, P), e.parent && (e.children.length === 0 || !t?.nested) && (n += "  parent " + e.parent + "\n"), n += "}\n", n;
 };
 //#endregion
 //#region src/ser-des/dump.ts
@@ -2104,7 +2125,7 @@ var lt = function(e, t) {
 		else if (e === "approve_by") n._relations.approver = t();
 		else if (e === "approval_record") n._relations.records = r(t());
 		else if (e === "reference") n._relations.ref = r(t());
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -2477,7 +2498,7 @@ var It = function(e, t) {
 function Rt(e) {
 	let t = "exclusive_gateway " + e.id + " {\n";
 	e.label !== "" && (t += "  label \"" + s(e.label) + "\"\n");
-	for (let n of e.edges ?? []) t += "  edge " + N(n.target) + " {", n.condition === "default" ? t += " condition default" : n.condition !== "" && (t += " condition \"" + s(n.condition) + "\""), n.label !== "" && (t += " label \"" + s(n.label) + "\""), t += " }\n";
+	for (let n of e.edges ?? []) t += "  edge " + P(n.target) + " {", n.condition === "default" ? t += " condition default" : n.condition !== "" && (t += " condition \"" + s(n.condition) + "\""), n.label !== "" && (t += " label \"" + s(n.label) + "\""), t += " }\n";
 	return t += "}\n", t;
 }
 //#endregion
@@ -2489,7 +2510,7 @@ var zt = [
 	"in-service"
 ], Bt = ["timer", "signal"], Vt = ["same-as-type-evaluation", "override"];
 function Ht(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function Ut(e) {
 	let t = {
@@ -2557,7 +2578,7 @@ var Kt = (e, t) => {
 					if (!Vt.includes(n)) throw Error(`Parsing error: verification_pathway. ID ${e}: Unknown limits mode "${n}" (valid: ${Vt.join(", ")})`);
 					t.mode = n;
 				} else if (n === "description") t.description = a(r());
-				else if (n === "source") t.source = I(i(r()));
+				else if (n === "source") t.source = L(i(r()));
 				else return !1;
 				return !0;
 			}, {
@@ -2572,7 +2593,7 @@ var Kt = (e, t) => {
 			y(i(r()), (n, r) => {
 				if (n === "mark") {
 					let n = {
-						id: a(P(r())),
+						id: a(F(r())),
 						mark: "",
 						location: "",
 						clause: ""
@@ -2603,7 +2624,7 @@ var Kt = (e, t) => {
 				if (n === "window") t.window = Ut(r());
 				else if (n === "trigger") {
 					let n = {
-						id: a(P(r())),
+						id: a(F(r())),
 						kind: "",
 						event: "",
 						action: "",
@@ -2618,9 +2639,9 @@ var Kt = (e, t) => {
 							n.kind = t;
 						} else if (t === "event") n.event = a(r());
 						else if (t === "action") n.action = a(r());
-						else if (t === "applicability") n.applicability = L(i(r()));
+						else if (t === "applicability") n.applicability = R(i(r()));
 						else if (t === "description") n.description = a(r());
-						else if (t === "source") n.source = I(i(r()));
+						else if (t === "source") n.source = L(i(r()));
 						else return !1;
 						return !0;
 					}, {
@@ -2633,7 +2654,7 @@ var Kt = (e, t) => {
 				construct: "verification_pathway validity",
 				id: e
 			}), n.validity = t;
-		} else if (t === "source") n.source = I(i(r()));
+		} else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -2641,18 +2662,18 @@ var Kt = (e, t) => {
 		id: e
 	}), (t) => (t.verificationPathways[e] = n, t);
 }, qt = function(e) {
-	let t = "verification_pathway " + N(e.id) + " {\n";
-	if (e.kind && (t += "  kind " + e.kind + "\n"), e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.visualInspection && (t += "  visual_inspection \"" + s(e.visualInspection) + "\"\n"), e.tests.length > 0 && (t += "  tests { " + e.tests.map(N).join(" ") + " }\n"), e.assessment && (t += "  assessment {\n", e.assessment.covers.length > 0 && (t += "    covers { " + e.assessment.covers.map(N).join(" ") + " }\n"), e.assessment.description && (t += "    description \"" + s(e.assessment.description) + "\"\n"), t += "  }\n"), e.limits && (t += "  limits {\n", e.limits.mode && (t += "    mode " + e.limits.mode + "\n"), e.limits.description && (t += "    description \"" + s(e.limits.description) + "\"\n"), e.limits.source && (t += Gt(e.limits.source, "    ")), t += "  }\n"), e.marking) {
+	let t = "verification_pathway " + P(e.id) + " {\n";
+	if (e.kind && (t += "  kind " + e.kind + "\n"), e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.visualInspection && (t += "  visual_inspection \"" + s(e.visualInspection) + "\"\n"), e.tests.length > 0 && (t += "  tests { " + e.tests.map(P).join(" ") + " }\n"), e.assessment && (t += "  assessment {\n", e.assessment.covers.length > 0 && (t += "    covers { " + e.assessment.covers.map(P).join(" ") + " }\n"), e.assessment.description && (t += "    description \"" + s(e.assessment.description) + "\"\n"), t += "  }\n"), e.limits && (t += "  limits {\n", e.limits.mode && (t += "    mode " + e.limits.mode + "\n"), e.limits.description && (t += "    description \"" + s(e.limits.description) + "\"\n"), e.limits.source && (t += Gt(e.limits.source, "    ")), t += "  }\n"), e.marking) {
 		t += "  marking {\n";
 		for (let n of e.marking.marks) {
-			let e = "    mark " + N(n.id) + " { mark \"" + s(n.mark) + "\"";
+			let e = "    mark " + P(n.id) + " { mark \"" + s(n.mark) + "\"";
 			n.location && (e += " location \"" + s(n.location) + "\""), n.clause && (e += " clause \"" + s(n.clause) + "\""), t += e + " }\n";
 		}
 		e.marking.securing.length > 0 && (t += "    securing { " + e.marking.securing.map((e) => "\"" + s(e) + "\"").join(" ") + " }\n"), t += "  }\n";
 	}
 	if (e.validity) {
 		t += "  validity {\n", e.validity.window && (t += Wt(e.validity.window, "    "));
-		for (let n of e.validity.triggers) t += "    trigger " + N(n.id) + " {\n", n.kind && (t += "      kind " + n.kind + "\n"), n.event && (t += "      event " + N(n.event) + "\n"), n.action && (t += "      action " + N(n.action) + "\n"), n.applicability.length > 0 && (t += "      applicability { " + R(n.applicability).trimEnd() + " }\n"), n.description && (t += "      description \"" + s(n.description) + "\"\n"), n.source && (t += Gt(n.source, "      ")), t += "    }\n";
+		for (let n of e.validity.triggers) t += "    trigger " + P(n.id) + " {\n", n.kind && (t += "      kind " + n.kind + "\n"), n.event && (t += "      event " + P(n.event) + "\n"), n.action && (t += "      action " + P(n.action) + "\n"), n.applicability.length > 0 && (t += "      applicability { " + z(n.applicability).trimEnd() + " }\n"), n.description && (t += "      description \"" + s(n.description) + "\"\n"), n.source && (t += Gt(n.source, "      ")), t += "    }\n";
 		t += "  }\n";
 	}
 	return e.source && (t += Gt(e.source, "  ")), t += "}\n", t;
@@ -2676,7 +2697,7 @@ var Kt = (e, t) => {
 function Qt(e) {
 	let t = {}, r = n(i(e));
 	for (let e = 0; e + 1 < r.length; e += 2) {
-		let n = a(P(r[e]));
+		let n = a(F(r[e]));
 		n && (t[n] = a(r[e + 1]));
 	}
 	return t;
@@ -2711,7 +2732,7 @@ var $t = (e, t) => {
 			};
 			y(i(o()), (e, r) => {
 				if (e === "model_field") t.modelField = a(r());
-				else if (e === "in") t.in = n(a(r())).map(P).map(a).filter((e) => e.length > 0);
+				else if (e === "in") t.in = n(a(r())).map(F).map(a).filter((e) => e.length > 0);
 				else if (e === "equals") t.equals = a(r());
 				else if (e === "not_null") t.notNull = r() === "true";
 				else return !1;
@@ -2750,12 +2771,12 @@ var $t = (e, t) => {
 		id: e
 	}), (t) => (t.labSelectionCriteria[e] = r, t);
 }, en = function(e) {
-	let t = "lab_selection_criterion " + N(e.id) + " {\n";
+	let t = "lab_selection_criterion " + P(e.id) + " {\n";
 	if (e.weight && (t += "  weight " + e.weight + "\n"), e.parameterType && (t += "  parameter_type " + e.parameterType + "\n"), e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.appliesWhen) {
-		let n = "  applies_when { model_field " + N(e.appliesWhen.modelField);
-		e.appliesWhen.in.length > 0 && (n += " in { " + e.appliesWhen.in.map(N).join(" ") + " }"), e.appliesWhen.equals && (n += " equals " + N(e.appliesWhen.equals)), e.appliesWhen.notNull !== null && (n += " not_null " + (e.appliesWhen.notNull ? "true" : "false")), t += n + " }\n";
+		let n = "  applies_when { model_field " + P(e.appliesWhen.modelField);
+		e.appliesWhen.in.length > 0 && (n += " in { " + e.appliesWhen.in.map(P).join(" ") + " }"), e.appliesWhen.equals && (n += " equals " + P(e.appliesWhen.equals)), e.appliesWhen.notNull !== null && (n += " not_null " + (e.appliesWhen.notNull ? "true" : "false")), t += n + " }\n";
 	}
-	return e.match && (t += "  match {\n", e.match.operator && (t += "    operator " + e.match.operator + "\n"), e.match.requiredCapability && (t += "    required_capability \"" + s(e.match.requiredCapability) + "\"\n"), e.match.requiredCapabilityPrefix && (t += "    required_capability_prefix \"" + s(e.match.requiredCapabilityPrefix) + "\"\n"), e.match.modelField && (t += "    model_field " + N(e.match.modelField) + "\n"), e.match.labCapabilityPrefix && (t += "    lab_capability_prefix \"" + s(e.match.labCapabilityPrefix) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	return e.match && (t += "  match {\n", e.match.operator && (t += "    operator " + e.match.operator + "\n"), e.match.requiredCapability && (t += "    required_capability \"" + s(e.match.requiredCapability) + "\"\n"), e.match.requiredCapabilityPrefix && (t += "    required_capability_prefix \"" + s(e.match.requiredCapabilityPrefix) + "\"\n"), e.match.modelField && (t += "    model_field " + P(e.match.modelField) + "\n"), e.match.labCapabilityPrefix && (t += "    lab_capability_prefix \"" + s(e.match.labCapabilityPrefix) + "\"\n"), t += "  }\n"), t += "}\n", t;
 }, tn = (e, t) => {
 	let n = {
 		id: e,
@@ -2789,10 +2810,10 @@ var $t = (e, t) => {
 		id: e
 	}), (t) => (t.sampleSelectionRules[e] = n, t);
 }, nn = function(e) {
-	let t = "sample_selection_rule " + N(e.id) + " {\n";
+	let t = "sample_selection_rule " + P(e.id) + " {\n";
 	e.step && (t += "  step \"" + s(e.step) + "\"\n"), e.rule && (t += "  rule \"" + s(e.rule) + "\"\n"), e.rationale && (t += "  rationale \"" + s(e.rationale) + "\"\n"), e.applicability && (t += "  applicability \"" + s(e.applicability) + "\"\n"), e.selector && (t += "  selector \"" + s(e.selector) + "\"\n"), e.testKind && (t += "  test_kind " + e.testKind + "\n"), e.singleSample !== null && (t += "  single_sample " + (e.singleSample ? "true" : "false") + "\n");
 	let n = Object.keys(e.additionalTests);
-	return n.length > 0 && (t += "  additional_tests { " + n.map((t) => N(t) + " \"" + s(e.additionalTests[t]) + "\"").join(" ") + " }\n"), e.post && (t += "  post \"" + s(e.post) + "\"\n"), t += "}\n", t;
+	return n.length > 0 && (t += "  additional_tests { " + n.map((t) => P(t) + " \"" + s(e.additionalTests[t]) + "\"").join(" ") + " }\n"), e.post && (t += "  post \"" + s(e.post) + "\"\n"), t += "}\n", t;
 }, rn = (e, t) => {
 	let n = {
 		id: e,
@@ -2815,7 +2836,7 @@ var $t = (e, t) => {
 		id: e
 	}), (t) => (t.specimenGovernanceRules[e] = n, t);
 }, an = function(e) {
-	let t = "specimen_governance_rule " + N(e.id) + " {\n";
+	let t = "specimen_governance_rule " + P(e.id) + " {\n";
 	return e.rule && (t += "  rule \"" + s(e.rule) + "\"\n"), e.rationale && (t += "  rationale \"" + s(e.rationale) + "\"\n"), e.applicability && (t += "  applicability \"" + s(e.applicability) + "\"\n"), e.constraint && (t += "  constraint \"" + s(e.constraint) + "\"\n"), e.post && (t += "  post \"" + s(e.post) + "\"\n"), t += "}\n", t;
 }, on = ["always", "conditional"], sn = ["shall", "may"];
 function cn(e, t, n) {
@@ -2838,7 +2859,7 @@ function cn(e, t, n) {
 			let e = a(t());
 			if (!on.includes(e)) throw Error(`Parsing error: test_report_skeleton. ID ${n}: Unknown required "${e}" (valid: ${on.join(", ")})`);
 			r.required = e;
-		} else if (e === "applicability") r.applicability = L(i(t()));
+		} else if (e === "applicability") r.applicability = R(i(t()));
 		else if (e === "notes") r.notes = a(t());
 		else return !1;
 		return !0;
@@ -2848,11 +2869,11 @@ function cn(e, t, n) {
 	}), r;
 }
 function ln(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function un(e, t) {
-	let n = t + "form " + N(e.id) + " {\n";
-	return e.file && (n += t + "  file \"" + s(e.file) + "\"\n"), e.title && (n += t + "  title \"" + s(e.title) + "\"\n"), e.conformanceTest && (n += t + "  conformance_test " + N(e.conformanceTest) + "\n"), e.requirements.length > 0 && (n += t + "  requirements { " + e.requirements.map(N).join(" ") + " }\n"), e.required && (n += t + "  required " + e.required + "\n"), e.applicability.length > 0 && (n += t + "  applicability { " + R(e.applicability).trimEnd() + " }\n"), e.notes && (n += t + "  notes \"" + s(e.notes) + "\"\n"), n += t + "}\n", n;
+	let n = t + "form " + P(e.id) + " {\n";
+	return e.file && (n += t + "  file \"" + s(e.file) + "\"\n"), e.title && (n += t + "  title \"" + s(e.title) + "\"\n"), e.conformanceTest && (n += t + "  conformance_test " + P(e.conformanceTest) + "\n"), e.requirements.length > 0 && (n += t + "  requirements { " + e.requirements.map(P).join(" ") + " }\n"), e.required && (n += t + "  required " + e.required + "\n"), e.applicability.length > 0 && (n += t + "  applicability { " + z(e.applicability).trimEnd() + " }\n"), e.notes && (n += t + "  notes \"" + s(e.notes) + "\"\n"), n += t + "}\n", n;
 }
 var dn = (e, t) => {
 	let n = {
@@ -2868,7 +2889,7 @@ var dn = (e, t) => {
 		else if (t === "note") n.note = a(r());
 		else if (t === "section") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				title: "",
 				description: "",
 				forms: [],
@@ -2877,7 +2898,7 @@ var dn = (e, t) => {
 			y(i(r()), (n, r) => {
 				if (n === "title") t.title = a(r());
 				else if (n === "description") t.description = a(r());
-				else if (n === "form") t.forms.push(cn(a(P(r())), i(r()), e));
+				else if (n === "form") t.forms.push(cn(a(F(r())), i(r()), e));
 				else if (n === "subsection") {
 					let n = {
 						title: a(r()),
@@ -2887,8 +2908,8 @@ var dn = (e, t) => {
 					};
 					y(i(r()), (t, r) => {
 						if (t === "description") n.description = a(r());
-						else if (t === "applicability") n.applicability = L(i(r()));
-						else if (t === "form") n.forms.push(cn(a(P(r())), i(r()), e));
+						else if (t === "applicability") n.applicability = R(i(r()));
+						else if (t === "form") n.forms.push(cn(a(F(r())), i(r()), e));
 						else return !1;
 						return !0;
 					}, {
@@ -2908,13 +2929,13 @@ var dn = (e, t) => {
 		id: e
 	}), (t) => (t.testReportSkeletons[e] = n, t);
 }, fn = function(e) {
-	let t = "test_report_skeleton " + N(e.id) + " {\n";
+	let t = "test_report_skeleton " + P(e.id) + " {\n";
 	e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n");
 	for (let n of e.sections) {
-		t += "  section " + N(n.id) + " {\n", n.title && (t += "    title \"" + s(n.title) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n");
+		t += "  section " + P(n.id) + " {\n", n.title && (t += "    title \"" + s(n.title) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n");
 		for (let e of n.forms) t += un(e, "    ");
 		for (let e of n.subsections) {
-			t += "    subsection \"" + s(e.title) + "\" {\n", e.description && (t += "      description \"" + s(e.description) + "\"\n"), e.applicability.length > 0 && (t += "      applicability { " + R(e.applicability).trimEnd() + " }\n");
+			t += "    subsection \"" + s(e.title) + "\" {\n", e.description && (t += "      description \"" + s(e.description) + "\"\n"), e.applicability.length > 0 && (t += "      applicability { " + z(e.applicability).trimEnd() + " }\n");
 			for (let n of e.forms) t += un(n, "      ");
 			t += "    }\n";
 		}
@@ -2931,7 +2952,7 @@ var dn = (e, t) => {
 		if (t === "overlay") n.overlay = r() === "true";
 		else if (t === "entry") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				element: null,
 				description: null,
 				obligation: null,
@@ -2962,9 +2983,9 @@ var dn = (e, t) => {
 		id: e
 	}), (t) => (t.testReportChecklists[e] = n, t);
 }, mn = function(e) {
-	let t = "test_report_checklist " + N(e.id) + " {\n";
+	let t = "test_report_checklist " + P(e.id) + " {\n";
 	e.overlay && (t += "  overlay true\n");
-	for (let n of e.entries) t += "  entry " + N(n.id) + " {\n", n.element !== null && (t += "    element \"" + s(n.element) + "\"\n"), n.description !== null && (t += "    description \"" + s(n.description) + "\"\n"), n.obligation !== null && (t += "    obligation " + n.obligation + "\n"), n.descriptionNote !== null && (t += "    description_note \"" + s(n.descriptionNote) + "\"\n"), n.source !== null && (t += "    source \"" + s(n.source) + "\"\n"), n.validation !== null && (t += "    validation \"" + s(n.validation) + "\"\n"), t += "  }\n";
+	for (let n of e.entries) t += "  entry " + P(n.id) + " {\n", n.element !== null && (t += "    element \"" + s(n.element) + "\"\n"), n.description !== null && (t += "    description \"" + s(n.description) + "\"\n"), n.obligation !== null && (t += "    obligation " + n.obligation + "\n"), n.descriptionNote !== null && (t += "    description_note \"" + s(n.descriptionNote) + "\"\n"), n.source !== null && (t += "    source \"" + s(n.source) + "\"\n"), n.validation !== null && (t += "    validation \"" + s(n.validation) + "\"\n"), t += "  }\n";
 	return t += "}\n", t;
 }, hn = function(e, t) {
 	let n = {
@@ -3248,14 +3269,14 @@ var Nn = [
 			if (!Nn.includes(t)) throw Error(`Parsing error: note. ID ${e}: Unknown type ${t} (valid: ${Nn.join(", ")})`);
 			n.type = t;
 		} else if (t === "message") n.message = x(o);
-		else if (t === "source_discrepancy") n.sourceDiscrepancy = A(i(o()));
+		else if (t === "source_discrepancy") n.sourceDiscrepancy = j(i(o()));
 		else if (t === "source") {
-			let e = I(i(o()));
+			let e = L(i(o()));
 			n.source ||= e, (n.sourceRefs ??= []).push(e);
 		} else if (t === "reference") n._relations.ref = r(o());
 		else if (t === "ref") {
-			let e = C(o, s, a, i);
-			T(n, e);
+			let e = w(o, s, a, i);
+			E(n, e);
 		} else return !1;
 		return !0;
 	}, {
@@ -3274,8 +3295,8 @@ var Nn = [
 	};
 }, In = function(e) {
 	let t = "note " + e.id + " {\n";
-	t += "  type " + e.type + "\n", t += "  message \"" + s(e.message) + "\"\n", e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "  ") + "\n");
-	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += E(n, "  ", s);
+	t += "  type " + e.type + "\n", t += "  message \"" + s(e.message) + "\"\n", e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "  ") + "\n");
+	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += D(n, "  ", s);
 	if (e.ref.length > 0) {
 		t += "  reference {\n";
 		for (let n of e.ref) t += "    " + n.id + "\n";
@@ -3291,7 +3312,7 @@ function Ln(e) {
 function Rn(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		if (i < r.length && r[i] === "{") throw Error(`Parsing error: table. Column "${e}": the old columns dialect (colN { name ... type ... }) is retired — write the canonical form: ${e === "" ? "name" : e}: type "unit"`);
 		i < r.length && r[i] === ":" && i++;
@@ -3307,7 +3328,7 @@ function Rn(e) {
 function zn(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		i < r.length && r[i] === ":" && i++, i < r.length && (t[e] = Ln(a(r[i++])));
 	}
@@ -3316,10 +3337,10 @@ function zn(e) {
 function Bn(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e || (o < r.length && r[o] === ":" && o++, o >= r.length)) break;
 		if (r[o].startsWith("[")) {
-			let a = be(r, o);
+			let a = ye(r, o);
 			o = a.next;
 			let s = a.text.trim().slice(1, a.text.lastIndexOf("]")), c = [];
 			for (let e of n(s)) e.startsWith("{") && c.push(zn(i(e)));
@@ -3341,19 +3362,19 @@ function Vn(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "description" ? r.description = a(o[s++]) : e === "dimension" ? r.dimension = a(o[s++]) : e === "unit" ? r.unit = a(o[s++]) : e === "type" ? r.type = a(o[s++]) : e === "source_discrepancy" ? r.sourceDiscrepancy = A(i(o[s++])) : e === "binding" ? r.binding = Bn(i(o[s++])) : i(o[s++]);
+		e === "description" ? r.description = a(o[s++]) : e === "dimension" ? r.dimension = a(o[s++]) : e === "unit" ? r.unit = a(o[s++]) : e === "type" ? r.type = a(o[s++]) : e === "source_discrepancy" ? r.sourceDiscrepancy = j(i(o[s++])) : e === "binding" ? r.binding = Bn(i(o[s++])) : i(o[s++]);
 	}
 	return r;
 }
 function Hn(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o] === ":" && o++, o < r.length && r[o].startsWith("{")) {
 			let s = n(i(r[o++])), c = {}, l = 0;
 			for (; l < s.length;) {
-				let e = P(s[l++]);
+				let e = F(s[l++]);
 				if (!e) break;
 				l < s.length && s[l] === ":" && l++, l < s.length && s[l].startsWith("{") ? c[e] = i(s[l++]).trim() : l < s.length && (c[e] = a(s[l++]));
 			}
@@ -3365,7 +3386,7 @@ function Hn(e) {
 function Un(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o] === ":" && o++, o < r.length && r[o].startsWith("{")) {
 			let s = n(i(r[o++])), c = {
@@ -3408,9 +3429,9 @@ var Wn = function(e, t) {
 					e.startsWith("{") ? o.columnDefs = Rn(i(e)) : o.columns = i(e);
 				} else if (t === "display") o.display = i(s[c++]);
 				else if (t === "source") {
-					let e = I(i(s[c++]));
+					let e = L(i(s[c++]));
 					o.sourceRef ||= e, (o.sourceRefs ??= []).push(e);
-				} else if (t === "source_discrepancy") o.sourceDiscrepancy = A(i(s[c++]));
+				} else if (t === "source_discrepancy") o.sourceDiscrepancy = j(i(s[c++]));
 				else if (t === "overrides") o.overrides = Un(i(s[c++]));
 				else if (t === "profiles") {
 					let e = n(i(s[c++])), t = [], r = 0;
@@ -3423,10 +3444,10 @@ var Wn = function(e, t) {
 				} else if (t === "domain") o.domain = i(s[c++]);
 				else if (t === "data") o.data = Gn(i(s[c++]));
 				else if (t === "ref") {
-					let e = S(s, c, a, i);
-					T(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
+					let e = C(s, c, a, i);
+					E(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
 				} else if (t === "corresponds") {
-					let e = D(s, c, a);
+					let e = O(s, c, a);
 					(o.correspondences ??= []).push(e.corr), c = e.next;
 				} else c = b(s, c, t);
 			} else throw Error(`Parsing error: table. ID ${e}: Expecting value for ${t}`);
@@ -3442,7 +3463,7 @@ function Gn(e) {
 	});
 }
 function Kn(e) {
-	return typeof e == "number" ? String(e) : N(String(e));
+	return typeof e == "number" ? String(e) : P(String(e));
 }
 function qn(e) {
 	return Array.isArray(e) ? "[" + e.map((e) => typeof e == "object" && e ? "{ " + Object.entries(e).map(([e, t]) => e + ": " + Kn(t)).join(" ") + " }" : Kn(e)).join(" ") + "]" : typeof e == "object" && e ? "{ " + Object.entries(e).map(([e, t]) => e + ": " + Kn(t)).join(" ") + " }" : Kn(e);
@@ -3458,8 +3479,8 @@ var Jn = function(e) {
 		t += "  }\n";
 	} else t += "  columns \"" + e.columns + "\"\n";
 	e.display && (t += "  display \"" + e.display + "\"\n");
-	for (let n of e.sourceRefs ?? (e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) ? [e.sourceRef] : [])) t += E(n, "  ", s);
-	if (e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "  ") + "\n"), t += k(e.correspondences, "  ", s, N), e.overrides && Object.keys(e.overrides).length > 0) {
+	for (let n of e.sourceRefs ?? (e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) ? [e.sourceRef] : [])) t += D(n, "  ", s);
+	if (e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "  ") + "\n"), t += A(e.correspondences, "  ", s, P), e.overrides && Object.keys(e.overrides).length > 0) {
 		t += "  overrides { ";
 		for (let [n, r] of Object.entries(e.overrides)) t += n + " { condition " + r.condition + " by " + r.by + " } ";
 		t += "}\n";
@@ -3481,7 +3502,7 @@ var Jn = function(e) {
 		}
 		for (let n of e.profileDefs ?? []) {
 			let e = "    profile " + n.name + " { ";
-			n.description && (e += "description \"" + s(n.description) + "\" "), n.dimension && (e += "dimension " + n.dimension + " "), n.unit && (e += "unit \"" + s(n.unit) + "\" "), n.type && (e += "type " + n.type + " "), n.sourceDiscrepancy && (e += j(n.sourceDiscrepancy, "") + " "), e += "binding { ";
+			n.description && (e += "description \"" + s(n.description) + "\" "), n.dimension && (e += "dimension " + n.dimension + " "), n.unit && (e += "unit \"" + s(n.unit) + "\" "), n.type && (e += "type " + n.type + " "), n.sourceDiscrepancy && (e += M(n.sourceDiscrepancy, "") + " "), e += "binding { ";
 			for (let [t, r] of Object.entries(n.binding)) e += t + ": " + qn(r) + " ";
 			e += "} ", t += e + "}\n";
 		}
@@ -3675,13 +3696,13 @@ var cr = function(e, t) {
 		id: e
 	}), (t) => (t.mapProfiles[e] = n, t);
 }, lr = function(e) {
-	let t = "map_profile " + N(e.namespace) + " {\n";
+	let t = "map_profile " + P(e.namespace) + " {\n";
 	e.description && (t += "  description \"" + s(e.description) + "\"\n");
 	let n = Object.keys(e.mappings);
 	if (n.length > 0) {
 		t += "  mapping {\n";
 		for (let r of n) for (let n of e.mappings[r]) {
-			let e = "    " + N(r) + " -> " + N(n.target), i = [];
+			let e = "    " + P(r) + " -> " + P(n.target), i = [];
 			n.description && i.push("description \"" + s(n.description) + "\""), n.justification && i.push("justification \"" + s(n.justification) + "\""), n.coverage && i.push("coverage " + n.coverage), t += i.length > 0 ? e + " { " + i.join(" ") + " }\n" : e + "\n";
 		}
 		t += "  }\n";
@@ -3689,7 +3710,7 @@ var cr = function(e, t) {
 	let r = Object.keys(e.coverage ?? {});
 	if (r.length > 0) {
 		t += "  coverage {\n";
-		for (let n of r) t += "    " + N(n) + " " + e.coverage[n] + "\n";
+		for (let n of r) t += "    " + P(n) + " " + e.coverage[n] + "\n";
 		t += "  }\n";
 	}
 	return t += "}\n", t;
@@ -3720,7 +3741,7 @@ var dr = function(e, t) {
 	}), (t) => (t.viewProfiles[e] = n, t);
 }, fr = function(e) {
 	let t = "view_profile " + e.id + " {\n";
-	return e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.roles.length > 0 && (t += "  roles { " + e.roles.map(N).join(" ") + " }\n"), e.visibleElements.length > 0 && (t += "  visible { " + e.visibleElements.map(N).join(" ") + " }\n"), e.against && (t += "  against " + e.against + "\n"), t += "}\n", t;
+	return e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.roles.length > 0 && (t += "  roles { " + e.roles.map(P).join(" ") + " }\n"), e.visibleElements.length > 0 && (t += "  visible { " + e.visibleElements.map(P).join(" ") + " }\n"), e.against && (t += "  against " + e.against + "\n"), t += "}\n", t;
 }, pr = function(e, t) {
 	let o = {
 		id: e,
@@ -3763,12 +3784,12 @@ var dr = function(e, t) {
 					};
 					for (let n = 0; n + 1 < e.length; n += 2) e[n] === "field" ? t.field = a(e[n + 1]) : e[n] === "item_key" && (t.itemKey = a(e[n + 1]));
 					o.reportRows = t;
-				} else if (t === "references") o.formReferences = ke(i(s[c++]));
+				} else if (t === "references") o.formReferences = Oe(i(s[c++]));
 				else if (t === "ref") {
-					let e = S(s, c, a, i);
-					T(o, e.ref) || (o.refs = [...o.refs ?? [], e.ref]), c = e.next;
+					let e = C(s, c, a, i);
+					E(o, e.ref) || (o.refs = [...o.refs ?? [], e.ref]), c = e.next;
 				} else if (t === "corresponds") {
-					let e = D(s, c, a);
+					let e = O(s, c, a);
 					o.correspondences = [...o.correspondences ?? [], e.corr], c = e.next;
 				} else if (t === "calculation_context") o.calculationContext = mr(i(s[c++]));
 				else if (t === "instances") o.formInstances = hr(i(s[c++]));
@@ -3776,10 +3797,10 @@ var dr = function(e, t) {
 				else if (t === "conformance_process") {
 					let e = s[c++];
 					e.startsWith("{") ? (o.conformanceProcessIds = n(i(e)).map(a), o.conformanceProcessId = o.conformanceProcessIds[0] ?? "") : o.conformanceProcessId = a(e);
-				} else if (t === "applicability") o.applicability = L(i(s[c++]));
+				} else if (t === "applicability") o.applicability = R(i(s[c++]));
 				else if (t === "field") {
-					let e = Se(s, c);
-					e ? (o.fields.push(Ce(e.name, e.block, e.type || void 0)), c = e.next) : c++;
+					let e = xe(s, c);
+					e ? (o.fields.push(Se(e.name, e.block, e.type || void 0)), c = e.next) : c++;
 				} else if (t === "subform_ref") {
 					let e = s[c++], t = c < s.length ? i(s[c++]) : "";
 					o.fields.push(yr(e, t));
@@ -3844,7 +3865,7 @@ function gr(e) {
 			for (; s < t.length;) {
 				let n = t[s++];
 				if (s >= t.length) break;
-				n === "rule" ? e.rule = a(t[s++]) : n === "on_violation" ? e.onViolation = a(t[s++]) : n === "notes" ? e.notes = a(t[s++]) : n === "source" ? e.source = I(i(t[s++])) : i(t[s++]);
+				n === "rule" ? e.rule = a(t[s++]) : n === "on_violation" ? e.onViolation = a(t[s++]) : n === "notes" ? e.notes = a(t[s++]) : n === "source" ? e.source = L(i(t[s++])) : i(t[s++]);
 			}
 		}
 		t.push(e);
@@ -3922,7 +3943,7 @@ function yr(e, t) {
 		sourceDiscrepancy: null,
 		fields: [],
 		itemsType: "",
-		subformRef: De(e, t)
+		subformRef: Ee(e, t)
 	};
 }
 var br = function(e) {
@@ -3934,7 +3955,7 @@ var br = function(e) {
 		t += "  ref " + e + " \"" + s(n.urn) + "\"\n";
 	}
 	if (e.refs && e.refs.length > 0) for (let n of e.refs) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
-	if (t += k(e.correspondences, "  ", s, N), e.calculationContext) {
+	if (t += A(e.correspondences, "  ", s, P), e.calculationContext) {
 		let n = e.calculationContext, r = "  calculation_context { ";
 		n.header && (r += "header " + n.header + " "), n.dimensions && (r += "dimensions true "), n.tables.length > 0 && (r += "tables { " + n.tables.join(" ") + " } "), t += r + "}\n";
 	}
@@ -3948,8 +3969,8 @@ var br = function(e) {
 		for (let n of e.formConstraints) t += "    constraint " + n.id + " { ", n.rule && (t += "rule \"" + s(n.rule) + "\" "), n.onViolation && (t += "on_violation " + n.onViolation + " "), n.notes && (t += "notes \"" + s(n.notes) + "\" "), n.source && (n.source.doc || n.source.clause) && (t += "source { doc \"" + s(n.source.doc) + "\" clause \"" + s(n.source.clause) + "\"" + (n.source.fragment ? " fragment \"" + s(n.source.fragment) + "\"" : "") + " } "), t += "}\n";
 		t += "  }\n";
 	}
-	e.conformanceProcessIds && e.conformanceProcessIds.length > 1 ? t += "  conformance_process { " + e.conformanceProcessIds.join(" ") + " }\n" : e.conformanceProcessId && (t += "  conformance_process " + e.conformanceProcessId + "\n"), e.applicability.length > 0 && (t += "  applicability {\n    " + R(e.applicability).trim() + "\n  }\n");
-	for (let n of e.fields) t += Oe(n, "  ");
+	e.conformanceProcessIds && e.conformanceProcessIds.length > 1 ? t += "  conformance_process { " + e.conformanceProcessIds.join(" ") + " }\n" : e.conformanceProcessId && (t += "  conformance_process " + e.conformanceProcessId + "\n"), e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n");
+	for (let n of e.fields) t += De(n, "  ");
 	return e.passFail && (t += xr(e.passFail)), t += "}\n", t;
 };
 function xr(e) {
@@ -3984,8 +4005,8 @@ var Sr = function(e, t) {
 					else throw Error(`Parsing error: subform. ID ${e}: type must be object or array (got ${t})`);
 				} else if (t === "parameters") n.parameters = Cr(i(o[s++]));
 				else if (t === "field") {
-					let e = Se(o, s);
-					e ? (n.fields.push(Ce(e.name, e.block, e.type || void 0)), s = e.next) : s++;
+					let e = xe(o, s);
+					e ? (n.fields.push(Se(e.name, e.block, e.type || void 0)), s = e.next) : s++;
 				} else s++;
 			} else throw Error(`Parsing error: subform. ID ${e}: Expecting value for ${t}`);
 		}
@@ -3995,7 +4016,7 @@ var Sr = function(e, t) {
 function Cr(e) {
 	let t = [], o = n(e), s = 0;
 	for (; s < o.length;) {
-		let e = P(o[s++]);
+		let e = F(o[s++]);
 		if (s >= o.length) break;
 		o[s] === ":" && s++;
 		let c = s < o.length ? o[s++] : "integer", l = "", u = !1, d = "", f = null;
@@ -4011,7 +4032,7 @@ function Cr(e) {
 						f = {};
 						let o = n(r), s = 0;
 						for (; s < o.length;) {
-							let e = P(o[s++]);
+							let e = F(o[s++]);
 							s < o.length && (o[s] === ":" && s++, s < o.length && (f[e] = a(o[s++])));
 						}
 					} else t++;
@@ -4044,7 +4065,7 @@ var wr = function(e) {
 		}
 		t += "  }\n";
 	}
-	for (let n of e.fields) t += Oe(n, "  ");
+	for (let n of e.fields) t += De(n, "  ");
 	return t += "}\n", t;
 }, Tr = [
 	"number",
@@ -4080,10 +4101,10 @@ var wr = function(e) {
 	};
 	return y(t, (t, s, c) => {
 		if (t === "ref") {
-			let e = C(s, c, a, i);
-			return T(o, e) || (o.refs ??= []).push(e), !0;
+			let e = w(s, c, a, i);
+			return E(o, e) || (o.refs ??= []).push(e), !0;
 		}
-		if (t === "corresponds") return (o.correspondences ??= []).push(O(s, c, a)), !0;
+		if (t === "corresponds") return (o.correspondences ??= []).push(k(s, c, a)), !0;
 		if (t === "name") o.name = x(s);
 		else if (t === "definition") o.definition = x(s);
 		else if (t === "type") {
@@ -4107,7 +4128,7 @@ var wr = function(e) {
 		} else if (t === "values") {
 			let e = s();
 			o.values = e.startsWith("{") ? r(e).map(a) : [a(e)];
-		} else if (t === "series") o.series = he(i(s()));
+		} else if (t === "series") o.series = me(i(s()));
 		else if (t === "kind") o.kind = a(s());
 		else if (t === "quantity_kind") o.quantityKind = a(s());
 		else if (t === "origin") o.origin = a(s());
@@ -4115,7 +4136,7 @@ var wr = function(e) {
 		else if (t === "attribute") o.attribute = a(s());
 		else if (t === "calculation") o.calculation = a(s());
 		else if (t === "profile") o.profile = a(s());
-		else if (t === "source") o.sourceRef = I(i(s()));
+		else if (t === "source") o.sourceRef = L(i(s()));
 		else if (t === "formula") {
 			let e = n(i(s())), t = {
 				display: "",
@@ -4150,7 +4171,7 @@ var wr = function(e) {
 	let t = "symbol " + e.id + " {\n";
 	t += "  name \"" + s(e.name) + "\"\n", e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), t += "  type " + e.type + "\n", e.unit && e.unit !== "1" && (t += "  unit \"" + s(e.unit) + "\"\n"), e.latex && (t += "  latex \"" + s(e.latex) + "\"\n");
 	for (let n of e.renders ?? []) t += "  render " + n.notation + " \"" + s(n.text) + "\"\n";
-	if (e.values.length > 0 && (t += "  values { " + e.values.map(N).join(" ") + " }\n"), e.series && (t += "  " + ge(e.series) + "\n"), e.kind && (t += "  kind " + e.kind + "\n"), e.quantityKind && (t += "  quantity_kind " + e.quantityKind + "\n"), e.origin && (t += "  origin " + e.origin + "\n"), e.legacyId && (t += "  legacy_id " + e.legacyId + "\n"), e.attribute && (t += "  attribute " + e.attribute + "\n"), e.calculation && (t += "  calculation " + e.calculation + "\n"), e.profile && (t += "  profile " + e.profile + "\n"), e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) && (t += "  source { doc \"" + s(e.sourceRef.doc) + "\" clause \"" + s(e.sourceRef.clause) + "\"" + (e.sourceRef.fragment ? " fragment \"" + s(e.sourceRef.fragment) + "\"" : "") + " }\n"), e.formula) {
+	if (e.values.length > 0 && (t += "  values { " + e.values.map(P).join(" ") + " }\n"), e.series && (t += "  " + he(e.series) + "\n"), e.kind && (t += "  kind " + e.kind + "\n"), e.quantityKind && (t += "  quantity_kind " + e.quantityKind + "\n"), e.origin && (t += "  origin " + e.origin + "\n"), e.legacyId && (t += "  legacy_id " + e.legacyId + "\n"), e.attribute && (t += "  attribute " + e.attribute + "\n"), e.calculation && (t += "  calculation " + e.calculation + "\n"), e.profile && (t += "  profile " + e.profile + "\n"), e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) && (t += "  source { doc \"" + s(e.sourceRef.doc) + "\" clause \"" + s(e.sourceRef.clause) + "\"" + (e.sourceRef.fragment ? " fragment \"" + s(e.sourceRef.fragment) + "\"" : "") + " }\n"), e.formula) {
 		let n = "  formula { ";
 		e.formula.display && (n += "display \"" + s(e.formula.display) + "\" "), e.formula.expression && (n += "expression \"" + s(e.formula.expression) + "\" "), e.formula.inputs.length > 0 && (n += "inputs { " + e.formula.inputs.join(" ") + " } "), t += n + "}\n";
 	}
@@ -4160,12 +4181,12 @@ var wr = function(e) {
 		for (let n of e.ref) t += "    " + n.id + "\n";
 		t += "  }\n";
 	}
-	return t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/formulaNote.ts
 function kr(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 var Ar = (e, t) => {
 	let n = {
@@ -4184,7 +4205,7 @@ var Ar = (e, t) => {
 	}), (t) => (t.formulaNotes[e] = n, t);
 }, jr = function(e) {
 	let t = "formula_note " + e.id + " {\n";
-	return e.text && (t += "  text \"" + s(e.text) + "\"\n"), e.appliesTo.length > 0 && (t += "  applies_to { " + e.appliesTo.map(N).join(" ") + " }\n"), t += "}\n", t;
+	return e.text && (t += "  text \"" + s(e.text) + "\"\n"), e.appliesTo.length > 0 && (t += "  applies_to { " + e.appliesTo.map(P).join(" ") + " }\n"), t += "}\n", t;
 }, Mr = function(e, t) {
 	let o = {
 		id: e,
@@ -4228,10 +4249,10 @@ var Ar = (e, t) => {
 					};
 				} else if (t === "reference") o._relations.ref = r(s[c++]);
 				else if (t === "ref") {
-					let e = S(s, c, a, i);
-					T(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
+					let e = C(s, c, a, i);
+					E(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
 				} else if (t === "corresponds") {
-					let e = D(s, c, a);
+					let e = O(s, c, a);
 					(o.correspondences ??= []).push(e.corr), c = e.next;
 				} else if (t === "source") {
 					let e = n(i(s[c++])), t = {
@@ -4389,8 +4410,8 @@ function Rr(e) {
 	return e.key && (t += "key " + e.key + " "), e.variable && (t += "variable " + e.variable + " "), e.multiplier && (t += "multiplier " + e.multiplier + " "), e.defaultTier && (t += "default_tier { factor " + e.defaultTier.factor, e.defaultTier.mode && (t += " mode " + e.defaultTier.mode), t += " } "), t;
 }
 function zr(e) {
-	let t = "  variant " + N(e.id) + " {\n";
-	return e.type && (t += "    type " + e.type + "\n"), e.label && (t += "    label \"" + s(e.label) + "\"\n"), e.description && (t += "    description \"" + s(e.description) + "\"\n"), e.params.length > 0 && (t += "    params { " + e.params.map(N).join(" ") + " }\n"), e.expression && (t += "    expression \"" + s(e.expression) + "\"\n"), e.lookup && (t += "    lookup { " + Rr(e.lookup) + "}\n"), e.profile && (t += "    profile " + N(e.profile) + "\n"), t += "  }\n", t;
+	let t = "  variant " + P(e.id) + " {\n";
+	return e.type && (t += "    type " + e.type + "\n"), e.label && (t += "    label \"" + s(e.label) + "\"\n"), e.description && (t += "    description \"" + s(e.description) + "\"\n"), e.params.length > 0 && (t += "    params { " + e.params.map(P).join(" ") + " }\n"), e.expression && (t += "    expression \"" + s(e.expression) + "\"\n"), e.lookup && (t += "    lookup { " + Rr(e.lookup) + "}\n"), e.profile && (t += "    profile " + P(e.profile) + "\n"), t += "  }\n", t;
 }
 var Br = function(e, t) {
 	let n = [];
@@ -4408,16 +4429,16 @@ var Br = function(e, t) {
 		t += "  inputs {\n";
 		for (let n of e.inputs) {
 			let e = "    " + n.name + " : " + n.type + " { ";
-			e += "unit \"" + s(n.unit) + "\"", n.quantityKind && (e += " quantity_kind " + n.quantityKind), n.description && (e += " description \"" + s(n.description) + "\""), n.hasDefault && (e += " default " + N(n.defaultValue)), n.enumValues && n.enumValues.length > 0 && (e += " enum_values { " + n.enumValues.join(" ") + " }"), n.hasRange && (e += " range {", n.rangeMin && (e += " min " + N(n.rangeMin)), n.rangeMax && (e += " max " + N(n.rangeMax)), e += " }"), e += " }\n", t += e;
+			e += "unit \"" + s(n.unit) + "\"", n.quantityKind && (e += " quantity_kind " + n.quantityKind), n.description && (e += " description \"" + s(n.description) + "\""), n.hasDefault && (e += " default " + P(n.defaultValue)), n.enumValues && n.enumValues.length > 0 && (e += " enum_values { " + n.enumValues.join(" ") + " }"), n.hasRange && (e += " range {", n.rangeMin && (e += " min " + P(n.rangeMin)), n.rangeMax && (e += " max " + P(n.rangeMax)), e += " }"), e += " }\n", t += e;
 		}
 		t += "  }\n";
 	}
 	let n = "  output : " + e.output.type + " { unit \"" + s(e.output.unit) + "\"";
-	e.output.quantityKind && (n += " quantity_kind " + e.output.quantityKind), e.output.name && (n += " name \"" + s(e.output.name) + "\""), e.output.description && (n += " description \"" + s(e.output.description) + "\""), e.output.hasRange && (n += " range {", e.output.rangeMin && (n += " min " + N(e.output.rangeMin)), e.output.rangeMax && (n += " max " + N(e.output.rangeMax)), n += " }"), t += n + " }\n", e.expression && (t += "  expression \"" + s(e.expression) + "\"\n"), e.math && (t += "  math {\n", t += "    notation " + e.math.notation + "\n", t += "    formula \"" + s(e.math.formula) + "\"\n", t += "  }\n"), e.params && e.params.length > 0 && (t += "  params { " + e.params.join(" ") + " }\n"), e.lookup && (t += "  lookup { " + Rr(e.lookup) + "}\n"), e.profile && (t += "  profile " + e.profile + "\n");
+	e.output.quantityKind && (n += " quantity_kind " + e.output.quantityKind), e.output.name && (n += " name \"" + s(e.output.name) + "\""), e.output.description && (n += " description \"" + s(e.output.description) + "\""), e.output.hasRange && (n += " range {", e.output.rangeMin && (n += " min " + P(e.output.rangeMin)), e.output.rangeMax && (n += " max " + P(e.output.rangeMax)), n += " }"), t += n + " }\n", e.expression && (t += "  expression \"" + s(e.expression) + "\"\n"), e.math && (t += "  math {\n", t += "    notation " + e.math.notation + "\n", t += "    formula \"" + s(e.math.formula) + "\"\n", t += "  }\n"), e.params && e.params.length > 0 && (t += "  params { " + e.params.join(" ") + " }\n"), e.lookup && (t += "  lookup { " + Rr(e.lookup) + "}\n"), e.profile && (t += "  profile " + e.profile + "\n");
 	for (let n of e.variants ?? []) t += zr(n);
-	for (let n of e.sourceRefs ?? (e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) ? [e.sourceRef] : [])) t += E(n, "  ", s);
+	for (let n of e.sourceRefs ?? (e.sourceRef && (e.sourceRef.doc || e.sourceRef.clause) ? [e.sourceRef] : [])) t += D(n, "  ", s);
 	for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
-	if (t += k(e.correspondences, "  ", s, N), e.ref.length > 0) {
+	if (t += A(e.correspondences, "  ", s, P), e.ref.length > 0) {
 		t += "  reference {\n";
 		for (let n of e.ref) t += "    " + n.id + "\n";
 		t += "  }\n";
@@ -4517,7 +4538,7 @@ function Wr(e, t) {
 			else if (e === "set") {
 				let e = n(i(s[c++])), t = 0;
 				for (; t < e.length;) {
-					let n = P(e[t++]);
+					let n = F(e[t++]);
 					if (t < e.length && (e[t] === ":" && t++, t < e.length)) {
 						let r = {
 							field: n,
@@ -4535,7 +4556,7 @@ function Wr(e, t) {
 function Gr(e) {
 	let t = {}, r = n(i(e)), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (o >= r.length) break;
 		r[o] === ":" && o++, o < r.length && (t[e] = a(r[o++]));
 	}
@@ -4712,7 +4733,7 @@ function ei(e) {
 				vehicleDc: null
 			}, s = 0;
 			for (; s < e.length;) {
-				let t = P(e[s++]);
+				let t = F(e[s++]);
 				if (s >= e.length) break;
 				let n = e[s++], r = n.startsWith("{") ? $r(i(n)) : null;
 				t === "ac" ? a.ac = r : t === "dc" ? a.dc = r : t === "vehicle_dc" && (a.vehicleDc = r);
@@ -5120,24 +5141,24 @@ var yi = function(e, t) {
 		if (s >= o.length) throw Error(`Parsing error: competence_kind. ID ${e}: Expecting value for ${t}`);
 		if (t === "label") n.label = vi(o[s++]);
 		else if (t === "definition") n.definition = vi(o[s++]);
-		else if (t === "source") n.source = I(i(o[s++]));
+		else if (t === "source") n.source = L(i(o[s++]));
 		else if (t === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (t === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, t);
 	}
 	return (t) => (t.competenceKinds[e] = n, t);
 }, bi = function(e) {
 	let t = "competence_kind " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/conformanceTest.ts
 function U(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function xi(e) {
 	return e.trim() !== "" && !isNaN(Number(e)) ? Number(e) : e;
@@ -5169,11 +5190,11 @@ function Si(e) {
 				else if (r === "unit") e.unit = a(t[s++]);
 				else if (r === "source") e.source = a(t[s++]);
 				else if (r === "derivation") {
-					let n = ue(t[s++], "test variable derivation");
+					let n = le(t[s++], "test variable derivation");
 					e.derivation = n.source, e.derivationBound = n.inline || void 0;
 				} else if (r === "description") e.description = a(t[s++]);
 				else if (r === "item_type") e.itemType = a(t[s++]);
-				else if (r === "series") e.series = he(i(t[s++]));
+				else if (r === "series") e.series = me(i(t[s++]));
 				else if (r === "provenance") {
 					let r = n(i(t[s++])), o = {
 						channel: "",
@@ -5209,7 +5230,7 @@ function Ci(e) {
 				let n = t[s++];
 				if (s >= t.length) break;
 				if (n === "check") {
-					let n = ue(t[s++], "precondition check");
+					let n = le(t[s++], "precondition check");
 					e.check = n.source, e.checkBound = n.inline || void 0;
 				} else n === "description" ? e.description = a(t[s++]) : n === "on_violation" ? e.onViolation = a(t[s++]) : n === "on_unresolvable" ? e.onUnresolvable = a(t[s++]) : i(t[s++]);
 			}
@@ -5294,7 +5315,7 @@ function Ti(e, t) {
 					};
 					for (let e = 0; e + 1 < r.length; e += 2) r[e] === "verdict" ? o.verdict = a(r[e + 1]) : r[e] === "op" ? o.op = a(r[e + 1]) : r[e] === "limit" && (o.limit = a(r[e + 1]));
 					c.accepts = o;
-				} else r === "source_discrepancy" ? c.sourceDiscrepancy = A(i(e[t++])) : i(e[t++]);
+				} else r === "source_discrepancy" ? c.sourceDiscrepancy = j(i(e[t++])) : i(e[t++]);
 			}
 		}
 		t.acceptanceCriteria.push(c);
@@ -5326,7 +5347,7 @@ function Ei(e) {
 function Di(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (i >= r.length) break;
 		r[i] === ":" && i++, i < r.length && (t[e] = a(r[i++]));
 	}
@@ -5344,12 +5365,12 @@ function Oi(e) {
 		else if (e === "values") {
 			let e = n(i(r[o++])), s = 0;
 			for (; s < e.length;) {
-				let r = P(e[s++]);
+				let r = F(e[s++]);
 				if (s >= e.length) break;
 				if (e[s] === ":" && s++, s < e.length && e[s].startsWith("{")) {
 					let o = n(i(e[s++])), c = {}, l = 0;
 					for (; l < o.length;) {
-						let e = P(o[l++]);
+						let e = F(o[l++]);
 						if (l >= o.length) break;
 						o[l] === ":" && l++, l < o.length && (c[e] = xi(a(o[l++])));
 					}
@@ -5363,10 +5384,10 @@ function Oi(e) {
 function ki(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (i >= r.length) break;
 		if (r[i] === ":" && i++, i < r.length) {
-			let n = M(r, i);
+			let n = N(r, i);
 			t[e] = a(n.text), i = n.next;
 		}
 	}
@@ -5394,10 +5415,10 @@ function ji(e, t, r, o, s) {
 		let e = l[u++];
 		if (u >= l.length) throw Error(`Parsing error: ${s}: Expecting value for ${e}`);
 		if (e === "description") c.description = a(l[u++]);
-		else if (e === "source") c.sourceRefs.push(I(i(l[u++])));
+		else if (e === "source") c.sourceRefs.push(L(i(l[u++])));
 		else if (e === "ref") {
-			let e = S(l, u, a, i);
-			T(c, e.ref), u = e.next;
+			let e = C(l, u, a, i);
+			E(c, e.ref), u = e.next;
 		} else if (e === t) {
 			let e = r(), t = l[u++];
 			t.startsWith("{") || (e.order = Number(a(t)), t = u < l.length && l[u].startsWith("{") ? l[u++] : ""), t.startsWith("{") && o(i(t), e), c.entries.push(e);
@@ -5458,15 +5479,15 @@ function Pi(e) {
 function Fi(e) {
 	let t = "  preparation {\n";
 	e.description !== "" && (t += "    description \"" + s(e.description) + "\"\n");
-	for (let n of e.entries) t += "    step" + (n.order === null ? "" : " " + n.order) + " {", n.action !== "" && (t += " action \"" + s(n.action) + "\""), n.drive !== "" && (t += " drive " + N(n.drive)), t += Pi(n.args), n.hold !== "" && (t += " hold " + N(n.hold)), n.verify && (t += " verify {", n.verify.read !== "" && (t += " read " + N(n.verify.read)), n.verify.tolerance !== "" && (t += " tolerance " + N(n.verify.tolerance)), t += " }"), t += " }\n";
-	for (let n of e.sourceRefs) t += E(n, "    ", s);
+	for (let n of e.entries) t += "    step" + (n.order === null ? "" : " " + n.order) + " {", n.action !== "" && (t += " action \"" + s(n.action) + "\""), n.drive !== "" && (t += " drive " + P(n.drive)), t += Pi(n.args), n.hold !== "" && (t += " hold " + P(n.hold)), n.verify && (t += " verify {", n.verify.read !== "" && (t += " read " + P(n.verify.read)), n.verify.tolerance !== "" && (t += " tolerance " + P(n.verify.tolerance)), t += " }"), t += " }\n";
+	for (let n of e.sourceRefs) t += D(n, "    ", s);
 	return t + "  }\n";
 }
 function Ii(e) {
 	let t = "  stimulus {\n";
 	e.description !== "" && (t += "    description \"" + s(e.description) + "\"\n");
-	for (let n of e.entries) t += "    point" + (n.order === null ? "" : " " + n.order) + " {", n.drive !== "" && (t += " drive " + N(n.drive)), t += Pi(n.args), n.hold !== "" && (t += " hold " + N(n.hold)), n.freshWithin !== "" && (t += " fresh_within " + N(n.freshWithin)), n.acceptance !== "" && (t += " acceptance " + N(n.acceptance)), t += " }\n";
-	for (let n of e.sourceRefs) t += E(n, "    ", s);
+	for (let n of e.entries) t += "    point" + (n.order === null ? "" : " " + n.order) + " {", n.drive !== "" && (t += " drive " + P(n.drive)), t += Pi(n.args), n.hold !== "" && (t += " hold " + P(n.hold)), n.freshWithin !== "" && (t += " fresh_within " + P(n.freshWithin)), n.acceptance !== "" && (t += " acceptance " + P(n.acceptance)), t += " }\n";
+	for (let n of e.sourceRefs) t += D(n, "    ", s);
 	return t + "  }\n";
 }
 var Li = function(e, t) {
@@ -5529,11 +5550,11 @@ var Li = function(e, t) {
 			} else o.sourceRef = null, o.sourceRefs = void 0, o.reference = e;
 		} else if (t === "targets") o.targets = r(s());
 		else if (t === "ref") {
-			let e = C(s, c, a, i);
-			T(o, e) || (o.refs ??= []).push(e);
-		} else if (t === "corresponds") (o.correspondences ??= []).push(O(s, c, a));
+			let e = w(s, c, a, i);
+			E(o, e) || (o.refs ??= []).push(e);
+		} else if (t === "corresponds") (o.correspondences ??= []).push(k(s, c, a));
 		else if (t === "binds_to") o.bindsTo = r(s());
-		else if (t === "applicability") o.applicability = L(i(s()));
+		else if (t === "applicability") o.applicability = R(i(s()));
 		else if (t === "procedure") {
 			let e = r(s()), t = 0;
 			for (; t < e.length;) {
@@ -5573,7 +5594,7 @@ var Li = function(e, t) {
 		else if (t === "validate_measurement") {
 			let e = r(s());
 			for (let t of e) t.startsWith("\"") && o.measurements.push(i(t));
-		} else if (t === "source_discrepancy") o.sourceDiscrepancy = A(i(s()));
+		} else if (t === "source_discrepancy") o.sourceDiscrepancy = j(i(s()));
 		else return !1;
 		return !0;
 	}, {
@@ -5582,8 +5603,8 @@ var Li = function(e, t) {
 	}), (t) => (t.conformanceTests[e] = o, t);
 }, Ri = function(e) {
 	let t = "conformance_test " + e.id + " {\n";
-	if (e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.type && (t += "  type " + e.type + "\n"), e.purpose && (t += "  purpose \"" + s(e.purpose) + "\"\n"), e.method && (t += "  method \"" + s(e.method) + "\"\n"), e.methodRef && (t += "  method_ref " + e.methodRef + "\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.sourceRefs && e.sourceRefs.length > 0) for (let n of e.sourceRefs) t += E(n, "  ", s);
-	else e.sourceRef && e.sourceRef.doc ? t += E(e.sourceRef, "  ", s) : e.reference && (t += "  reference " + e.reference + "\n");
+	if (e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.type && (t += "  type " + e.type + "\n"), e.purpose && (t += "  purpose \"" + s(e.purpose) + "\"\n"), e.method && (t += "  method \"" + s(e.method) + "\"\n"), e.methodRef && (t += "  method_ref " + e.methodRef + "\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.sourceRefs && e.sourceRefs.length > 0) for (let n of e.sourceRefs) t += D(n, "  ", s);
+	else e.sourceRef && e.sourceRef.doc ? t += D(e.sourceRef, "  ", s) : e.reference && (t += "  reference " + e.reference + "\n");
 	for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
 	if (e.targets.length > 0) {
 		t += "  targets {\n";
@@ -5595,7 +5616,7 @@ var Li = function(e, t) {
 		for (let n of e.bindsTo) t += "    " + n + "\n";
 		t += "  }\n";
 	}
-	if (e.applicability.length > 0 && (t += "  applicability {\n    " + R(e.applicability).trim() + "\n  }\n"), e.procedure.length > 0) {
+	if (e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.procedure.length > 0) {
 		t += "  procedure {\n";
 		for (let n of e.procedure) {
 			let e = "    " + n.order + " \"" + s(n.action) + "\"";
@@ -5619,7 +5640,7 @@ var Li = function(e, t) {
 			let e = "    variable " + n.name + " { ";
 			n.type && (e += "type " + n.type + " "), n.unit && (e += "unit \"" + s(n.unit) + "\" "), n.source && (e += "source " + n.source + " ");
 			let r = "";
-			if (n.derivation && (n.derivationBound ? r = de("derivation", n.derivation, "      ") : e += "derivation \"" + s(n.derivation) + "\" "), n.description && (e += "description \"" + s(n.description) + "\" "), n.itemType && (e += "item_type \"" + s(n.itemType) + "\" "), n.series && (e += ge(n.series) + " "), n.provenance) {
+			if (n.derivation && (n.derivationBound ? r = ue("derivation", n.derivation, "      ") : e += "derivation \"" + s(n.derivation) + "\" "), n.description && (e += "description \"" + s(n.description) + "\" "), n.itemType && (e += "item_type \"" + s(n.itemType) + "\" "), n.series && (e += he(n.series) + " "), n.provenance) {
 				let t = "provenance { ";
 				n.provenance.channel && (t += "channel " + n.provenance.channel + " "), n.provenance.ref && (t += "ref \"" + s(n.provenance.ref) + "\" "), n.provenance.observedAt && (t += "observed_at " + n.provenance.observedAt + " "), n.provenance.limitation && (t += "limitation \"" + s(n.provenance.limitation) + "\" "), e += t + "} ";
 			}
@@ -5639,7 +5660,7 @@ var Li = function(e, t) {
 		t += "  preconditions {\n";
 		for (let n of e.preconditions) {
 			let e = "    precondition " + n.id + " { ", r = "";
-			n.check && (n.checkBound ? r = de("check", n.check, "      ") : e += "check \"" + s(n.check) + "\" "), n.description && (e += "description \"" + s(n.description) + "\" "), e += "on_violation " + n.onViolation + " ", n.onUnresolvable && (e += "on_unresolvable " + n.onUnresolvable + " "), t += r ? e + "\n" + r + "    }\n" : e + "}\n";
+			n.check && (n.checkBound ? r = ue("check", n.check, "      ") : e += "check \"" + s(n.check) + "\" "), n.description && (e += "description \"" + s(n.description) + "\" "), e += "on_violation " + n.onViolation + " ", n.onUnresolvable && (e += "on_unresolvable " + n.onUnresolvable + " "), t += r ? e + "\n" + r + "    }\n" : e + "}\n";
 		}
 		t += "  }\n";
 	}
@@ -5647,7 +5668,7 @@ var Li = function(e, t) {
 		t += "  acceptance_criteria {\n", e.acceptanceCriteriaType && (t += "    type " + e.acceptanceCriteriaType + "\n"), e.acceptanceCriteriaDescription && (t += "    description \"" + s(e.acceptanceCriteriaDescription) + "\"\n"), e.acceptancePassIf && (t += "    pass_if \"" + s(e.acceptancePassIf) + "\"\n");
 		for (let n of e.acceptanceCriteria) {
 			let e = "    criterion " + (n.item || "\"\"") + " { ";
-			n.passIf && (e += "pass_if \"" + s(n.passIf) + "\" "), n.requirementId && (e += "requirement " + n.requirementId + " "), n.criterion && (e += "criterion " + n.criterion + " "), n.optional && (e += "optional true "), n.description && (e += "description \"" + s(n.description) + "\" "), n.reference && (e += "reference \"" + s(n.reference) + "\" "), n.accepts && (e += "accepts { verdict " + n.accepts.verdict + " op " + n.accepts.op + " limit \"" + s(n.accepts.limit) + "\" } "), n.sourceDiscrepancy && (e += j(n.sourceDiscrepancy, "") + " "), t += e + "}\n";
+			n.passIf && (e += "pass_if \"" + s(n.passIf) + "\" "), n.requirementId && (e += "requirement " + n.requirementId + " "), n.criterion && (e += "criterion " + n.criterion + " "), n.optional && (e += "optional true "), n.description && (e += "description \"" + s(n.description) + "\" "), n.reference && (e += "reference \"" + s(n.reference) + "\" "), n.accepts && (e += "accepts { verdict " + n.accepts.verdict + " op " + n.accepts.op + " limit \"" + s(n.accepts.limit) + "\" } "), n.sourceDiscrepancy && (e += M(n.sourceDiscrepancy, "") + " "), t += e + "}\n";
 		}
 		t += "  }\n";
 	}
@@ -5665,7 +5686,7 @@ var Li = function(e, t) {
 		for (let n of e.derivedValues) t += "    value " + n.name + " { expression \"" + s(n.expression) + "\" }\n";
 		t += "  }\n";
 	}
-	return e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "  ") + "\n"), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "  ") + "\n"), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, zi = {
 	aliases: "aliases",
 	alt: "aliases",
@@ -5693,10 +5714,10 @@ var Hi = function(e, t) {
 	};
 	return y(t, (t, o, s) => {
 		if (t === "ref") {
-			let e = C(o, s, a, i);
+			let e = w(o, s, a, i);
 			return e.predicate === "derives-from" && !n.source ? n.source = e.target : e.predicate === "cites" ? n.referenceIds.push(e.target) : (n.refs ??= []).push(e), !0;
 		}
-		if (t === "corresponds") return (n.correspondences ??= []).push(O(o, s, a)), !0;
+		if (t === "corresponds") return (n.correspondences ??= []).push(k(o, s, a)), !0;
 		if (t === "label") n.label = x(o);
 		else if (t === "definition") n.definition = x(o);
 		else if (t === "symbol") n.symbolId = a(o());
@@ -5760,7 +5781,7 @@ var Hi = function(e, t) {
 		for (let n of e.referenceIds) t += "    " + n + "\n";
 		t += "  }\n";
 	}
-	return t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, Wi = [
 	"none",
 	"max",
@@ -5769,7 +5790,7 @@ var Hi = function(e, t) {
 	"max_abs_over_window"
 ];
 function Gi(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 var Ki = function(e, t) {
 	let r = {
@@ -5793,7 +5814,7 @@ var Ki = function(e, t) {
 		} else if (t === "symbol") r.symbol = x(o);
 		else if (t === "behavior") r.behavior = o();
 		else if (t === "derive" || t === "expression") {
-			let e = ue(o(), "verdict derive");
+			let e = le(o(), "verdict derive");
 			r.derive = e.source, r.deriveBound = e.inline || void 0;
 		} else if (t === "inputs" || t === "uses") r.inputs = Gi(o());
 		else if (t === "series_reduction") {
@@ -5802,12 +5823,12 @@ var Ki = function(e, t) {
 			r.seriesReduction = t;
 		} else if (t === "acceptance") r.acceptance = Xr(i(o()));
 		else if (t === "source" || t === "reference") {
-			let e = I(i(o()));
+			let e = L(i(o()));
 			(r.sourceRefs ??= []).push(e), r.source ||= e;
 		} else if (t === "ref") {
-			let e = C(o, s, a, i);
-			T(r, e) || (r.refs ??= []).push(e);
-		} else if (t === "corresponds") (r.correspondences ??= []).push(O(o, s, a));
+			let e = w(o, s, a, i);
+			E(r, e) || (r.refs ??= []).push(e);
+		} else if (t === "corresponds") (r.correspondences ??= []).push(k(o, s, a));
 		else return !1;
 		return !0;
 	}, {
@@ -5816,10 +5837,10 @@ var Ki = function(e, t) {
 	}), (t) => (t.verdicts[e] = r, t);
 }, qi = function(e) {
 	let t = "verdict " + e.id + " {\n";
-	e.symbol && (t += "  symbol \"" + s(e.symbol) + "\"\n"), e.behavior && (t += "  behavior " + e.behavior + "\n"), e.quantityKind && (t += "  quantity { kind " + e.quantityKind, e.unit && (t += " unit \"" + s(e.unit) + "\""), t += " }\n"), e.derive && (e.deriveBound ? t += de("derive", e.derive, "  ") : t += "  derive \"" + s(e.derive) + "\"\n"), e.inputs.length > 0 && (t += "  inputs { " + e.inputs.join(" ") + " }\n"), e.seriesReduction && (t += "  series_reduction " + e.seriesReduction + "\n"), e.acceptance && (t += Zr(e.acceptance, "  ") + "\n");
+	e.symbol && (t += "  symbol \"" + s(e.symbol) + "\"\n"), e.behavior && (t += "  behavior " + e.behavior + "\n"), e.quantityKind && (t += "  quantity { kind " + e.quantityKind, e.unit && (t += " unit \"" + s(e.unit) + "\""), t += " }\n"), e.derive && (e.deriveBound ? t += ue("derive", e.derive, "  ") : t += "  derive \"" + s(e.derive) + "\"\n"), e.inputs.length > 0 && (t += "  inputs { " + e.inputs.join(" ") + " }\n"), e.seriesReduction && (t += "  series_reduction " + e.seriesReduction + "\n"), e.acceptance && (t += Zr(e.acceptance, "  ") + "\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source && (e.source.doc || e.source.clause) ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	for (let e of n) t += D(e, "  ", s);
+	return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/referenceMaterial.ts
@@ -5875,7 +5896,7 @@ function Yi(e) {
 				else if (r === "evidence") {
 					let r = n(i(t[s++])), o = 0;
 					for (; o < r.length;) {
-						let t = P(r[o++]);
+						let t = F(r[o++]);
 						if (o >= r.length) break;
 						r[o] === ":" && o++, o < r.length && (e.evidence[t] = a(r[o++]));
 					}
@@ -5892,11 +5913,11 @@ function Yi(e) {
 					}
 					e.override = o;
 				} else if (r === "on_violation") e.onViolation = a(t[s++]);
-				else if (r === "source") e.source = I(i(t[s++]));
+				else if (r === "source") e.source = L(i(t[s++]));
 				else if (r === "ref") {
-					let n = S(t, s, a, i);
+					let n = C(t, s, a, i);
 					if (s = n.next, n.ref.predicate === "derives-from" && !e.source) {
-						let t = me(n.ref.target);
+						let t = pe(n.ref.target);
 						t && (e.source = t);
 					}
 				} else s = b(t, s, r);
@@ -5921,12 +5942,12 @@ var Xi = function(e, t) {
 		else if (e === "name") n.name = x(t);
 		else if (e === "definition") n.definition = x(t);
 		else if (e === "source") {
-			let e = I(i(t()));
+			let e = L(i(t()));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
 		} else if (e === "ref") {
-			let e = C(t, r, a, i);
-			T(n, e) || (n.refs ??= []).push(e);
-		} else if (e === "corresponds") (n.correspondences ??= []).push(O(t, r, a));
+			let e = w(t, r, a, i);
+			E(n, e) || (n.refs ??= []).push(e);
+		} else if (e === "corresponds") (n.correspondences ??= []).push(k(t, r, a));
 		else if (e === "identity_fields") n.identityFields = Ji(i(t()));
 		else if (e === "constraints") n.constraints = Yi(i(t()));
 		else return !1;
@@ -5939,8 +5960,8 @@ var Xi = function(e, t) {
 	let t = "reference_material " + e.id + " {\n";
 	e.kind && (t += "  kind " + e.kind + "\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	if (t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), e.identityFields.length > 0) {
+	for (let e of n) t += D(e, "  ", s);
+	if (t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), e.identityFields.length > 0) {
 		t += "  identity_fields {\n";
 		for (let n of e.identityFields) {
 			let e = "    field " + n.name + " { ";
@@ -5953,7 +5974,7 @@ var Xi = function(e, t) {
 		for (let n of e.constraints) {
 			t += "    constraint " + n.id + " {\n", n.description && (t += "      description \"" + s(n.description) + "\"\n"), n.rule && (t += "      rule \"" + s(n.rule) + "\"\n");
 			let e = Object.keys(n.evidence);
-			e.length > 0 && (t += "      evidence { " + e.map((e) => e + ": " + n.evidence[e]).join(" ") + " }\n"), n.override && (t += "      override { rule \"" + s(n.override.rule) + "\"", t += " by " + n.override.by, n.override.evidence && (t += " evidence " + n.override.evidence), t += " }\n"), n.onViolation && (t += "      on_violation " + n.onViolation + "\n"), n.source && (n.source.doc || n.source.clause) && (t += E(n.source, "      ", s)), t += "    }\n";
+			e.length > 0 && (t += "      evidence { " + e.map((e) => e + ": " + n.evidence[e]).join(" ") + " }\n"), n.override && (t += "      override { rule \"" + s(n.override.rule) + "\"", t += " by " + n.override.by, n.override.evidence && (t += " evidence " + n.override.evidence), t += " }\n"), n.onViolation && (t += "      on_violation " + n.onViolation + "\n"), n.source && (n.source.doc || n.source.clause) && (t += D(n.source, "      ", s)), t += "    }\n";
 		}
 		t += "  }\n";
 	}
@@ -5970,7 +5991,7 @@ var Xi = function(e, t) {
 	"service_or_process"
 ];
 function ea(e) {
-	return r(i(e)).map(P).map(a).filter((e) => e.length > 0);
+	return r(i(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 var ta = (e, t) => {
 	let n = {
@@ -5990,7 +6011,7 @@ var ta = (e, t) => {
 			n.family = t;
 		} else if (t === "row") n.row = a(r());
 		else if (t === "label") n.label = a(r());
-		else if (t === "source") n.source = I(i(r()));
+		else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -6043,7 +6064,7 @@ var ra = (e, t) => {
 		else if (t === "attestation") n.attestation = ea(o());
 		else if (t === "surveillance") n.surveillance = na(i(o()));
 		else if (t === "notes") n.notes = r(i(o())).map(a).filter((e) => e.length > 0);
-		else if (t === "source") n.source = I(i(o()));
+		else if (t === "source") n.source = L(i(o()));
 		else return !1;
 		return !0;
 	}, {
@@ -6061,7 +6082,7 @@ var aa = function(e) {
 	return t += "  family " + e.family + "\n", e.row && (t += "  row \"" + s(e.row) + "\"\n"), e.label && (t += "  label \"" + s(e.label) + "\"\n"), t += ia(e.source, "  "), t += "}\n", t;
 }, oa = function(e) {
 	let t = "scheme_type " + e.id + " {\n";
-	if (e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.sampling && (t += "  sampling \"" + s(e.sampling) + "\"\n"), e.attestationObject && (t += "  attestation_object " + e.attestationObject + "\n"), e.determination.length > 0 && (t += "  determination { " + e.determination.map(N).join(" ") + " }\n"), e.attestation.length > 0 && (t += "  attestation { " + e.attestation.map(N).join(" ") + " }\n"), e.surveillance && (t += "  surveillance {\n", t += "    required " + (e.surveillance.required ? "true" : "false") + "\n", e.surveillance.activities.length > 0 && (t += "    activities { " + e.surveillance.activities.map(N).join(" ") + " }\n"), t += "  }\n"), e.notes.length > 0) {
+	if (e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.sampling && (t += "  sampling \"" + s(e.sampling) + "\"\n"), e.attestationObject && (t += "  attestation_object " + e.attestationObject + "\n"), e.determination.length > 0 && (t += "  determination { " + e.determination.map(P).join(" ") + " }\n"), e.attestation.length > 0 && (t += "  attestation { " + e.attestation.map(P).join(" ") + " }\n"), e.surveillance && (t += "  surveillance {\n", t += "    required " + (e.surveillance.required ? "true" : "false") + "\n", e.surveillance.activities.length > 0 && (t += "    activities { " + e.surveillance.activities.map(P).join(" ") + " }\n"), t += "  }\n"), e.notes.length > 0) {
 		t += "  notes {\n";
 		for (let n of e.notes) t += "    \"" + s(n) + "\"\n";
 		t += "  }\n";
@@ -6113,18 +6134,18 @@ var ua = function(e, t) {
 		if (s >= o.length) throw Error(`Parsing error: constraint. ID ${e}: Expecting value for ${t}`);
 		if (t === "stereotype") n.stereotype = a(o[s++]);
 		else if (t === "name") n.name = la(o[s++]);
-		else if (t === "args") n.args ||= [], n.args.push(...fe(i(o[s++])));
+		else if (t === "args") n.args ||= [], n.args.push(...de(i(o[s++])));
 		else if (t === "check") {
-			let e = ue(o[s++], "constraint check");
+			let e = le(o[s++], "constraint check");
 			n.check = e.source, n.checkBound = e.inline || void 0;
 		} else if (t === "violation_meaning") n.violationMeaning = la(o[s++]);
 		else if (t === "on_violation") n.onViolation = a(o[s++]);
-		else if (t === "source") n.source = I(i(o[s++]));
+		else if (t === "source") n.source = L(i(o[s++]));
 		else if (t === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (t === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, t);
 	}
@@ -6136,7 +6157,7 @@ var ua = function(e, t) {
 		for (let n of e.args ?? []) t += "    " + n.name + " <- " + n.source + "\n";
 		t += "  }\n";
 	}
-	return e.check && (e.checkBound ? t += de("check", e.check, "  ") : t += "  check \"" + s(e.check) + "\"\n"), e.violationMeaning && (t += "  violation_meaning \"" + s(e.violationMeaning) + "\"\n"), t += "  on_violation " + (e.onViolation || "invalid") + "\n", e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return e.check && (e.checkBound ? t += ue("check", e.check, "  ") : t += "  check \"" + s(e.check) + "\"\n"), e.violationMeaning && (t += "  violation_meaning \"" + s(e.violationMeaning) + "\"\n"), t += "  on_violation " + (e.onViolation || "invalid") + "\n", e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, fa = /* @__PURE__ */ new Set([
 	"rectangular",
 	"triangular",
@@ -6166,7 +6187,7 @@ function pa(e) {
 			let e = a(n[o++]);
 			if (!fa.has(e)) throw Error(`Parsing error: uncertainty_budget component. ID ${t.id}: unknown distribution "${e}" (rectangular | triangular | normal | ushape)`);
 			t.distribution = e;
-		} else e === "half_width" ? t.halfWidth = a(n[o++]) : e === "unit" ? t.unit = a(n[o++]) : e === "description" ? t.description = a(n[o++]) : e === "source" ? t.source = I(i(n[o++])) : o = b(n, o, e);
+		} else e === "half_width" ? t.halfWidth = a(n[o++]) : e === "unit" ? t.unit = a(n[o++]) : e === "description" ? t.description = a(n[o++]) : e === "source" ? t.source = L(i(n[o++])) : o = b(n, o, e);
 	}
 	return t;
 }
@@ -6189,12 +6210,12 @@ var ma = function(e, t) {
 			if (o[s].startsWith("{")) throw Error(`Parsing error: uncertainty_budget. ID ${e}: a component carries an id — component <id> { … }`);
 			let t = a(o[s++]), r = pa(i(o[s++]));
 			r.id = t, n.components.push(r);
-		} else if (t === "source") n.source = I(i(o[s++]));
+		} else if (t === "source") n.source = L(i(o[s++]));
 		else if (t === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (t === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, t);
 	}
@@ -6203,7 +6224,7 @@ var ma = function(e, t) {
 	let t = "uncertainty_budget " + e.id + " {\n";
 	e.target && (t += "  target " + e.target + "\n"), e.coverageK && (t += "  coverage k " + e.coverageK + "\n");
 	for (let n of e.components) t += "  component " + n.id + " {\n", t += "    type " + n.type + "\n", n.type === "A" && n.series && (t += "    series " + n.series + "\n"), n.type === "B" && (n.distribution && (t += "    distribution " + n.distribution + "\n"), n.halfWidth && (t += "    half_width " + n.halfWidth + "\n"), n.unit && (t += "    unit \"" + s(n.unit) + "\"\n")), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.source && (n.source.doc || n.source.clause) && (t += "    source { doc \"" + s(n.source.doc) + "\" clause \"" + s(n.source.clause) + "\"" + (n.source.fragment ? " fragment \"" + s(n.source.fragment) + "\"" : "") + " }\n"), t += "  }\n";
-	return e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return e.source && (e.source.doc || e.source.clause) && (t += "  source { doc \"" + s(e.source.doc) + "\" clause \"" + s(e.source.clause) + "\"" + (e.source.fragment ? " fragment \"" + s(e.source.fragment) + "\"" : "") + " }\n"), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, ga = ["open", "resolved"], _a = function(e, t) {
 	let i = {
 		id: e,
@@ -6225,7 +6246,7 @@ var ma = function(e, t) {
 		else if (t === "sources") i.sources = n(a(o[s++])).map(a).filter((e) => e.length > 0);
 		else if (t === "resolution") {
 			let t = a(o[s++]);
-			if (!_e.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown resolution ${t} (valid: ${_e.join(", ")})`);
+			if (!ge.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown resolution ${t} (valid: ${ge.join(", ")})`);
 			i.resolution = t;
 		} else t === "governing" ? i.governing = a(o[s++]) : t === "rationale" ? i.rationale = a(o[s++]) : s++;
 	}
@@ -6239,7 +6260,7 @@ var ma = function(e, t) {
 function ya(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o] === ":" && o++, o < r.length && r[o].startsWith("{")) {
 			let s = n(i(r[o++])), c = {
@@ -6293,12 +6314,12 @@ var xa = function(e, t) {
 	return y(t, (e, t, r) => {
 		if (e === "description") n.description = x(t);
 		else if (e === "source") {
-			let e = I(i(t()));
+			let e = L(i(t()));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
 		} else if (e === "ref") {
-			let e = C(t, r, a, i);
-			T(n, e) || (n.refs ??= []).push(e);
-		} else if (e === "corresponds") (n.correspondences ??= []).push(O(t, r, a));
+			let e = w(t, r, a, i);
+			E(n, e) || (n.refs ??= []).push(e);
+		} else if (e === "corresponds") (n.correspondences ??= []).push(k(t, r, a));
 		else if (e === "cardinality") n.cardinality = ya(i(t()));
 		else if (e === "repetitions_per_point") n.repetitionsPerPoint = Number(a(t()));
 		else if (e === "points") n.points = ba(i(t()));
@@ -6312,8 +6333,8 @@ var xa = function(e, t) {
 	let t = "test_point_set " + e.id + " {\n";
 	e.description && (t += "  description \"" + s(e.description) + "\"\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source && (e.source.doc || e.source.clause) ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N);
+	for (let e of n) t += D(e, "  ", s);
+	t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P);
 	let r = Object.keys(e.cardinality);
 	if (r.length > 0) {
 		t += "  cardinality {\n";
@@ -6344,7 +6365,7 @@ var xa = function(e, t) {
 		if (e === "title") n.title = a(t());
 		else if (e === "reference") n.reference = a(t());
 		else if (e === "description") n.description = a(t());
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -6358,7 +6379,7 @@ var xa = function(e, t) {
 //#endregion
 //#region src/ser-des/config/requirement.ts
 function Ta(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function Ea(e) {
 	let t = {
@@ -6370,7 +6391,7 @@ function Ea(e) {
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "verdict" ? t.verdict = a(r[o++]) : e === "op" ? t.op = a(r[o++]) : e === "limit" ? t.limit = a(r[o++]) : e === "source_discrepancy" ? t.sourceDiscrepancy = A(i(r[o++])) : o = b(r, o, e);
+		e === "verdict" ? t.verdict = a(r[o++]) : e === "op" ? t.op = a(r[o++]) : e === "limit" ? t.limit = a(r[o++]) : e === "source_discrepancy" ? t.sourceDiscrepancy = j(i(r[o++])) : o = b(r, o, e);
 	}
 	return t;
 }
@@ -6430,7 +6451,7 @@ function Aa(e, t, r) {
 				e === "kind" ? r.kind = a(s[c++]) : e === "unit" ? r.unit = a(s[c++]) : i(s[c++]);
 			}
 			t.quantity = r;
-		} else r === "accepts" ? t.accepts = Ea(i(e[o++])) : r === "acceptance" ? t.acceptance = Xr(i(e[o++])) : r === "source_discrepancy" ? t.sourceDiscrepancy = A(i(e[o++])) : o = b(e, o, r);
+		} else r === "accepts" ? t.accepts = Ea(i(e[o++])) : r === "acceptance" ? t.acceptance = Xr(i(e[o++])) : r === "source_discrepancy" ? t.sourceDiscrepancy = j(i(e[o++])) : o = b(e, o, r);
 	}
 }
 function ja(e) {
@@ -6465,7 +6486,7 @@ function Ma(e) {
 			continue;
 		}
 		let e = {
-			name: P(a(r[o++])),
+			name: F(a(r[o++])),
 			type: "",
 			description: "",
 			unit: "",
@@ -6530,7 +6551,7 @@ var Na = function(e, t) {
 		else if (e === "subjects") o.subjects = ja(i(s[c++]));
 		else if (e === "parameters") o.parameters = Ma(i(s[c++]));
 		else if (e === "limit") o.limit = Oa(i(s[c++]));
-		else if (e === "applicability") o.applicability = L(i(s[c++]));
+		else if (e === "applicability") o.applicability = R(i(s[c++]));
 		else if (e === "channel") o.channel = a(s[c++]);
 		else if (e === "report_row") o.reportRow = a(s[c++]);
 		else if (e === "obligation") o.obligation = a(s[c++]);
@@ -6543,15 +6564,15 @@ var Na = function(e, t) {
 				n === "method" ? o.verificationMethod = a(e[t++]) : n === "description" ? o.verificationDescription = a(e[t++]) : i(e[t++]);
 			}
 		} else if (e === "dependencies") o.dependencies = Ta(s[c++]);
-		else if (e === "source_discrepancy") o.sourceDiscrepancy = A(i(s[c++]));
+		else if (e === "source_discrepancy") o.sourceDiscrepancy = j(i(s[c++]));
 		else if (e === "source" || e === "reference") {
-			let e = I(i(s[c++]));
+			let e = L(i(s[c++]));
 			o.source ||= e, (o.sourceRefs ??= []).push(e);
 		} else if (e === "ref") {
-			let e = S(s, c, a, i);
-			T(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
+			let e = C(s, c, a, i);
+			E(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
 		} else if (e === "corresponds") {
-			let e = D(s, c, a);
+			let e = O(s, c, a);
 			(o.correspondences ??= []).push(e.corr), c = e.next;
 		} else c = b(s, c, e);
 	}
@@ -6569,9 +6590,9 @@ function Pa(e) {
 		for (let n of e.expression.split("\n")) t += "      " + n + "\n";
 		if (t += "    }\n", e.modality && (t += "    modality " + e.modality + "\n"), e.relativeTo && (t += "    relative_to " + e.relativeTo + "\n"), e.notes && (t += "    notes \"" + s(e.notes) + "\"\n"), e.accepts) {
 			let n = e.accepts, r = "    accepts { verdict " + n.verdict;
-			n.op && (r += " op " + n.op), n.limit && (r += " limit \"" + s(n.limit) + "\""), n.sourceDiscrepancy && (r += " " + j(n.sourceDiscrepancy, "")), t += r + " }\n";
+			n.op && (r += " op " + n.op), n.limit && (r += " limit \"" + s(n.limit) + "\""), n.sourceDiscrepancy && (r += " " + M(n.sourceDiscrepancy, "")), t += r + " }\n";
 		}
-		return e.acceptance && (t += Zr(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
+		return e.acceptance && (t += Zr(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
 	}
 	let t = "  limit {\n";
 	if (e.expression && (t += "    expression \"" + s(e.expression) + "\"\n"), e.uses.length > 0 && (t += "    uses { " + e.uses.join(" ") + " }\n"), e.modality && (t += "    modality " + e.modality + "\n"), e.relativeTo && (t += "    relative_to " + e.relativeTo + "\n"), e.notes && (t += "    notes \"" + s(e.notes) + "\"\n"), e.quantity) {
@@ -6580,9 +6601,9 @@ function Pa(e) {
 	}
 	if (e.accepts) {
 		let n = e.accepts, r = "    accepts { verdict " + n.verdict;
-		n.op && (r += " op " + n.op), n.limit && (r += " limit \"" + s(n.limit) + "\""), n.sourceDiscrepancy && (r += " " + j(n.sourceDiscrepancy, "")), t += r + " }\n";
+		n.op && (r += " op " + n.op), n.limit && (r += " limit \"" + s(n.limit) + "\""), n.sourceDiscrepancy && (r += " " + M(n.sourceDiscrepancy, "")), t += r + " }\n";
 	}
-	return e.acceptance && (t += Zr(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
+	return e.acceptance && (t += Zr(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
 }
 var Fa = function(e) {
 	let t = "requirement " + e.id + " {\n";
@@ -6595,18 +6616,18 @@ var Fa = function(e) {
 		t += "  parameters {\n";
 		for (let n of e.parameters) {
 			let e = "    param " + n.name + ": " + n.type + " { ";
-			n.description && (e += "description \"" + s(n.description) + "\" "), n.unit && (e += "unit \"" + s(n.unit) + "\" "), n.bind && (e += "bind \"" + s(n.bind) + "\" "), n.hasDefault && (e += "default " + N(n.defaultValue) + " "), n.hasRange && (e += "range { ", n.rangeMin && (e += "min " + N(n.rangeMin) + " "), n.rangeMax && (e += "max " + N(n.rangeMax) + " "), e += "} "), n.enumValues.length > 0 && (e += "enum_values { " + n.enumValues.join(" ") + " } "), t += e + "}\n";
+			n.description && (e += "description \"" + s(n.description) + "\" "), n.unit && (e += "unit \"" + s(n.unit) + "\" "), n.bind && (e += "bind \"" + s(n.bind) + "\" "), n.hasDefault && (e += "default " + P(n.defaultValue) + " "), n.hasRange && (e += "range { ", n.rangeMin && (e += "min " + P(n.rangeMin) + " "), n.rangeMax && (e += "max " + P(n.rangeMax) + " "), e += "} "), n.enumValues.length > 0 && (e += "enum_values { " + n.enumValues.join(" ") + " } "), t += e + "}\n";
 		}
 		t += "  }\n";
 	}
-	if (e.limit && (t += Pa(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + R(e.applicability).trim() + "\n  }\n"), e.channel && (t += "  channel " + e.channel + "\n"), e.reportRow && (t += "  report_row " + e.reportRow + "\n"), e.obligation && (t += "  obligation " + e.obligation + "\n"), e.acceptanceCriteria && (t += "  acceptance_criteria {\n    " + e.acceptanceCriteria + "\n  }\n"), e.verificationMethod) {
+	if (e.limit && (t += Pa(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.channel && (t += "  channel " + e.channel + "\n"), e.reportRow && (t += "  report_row " + e.reportRow + "\n"), e.obligation && (t += "  obligation " + e.obligation + "\n"), e.acceptanceCriteria && (t += "  acceptance_criteria {\n    " + e.acceptanceCriteria + "\n  }\n"), e.verificationMethod) {
 		let n = "  verification { method " + e.verificationMethod;
 		e.verificationDescription && (n += " description \"" + s(e.verificationDescription) + "\""), t += n + " }\n";
 	}
-	e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.sourceDiscrepancy && (t += j(e.sourceDiscrepancy, "  ") + "\n");
-	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += E(n, "  ", s);
+	e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.sourceDiscrepancy && (t += M(e.sourceDiscrepancy, "  ") + "\n");
+	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += D(n, "  ", s);
 	for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
-	return t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, Ia = function(e, t) {
 	let n = {
 		id: e,
@@ -6626,7 +6647,7 @@ var Fa = function(e) {
 		else if (e === "description") n.description = a(c[l++]);
 		else if (e === "subject") n.subject = a(c[l++]);
 		else if (e === "guidance") n.guidance = a(c[l++]);
-		else if (e === "applicability") n.applicability = L(i(c[l++]));
+		else if (e === "applicability") n.applicability = R(i(c[l++]));
 		else if (e === "dependencies") n.dependencies = Ta(c[l++]);
 		else if (e === "reference") n.referenceIds = Ta(c[l++]);
 		else if (e === "limit") n.limit = Oa(i(c[l++]));
@@ -6642,7 +6663,7 @@ var Fa = function(e) {
 	};
 }, La = function(e) {
 	let t = "requirement_class " + e.id + " {\n";
-	return e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.subject && (t += "  subject \"" + s(e.subject) + "\"\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.applicability && e.applicability.length > 0 && (t += "  applicability {\n    " + R(e.applicability).trim() + "\n  }\n"), e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), e.limit && (t += Pa(e.limit)), t += "}\n", t;
+	return e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.subject && (t += "  subject \"" + s(e.subject) + "\"\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.applicability && e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), e.limit && (t += Pa(e.limit)), t += "}\n", t;
 }, Ra = {
 	keyword: "requirement",
 	field: "requirements",
@@ -6720,10 +6741,10 @@ var Ua = function(e) {
 		else if (e === "product") t.product = a(r[o++]);
 		else if (e === "maps_to" || e === "mapsTo") t.mapsTo = W(r[o++]);
 		else if (e === "ref") {
-			let e = S(r, o, a, i);
-			T(t, e.ref) || (t.refs ??= []).push(e.ref), o = e.next;
+			let e = C(r, o, a, i);
+			E(t, e.ref) || (t.refs ??= []).push(e.ref), o = e.next;
 		} else if (e === "corresponds") {
-			let e = D(r, o, a);
+			let e = O(r, o, a);
 			(t.correspondences ??= []).push(e.corr), o = e.next;
 		} else if (e === "scheme_type" || e === "schemeType") t.schemeType = a(r[o++]);
 		else if (e === "license_key" || e === "licenseKey") t.licenseKey !== void 0 && (t.licenseKeyDuplicates ??= []).push(t.licenseKey), t.licenseKey = a(r[o++]);
@@ -6768,7 +6789,7 @@ function Wa(e) {
 	let t = "package {\n";
 	e.id && (t += "  id " + e.id + "\n"), e.kind && (t += "  kind " + e.kind + "\n"), e.manufacturer && (t += "  manufacturer \"" + e.manufacturer.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.product && (t += "  product \"" + e.product.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.mapsTo && e.mapsTo.length > 0 && (t += "  maps_to { " + e.mapsTo.join(" ") + " }\n");
 	for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + n.target.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"" + (n.note ? " { note \"" + n.note.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\" }" : "") + "\n";
-	return t += k(e.correspondences, "  ", s, N), e.schemeType && (t += "  scheme_type " + e.schemeType + "\n"), e.licenseKey && (t += "  license_key \"" + e.licenseKey.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.licenseHolder && (t += "  license_holder \"" + e.licenseHolder.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.title && (t += "  title \"" + e.title.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.version && (t += "  version \"" + e.version + "\"\n"), e.editions.length > 0 && (t += "  editions { " + e.editions.join(" ") + " }\n"), e.baseUrn && (t += "  baseUrn \"" + e.baseUrn + "\"\n"), e.extends && (t += "  extends " + e.extends + "\n"), e.uses && e.uses.length > 0 && (t += "  uses { " + e.uses.map((t) => e.usePins?.[t] ? `${t}@${e.usePins[t]}` : t).join(" ") + " }\n"), e.provides && e.provides.length > 0 && (t += "  provides { " + e.provides.join(" ") + " }\n"), e.requires && e.requires.length > 0 && (t += "  requires { " + e.requires.join(" ") + " }\n"), e.waives && e.waives.length > 0 && (t += "  waives { " + e.waives.join(" ") + " }\n"), e.supersedes && e.supersedes.length > 0 && (t += "  supersedes { " + e.supersedes.join(" ") + " }\n"), e.replaces && e.replaces.length > 0 && (t += "  replaces { " + e.replaces.join(" ") + " }\n"), e.supersededBy && e.supersededBy.length > 0 && (t += "  superseded_by { " + e.supersededBy.join(" ") + " }\n"), e.validity && e.validity.from && (t += "  validity { from " + e.validity.from + (e.validity.to ? " to " + e.validity.to : "") + " }\n"), e.status && (t += "  status " + e.status + "\n"), e.defaultSpelling && (t += "  default_spelling " + e.defaultSpelling + "\n"), e.spellings && e.spellings.length > 0 && (t += "  spellings { " + e.spellings.join(" ") + " }\n"), e.description && (t += "  description \"" + e.description.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.source && (t += "  source { collection \"" + e.source.collection + "\" parts { " + e.source.parts.join(" ") + " } }\n"), t += "}\n", t;
+	return t += A(e.correspondences, "  ", s, P), e.schemeType && (t += "  scheme_type " + e.schemeType + "\n"), e.licenseKey && (t += "  license_key \"" + e.licenseKey.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.licenseHolder && (t += "  license_holder \"" + e.licenseHolder.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.title && (t += "  title \"" + e.title.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.version && (t += "  version \"" + e.version + "\"\n"), e.editions.length > 0 && (t += "  editions { " + e.editions.join(" ") + " }\n"), e.baseUrn && (t += "  baseUrn \"" + e.baseUrn + "\"\n"), e.extends && (t += "  extends " + e.extends + "\n"), e.uses && e.uses.length > 0 && (t += "  uses { " + e.uses.map((t) => e.usePins?.[t] ? `${t}@${e.usePins[t]}` : t).join(" ") + " }\n"), e.provides && e.provides.length > 0 && (t += "  provides { " + e.provides.join(" ") + " }\n"), e.requires && e.requires.length > 0 && (t += "  requires { " + e.requires.join(" ") + " }\n"), e.waives && e.waives.length > 0 && (t += "  waives { " + e.waives.join(" ") + " }\n"), e.supersedes && e.supersedes.length > 0 && (t += "  supersedes { " + e.supersedes.join(" ") + " }\n"), e.replaces && e.replaces.length > 0 && (t += "  replaces { " + e.replaces.join(" ") + " }\n"), e.supersededBy && e.supersededBy.length > 0 && (t += "  superseded_by { " + e.supersededBy.join(" ") + " }\n"), e.validity && e.validity.from && (t += "  validity { from " + e.validity.from + (e.validity.to ? " to " + e.validity.to : "") + " }\n"), e.status && (t += "  status " + e.status + "\n"), e.defaultSpelling && (t += "  default_spelling " + e.defaultSpelling + "\n"), e.spellings && e.spellings.length > 0 && (t += "  spellings { " + e.spellings.join(" ") + " }\n"), e.description && (t += "  description \"" + e.description.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"\n"), e.source && (t += "  source { collection \"" + e.source.collection + "\" parts { " + e.source.parts.join(" ") + " } }\n"), t += "}\n", t;
 }
 var Ga = {
 	keyword: "conformance_class",
@@ -6790,13 +6811,13 @@ var Ga = {
 		for (; c < s.length;) {
 			let e = s[c++];
 			if (c >= s.length) break;
-			e === "name" ? o.name = a(s[c++]) : e === "title" ? o.title = a(s[c++]) : e === "description" ? o.description = a(s[c++]) : e === "target" ? o.target = a(s[c++]) : e === "subject" ? o.subject = a(s[c++]) : e === "applicability" ? o.applicability = L(i(s[c++])) : e === "test_subject" ? o.testSubject = Di(i(s[c++])) : e === "guidance" ? o.guidance = a(s[c++]) : e === "dependencies" ? o.dependencies = n(a(s[c++])).map(a) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a) : c = b(s, c, e);
+			e === "name" ? o.name = a(s[c++]) : e === "title" ? o.title = a(s[c++]) : e === "description" ? o.description = a(s[c++]) : e === "target" ? o.target = a(s[c++]) : e === "subject" ? o.subject = a(s[c++]) : e === "applicability" ? o.applicability = R(i(s[c++])) : e === "test_subject" ? o.testSubject = Di(i(s[c++])) : e === "guidance" ? o.guidance = a(s[c++]) : e === "dependencies" ? o.dependencies = n(a(s[c++])).map(a) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a) : c = b(s, c, e);
 		}
 		return (t) => (t.conformanceClasses[e] = o, t);
 	},
 	dump: function(e) {
 		let t = "conformance_class " + e.id + " {\n";
-		if (e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.target && (t += "  target " + e.target + "\n"), e.subject && (t += "  subject \"" + s(e.subject) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.applicability.length > 0 && (t += "  applicability {\n    " + R(e.applicability).trim() + "\n  }\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.testSubject && Object.keys(e.testSubject).length > 0) {
+		if (e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.target && (t += "  target " + e.target + "\n"), e.subject && (t += "  subject \"" + s(e.subject) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.testSubject && Object.keys(e.testSubject).length > 0) {
 			t += "  test_subject {\n";
 			for (let [n, r] of Object.entries(e.testSubject)) t += "    " + n + ": \"" + s(r) + "\"\n";
 			t += "  }\n";
@@ -6861,7 +6882,7 @@ function Xa(e, t) {
 				timestamp: !1
 			}, c = 0;
 			for (; c < e.length;) {
-				let n = P(e[c++]);
+				let n = F(e[c++]);
 				if (c >= e.length) break;
 				n === "quantity_kind" ? t.quantityKind = a(e[c++]) : n === "unit" ? t.unit = a(e[c++]) : n === "timestamp" ? t.timestamp = a(e[c++]) === "true" : i(e[c++]);
 			}
@@ -6873,7 +6894,7 @@ function Xa(e, t) {
 function Za(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o].startsWith("{")) {
 			let s = n(i(r[o++])).map((e) => a(e)).filter((e) => e.length > 0);
@@ -6893,26 +6914,26 @@ function Qa(e, t) {
 		let e = o[s++];
 		if (s > o.length) break;
 		if (e === "operation") {
-			let e = P(o[s++] ?? ""), t = s < o.length ? i(o[s++]) : "";
+			let e = F(o[s++] ?? ""), t = s < o.length ? i(o[s++]) : "";
 			e && r.operations.push(Xa(e, t));
 		} else e === "access" ? r.access = Za(i(o[s++] ?? "")) : e === "profile" ? r.profile = a(o[s++] ?? "") : i(o[s++] ?? "");
 	}
 	return r;
 }
 function $a(e, t) {
-	let n = t + "operation " + N(e.name) + " {";
-	return e.kind && (n += " kind " + N(e.kind)), e.serves.length > 0 && (n += " serves { " + e.serves.map(N).join(" ") + " }"), e.does.length > 0 && (n += " does { " + e.does.map(N).join(" ") + " }"), e.payload && (n += " payload { quantity_kind " + N(e.payload.quantityKind) + " unit " + N(e.payload.unit) + " timestamp " + (e.payload.timestamp ? "true" : "false") + " }"), n + " }\n";
+	let n = t + "operation " + P(e.name) + " {";
+	return e.kind && (n += " kind " + P(e.kind)), e.serves.length > 0 && (n += " serves { " + e.serves.map(P).join(" ") + " }"), e.does.length > 0 && (n += " does { " + e.does.map(P).join(" ") + " }"), e.payload && (n += " payload { quantity_kind " + P(e.payload.quantityKind) + " unit " + P(e.payload.unit) + " timestamp " + (e.payload.timestamp ? "true" : "false") + " }"), n + " }\n";
 }
 function eo(e, t) {
-	let n = t + "endpoint " + N(e.id) + " {\n";
+	let n = t + "endpoint " + P(e.id) + " {\n";
 	for (let r of e.operations) n += $a(r, t + "  ");
 	let r = qa.filter((t) => (e.access[t] ?? []).length > 0), i = Object.keys(e.access).filter((e) => !qa.includes(e));
 	if (r.length + i.length > 0) {
 		n += t + "  access {";
-		for (let t of [...r, ...i]) n += " " + t + " { " + (e.access[t] ?? []).map(N).join(" ") + " }";
+		for (let t of [...r, ...i]) n += " " + t + " { " + (e.access[t] ?? []).map(P).join(" ") + " }";
 		n += " }\n";
 	}
-	return e.profile && (n += t + "  profile " + N(e.profile) + "\n"), n + t + "}\n";
+	return e.profile && (n += t + "  profile " + P(e.profile) + "\n"), n + t + "}\n";
 }
 function to(e, t) {
 	let r = {
@@ -6934,8 +6955,8 @@ function to(e, t) {
 	};
 }
 function no(e, t) {
-	let n = t + "serve " + N(e.aspect) + " via " + N(e.via);
-	return e.freshWithin && (n += " { fresh_within " + N(e.freshWithin) + " }"), n + "\n";
+	let n = t + "serve " + P(e.aspect) + " via " + P(e.via);
+	return e.freshWithin && (n += " { fresh_within " + P(e.freshWithin) + " }"), n + "\n";
 }
 var ro = {
 	keyword: "connector_profile",
@@ -7024,15 +7045,15 @@ function oo(e) {
 	return t;
 }
 function so(e, t) {
-	let n = t + "component " + N(e.id) + " {\n";
-	return n += t + "  product " + N(e.product) + "\n", n += t + "  endpoint " + N(e.endpoint) + "\n", n += t + "  serial " + s(e.serial) + "\n", n += t + "  certificate " + (e.certificate === null ? "null" : s(e.certificate)) + "\n", n + t + "}\n";
+	let n = t + "component " + P(e.id) + " {\n";
+	return n += t + "  product " + P(e.product) + "\n", n += t + "  endpoint " + P(e.endpoint) + "\n", n += t + "  serial " + s(e.serial) + "\n", n += t + "  certificate " + (e.certificate === null ? "null" : s(e.certificate)) + "\n", n + t + "}\n";
 }
 function co(e, t) {
 	let n = t + "composed_of {\n";
 	for (let r of e.components) n += so(r, t + "  ");
 	if (e.decomposition.length > 0) {
 		n += t + "  decomposition {\n";
-		for (let r of e.decomposition) n += t + "    " + N(r.register) + " -> " + (r.component === "composite" ? "rule " + N(r.rule ?? "") : N(r.component) + "." + N(r.componentRegister ?? "")) + "\n";
+		for (let r of e.decomposition) n += t + "    " + P(r.register) + " -> " + (r.component === "composite" ? "rule " + P(r.rule ?? "") : P(r.component) + "." + P(r.componentRegister ?? "")) + "\n";
 		n += t + "  }\n";
 	}
 	return e.revision !== void 0 && (n += t + "  revision " + String(e.revision) + "\n"), n + t + "}\n";
@@ -7045,7 +7066,7 @@ function lo(e, t, n) {
 	return `${n}${e} { doc "${s(t.doc)}" clause "${s(t.clause)}"${r} }\n`;
 }
 function G(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function K(e, t, n) {
 	return t.length === 0 ? "" : `${n}${e} { ${t.join(" ")} }\n`;
@@ -7082,7 +7103,7 @@ var uo = function(e, t) {
 		else if (e === "definition") o.definition = a(s[c++]);
 		else if (e === "note") o.note = a(s[c++]);
 		else if (e === "source") {
-			let e = I(i(s[c++]));
+			let e = L(i(s[c++]));
 			(o.sourceRefs ??= []).push(e), o.source ||= e;
 		} else if (e === "variant") {
 			let e = a(s[c++]), t = c < s.length ? i(s[c++]) : "", r = {
@@ -7092,7 +7113,7 @@ var uo = function(e, t) {
 			for (; u < l.length;) {
 				let e = l[u++];
 				if (u >= l.length) break;
-				e === "name" ? r.name = a(l[u++]) : e === "definition" ? r.definition = a(l[u++]) : e === "note" ? r.note = a(l[u++]) : e === "source" ? r.source = I(i(l[u++])) : i(l[u++]);
+				e === "name" ? r.name = a(l[u++]) : e === "definition" ? r.definition = a(l[u++]) : e === "note" ? r.note = a(l[u++]) : e === "source" ? r.source = L(i(l[u++])) : i(l[u++]);
 			}
 			o.variants.push(r);
 		} else if (e === "dimension") o.dimensions.push(ho(a(s[c++]), i(s[c++])));
@@ -7106,11 +7127,11 @@ var uo = function(e, t) {
 				if (n === "metamodel_class") o.familyMetamodelClass = a(e[t++]);
 				else if (n === "definition") o.familyDefinition = a(e[t++]);
 				else if (n === "note") o.familyNote = a(e[t++]);
-				else if (n === "source") o.familySource = I(i(e[t++]));
+				else if (n === "source") o.familySource = L(i(e[t++]));
 				else if (n === "ref") {
-					let n = S(e, t, a, i);
+					let n = C(e, t, a, i);
 					if (t = n.next, n.ref.predicate === "derives-from") {
-						let e = me(n.ref.target);
+						let e = pe(n.ref.target);
 						e && !o.familySource && (o.familySource = e);
 					}
 				} else i(e[t++]);
@@ -7125,10 +7146,10 @@ var uo = function(e, t) {
 		} else if (e === "model_group") o.modelGroup = vo(i(s[c++]));
 		else if (e === "reference") o.referenceIds = q(s[c++]);
 		else if (e === "ref") {
-			let e = S(s, c, a, i);
-			T(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
+			let e = C(s, c, a, i);
+			E(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
 		} else if (e === "corresponds") {
-			let e = D(s, c, a);
+			let e = O(s, c, a);
 			(o.correspondences ??= []).push(e.corr), c = e.next;
 		} else c = b(s, c, e);
 	}
@@ -7157,7 +7178,7 @@ function fo(e) {
 				t === "target_object" ? e.targetObject = a(s[c++]) : t === "identification_method" ? e.identificationMethod = a(s[c++]) : i(s[c++]);
 			}
 			t.context = e;
-		} else e === "source" ? t.source = I(i(r[o++])) : o = b(r, o, e);
+		} else e === "source" ? t.source = L(i(r[o++])) : o = b(r, o, e);
 	}
 	return t;
 }
@@ -7171,7 +7192,7 @@ function po(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "class" ? r.classId = a(o[s++]) : e === "definition" ? r.definition = a(o[s++]) : e === "source" ? r.source = I(i(o[s++])) : s = b(o, s, e);
+		e === "class" ? r.classId = a(o[s++]) : e === "definition" ? r.definition = a(o[s++]) : e === "source" ? r.source = L(i(o[s++])) : s = b(o, s, e);
 	}
 	return r;
 }
@@ -7192,14 +7213,14 @@ function mo(e, t) {
 		if (e === "predicate") r.predicate = a(o[s++]);
 		else if (e === "subject") r.subject = a(o[s++]);
 		else if (e === "target") r.target = a(o[s++]);
-		else if (e === "applicability") r.applicability = L(i(o[s++]));
+		else if (e === "applicability") r.applicability = R(i(o[s++]));
 		else if (e === "propagation") {
 			let e = n(i(o[s++]));
 			for (let t = 0; t + 1 < e.length; t += 2) r.propagation.push({
 				property: a(e[t]),
 				direction: a(e[t + 1])
 			});
-		} else e === "note" ? r.note = a(o[s++]) : e === "source" ? r.source = I(i(o[s++])) : s = b(o, s, e);
+		} else e === "note" ? r.note = a(o[s++]) : e === "source" ? r.source = L(i(o[s++])) : s = b(o, s, e);
 	}
 	return r;
 }
@@ -7225,13 +7246,13 @@ function ho(e, t) {
 			r.cardinality = t;
 		} else if (t === "label_separator") r.labelSeparator = a(o[s++]);
 		else if (t === "description") r.description = a(o[s++]);
-		else if (t === "reference" || t === "source") r.source = I(i(o[s++]));
+		else if (t === "reference" || t === "source") r.source = L(i(o[s++]));
 		else if (t === "values") r.values = go(i(o[s++]));
-		else if (t === "payload_class") r.payloadClass = P(a(o[s++]));
+		else if (t === "payload_class") r.payloadClass = F(a(o[s++]));
 		else if (t === "values_of") r.valuesOf = a(o[s++]);
 		else if (t === "ref") {
-			let e = S(o, s, a, i);
-			T(r, e.ref) || (r.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(r, e.ref) || (r.refs ??= []).push(e.ref), s = e.next;
 		} else s = b(o, s, t);
 	}
 	return r;
@@ -7239,7 +7260,7 @@ function ho(e, t) {
 function go(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		let s = {
 			id: e,
@@ -7260,12 +7281,12 @@ function go(e) {
 				else if (r === "payload") {
 					let r = n(i(e[t++])), o = 0;
 					for (; o < r.length;) {
-						let e = P(r[o++]);
+						let e = F(r[o++]);
 						if (o >= r.length) break;
 						if (r[o] === ":" && o++, o < r.length && r[o].startsWith("{")) {
 							let t = n(i(r[o++])), c = {}, l = 0;
 							for (; l < t.length;) {
-								let e = P(t[l++]);
+								let e = F(t[l++]);
 								if (l >= t.length) break;
 								t[l] === ":" && l++, l < t.length && (c[e] = a(t[l++]));
 							}
@@ -7301,7 +7322,7 @@ function _o(e, t) {
 		}
 		i += n + "}\n";
 	}
-	return i += w(e.refs, n, s), i += t + "}\n", i;
+	return i += T(e.refs, n, s), i += t + "}\n", i;
 }
 function vo(e) {
 	let t = {
@@ -7319,14 +7340,14 @@ function vo(e) {
 		else if (e === "identical_attributes") t.identicalAttributes = G(r[o++]);
 		else if (e === "group_by") t.groupBy = a(r[o++]);
 		else if (e === "note") t.note = a(r[o++]);
-		else if (e === "source") t.sources.push(I(i(r[o++])));
+		else if (e === "source") t.sources.push(L(i(r[o++])));
 		else if (e === "ref") {
-			let e = S(r, o, a, i);
+			let e = C(r, o, a, i);
 			if (o = e.next, e.ref.predicate === "derives-from") {
-				let n = me(e.ref.target);
+				let n = pe(e.ref.target);
 				n && t.sources.push(n);
 			}
-		} else e === "sample_selection" ? t.sampleSelection.push(I(i(r[o++]))) : o = b(r, o, e);
+		} else e === "sample_selection" ? t.sampleSelection.push(L(i(r[o++]))) : o = b(r, o, e);
 	}
 	return t;
 }
@@ -7341,7 +7362,7 @@ var yo = function(e) {
 		n.classId && (e += "class " + n.classId + " "), n.definition && (e += "definition \"" + s(n.definition) + "\" "), n.source && (n.source.doc || n.source.clause) && (e += "source { doc \"" + s(n.source.doc) + "\" clause \"" + s(n.source.clause) + "\" } "), t += e + "}\n";
 	}
 	for (let n of e.structure ?? []) {
-		if (t += "  structure " + n.id + " {\n", n.predicate && (t += "    predicate " + n.predicate + "\n"), n.subject && (t += "    subject " + n.subject + "\n"), n.target && (t += "    target " + n.target + "\n"), n.applicability.length > 0 && (t += "    applicability { " + R(n.applicability).trim() + " }\n"), n.propagation.length > 0) {
+		if (t += "  structure " + n.id + " {\n", n.predicate && (t += "    predicate " + n.predicate + "\n"), n.subject && (t += "    subject " + n.subject + "\n"), n.target && (t += "    target " + n.target + "\n"), n.applicability.length > 0 && (t += "    applicability { " + z(n.applicability).trim() + " }\n"), n.propagation.length > 0) {
 			t += "    propagation { ";
 			for (let e of n.propagation) t += e.property + " " + e.direction + " ";
 			t += "}\n";
@@ -7354,20 +7375,20 @@ var yo = function(e) {
 		n.name && (e += "name \"" + s(n.name) + "\" "), e += "definition \"" + s(n.definition) + "\" ", n.note && (e += "note \"" + s(n.note) + "\" "), n.source && (n.source.doc || n.source.clause) && (e += "source { doc \"" + s(n.source.doc) + "\" clause \"" + s(n.source.clause) + "\" } "), t += e + "}\n";
 	}
 	for (let n of e.dimensions) t += _o(n, "  ");
-	if ((e.familyMetamodelClass || e.familyDefinition || e.familyNote || e.familySource && (e.familySource.doc || e.familySource.clause)) && (t += "  family {\n", e.familyMetamodelClass && (t += "    metamodel_class " + e.familyMetamodelClass + "\n"), e.familyDefinition && (t += "    definition \"" + s(e.familyDefinition) + "\"\n"), e.familyNote && (t += "    note \"" + s(e.familyNote) + "\"\n"), e.familySource && (e.familySource.doc || e.familySource.clause) && (t += E(e.familySource, "    ", s)), t += "  }\n"), e.familyCriteria.length > 0) {
+	if ((e.familyMetamodelClass || e.familyDefinition || e.familyNote || e.familySource && (e.familySource.doc || e.familySource.clause)) && (t += "  family {\n", e.familyMetamodelClass && (t += "    metamodel_class " + e.familyMetamodelClass + "\n"), e.familyDefinition && (t += "    definition \"" + s(e.familyDefinition) + "\"\n"), e.familyNote && (t += "    note \"" + s(e.familyNote) + "\"\n"), e.familySource && (e.familySource.doc || e.familySource.clause) && (t += D(e.familySource, "    ", s)), t += "  }\n"), e.familyCriteria.length > 0) {
 		t += "  family_criteria {\n";
 		for (let n of e.familyCriteria) t += "    \"" + s(n) + "\"\n";
 		t += "  }\n";
 	}
 	if ((e.familyDefaultDimensions.length > 0 || e.familyDefaultParameters.length > 0) && (t += "  family_defaults {\n", t += K("dimensions", e.familyDefaultDimensions, "    "), t += K("parameters", e.familyDefaultParameters, "    "), t += "  }\n"), e.modelGroup) {
 		t += "  model_group {\n", e.modelGroup.definition && (t += "    definition \"" + s(e.modelGroup.definition) + "\"\n"), e.modelGroup.groupBy && (t += "    group_by " + e.modelGroup.groupBy + "\n"), e.modelGroup.note && (t += "    note \"" + s(e.modelGroup.note) + "\"\n"), t += K("identical_characteristics", e.modelGroup.identicalCharacteristics, "    "), t += K("identical_attributes", e.modelGroup.identicalAttributes, "    ");
-		for (let n of e.modelGroup.sources ?? []) t += E(n, "    ", s);
+		for (let n of e.modelGroup.sources ?? []) t += D(n, "    ", s);
 		for (let n of e.modelGroup.sampleSelection ?? []) t += lo("sample_selection", n, "    ");
 		t += "  }\n";
 	}
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += K("reference", e.referenceIds, "  "), t += "}\n", t;
+	for (let e of n) t += D(e, "  ", s);
+	return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += K("reference", e.referenceIds, "  "), t += "}\n", t;
 };
 function bo(e) {
 	let t = {
@@ -7393,7 +7414,7 @@ function bo(e) {
 				for (; s < t.length;) {
 					let n = t[s++];
 					if (s >= t.length) break;
-					n === "name" ? e.name = a(t[s++]) : n === "source" ? e.source = I(i(t[s++])) : i(t[s++]);
+					n === "name" ? e.name = a(t[s++]) : n === "source" ? e.source = L(i(t[s++])) : i(t[s++]);
 				}
 			}
 			t.components.push(e);
@@ -7403,8 +7424,8 @@ function bo(e) {
 }
 function xo(e) {
 	let t = "  pair_list {\n";
-	t += "    key " + N(e.key) + "\n", t += "    value " + N(e.value) + "\n", e.keyDimension && (t += "    key_dimension " + N(e.keyDimension) + "\n");
-	for (let n of e.components) t += "    component " + N(n.id) + " {\n", n.name && (t += "      name \"" + s(n.name) + "\"\n"), n.source && (n.source.doc || n.source.clause) && (t += "      source {\n", n.source.doc && (t += "        doc \"" + s(n.source.doc) + "\"\n"), n.source.clause && (t += "        clause \"" + s(n.source.clause) + "\"\n"), t += "      }\n"), t += "    }\n";
+	t += "    key " + P(e.key) + "\n", t += "    value " + P(e.value) + "\n", e.keyDimension && (t += "    key_dimension " + P(e.keyDimension) + "\n");
+	for (let n of e.components) t += "    component " + P(n.id) + " {\n", n.name && (t += "      name \"" + s(n.name) + "\"\n"), n.source && (n.source.doc || n.source.clause) && (t += "      source {\n", n.source.doc && (t += "        doc \"" + s(n.source.doc) + "\"\n"), n.source.clause && (t += "        clause \"" + s(n.source.clause) + "\"\n"), t += "      }\n"), t += "    }\n";
 	return t += "  }\n", t;
 }
 var So = function(e, t) {
@@ -7434,7 +7455,7 @@ var So = function(e, t) {
 		else if (e === "name") n.name = a(o[s++]);
 		else if (e === "definition") n.definition = a(o[s++]);
 		else if (e === "source" || e === "reference") {
-			let e = I(i(o[s++]));
+			let e = L(i(o[s++]));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
 		} else if (e === "quantity_kind") n.quantityKind = a(o[s++]);
 		else if (e === "unit") n.unit = a(o[s++]);
@@ -7448,13 +7469,13 @@ var So = function(e, t) {
 		else if (e === "enum_values") n.enumValues = G(o[s++]);
 		else if (e === "note") n.note = a(o[s++]);
 		else if (e === "irdi") n.irdi = a(o[s++]);
-		else if (e === "class") n.classRef = P(a(o[s++]));
+		else if (e === "class") n.classRef = F(a(o[s++]));
 		else if (e === "derived") n.derived = a(o[s++]);
 		else if (e === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (e === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, e);
 	}
@@ -7463,9 +7484,9 @@ var So = function(e, t) {
 	let t = "attribute_definition " + e.id + " {\n";
 	e.overlay && (t += "  overlay true\n"), e.symbol && (t += "  symbol \"" + s(e.symbol) + "\"\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
+	for (let e of n) t += D(e, "  ", s);
 	for (let n of e.referenceIds) t += "  ref cites \"" + s(n) + "\"\n";
-	return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), e.quantityKind && (t += "  quantity_kind " + e.quantityKind + "\n"), e.unit && (t += "  unit \"" + s(e.unit) + "\"\n"), e.valueType && (t += "  value_type " + e.valueType + "\n"), e.pairList && (t += xo(e.pairList)), e.origin && (t += "  origin " + e.origin + "\n"), e.scope && (t += "  scope " + e.scope + "\n"), e.category && (t += "  category " + e.category + "\n"), e.isDimension !== null && e.isDimension !== void 0 && (t += "  is_dimension " + (e.isDimension ? "true" : "false") + "\n"), e.enumRef && (t += "  enum " + e.enumRef + "\n"), e.enumValues && e.enumValues.length > 0 && (t += "  enum_values { " + e.enumValues.map(N).join(" ") + " }\n"), e.irdi && (t += "  irdi \"" + s(e.irdi) + "\"\n"), e.classRef && (t += "  class " + e.classRef + "\n"), e.derived && (t += "  derived \"" + s(e.derived) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n"), t += "}\n", t;
+	return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), e.quantityKind && (t += "  quantity_kind " + e.quantityKind + "\n"), e.unit && (t += "  unit \"" + s(e.unit) + "\"\n"), e.valueType && (t += "  value_type " + e.valueType + "\n"), e.pairList && (t += xo(e.pairList)), e.origin && (t += "  origin " + e.origin + "\n"), e.scope && (t += "  scope " + e.scope + "\n"), e.category && (t += "  category " + e.category + "\n"), e.isDimension !== null && e.isDimension !== void 0 && (t += "  is_dimension " + (e.isDimension ? "true" : "false") + "\n"), e.enumRef && (t += "  enum " + e.enumRef + "\n"), e.enumValues && e.enumValues.length > 0 && (t += "  enum_values { " + e.enumValues.map(P).join(" ") + " }\n"), e.irdi && (t += "  irdi \"" + s(e.irdi) + "\"\n"), e.classRef && (t += "  class " + e.classRef + "\n"), e.derived && (t += "  derived \"" + s(e.derived) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n"), t += "}\n", t;
 }, wo = function(e, t) {
 	let n = {
 		id: e,
@@ -7492,17 +7513,17 @@ var So = function(e, t) {
 		else if (e === "verified_by_tests" || e === "verified_by") n.verifiedByTests = q(o[s++]);
 		else if (e === "reference") n.referenceIds = q(o[s++]);
 		else if (e === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (e === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, e);
 	}
 	return (t) => (t.capabilities[e] = n, t);
 }, To = function(e) {
 	let t = "capability " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.abstract && (t += "  abstract true\n"), t += K("extends", e.extends, "  "), t += K("requires", e.requires, "  "), t += K("has_parameters", e.hasParameters, "  "), t += K("satisfies_requirements", e.satisfiesRequirements, "  "), t += K("verified_by_tests", e.verifiedByTests, "  "), t += K("reference", e.referenceIds, "  "), t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.abstract && (t += "  abstract true\n"), t += K("extends", e.extends, "  "), t += K("requires", e.requires, "  "), t += K("has_parameters", e.hasParameters, "  "), t += K("satisfies_requirements", e.satisfiesRequirements, "  "), t += K("verified_by_tests", e.verifiedByTests, "  "), t += K("reference", e.referenceIds, "  "), t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 }, Eo = function(e, t) {
 	let n = {
 		id: e,
@@ -7520,14 +7541,14 @@ var So = function(e, t) {
 		else if (e === "stimulus") n.stimulus = a(o[s++]);
 		else if (e === "response") n.response = a(o[s++]);
 		else if (e === "source" || e === "reference") {
-			let e = I(i(o[s++]));
+			let e = L(i(o[s++]));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
 		} else if (e === "verified_by" || e === "verified_by_tests") n.verifiedBy = q(o[s++]);
 		else if (e === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (e === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, e);
 	}
@@ -7536,8 +7557,8 @@ var So = function(e, t) {
 	let t = "behavior " + e.id + " {\n";
 	e.kind && (t += "  kind " + e.kind + "\n"), e.stimulus && (t += "  stimulus " + e.stimulus + "\n"), e.response && (t += "  response \"" + s(e.response) + "\"\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += K("verified_by", e.verifiedBy, "  "), t += "}\n", t;
+	for (let e of n) t += D(e, "  ", s);
+	return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += K("verified_by", e.verifiedBy, "  "), t += "}\n", t;
 }, Oo = function(e, t) {
 	let n = {
 		id: e,
@@ -7555,16 +7576,16 @@ var So = function(e, t) {
 		else if (e === "description") n.description = a(o[s++]);
 		else if (e === "entries") n.entries = ko(i(o[s++]));
 		else if (e === "source") {
-			let e = I(i(o[s++]));
+			let e = L(i(o[s++]));
 			n.sources.push(e), n.source ||= e;
 		} else if (e === "ref") {
-			let e = S(o, s, a, i);
+			let e = C(o, s, a, i);
 			if (s = e.next, e.ref.predicate === "derives-from") {
-				let t = me(e.ref.target);
+				let t = pe(e.ref.target);
 				t ? (n.sources.push(t), n.source ||= t) : (n.refs ??= []).push(e.ref);
 			} else e.ref.predicate === "cites" ? n.referenceIds.push(e.ref.target) : (n.refs ??= []).push(e.ref);
 		} else if (e === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else e === "reference" ? n.referenceIds = q(o[s++]) : s = b(o, s, e);
 	}
@@ -7573,7 +7594,7 @@ var So = function(e, t) {
 function ko(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		let s = {
 			quantityKind: e,
@@ -7598,19 +7619,19 @@ var Ao = function(e) {
 	if (e.role && (t += "  role " + e.role + "\n"), e.subject && (t += "  subject " + e.subject + "\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.entries.length > 0) {
 		t += "  entries {\n";
 		for (let n of e.entries) {
-			let e = "    " + n.quantityKind + " { value " + N(n.value);
-			n.unit && (e += " unit \"" + s(n.unit) + "\""), n.tolerance && (e += " tolerance " + N(n.tolerance)), n.note && (e += " note \"" + s(n.note) + "\""), t += e + " }\n";
+			let e = "    " + n.quantityKind + " { value " + P(n.value);
+			n.unit && (e += " unit \"" + s(n.unit) + "\""), n.tolerance && (e += " tolerance " + P(n.tolerance)), n.note && (e += " note \"" + s(n.note) + "\""), t += e + " }\n";
 		}
 		t += "  }\n";
 	}
 	let n = e.sources && e.sources.length > 0 ? e.sources : e.source ? [e.source] : [];
-	for (let e of n) t += E(e, "  ", s);
-	return t += K("reference", e.referenceIds, "  "), t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+	for (let e of n) t += D(e, "  ", s);
+	return t += K("reference", e.referenceIds, "  "), t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 };
 function jo(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		r[i] === ":" && i++, i < r.length && (t[e] = a(r[i++]));
 	}
@@ -7619,7 +7640,7 @@ function jo(e) {
 function Mo(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		r[i] === ":" && i++;
 		let n = [];
@@ -7634,7 +7655,7 @@ function No(e) {
 function Po(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (r[o] === ":" && o++, r[o] === "in" && o++, o < r.length) {
 			let n = r[o++];
@@ -7646,7 +7667,7 @@ function Po(e) {
 function Fo(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o].startsWith("{")) {
 			t[e] = Io(i(r[o++]));
@@ -7655,7 +7676,7 @@ function Fo(e) {
 		let n = "", s = "", c = !1;
 		if (e.length > 1 && e.endsWith("=") && (e = e.slice(0, -1), c = !0), !c && o < r.length && r[o] !== "=" && (c = r[o].endsWith("="), n = c ? r[o].slice(0, -1) : r[o], o++), c || r[o] === "=") {
 			c || o++;
-			let e = M(r, o);
+			let e = N(r, o);
 			s = a(e.text), o = e.next;
 		}
 		t[e] = {
@@ -7675,9 +7696,9 @@ function Io(e) {
 		if (o >= r.length) break;
 		if (e === "symbol") t.symbol = a(r[o++]);
 		else if (e === "derivation" || e === "derive") {
-			let e = M(r, o);
+			let e = N(r, o);
 			t.derivation = a(e.text), o = e.next;
-		} else e === "behavior" ? t.behavior = a(r[o++]) : e === "quantity_kind" ? t.quantityKind = a(r[o++]) : e === "unit" ? t.unit = a(r[o++]) : e === "source" || e === "reference" ? t.source = I(i(r[o++])) : o = b(r, o, e);
+		} else e === "behavior" ? t.behavior = a(r[o++]) : e === "quantity_kind" ? t.quantityKind = a(r[o++]) : e === "unit" ? t.unit = a(r[o++]) : e === "source" || e === "reference" ? t.source = L(i(r[o++])) : o = b(r, o, e);
 	}
 	return t;
 }
@@ -7686,7 +7707,7 @@ function Ro(e, t, n) {
 	return e === "endpoint" ? (n < t.length && !t[n].startsWith("{") && n++, n < t.length && t[n].startsWith("{") && n++, n) : e === "serve" ? (n < t.length && n++, t[n] === "via" && (n += 2), n < t.length && t[n].startsWith("{") && n++, n) : n;
 }
 function zo(e, t, n, r, i) {
-	let a = P(n);
+	let a = F(n);
 	return e.misplacedAspects.push({
 		family: t,
 		aspect: a
@@ -7706,7 +7727,7 @@ function Bo(e, t) {
 		for (; s < o.length;) {
 			let e = o[s++];
 			if (s > o.length) break;
-			e === "min" ? r.min = z(o[s++]) : e === "max" ? r.max = z(o[s++]) : e === "unit" ? r.unit = a(o[s++]) : i(o[s++]);
+			e === "min" ? r.min = B(o[s++]) : e === "max" ? r.max = B(o[s++]) : e === "unit" ? r.unit = a(o[s++]) : i(o[s++]);
 		}
 		return {
 			level: r,
@@ -7716,7 +7737,7 @@ function Bo(e, t) {
 	return {
 		level: {
 			kind: "quantity",
-			quantity: Me(i(r))
+			quantity: je(i(r))
 		},
 		next: t + 1
 	};
@@ -7739,7 +7760,7 @@ function Vo(e) {
 			});
 			continue;
 		}
-		t.push(Wo(P(e), i(r[o++])));
+		t.push(Wo(F(e), i(r[o++])));
 	}
 	return t;
 }
@@ -7788,9 +7809,9 @@ function Wo(e, t) {
 			let e = Bo(o, s);
 			r.level = e.level, s = e.next;
 		} else if (e === "conditions") {
-			let e = M(o, s);
+			let e = N(o, s);
 			r.conditions = a(e.text), s = e.next;
-		} else e === "statement" ? r.statement = a(o[s++]) : e === "verified_by" ? r.verifiedBy = G(o[s++]) : e === "source" ? r.source = I(i(o[s++])) : e === "certificate" ? r.certificate = Uo(r.id, i(o[s++])) : i(o[s++]);
+		} else e === "statement" ? r.statement = a(o[s++]) : e === "verified_by" ? r.verifiedBy = G(o[s++]) : e === "source" ? r.source = L(i(o[s++])) : e === "certificate" ? r.certificate = Uo(r.id, i(o[s++])) : i(o[s++]);
 	}
 	return r;
 }
@@ -7810,7 +7831,7 @@ function Ko(e, t) {
 		else if (e === "promises") t.is.promises = Vo(i(r[a++]));
 		else if (e === "artifacts") t.is.artifacts = No(i(r[a++]));
 		else if (e === "endpoint") {
-			let e = P(r[a++] ?? ""), n = a < r.length ? i(r[a++]) : "";
+			let e = F(r[a++] ?? ""), n = a < r.length ? i(r[a++]) : "";
 			e && t.is.endpoints.push(Qa(e, n));
 		} else e === "composed_of" ? t.is.composedOf = oo(i(r[a++] ?? "")) : a = zo(t, "is", e, r, a);
 	}
@@ -7935,45 +7956,45 @@ function Zo(e, t) {
 }
 function Qo(e, t) {
 	let n = Object.keys(t);
-	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " " + N(t[e])).join(" ") + " }\n";
+	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " " + P(t[e])).join(" ") + " }\n";
 }
 function $o(e, t) {
 	let n = Object.keys(t);
-	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " :" + (t[e] ? " " + N(t[e]) : "")).join(" ") + " }\n";
+	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " :" + (t[e] ? " " + P(t[e]) : "")).join(" ") + " }\n";
 }
 function es(e, t) {
-	return t.length === 0 ? "" : "    " + e + " { " + t.map(N).join(" ") + " }\n";
+	return t.length === 0 ? "" : "    " + e + " { " + t.map(P).join(" ") + " }\n";
 }
 function ts(e) {
 	let t = Object.keys(e);
 	return t.length === 0 ? "" : "    dimensions { " + t.map((t) => t + " in { " + e[t].join(", ") + " }").join(" ") + " }\n";
 }
 function ns(e) {
-	return /^ocl\{[\s\S]*\}$/.test(e) ? e : N(e);
+	return /^ocl\{[\s\S]*\}$/.test(e) ? e : P(e);
 }
 function rs(e) {
-	if (e.kind === "symbolic") return "symbolic " + N(e.symbolic ?? "");
+	if (e.kind === "symbolic") return "symbolic " + P(e.symbolic ?? "");
 	if (e.kind === "range") {
 		let t = "";
-		return e.min !== void 0 && (t += "min " + B(e.min) + " "), e.max !== void 0 && (t += "max " + B(e.max) + " "), e.unit && (t += "unit \"" + s(e.unit) + "\""), "range { " + t.trimEnd() + " }";
+		return e.min !== void 0 && (t += "min " + V(e.min) + " "), e.max !== void 0 && (t += "max " + V(e.max) + " "), e.unit && (t += "unit \"" + s(e.unit) + "\""), "range { " + t.trimEnd() + " }";
 	}
-	return Le(e.quantity ?? { value: "" });
+	return Ie(e.quantity ?? { value: "" });
 }
 function is(e, t) {
 	let n = t + "  ", r = t + "certificate {\n";
-	return e.attribute && (r += n + "attribute " + N(e.attribute) + "\n"), e.attributes.length > 0 && (r += n + "attributes { " + e.attributes.map(N).join(" ") + " }\n"), e.dimension && (r += n + "dimension " + N(e.dimension) + "\n"), e.type && (r += n + "type " + N(e.type) + "\n"), e.label && (r += n + "label \"" + s(e.label) + "\"\n"), e.obligation && (r += n + "obligation " + N(e.obligation) + "\n"), r += t + "}\n", r;
+	return e.attribute && (r += n + "attribute " + P(e.attribute) + "\n"), e.attributes.length > 0 && (r += n + "attributes { " + e.attributes.map(P).join(" ") + " }\n"), e.dimension && (r += n + "dimension " + P(e.dimension) + "\n"), e.type && (r += n + "type " + P(e.type) + "\n"), e.label && (r += n + "label \"" + s(e.label) + "\"\n"), e.obligation && (r += n + "obligation " + P(e.obligation) + "\n"), r += t + "}\n", r;
 }
 function as(e, t, n = "") {
-	let r = t + "  ", i = t + n + N(e.id) + " {\n";
-	return e.target && (i += r + "target " + N(e.target) + "\n"), e.level && (i += r + "level " + rs(e.level) + "\n"), e.conditions && (i += r + "conditions " + ns(e.conditions) + "\n"), e.statement && (i += r + "statement \"" + s(e.statement) + "\"\n"), i += K("verified_by", e.verifiedBy, r), i += lo("source", e.source ?? null, r), e.certificate && (i += is(e.certificate, r)), i += t + "}\n", i;
+	let r = t + "  ", i = t + n + P(e.id) + " {\n";
+	return e.target && (i += r + "target " + P(e.target) + "\n"), e.level && (i += r + "level " + rs(e.level) + "\n"), e.conditions && (i += r + "conditions " + ns(e.conditions) + "\n"), e.statement && (i += r + "statement \"" + s(e.statement) + "\"\n"), i += K("verified_by", e.verifiedBy, r), i += lo("source", e.source ?? null, r), e.certificate && (i += is(e.certificate, r)), i += t + "}\n", i;
 }
 function os(e) {
 	if (e.length === 0) return "";
-	if (e.every(Go)) return "    promises { " + e.map((e) => N(e.statement)).join(" ") + " }\n";
+	if (e.every(Go)) return "    promises { " + e.map((e) => P(e.statement)).join(" ") + " }\n";
 	let t = "    promises {\n";
 	for (let n of e) {
 		if (Go(n)) {
-			t += "      " + N(n.statement) + "\n";
+			t += "      " + P(n.statement) + "\n";
 			continue;
 		}
 		t += as(n, "      ");
@@ -7987,7 +8008,7 @@ function ss(e) {
 	for (let r of t) {
 		let t = e[r];
 		if (t.behavior || t.quantityKind || t.unit || t.source && (t.source.doc || t.source.clause)) {
-			n += "      " + r + " {\n", t.symbol && (n += "        symbol \"" + s(t.symbol) + "\"\n"), t.derivation && (n += "        derivation " + ns(t.derivation) + "\n"), t.behavior && (n += "        behavior " + N(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + N(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += lo("source", t.source ?? null, "        "), n += "      }\n";
+			n += "      " + r + " {\n", t.symbol && (n += "        symbol \"" + s(t.symbol) + "\"\n"), t.derivation && (n += "        derivation " + ns(t.derivation) + "\n"), t.behavior && (n += "        behavior " + P(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + P(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += lo("source", t.source ?? null, "        "), n += "      }\n";
 			continue;
 		}
 		n += "      " + r + (t.symbol ? " " + t.symbol : ""), t.derivation && (n += " = " + ns(t.derivation)), n += "\n";
@@ -8009,10 +8030,10 @@ var us = function(e) {
 	e.extends && (t += "  extends " + e.extends + "\n");
 	let n = Qo("metadata", e.is.metadata) + Qo("provenance", e.is.provenance) + es("structure", e.is.structure) + $o("design_parameters", e.is.designParameters) + Qo("designed_conditions", e.is.designedConditions) + os(e.is.promises) + es("artifacts", e.is.artifacts) + cs(e.is.endpoints) + (e.is.composedOf ? co(e.is.composedOf, "    ") : "");
 	n && (t += "  is {\n" + n + "  }\n");
-	let r = $o("attributes", e.has.attributes) + ts(e.has.dimensions) + (e.has.state ? "    state " + N(e.has.state) + "\n" : "") + ss(e.has.characteristics) + es("environmental_context", e.has.environmentalContext) + es("artifact_instances", e.has.artifactInstances) + ls(e.has.serves);
+	let r = $o("attributes", e.has.attributes) + ts(e.has.dimensions) + (e.has.state ? "    state " + P(e.has.state) + "\n" : "") + ss(e.has.characteristics) + es("environmental_context", e.has.environmentalContext) + es("artifact_instances", e.has.artifactInstances) + ls(e.has.serves);
 	r && (t += "  has {\n" + r + "  }\n");
 	let i = "";
-	for (let t of e.does.behaviors) i += "    behavior " + N(t) + "\n";
+	for (let t of e.does.behaviors) i += "    behavior " + P(t) + "\n";
 	return i && (t += "  does {\n" + i + "  }\n"), t += K("reference", e.referenceIds, "  "), t += "}\n", t;
 }, ds = {
 	keyword: "instrument",
@@ -8060,7 +8081,7 @@ function _s(e) {
 function vs(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		r[o] === ":" && o++;
 		let n = [];
@@ -8071,10 +8092,10 @@ function vs(e) {
 		}
 		if (n.length > 2) throw Error(`Parsing error: instance value entry "${e}" has ${n.length} tokens (shape: key : value [unit]) — quote multi-word values`);
 		if (n.length === 1 && n[0].startsWith("{")) {
-			t[e] = Me(i(n[0]));
+			t[e] = je(i(n[0]));
 			continue;
 		}
-		let [s, c] = n, l = z(s);
+		let [s, c] = n, l = B(s);
 		t[e] = c === void 0 ? { value: l } : {
 			value: l,
 			unit: a(c)
@@ -8085,7 +8106,7 @@ function vs(e) {
 function ys(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		r[i] === ":" && i++, i < r.length && (t[e] = a(r[i++]));
 	}
@@ -8141,11 +8162,11 @@ var Cs = function(e, t) {
 };
 function ws(e, t) {
 	let n = Object.keys(t);
-	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + Ie(t[e])).join(" ") + " }\n";
+	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + Fe(t[e])).join(" ") + " }\n";
 }
 function Ts(e, t) {
 	let n = Object.keys(t);
-	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + N(t[e])).join(" ") + " }\n";
+	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + P(t[e])).join(" ") + " }\n";
 }
 var Es = {
 	keyword: "instance",
@@ -8156,7 +8177,7 @@ var Es = {
 		let t = "instance " + e.id + " {\n";
 		e.of && (t += "  of " + e.of + "\n"), e.level && (t += "  level " + e.level + "\n"), e.model && (t += "  model " + e.model + "\n"), e.group && (t += "  group " + e.group + "\n"), e.family && (t += "  family " + e.family + "\n");
 		let n = Object.keys(e.definitionVersions);
-		n.length > 0 && (t += "  definition_versions { " + n.map((t) => t + " : " + N(e.definitionVersions[t])).join(" ") + " }\n");
+		n.length > 0 && (t += "  definition_versions { " + n.map((t) => t + " : " + P(e.definitionVersions[t])).join(" ") + " }\n");
 		let r = ws("attributes", e.has.attributes) + Ts("dimensions", e.has.dimensions) + ws("test_context", e.has.testContext);
 		return r && (t += "  has {\n" + r + "  }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
@@ -8185,13 +8206,13 @@ var Es = {
 			if (!Ds.includes(t)) throw Error(`Parsing error: identity_slot. ID ${e}: Unknown identity slot type "${t}" (valid: ${Ds.join(", ")})`);
 			r.type = t;
 		} else if (t === "presentation") {
-			let t = n(a(o())).map(P).map(a).filter((e) => e.length > 0);
+			let t = n(a(o())).map(F).map(a).filter((e) => e.length > 0);
 			for (let n of t) if (!Os.includes(n)) throw Error(`Parsing error: identity_slot. ID ${e}: Unknown presentation channel "${n}" (valid: ${Os.join(", ")})`);
 			r.presentation = t;
 		} else if (t === "optional") r.optional = o() === "true";
 		else if (t === "definition") r.definition = a(o());
 		else if (t === "metamodel_class") r.metamodelClass = a(o());
-		else if (t === "source") r.source = I(i(o()));
+		else if (t === "source") r.source = L(i(o()));
 		else return !1;
 		return !0;
 	}, {
@@ -8200,7 +8221,7 @@ var Es = {
 	}), (t) => (t.identitySlots[e] = r, t);
 }, As = function(e) {
 	let t = "identity_slot " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.type && (t += "  type " + N(e.type) + "\n"), e.presentation.length > 0 && (t += "  presentation { " + e.presentation.map(N).join(" ") + " }\n"), e.optional && (t += "  optional true\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.metamodelClass && (t += "  metamodel_class " + N(e.metamodelClass) + "\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.type && (t += "  type " + P(e.type) + "\n"), e.presentation.length > 0 && (t += "  presentation { " + e.presentation.map(P).join(" ") + " }\n"), e.optional && (t += "  optional true\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.metamodelClass && (t += "  metamodel_class " + P(e.metamodelClass) + "\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 }, js = [
 	"marking",
 	"inscription",
@@ -8237,8 +8258,8 @@ var Es = {
 		else if (t === "term_ref") r.termRef = a(o());
 		else if (t === "component") r.component = a(o());
 		else if (t === "attribute") r.attribute = a(o());
-		else if (t === "contains") r.contains = n(a(o())).map(P).map(a).filter((e) => e.length > 0);
-		else if (t === "source") r.source = I(i(o()));
+		else if (t === "contains") r.contains = n(a(o())).map(F).map(a).filter((e) => e.length > 0);
+		else if (t === "source") r.source = L(i(o()));
 		else return !1;
 		return !0;
 	}, {
@@ -8247,7 +8268,7 @@ var Es = {
 	}), (t) => (t.aspects[e] = r, t);
 }, Ns = function(e) {
 	let t = "aspect " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.kind && (t += "  kind " + N(e.kind) + "\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.metamodelClass && (t += "  metamodel_class " + N(e.metamodelClass) + "\n"), e.termRef && (t += "  term_ref " + N(e.termRef) + "\n"), e.component && (t += "  component " + N(e.component) + "\n"), e.attribute && (t += "  attribute " + N(e.attribute) + "\n"), e.contains.length > 0 && (t += "  contains { " + e.contains.map(N).join(" ") + " }\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.kind && (t += "  kind " + P(e.kind) + "\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.metamodelClass && (t += "  metamodel_class " + P(e.metamodelClass) + "\n"), e.termRef && (t += "  term_ref " + P(e.termRef) + "\n"), e.component && (t += "  component " + P(e.component) + "\n"), e.attribute && (t += "  attribute " + P(e.attribute) + "\n"), e.contains.length > 0 && (t += "  contains { " + e.contains.map(P).join(" ") + " }\n"), e.source && (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 }, Ps = (e, t) => {
 	let n = {
 		id: e,
@@ -8255,7 +8276,7 @@ var Es = {
 	};
 	return y(t, (e, t) => {
 		if (e === "promise") {
-			let e = a(P(t()));
+			let e = a(F(t()));
 			n.promises.push(Wo(e, i(t())));
 		} else return !1;
 		return !0;
@@ -8264,7 +8285,7 @@ var Es = {
 		id: e
 	}), (t) => (t.promiseSets[e] = n, t);
 }, Fs = function(e) {
-	let t = "promise_set " + N(e.id) + " {\n";
+	let t = "promise_set " + P(e.id) + " {\n";
 	for (let n of e.promises) t += as(n, "  ", "promise ");
 	return t += "}\n", t;
 }, Is = [
@@ -8281,7 +8302,7 @@ var Es = {
 		if (t === "declaration_form") n.declarationForm = a(r());
 		else if (t === "document") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				name: "",
 				description: "",
 				obligation: "",
@@ -8294,7 +8315,7 @@ var Es = {
 					let n = a(r());
 					if (!Is.includes(n)) throw Error(`Parsing error: application_declaration. ID ${e}: Unknown obligation "${n}" (valid: ${Is.join(", ")})`);
 					t.obligation = n;
-				} else if (n === "source") t.source = I(i(r()));
+				} else if (n === "source") t.source = L(i(r()));
 				else return !1;
 				return !0;
 			}, {
@@ -8308,9 +8329,9 @@ var Es = {
 		id: e
 	}), (t) => (t.applicationDeclarations[e] = n, t);
 }, Rs = function(e) {
-	let t = "application_declaration " + N(e.id) + " {\n";
-	e.declarationForm && (t += "  declaration_form " + N(e.declarationForm) + "\n");
-	for (let n of e.documents) t += "  document " + N(n.id) + " {\n", n.name && (t += "    name \"" + s(n.name) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.obligation && (t += "    obligation " + N(n.obligation) + "\n"), n.source && (n.source.doc || n.source.clause) && (t += "    source {\n", n.source.doc && (t += "      doc \"" + s(n.source.doc) + "\"\n"), n.source.clause && (t += "      clause \"" + s(n.source.clause) + "\"\n"), t += "    }\n"), t += "  }\n";
+	let t = "application_declaration " + P(e.id) + " {\n";
+	e.declarationForm && (t += "  declaration_form " + P(e.declarationForm) + "\n");
+	for (let n of e.documents) t += "  document " + P(n.id) + " {\n", n.name && (t += "    name \"" + s(n.name) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.obligation && (t += "    obligation " + P(n.obligation) + "\n"), n.source && (n.source.doc || n.source.clause) && (t += "    source {\n", n.source.doc && (t += "      doc \"" + s(n.source.doc) + "\"\n"), n.source.clause && (t += "      clause \"" + s(n.source.clause) + "\"\n"), t += "    }\n"), t += "  }\n";
 	return t += "}\n", t;
 }, zs = (e, t) => {
 	let n = {
@@ -8320,7 +8341,7 @@ var Es = {
 	return y(t, (t, r) => {
 		if (t === "field") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				source: "",
 				expression: ""
 			};
@@ -8340,9 +8361,9 @@ var Es = {
 		id: e
 	}), (t) => (t.calculationContexts[e] = n, t);
 }, Bs = function(e) {
-	let t = "calculation_context " + N(e.id) + " {\n";
+	let t = "calculation_context " + P(e.id) + " {\n";
 	for (let n of e.fields) {
-		let e = "  field " + N(n.id) + " { source " + N(n.source);
+		let e = "  field " + P(n.id) + " { source " + P(n.source);
 		n.expression && (e += " expression \"" + s(n.expression) + "\""), t += e + " }\n";
 	}
 	return t += "}\n", t;
@@ -8370,7 +8391,7 @@ var Es = {
 		if (t === "label") n.label = a(r());
 		else if (t === "field") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				label: "",
 				type: "",
 				enumRef: "",
@@ -8406,9 +8427,9 @@ var Es = {
 		id: e
 	}), (t) => (t.evaluationDimensions[e] = n, t);
 }, Ws = function(e) {
-	let t = "evaluation_dimensions " + N(e.id) + " {\n";
+	let t = "evaluation_dimensions " + P(e.id) + " {\n";
 	e.label && (t += "  label \"" + s(e.label) + "\"\n");
-	for (let n of e.fields) t += "  field " + N(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.type && (t += "    type " + N(n.type) + "\n"), n.enumRef && (t += "    enum " + N(n.enumRef) + "\n"), t += "    required " + (n.required ? "true" : "false") + "\n", t += "    editable " + (n.editable ? "true" : "false") + "\n", n.setting && (t += "    setting " + N(n.setting) + "\n"), n.multiple && (t += "    multiple true\n"), t += "  }\n";
+	for (let n of e.fields) t += "  field " + P(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.type && (t += "    type " + P(n.type) + "\n"), n.enumRef && (t += "    enum " + P(n.enumRef) + "\n"), t += "    required " + (n.required ? "true" : "false") + "\n", t += "    editable " + (n.editable ? "true" : "false") + "\n", n.setting && (t += "    setting " + P(n.setting) + "\n"), n.multiple && (t += "    multiple true\n"), t += "  }\n";
 	return t += "}\n", t;
 }, Gs = (e, t) => {
 	let r = {
@@ -8420,7 +8441,7 @@ var Es = {
 		if (e === "dimensions") {
 			let e = n(i(t()));
 			for (let t = 0; t + 1 < e.length; t += 2) {
-				let o = a(P(e[t])), s = e[t + 1], c = s.startsWith("{") ? n(i(s)).map((e) => a(e)) : a(s);
+				let o = a(F(e[t])), s = e[t + 1], c = s.startsWith("{") ? n(i(s)).map((e) => a(e)) : a(s);
 				o && (r.dimensions[o] = c);
 			}
 		} else if (e === "description") r.description = a(t());
@@ -8431,10 +8452,10 @@ var Es = {
 		id: e
 	}), (t) => (t.evaluationProfiles[e] = r, t);
 }, Ks = function(e) {
-	let t = "evaluation_profile " + N(e.id) + " {\n", n = Object.keys(e.dimensions);
+	let t = "evaluation_profile " + P(e.id) + " {\n", n = Object.keys(e.dimensions);
 	return n.length > 0 && (t += "  dimensions { " + n.map((t) => {
 		let n = e.dimensions[t];
-		return Array.isArray(n) ? N(t) + " { " + n.map(N).join(" ") + " }" : N(t) + " " + N(n);
+		return Array.isArray(n) ? P(t) + " { " + n.map(P).join(" ") + " }" : P(t) + " " + P(n);
 	}).join(" ") + " }\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), t += "}\n", t;
 }, qs = (e, t) => {
 	let n = {
@@ -8452,16 +8473,16 @@ var Es = {
 		referenceIds: []
 	};
 	return y(t, (t, r) => {
-		if (t === "subject") n.subject = a(P(r()));
-		else if (t === "promises") n.promises = a(P(r()));
+		if (t === "subject") n.subject = a(F(r()));
+		else if (t === "promises") n.promises = a(F(r()));
 		else if (t === "basis") {
-			let e = a(P(r())), t = a(r());
+			let e = a(F(r())), t = a(r());
 			n.basis.push({
 				kind: e,
 				id: t
 			});
 		} else if (t === "authority") {
-			let e = a(P(r())), t = a(r());
+			let e = a(F(r())), t = a(r());
 			n.authority = {
 				role: e,
 				name: t
@@ -8469,7 +8490,7 @@ var Es = {
 		} else if (t === "statement") n.statement = a(r());
 		else if (t === "limits") y(i(r()), (e, t) => {
 			let r = {
-				label: P(e),
+				label: F(e),
 				text: a(t())
 			};
 			return n.limits.push(r), !0;
@@ -8479,13 +8500,13 @@ var Es = {
 		});
 		else if (t === "claims") y(i(r()), (t, r) => {
 			let o = {
-				promise: P(t),
+				promise: F(t),
 				declared: "",
 				validatedBy: ""
 			};
 			return y(i(r()), (e, t) => {
-				if (e === "declared") o.declared = a(P(t()));
-				else if (e === "validated_by") o.validatedBy = a(P(t()));
+				if (e === "declared") o.declared = a(F(t()));
+				else if (e === "validated_by") o.validatedBy = a(F(t()));
 				else return !1;
 				return !0;
 			}, {
@@ -8503,23 +8524,23 @@ var Es = {
 		id: e
 	}), (t) => (t.attestations[e] = n, t);
 }, Js = function(e) {
-	let t = "attestation " + N(e.id) + " {\n";
-	e.subject && (t += "  subject " + N(e.subject) + "\n"), e.promises && (t += "  promises " + N(e.promises) + "\n");
-	for (let n of e.basis) t += "  basis " + N(n.kind) + " \"" + n.id.replace(/"/g, "\\\"") + "\"\n";
-	if ((e.authority.role || e.authority.name) && (t += "  authority " + N(e.authority.role) + " \"" + e.authority.name.replace(/"/g, "\\\"") + "\"\n"), e.statement && (t += "  statement \"" + e.statement.replace(/"/g, "\\\"") + "\"\n"), e.limits.length > 0) {
+	let t = "attestation " + P(e.id) + " {\n";
+	e.subject && (t += "  subject " + P(e.subject) + "\n"), e.promises && (t += "  promises " + P(e.promises) + "\n");
+	for (let n of e.basis) t += "  basis " + P(n.kind) + " \"" + n.id.replace(/"/g, "\\\"") + "\"\n";
+	if ((e.authority.role || e.authority.name) && (t += "  authority " + P(e.authority.role) + " \"" + e.authority.name.replace(/"/g, "\\\"") + "\"\n"), e.statement && (t += "  statement \"" + e.statement.replace(/"/g, "\\\"") + "\"\n"), e.limits.length > 0) {
 		t += "  limits {\n";
-		for (let n of e.limits) t += "    " + N(n.label) + " \"" + n.text.replace(/"/g, "\\\"") + "\"\n";
+		for (let n of e.limits) t += "    " + P(n.label) + " \"" + n.text.replace(/"/g, "\\\"") + "\"\n";
 		t += "  }\n";
 	}
 	if (e.claims.length > 0) {
 		t += "  claims {\n";
-		for (let n of e.claims) t += "    " + N(n.promise) + " {\n", t += "      declared " + N(n.declared) + "\n", t += "      validated_by " + N(n.validatedBy) + "\n", t += "    }\n";
+		for (let n of e.claims) t += "    " + P(n.promise) + " {\n", t += "      declared " + P(n.declared) + "\n", t += "      validated_by " + P(n.validatedBy) + "\n", t += "    }\n";
 		t += "  }\n";
 	}
 	return t += "}\n", t;
 }, Ys = ["mandatory", "optional"];
 function Xs(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 var Zs = (e, t) => {
 	let n = {
@@ -8548,7 +8569,7 @@ var Zs = (e, t) => {
 			}), n.dimensionLabels = t;
 		} else if (t === "characteristic") {
 			let t = {
-				id: a(P(r())),
+				id: a(F(r())),
 				type: "",
 				label: "",
 				attribute: "",
@@ -8599,9 +8620,9 @@ var Zs = (e, t) => {
 		id: e
 	}), (t) => (t.certificateTemplates[e] = n, t);
 }, Qs = function(e) {
-	let t = "certificate_template " + N(e.id) + " {\n";
+	let t = "certificate_template " + P(e.id) + " {\n";
 	e.overlay && (t += "  overlay true\n"), e.numberFormat && (t += "  number_format \"" + s(e.numberFormat) + "\"\n"), e.dimensionLabels && (t += "  dimension_labels {\n", t += "    pattern \"" + s(e.dimensionLabels.pattern) + "\"\n", e.dimensionLabels.separator && (t += "    separator \"" + s(e.dimensionLabels.separator) + "\"\n"), t += "  }\n");
-	for (let n of e.characteristics) t += "  characteristic " + N(n.id) + " {\n", n.type && (t += "    type " + N(n.type) + "\n"), n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.attribute && (t += "    attribute " + N(n.attribute) + "\n"), n.attributes.length > 0 && (t += "    attributes { " + n.attributes.map(N).join(" ") + " }\n"), n.dimension && (t += "    dimension " + N(n.dimension) + "\n"), n.obligation && (t += "    obligation " + n.obligation + "\n"), t += "  }\n";
+	for (let n of e.characteristics) t += "  characteristic " + P(n.id) + " {\n", n.type && (t += "    type " + P(n.type) + "\n"), n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.attribute && (t += "    attribute " + P(n.attribute) + "\n"), n.attributes.length > 0 && (t += "    attributes { " + n.attributes.map(P).join(" ") + " }\n"), n.dimension && (t += "    dimension " + P(n.dimension) + "\n"), n.obligation && (t += "    obligation " + n.obligation + "\n"), t += "  }\n";
 	if (e.anrSection) {
 		let n = e.anrSection;
 		t += "  anr_section {\n", n.title && (t += "    title \"" + s(n.title) + "\"\n"), n.coveredLabel && (t += "    covered_label \"" + s(n.coveredLabel) + "\"\n"), n.notEvaluatedLabel && (t += "    not_evaluated_label \"" + s(n.notEvaluatedLabel) + "\"\n"), n.pendingLabel && (t += "    pending_label \"" + s(n.pendingLabel) + "\"\n"), n.noneTargetedNote && (t += "    none_targeted_note \"" + s(n.noneTargetedNote) + "\"\n"), t += "  }\n";
@@ -8611,7 +8632,7 @@ var Zs = (e, t) => {
 //#endregion
 //#region src/ser-des/config/artifact.ts
 function $s(e) {
-	return n(a(e)).map(P).map(a).filter((e) => e.length > 0);
+	return n(a(e)).map(F).map(a).filter((e) => e.length > 0);
 }
 function ec(e, t, n) {
 	return t.length === 0 ? "" : `${n}${e} { ${t.join(" ")} }\n`;
@@ -8622,7 +8643,7 @@ function tc(e) {
 function nc(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
-		let e = P(r[i++]);
+		let e = F(r[i++]);
 		if (!e) break;
 		r[i] === ":" && i++;
 		let n = "";
@@ -8642,7 +8663,7 @@ function nc(e) {
 function rc(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
-		let e = P(r[o++]);
+		let e = F(r[o++]);
 		if (!e) break;
 		let s = {
 			field: e,
@@ -8695,7 +8716,7 @@ var ac = function(e, t) {
 		if (e === "name") n.name = a(o[s++]);
 		else if (e === "description") n.description = a(o[s++]);
 		else if (e === "content_contract") n.contentContract = ic(i(o[s++]));
-		else if (e === "contract_from") n.contractFrom = P(a(o[s++]));
+		else if (e === "contract_from") n.contractFrom = F(a(o[s++]));
 		else if (e === "produced_when") {
 			let e = a(o[s++] ?? "");
 			n.producedWhen = e === "per_interval" ? {
@@ -8707,21 +8728,21 @@ var ac = function(e, t) {
 			} : { kind: e };
 		} else if (e === "retention") n.retention = a(o[s++]);
 		else if (e === "source") {
-			let e = I(i(o[s++]));
+			let e = L(i(o[s++]));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
 		} else if (e === "reference") n.referenceIds = tc(o[s++]);
 		else if (e === "ref") {
-			let e = S(o, s, a, i);
-			T(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
+			let e = C(o, s, a, i);
+			E(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else if (e === "corresponds") {
-			let e = D(o, s, a);
+			let e = O(o, s, a);
 			(n.correspondences ??= []).push(e.corr), s = e.next;
 		} else s = b(o, s, e);
 	}
 	return (t) => (t.artifactDefinitions[e] = n, t);
 };
 function oc(e) {
-	return e.kind === "per_interval" ? `per_interval ${N(e.interval ?? "")}` : e.kind === "on_event" ? `on_event ${N(e.event ?? "")}` : e.kind;
+	return e.kind === "per_interval" ? `per_interval ${P(e.interval ?? "")}` : e.kind === "on_event" ? `on_event ${P(e.event ?? "")}` : e.kind;
 }
 var sc = function(e) {
 	let t = "artifact_definition " + e.id + " {\n";
@@ -8730,7 +8751,7 @@ var sc = function(e) {
 	if (n.fields.length > 0 || n.structure || n.media.length > 0) {
 		if (t += "  content_contract {\n", n.fields.length > 0) {
 			t += "    fields {\n";
-			for (let e of n.fields) t += "      " + e.name + " : " + N(e.type) + (e.optional ? " optional" : "") + (e.description ? " \"" + s(e.description) + "\"" : "") + "\n";
+			for (let e of n.fields) t += "      " + e.name + " : " + P(e.type) + (e.optional ? " optional" : "") + (e.description ? " \"" + s(e.description) + "\"" : "") + "\n";
 			t += "    }\n";
 		}
 		if (n.structure && (t += "    structure \"" + s(n.structure) + "\"\n"), n.media.length > 0) {
@@ -8745,8 +8766,8 @@ var sc = function(e) {
 	}
 	e.producedWhen.kind && (t += "  produced_when " + oc(e.producedWhen) + "\n"), e.retention && (t += "  retention \"" + s(e.retention) + "\"\n");
 	let r = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-	for (let e of r) t += E(e, "  ", s);
-	return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += ec("reference", e.referenceIds, "  "), t += "}\n", t;
+	for (let e of r) t += D(e, "  ", s);
+	return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += ec("reference", e.referenceIds, "  "), t += "}\n", t;
 }, cc = function(e, t) {
 	let n = {
 		id: e,
@@ -8765,9 +8786,9 @@ var sc = function(e) {
 	return (t) => (t.artifactInstances[e] = n, t);
 }, lc = function(e) {
 	let t = "artifact_instance " + e.id + " {\n";
-	e.of && (t += "  of " + e.of + "\n"), e.producedAt && (t += "  produced_at " + N(e.producedAt) + "\n"), e.by && (t += "  by " + N(e.by) + "\n");
+	e.of && (t += "  of " + e.of + "\n"), e.producedAt && (t += "  produced_at " + P(e.producedAt) + "\n"), e.by && (t += "  by " + P(e.by) + "\n");
 	let n = Object.keys(e.content);
-	return n.length > 0 && (t += "  content { " + n.map((t) => t + " : " + Ie(e.content[t])).join(" ") + " }\n"), t += ec("links", e.links, "  "), t += ec("reference", e.referenceIds, "  "), t += "}\n", t;
+	return n.length > 0 && (t += "  content { " + n.map((t) => t + " : " + Fe(e.content[t])).join(" ") + " }\n"), t += ec("links", e.links, "  "), t += ec("reference", e.referenceIds, "  "), t += "}\n", t;
 }, uc = {
 	keyword: "artifact_definition",
 	field: "artifactDefinitions",
@@ -8780,7 +8801,7 @@ var sc = function(e) {
 	takesID: !0,
 	parse: cc,
 	dump: lc
-}, fc = F;
+}, fc = I;
 function pc(e, t) {
 	let n = e[t] ?? "";
 	if (n.startsWith("{")) return {
@@ -8813,7 +8834,7 @@ function pc(e, t) {
 	};
 }
 function mc(e) {
-	let t = [], n = xe(e), r = 0;
+	let t = [], n = be(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
 		if (e === "every") t.push({
@@ -8856,7 +8877,7 @@ function hc(e) {
 			expression: "",
 			refs: []
 		}
-	}, n = xe(e), r = 0;
+	}, n = be(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
 		if (e === "requirements" || e === "promises") {
@@ -8867,7 +8888,7 @@ function hc(e) {
 	return t;
 }
 function gc(e) {
-	let t = [], n = xe(e), r = 0;
+	let t = [], n = be(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
 		n[r] === "->" ? (r++, t.push({
@@ -8881,7 +8902,7 @@ function gc(e) {
 	return t;
 }
 function _c(e) {
-	let t = [], n = xe(e), r = 0;
+	let t = [], n = be(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
 		e === "notify" ? t.push({
@@ -8898,7 +8919,7 @@ function vc(e) {
 	let t = [], n = r(e), o = 0;
 	for (; o < n.length;) {
 		if (n[o++] !== "on") continue;
-		let e = P(a(n[o++] ?? ""));
+		let e = F(a(n[o++] ?? ""));
 		if (o < n.length && n[o].startsWith("{")) {
 			t.push({
 				outcome: e,
@@ -8908,7 +8929,7 @@ function vc(e) {
 		}
 		let r = [];
 		for (; o < n.length && n[o] !== "on";) {
-			let e = P(n[o++].replace(/^;+|;+$/g, ""));
+			let e = F(n[o++].replace(/^;+|;+$/g, ""));
 			e !== "" && (e === "notify" ? r.push({
 				action: "notify",
 				role: a(n[o++] ?? "")
@@ -8960,14 +8981,14 @@ var yc = function(e, t) {
 	}), (t) => (t.monitors[e] = n, t);
 };
 function bc(e) {
-	return e.kind === "timer" ? "every " + N(e.every) : e.kind === "signal" ? "on signal " + N(e.signal) : e.kind === "change" ? "on change " + N(e.aspect) : "on " + N(e.kind);
+	return e.kind === "timer" ? "every " + P(e.every) : e.kind === "signal" ? "on signal " + P(e.signal) : e.kind === "change" ? "on change " + P(e.aspect) : "on " + P(e.kind);
 }
 function xc(e) {
-	return e.kind === "applicable_to" ? "applicable_to(" + e.expression + ")" : e.kind === "refs" ? "{ " + e.refs.map(N).join(" ") + " }" : N(e.kind);
+	return e.kind === "applicable_to" ? "applicable_to(" + e.expression + ")" : e.kind === "refs" ? "{ " + e.refs.map(P).join(" ") + " }" : P(e.kind);
 }
 function Sc(e) {
-	let t = e.actions.map((e) => e.action === "notify" ? "notify " + N(e.role) : N(e.action)).join(" ");
-	return "on " + N(e.outcome) + " { " + t + " }";
+	let t = e.actions.map((e) => e.action === "notify" ? "notify " + P(e.role) : P(e.action)).join(" ");
+	return "on " + P(e.outcome) + " { " + t + " }";
 }
 var Cc = {
 	keyword: "monitor",
@@ -8976,9 +8997,9 @@ var Cc = {
 	parse: yc,
 	dump: function(e) {
 		let t = "monitor " + e.id + " {\n";
-		e.over.length > 0 && (t += "  over { " + e.over.map(N).join(" ") + " }\n"), e.triggers.length > 0 && (t += "  triggers { " + e.triggers.map(bc).join(" ") + " }\n");
+		e.over.length > 0 && (t += "  over { " + e.over.map(P).join(" ") + " }\n"), e.triggers.length > 0 && (t += "  triggers { " + e.triggers.map(bc).join(" ") + " }\n");
 		let n = e.evaluate.requirements, r = e.evaluate.promises;
-		return (n.kind || r.kind) && (t += "  evaluate {", n.kind && (t += " requirements " + xc(n)), r.kind && (t += " promises " + xc(r)), t += " }\n"), e.emit.length > 0 && (t += "  emit { " + e.emit.map((e) => e.stream + " -> " + N(e.target)).join(" ") + " }\n"), e.escalate.length > 0 && (t += "  escalate { " + e.escalate.map(Sc).join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(N).join(" ") + " }\n"), t += "}\n", t;
+		return (n.kind || r.kind) && (t += "  evaluate {", n.kind && (t += " requirements " + xc(n)), r.kind && (t += " promises " + xc(r)), t += " }\n"), e.emit.length > 0 && (t += "  emit { " + e.emit.map((e) => e.stream + " -> " + P(e.target)).join(" ") + " }\n"), e.escalate.length > 0 && (t += "  escalate { " + e.escalate.map(Sc).join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(P).join(" ") + " }\n"), t += "}\n", t;
 	}
 }, wc = [
 	"identity",
@@ -8999,7 +9020,7 @@ var Cc = {
 //#endregion
 //#region src/ser-des/config/passport.ts
 function Dc(e, t) {
-	return F(t).map((t) => {
+	return I(t).map((t) => {
 		let n = t.indexOf(".");
 		return n === -1 ? {
 			access: e,
@@ -9048,7 +9069,7 @@ var Oc = function(e, t) {
 				construct: "passport.carrier",
 				id: e
 			}), n.carriers.push(t);
-		} else if (t === "reference") n.referenceIds = F(r());
+		} else if (t === "reference") n.referenceIds = I(r());
 		else {
 			let i = r();
 			if (Tc.includes(t)) n.entries.push(...Dc(t, i));
@@ -9061,7 +9082,7 @@ var Oc = function(e, t) {
 	}), (t) => (t.passports[e] = n, t);
 };
 function kc(e) {
-	return N(e.ref === "" ? e.contentClass : e.contentClass + "." + e.ref);
+	return P(e.ref === "" ? e.contentClass : e.contentClass + "." + e.ref);
 }
 var Ac = {
 	keyword: "passport",
@@ -9070,14 +9091,14 @@ var Ac = {
 	parse: Oc,
 	dump: function(e) {
 		let t = "passport " + e.id + " {\n";
-		(e.upi.pattern !== "" || e.upi.level !== "") && (t += "  upi {", e.upi.pattern !== "" && (t += " pattern " + N(e.upi.pattern)), e.upi.level !== "" && (t += " level " + N(e.upi.level)), t += " }\n");
-		for (let n of e.carriers) t += "  carrier { kind " + N(n.kind) + " payload " + N(n.payload) + " }\n";
+		(e.upi.pattern !== "" || e.upi.level !== "") && (t += "  upi {", e.upi.pattern !== "" && (t += " pattern " + P(e.upi.pattern)), e.upi.level !== "" && (t += " level " + P(e.upi.level)), t += " }\n");
+		for (let n of e.carriers) t += "  carrier { kind " + P(n.kind) + " payload " + P(n.payload) + " }\n";
 		let n = [...Tc, ...[...new Set(e.entries.map((e) => e.access))].filter((e) => !Tc.includes(e))];
 		for (let r of n) {
 			let n = e.entries.filter((e) => e.access === r);
 			n.length > 0 && (t += "  " + r + " { " + n.map(kc).join(" ") + " }\n");
 		}
-		return e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(N).join(" ") + " }\n"), t += "}\n", t;
+		return e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(P).join(" ") + " }\n"), t += "}\n", t;
 	}
 }, jc = {
 	keyword: "invariant",
@@ -9100,11 +9121,11 @@ var Ac = {
 			if (e === "name") n.name = a(t());
 			else if (e === "statement") n.statement = a(t());
 			else if (e === "severity") n.severity = a(t());
-			else if (e === "applies_to") n.appliesTo.push(...F(t()));
+			else if (e === "applies_to") n.appliesTo.push(...I(t()));
 			else if (e === "source") n.source = a(t());
 			else if (e === "enforcement") {
 				let e = t();
-				!e.startsWith("{") && a(e) === "aspirational" ? n.enforcement.aspirational = !0 : n.enforcement.claims.push(...F(e));
+				!e.startsWith("{") && a(e) === "aspirational" ? n.enforcement.aspirational = !0 : n.enforcement.claims.push(...I(e));
 			} else return !1;
 			return !0;
 		}, {
@@ -9114,7 +9135,7 @@ var Ac = {
 	},
 	dump: function(e) {
 		let t = "invariant " + e.id + " {\n";
-		return e.name !== "" && (t += "  name \"" + s(e.name) + "\"\n"), e.statement !== "" && (t += "  statement \"" + s(e.statement) + "\"\n"), e.severity !== "" && (t += "  severity " + N(e.severity) + "\n"), e.appliesTo.length > 0 && (t += "  applies_to { " + e.appliesTo.map(N).join(" ") + " }\n"), e.source !== "" && (t += "  source \"" + s(e.source) + "\"\n"), e.enforcement.aspirational && (t += "  enforcement aspirational\n"), e.enforcement.claims.length > 0 && (t += "  enforcement { " + e.enforcement.claims.map(N).join(" ") + " }\n"), t += "}\n", t;
+		return e.name !== "" && (t += "  name \"" + s(e.name) + "\"\n"), e.statement !== "" && (t += "  statement \"" + s(e.statement) + "\"\n"), e.severity !== "" && (t += "  severity " + P(e.severity) + "\n"), e.appliesTo.length > 0 && (t += "  applies_to { " + e.appliesTo.map(P).join(" ") + " }\n"), e.source !== "" && (t += "  source \"" + s(e.source) + "\"\n"), e.enforcement.aspirational && (t += "  enforcement aspirational\n"), e.enforcement.claims.length > 0 && (t += "  enforcement { " + e.enforcement.claims.map(P).join(" ") + " }\n"), t += "}\n", t;
 	}
 };
 //#endregion
@@ -9152,12 +9173,12 @@ var Nc = {
 			else if (t === "description") n.description = a(o[s++]);
 			else if (t === "sample_applicability") n.sampleApplicability = a(o[s++]);
 			else if (t === "ref") {
-				let e = S(o, s, a, i);
-				T(n, e.ref) || (n.refs = [...n.refs ?? [], e.ref]), s = e.next;
+				let e = C(o, s, a, i);
+				E(n, e.ref) || (n.refs = [...n.refs ?? [], e.ref]), s = e.next;
 			} else if (t === "corresponds") {
-				let e = D(o, s, a);
+				let e = O(o, s, a);
 				n.correspondences = [...n.correspondences ?? [], e.corr], s = e.next;
-			} else if (t === "source") n.sourceRefs.push(I(i(o[s++])));
+			} else if (t === "source") n.sourceRefs.push(L(i(o[s++])));
 			else if (t === "step") {
 				let t = {
 					order: null,
@@ -9174,11 +9195,11 @@ var Nc = {
 	dump: function(e) {
 		let t = "test_sequence " + e.id + " {\n";
 		e.name !== "" && (t += "  name \"" + s(e.name) + "\"\n"), e.description !== "" && (t += "  description \"" + s(e.description) + "\"\n");
-		for (let n of e.steps) t += "  step" + (n.order === null ? "" : " " + n.order) + " {", n.test !== "" && (t += " test \"" + s(n.test) + "\""), n.phase !== "" && (t += " phase \"" + s(n.phase) + "\""), n.role !== "" && (t += " role " + N(n.role)), n.dependsOn !== null && (t += " depends_on " + n.dependsOn), t += " }\n";
-		e.sampleApplicability !== "" && (t += "  sample_applicability " + N(e.sampleApplicability) + "\n");
+		for (let n of e.steps) t += "  step" + (n.order === null ? "" : " " + n.order) + " {", n.test !== "" && (t += " test \"" + s(n.test) + "\""), n.phase !== "" && (t += " phase \"" + s(n.phase) + "\""), n.role !== "" && (t += " role " + P(n.role)), n.dependsOn !== null && (t += " depends_on " + n.dependsOn), t += " }\n";
+		e.sampleApplicability !== "" && (t += "  sample_applicability " + P(e.sampleApplicability) + "\n");
 		for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
-		for (let n of e.sourceRefs) t += E(n, "  ", s);
-		return t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+		for (let n of e.sourceRefs) t += D(n, "  ", s);
+		return t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 	}
 }, Pc = {
 	keyword: "formulas_used",
@@ -9195,12 +9216,12 @@ var Nc = {
 		return y(t, (e, t, r) => {
 			if (e === "name") n.name = a(t());
 			else if (e === "description") n.description = a(t());
-			else if (e === "formulas") n.formulas.push(...F(t()));
+			else if (e === "formulas") n.formulas.push(...I(t()));
 			else if (e === "ref") {
-				let e = C(t, r, a, i);
-				T(n, e) || (n.refs ??= []).push(e);
-			} else if (e === "corresponds") (n.correspondences ??= []).push(O(t, r, a));
-			else if (e === "source") n.sourceRefs.push(I(i(t())));
+				let e = w(t, r, a, i);
+				E(n, e) || (n.refs ??= []).push(e);
+			} else if (e === "corresponds") (n.correspondences ??= []).push(k(t, r, a));
+			else if (e === "source") n.sourceRefs.push(L(i(t())));
 			else return !1;
 			return !0;
 		}, {
@@ -9210,10 +9231,10 @@ var Nc = {
 	},
 	dump: function(e) {
 		let t = "formulas_used " + e.id + " {\n";
-		e.name !== "" && (t += "  name \"" + s(e.name) + "\"\n"), e.description !== "" && (t += "  description \"" + s(e.description) + "\"\n"), e.formulas.length > 0 && (t += "  formulas { " + e.formulas.map(N).join(" ") + " }\n");
+		e.name !== "" && (t += "  name \"" + s(e.name) + "\"\n"), e.description !== "" && (t += "  description \"" + s(e.description) + "\"\n"), e.formulas.length > 0 && (t += "  formulas { " + e.formulas.map(P).join(" ") + " }\n");
 		for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
-		for (let n of e.sourceRefs) t += E(n, "  ", s);
-		return t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+		for (let n of e.sourceRefs) t += D(n, "  ", s);
+		return t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 	}
 }, Fc = function(e, t) {
 	let n = {
@@ -9254,7 +9275,7 @@ var Nc = {
 function Lc(e) {
 	let t = {}, r = n(e);
 	for (let e = 0; e + 1 < r.length; e += 2) {
-		let n = P(r[e]), i = Number(r[e + 1]);
+		let n = F(r[e]), i = Number(r[e + 1]);
 		n && !Number.isNaN(i) && (t[n] = i);
 	}
 	return t;
@@ -9277,7 +9298,7 @@ function zc(e, t) {
 		else if (e === "si_unit") r.siUnit = a(o[s++]);
 		else if (e === "description") r.description = a(o[s++]);
 		else if (e === "corresponds") {
-			let { corr: e, next: t } = D(o, s, a);
+			let { corr: e, next: t } = O(o, s, a);
 			(r.correspondences ??= []).push(e), s = t;
 		} else i(o[s++]);
 	}
@@ -9303,7 +9324,7 @@ function Bc(e, t) {
 		else if (e === "offset") r.offsetToSI = Rc(o[s++], 0);
 		else if (e === "definition") r.definition = a(o[s++]);
 		else if (e === "corresponds") {
-			let { corr: e, next: t } = D(o, s, a);
+			let { corr: e, next: t } = O(o, s, a);
 			(r.correspondences ??= []).push(e), s = t;
 		} else i(o[s++]);
 	}
@@ -9319,17 +9340,17 @@ var Vc = function(e, t) {
 	for (; c < s.length;) {
 		let e = s[c++];
 		if (c >= s.length) break;
-		e === "kind" ? o.kinds.push(zc(P(s[c++]), i(s[c++]))) : e === "unit" ? o.units.push(Bc(P(s[c++]), i(s[c++]))) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a).filter((e) => e.length > 0) : i(s[c++]);
+		e === "kind" ? o.kinds.push(zc(F(s[c++]), i(s[c++]))) : e === "unit" ? o.units.push(Bc(F(s[c++]), i(s[c++]))) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a).filter((e) => e.length > 0) : i(s[c++]);
 	}
 	return (t) => (t.quantityRegisters[e] = o, t);
 };
 function Hc(e) {
 	let t = "";
-	for (let n of e ?? []) if (t += " corresponds " + N(n.scheme) + " \"" + s(n.concept) + "\"", n.projections.length > 0) {
+	for (let n of e ?? []) if (t += " corresponds " + P(n.scheme) + " \"" + s(n.concept) + "\"", n.projections.length > 0) {
 		t += " {";
 		for (let e of n.projections) {
-			t += " projection " + N(e.codec) + " {";
-			for (let n of e.entries) t += " " + N(n.key) + " " + N(n.value);
+			t += " projection " + P(e.codec) + " {";
+			for (let n of e.entries) t += " " + P(n.key) + " " + P(n.value);
 			t += " }";
 		}
 		t += " }";
@@ -9352,7 +9373,7 @@ var Wc = {
 			n.siUnit && (e += " si_unit \"" + s(n.siUnit) + "\""), n.description && (e += " description \"" + s(n.description) + "\""), e += Hc(n.correspondences), t += e + " }\n";
 		}
 		for (let n of e.units) {
-			let e = "  unit " + N(n.id) + " {";
+			let e = "  unit " + P(n.id) + " {";
 			n.symbol && (e += " symbol \"" + s(n.symbol) + "\""), n.label && (e += " label \"" + s(n.label) + "\""), n.kind && (e += " kind " + n.kind), n.factorToSI !== 1 && (e += " factor " + n.factorToSI), n.offsetToSI !== 0 && (e += " offset " + n.offsetToSI), n.definition && (e += " definition \"" + s(n.definition) + "\""), e += Hc(n.correspondences), t += e + " }\n";
 		}
 		return e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
@@ -9370,13 +9391,13 @@ var Wc = {
 		for (; c < s.length;) {
 			let e = s[c++];
 			if (c >= s.length) break;
-			e === "attribute" ? o.attribute = a(s[c++]) : e === "designed" ? o.designed = Me(i(s[c++])) : e === "exhibited" ? o.exhibited = Me(i(s[c++])) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a).filter((e) => e.length > 0) : i(s[c++]);
+			e === "attribute" ? o.attribute = a(s[c++]) : e === "designed" ? o.designed = je(i(s[c++])) : e === "exhibited" ? o.exhibited = je(i(s[c++])) : e === "reference" ? o.referenceIds = n(a(s[c++])).map(a).filter((e) => e.length > 0) : i(s[c++]);
 		}
 		return (t) => (t.duals[e] = o, t);
 	},
 	dump: function(e) {
 		let t = "dual " + e.id + " {\n";
-		return e.attribute && (t += "  attribute " + e.attribute + "\n"), e.designed && (t += "  designed " + Le(e.designed) + "\n"), e.exhibited && (t += "  exhibited " + Le(e.exhibited) + "\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
+		return e.attribute && (t += "  attribute " + e.attribute + "\n"), e.designed && (t += "  designed " + Ie(e.designed) + "\n"), e.exhibited && (t += "  exhibited " + Ie(e.exhibited) + "\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
 };
 //#endregion
@@ -9447,7 +9468,7 @@ var Jc = {
 					construct: "dataspace.artifact_class",
 					id: e.id
 				}), n.artifactClasses.push(e);
-			} else if (e === "policies") n.policies = F(t());
+			} else if (e === "policies") n.policies = I(t());
 			else if (e === "default_policy") n.defaultPolicy = a(t());
 			else if (e === "trust_anchor") {
 				let e = {
@@ -9466,14 +9487,14 @@ var Jc = {
 					construct: "dataspace.trust_anchor",
 					id: e.id
 				}), n.trustAnchors.push(e);
-			} else if (e === "compatible_with") n.compatibleWith = F(t());
+			} else if (e === "compatible_with") n.compatibleWith = I(t());
 			else if (e === "source") {
-				let e = I(i(t()));
+				let e = L(i(t()));
 				n.sourceRefs.push(e), n.source ||= e;
 			} else if (e === "ref") {
-				let e = C(t, r, a, i);
-				T(n, e) || (n.refs ??= []).push(e);
-			} else if (e === "corresponds") (n.correspondences ??= []).push(O(t, r, a));
+				let e = w(t, r, a, i);
+				E(n, e) || (n.refs ??= []).push(e);
+			} else if (e === "corresponds") (n.correspondences ??= []).push(k(t, r, a));
 			else return !1;
 			return !0;
 		}, {
@@ -9484,14 +9505,14 @@ var Jc = {
 	dump: function(e) {
 		let t = "dataspace " + e.id + " {\n";
 		e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n");
-		for (let n of e.participantClasses) t += "  participant_class " + N(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
-		for (let n of e.artifactClasses) t += "  artifact_class " + N(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.element && (t += "    element " + N(n.element) + "\n"), n.policy && (t += "    policy " + N(n.policy) + "\n"), t += "  }\n";
-		e.policies.length > 0 && (t += "  policies { " + e.policies.map(N).join(" ") + " }\n"), e.defaultPolicy && (t += "  default_policy " + N(e.defaultPolicy) + "\n");
-		for (let n of e.trustAnchors) t += "  trust_anchor " + N(n.id) + " {\n", n.trustRef && (t += qc(n.trustRef, "    ", N)), n.role && (t += "    role " + N(n.role) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
-		e.compatibleWith.length > 0 && (t += "  compatible_with { " + e.compatibleWith.map(N).join(" ") + " }\n");
+		for (let n of e.participantClasses) t += "  participant_class " + P(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+		for (let n of e.artifactClasses) t += "  artifact_class " + P(n.id) + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.element && (t += "    element " + P(n.element) + "\n"), n.policy && (t += "    policy " + P(n.policy) + "\n"), t += "  }\n";
+		e.policies.length > 0 && (t += "  policies { " + e.policies.map(P).join(" ") + " }\n"), e.defaultPolicy && (t += "  default_policy " + P(e.defaultPolicy) + "\n");
+		for (let n of e.trustAnchors) t += "  trust_anchor " + P(n.id) + " {\n", n.trustRef && (t += qc(n.trustRef, "    ", P)), n.role && (t += "    role " + P(n.role) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+		e.compatibleWith.length > 0 && (t += "  compatible_with { " + e.compatibleWith.map(P).join(" ") + " }\n");
 		let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-		for (let e of n) t += E(e, "  ", s);
-		return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+		for (let e of n) t += D(e, "  ", s);
+		return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 	}
 }, Yc = [
 	"permission",
@@ -9515,7 +9536,7 @@ var Jc = {
 		return y(t, (t, r, o) => {
 			if (t === "name") n.name = x(r);
 			else if (t === "description") n.description = x(r);
-			else if (t === "governs") n.governs = F(r());
+			else if (t === "governs") n.governs = I(r());
 			else if (t === "default_posture") {
 				let t = a(r());
 				if (t !== "true" && t !== "false") throw Error(`Parsing error: policy. ID ${e}: default_posture is true | false, got "${t}"`);
@@ -9543,12 +9564,12 @@ var Jc = {
 					id: e.id
 				}), n.rules.push(e);
 			} else if (t === "source") {
-				let e = I(i(r()));
+				let e = L(i(r()));
 				n.sourceRefs.push(e), n.source ||= e;
 			} else if (t === "ref") {
-				let e = C(r, o, a, i);
-				T(n, e) || (n.refs ??= []).push(e);
-			} else if (t === "corresponds") (n.correspondences ??= []).push(O(r, o, a));
+				let e = w(r, o, a, i);
+				E(n, e) || (n.refs ??= []).push(e);
+			} else if (t === "corresponds") (n.correspondences ??= []).push(k(r, o, a));
 			else return !1;
 			return !0;
 		}, {
@@ -9558,15 +9579,15 @@ var Jc = {
 	},
 	dump: function(e) {
 		let t = "policy " + e.id + " {\n";
-		e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.defaultPosture !== null && (t += "  default_posture " + (e.defaultPosture ? "true" : "false") + "\n"), e.governs.length > 0 && (t += "  governs { " + e.governs.map(N).join(" ") + " }\n");
+		e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.defaultPosture !== null && (t += "  default_posture " + (e.defaultPosture ? "true" : "false") + "\n"), e.governs.length > 0 && (t += "  governs { " + e.governs.map(P).join(" ") + " }\n");
 		for (let n of e.rules) {
-			t += "  rule " + N(n.id) + " {\n", n.kind && (t += "    kind " + n.kind + "\n"), n.action && (t += "    action " + N(n.action) + "\n"), n.artifact && (t += "    artifact " + N(n.artifact) + "\n");
+			t += "  rule " + P(n.id) + " {\n", n.kind && (t += "    kind " + n.kind + "\n"), n.action && (t += "    action " + P(n.action) + "\n"), n.artifact && (t += "    artifact " + P(n.artifact) + "\n");
 			for (let e of n.constraints) t += "    constraint \"" + s(e) + "\"\n";
 			t += "  }\n";
 		}
 		let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source ? [e.source] : [];
-		for (let e of n) t += E(e, "  ", s);
-		return t += w(e.refs, "  ", s), t += k(e.correspondences, "  ", s, N), t += "}\n", t;
+		for (let e of n) t += D(e, "  ", s);
+		return t += T(e.refs, "  ", s), t += A(e.correspondences, "  ", s, P), t += "}\n", t;
 	}
 }, Zc = {
 	keyword: "dimension",
@@ -9600,7 +9621,7 @@ var Jc = {
 	}), (t) => (t.activityArchetypes[e] = n, t);
 }, $c = function(e) {
 	let t = "activity_archetype " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.parent && (t += "  parent " + N(e.parent) + "\n"), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.parent && (t += "  parent " + P(e.parent) + "\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/participantKind.ts
@@ -9704,7 +9725,7 @@ var rl = (e, t) => {
 			let t = a(r()), s = o();
 			if (s === void 0 || !s.startsWith("{")) throw Error(`Parsing error: participant_kind. ID ${e}: subkind ${t} is missing its block`);
 			n.subkinds.push(nl(t, i(r())));
-		} else if (t === "source") n.source = I(i(r()));
+		} else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -9714,19 +9735,19 @@ var rl = (e, t) => {
 };
 function il(e) {
 	let t = "  competence {\n";
-	return e.delegates_to && (t += "    delegates_to " + N(e.delegates_to) + "\n"), e.clause && (t += "    clause \"" + s(e.clause) + "\"\n"), e.note && (t += "    note \"" + s(e.note) + "\"\n"), t += "  }\n", t;
+	return e.delegates_to && (t += "    delegates_to " + P(e.delegates_to) + "\n"), e.clause && (t += "    clause \"" + s(e.clause) + "\"\n"), e.note && (t += "    note \"" + s(e.note) + "\"\n"), t += "  }\n", t;
 }
 function al(e) {
 	let t = "  approval {\n";
-	return e.decided_by && (t += "    decided_by " + N(e.decided_by) + "\n"), e.on_recommendation_of && (t += "    on_recommendation_of " + N(e.on_recommendation_of) + "\n"), e.procedure && (t += "    procedure \"" + s(e.procedure) + "\"\n"), e.clause && (t += "    clause \"" + s(e.clause) + "\"\n"), t += "  }\n", t;
+	return e.decided_by && (t += "    decided_by " + P(e.decided_by) + "\n"), e.on_recommendation_of && (t += "    on_recommendation_of " + P(e.on_recommendation_of) + "\n"), e.procedure && (t += "    procedure \"" + s(e.procedure) + "\"\n"), e.clause && (t += "    clause \"" + s(e.clause) + "\"\n"), t += "  }\n", t;
 }
 function ol(e) {
-	let t = "  subkind " + N(e.id) + " {\n";
-	return e.label && (t += "    label \"" + s(e.label) + "\"\n"), e.term && (t += "    term \"" + s(e.term) + "\"\n"), e.definition && (t += "    definition \"" + s(e.definition) + "\"\n"), e.data_flag && (t += "    data_flag \"" + s(e.data_flag) + "\"\n"), e.acceptance && (t += "    acceptance " + N(e.acceptance) + "\n"), e.acceptance_note && (t += "    acceptance_note \"" + s(e.acceptance_note) + "\"\n"), t += "  }\n", t;
+	let t = "  subkind " + P(e.id) + " {\n";
+	return e.label && (t += "    label \"" + s(e.label) + "\"\n"), e.term && (t += "    term \"" + s(e.term) + "\"\n"), e.definition && (t += "    definition \"" + s(e.definition) + "\"\n"), e.data_flag && (t += "    data_flag \"" + s(e.data_flag) + "\"\n"), e.acceptance && (t += "    acceptance " + P(e.acceptance) + "\n"), e.acceptance_note && (t += "    acceptance_note \"" + s(e.acceptance_note) + "\"\n"), t += "  }\n", t;
 }
 var sl = function(e) {
 	let t = "participant_kind " + e.id + " {\n";
-	e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.term && (t += "  term \"" + s(e.term) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.member && (t += "  member " + N(e.member) + "\n"), e.competence && (t += il(e.competence)), e.approval && (t += al(e.approval)), e.approved_by && (t += "  approved_by " + N(e.approved_by) + "\n"), e.designated_by && (t += "  designated_by " + N(e.designated_by) + "\n"), e.declaration && (t += "  declaration " + N(e.declaration) + "\n"), e.admission && (t += "  admission \"" + s(e.admission) + "\"\n"), e.becomes && (t += "  becomes " + N(e.becomes) + "\n"), e.procedure && (t += "  procedure \"" + s(e.procedure) + "\"\n");
+	e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.term && (t += "  term \"" + s(e.term) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.member && (t += "  member " + P(e.member) + "\n"), e.competence && (t += il(e.competence)), e.approval && (t += al(e.approval)), e.approved_by && (t += "  approved_by " + P(e.approved_by) + "\n"), e.designated_by && (t += "  designated_by " + P(e.designated_by) + "\n"), e.declaration && (t += "  declaration " + P(e.declaration) + "\n"), e.admission && (t += "  admission \"" + s(e.admission) + "\"\n"), e.becomes && (t += "  becomes " + P(e.becomes) + "\n"), e.procedure && (t += "  procedure \"" + s(e.procedure) + "\"\n");
 	for (let n of e.subkinds) t += ol(n);
 	return (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 }, cl = (e, t) => {
@@ -9750,7 +9771,7 @@ var sl = function(e) {
 		else if (e === "mandate") n.mandate = a(t());
 		else if (e === "sub_committee_of") n.sub_committee_of = a(t());
 		else if (e === "independent_of") n.independent_of = a(t());
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -9759,7 +9780,7 @@ var sl = function(e) {
 	}), (t) => (t.governanceOrgans[e] = n, t);
 }, ll = function(e) {
 	let t = "governance_organ " + e.id + " {\n";
-	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.term && (t += "  term \"" + s(e.term) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.mandate && (t += "  mandate \"" + s(e.mandate) + "\"\n"), e.sub_committee_of && (t += "  sub_committee_of " + N(e.sub_committee_of) + "\n"), e.independent_of && (t += "  independent_of " + N(e.independent_of) + "\n"), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	return e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.term && (t += "  term \"" + s(e.term) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.mandate && (t += "  mandate \"" + s(e.mandate) + "\"\n"), e.sub_committee_of && (t += "  sub_committee_of " + P(e.sub_committee_of) + "\n"), e.independent_of && (t += "  independent_of " + P(e.independent_of) + "\n"), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/declaration.ts
@@ -9807,7 +9828,7 @@ var dl = (e, t) => {
 			let t = a(r()), s = o();
 			if (s === void 0 || !s.startsWith("{")) throw Error(`Parsing error: declaration_kind. ID ${e}: content ${t} is missing its block`);
 			n.content.push(ul(t, i(r())));
-		} else if (t === "source") n.source = I(i(r()));
+		} else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -9816,7 +9837,7 @@ var dl = (e, t) => {
 	}), (t) => (t.declarationKinds[e] = n, t);
 };
 function fl(e) {
-	let t = "  content " + N(e.id) + " {\n";
+	let t = "  content " + P(e.id) + " {\n";
 	return e.clause && (t += "    clause \"" + s(e.clause) + "\"\n"), e.description && (t += "    description \"" + s(e.description) + "\"\n"), t += "  }\n", t;
 }
 function pl(e) {
@@ -9825,7 +9846,7 @@ function pl(e) {
 }
 var ml = function(e) {
 	let t = "declaration_kind " + e.id + " {\n";
-	e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.holder && (t += "  holder " + N(e.holder) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.procedure && (t += "  procedure \"" + s(e.procedure) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.scope_model && (t += "  scope_model " + N(e.scope_model) + "\n"), e.scheme_a_obligation && (t += "  scheme_a_obligation \"" + s(e.scheme_a_obligation) + "\"\n");
+	e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.holder && (t += "  holder " + P(e.holder) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.procedure && (t += "  procedure \"" + s(e.procedure) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.scope_model && (t += "  scope_model " + P(e.scope_model) + "\n"), e.scheme_a_obligation && (t += "  scheme_a_obligation \"" + s(e.scheme_a_obligation) + "\"\n");
 	for (let n of e.content) t += fl(n);
 	return (e.source.doc || e.source.clause) && (t += pl(e.source)), t += "}\n", t;
 }, hl = (e, t) => {
@@ -9867,7 +9888,7 @@ var ml = function(e) {
 		else if (e === "blocks") n.blocks = r(i(t())).filter((e) => e.length > 0);
 		else if (e === "blocks_note") n.blocks_note = a(t());
 		else if (e === "scope_checked") n.scope_checked = r(i(t())).filter((e) => e.length > 0);
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -9876,7 +9897,7 @@ var ml = function(e) {
 	}), (t) => (t.declarationGates[e] = n, t);
 }, vl = function(e) {
 	let t = "declaration_gate " + e.id + " {\n";
-	return e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.statement && (t += "  statement \"" + s(e.statement) + "\"\n"), e.holder && (t += "  holder " + N(e.holder) + "\n"), e.declaration && (t += "  declaration " + N(e.declaration) + "\n"), e.blocks.length > 0 && (t += "  blocks { " + e.blocks.map(N).join(" ") + " }\n"), e.blocks_note && (t += "  blocks_note \"" + s(e.blocks_note) + "\"\n"), e.scope_checked.length > 0 && (t += "  scope_checked { " + e.scope_checked.map(N).join(" ") + " }\n"), (e.source.doc || e.source.clause) && (t += pl(e.source)), t += "}\n", t;
+	return e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.statement && (t += "  statement \"" + s(e.statement) + "\"\n"), e.holder && (t += "  holder " + P(e.holder) + "\n"), e.declaration && (t += "  declaration " + P(e.declaration) + "\n"), e.blocks.length > 0 && (t += "  blocks { " + e.blocks.map(P).join(" ") + " }\n"), e.blocks_note && (t += "  blocks_note \"" + s(e.blocks_note) + "\"\n"), e.scope_checked.length > 0 && (t += "  scope_checked { " + e.scope_checked.map(P).join(" ") + " }\n"), (e.source.doc || e.source.clause) && (t += pl(e.source)), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/scheme.ts
@@ -9918,7 +9939,7 @@ var bl = (e, t) => {
 		else if (e === "clause") n.clause = a(t());
 		else if (e === "definition") n.definition = a(t());
 		else if (e === "demonstration") n.demonstration = yl(i(t()));
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -9934,7 +9955,7 @@ var Sl = function(e) {
 	let t = "scheme_definition " + e.id + " {\n";
 	if (e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.term && (t += "  term \"" + s(e.term) + "\"\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.demonstration) {
 		let n = e.demonstration;
-		t += "  demonstration {\n", n.method && (t += "    method " + N(n.method) + "\n"), n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.basis.length > 0 && (t += "    basis { " + n.basis.map(N).join(" ") + " }\n"), n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += "  }\n";
+		t += "  demonstration {\n", n.method && (t += "    method " + P(n.method) + "\n"), n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.basis.length > 0 && (t += "    basis { " + n.basis.map(P).join(" ") + " }\n"), n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += "  }\n";
 	}
 	return (e.source.doc || e.source.clause) && (t += xl(e.source)), t += "}\n", t;
 };
@@ -10043,7 +10064,7 @@ var El = (e, t) => {
 			let t = a(r()), s = o();
 			if (s === void 0 || !s.startsWith("{")) throw Error(`Parsing error: scheme_lifecycle. ID ${e}: trigger ${t} is missing its block`);
 			n.triggers.push(Tl(t, i(r())));
-		} else if (t === "source") n.source = I(i(r()));
+		} else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -10052,13 +10073,13 @@ var El = (e, t) => {
 	}), (t) => (t.schemeLifecycles[e] = n, t);
 }, Dl = function(e) {
 	let t = "scheme_lifecycle " + e.id + " {\n";
-	if (e.applies_to && (t += "  applies_to " + N(e.applies_to) + "\n"), e.initial && (t += "  initial " + N(e.initial) + "\n"), e.entry) {
+	if (e.applies_to && (t += "  applies_to " + P(e.applies_to) + "\n"), e.initial && (t += "  initial " + P(e.initial) + "\n"), e.entry) {
 		let n = e.entry;
-		t += "  entry {\n", n.action && (t += "    action " + N(n.action) + "\n"), t += "    automatic " + (n.automatic ? "true" : "false") + "\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.conditions_ref && (t += "    conditions_ref " + N(n.conditions_ref) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+		t += "  entry {\n", n.action && (t += "    action " + P(n.action) + "\n"), t += "    automatic " + (n.automatic ? "true" : "false") + "\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.conditions_ref && (t += "    conditions_ref " + P(n.conditions_ref) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
 	}
-	for (let n of e.transitions) t += "  transition " + N(n.from) + " -> " + N(n.to), n.action && (t += " action " + N(n.action)), t += " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.decided_by && (t += "    decided_by " + N(n.decided_by) + "\n"), n.on_proposal_of && (t += "    on_proposal_of " + N(n.on_proposal_of) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+	for (let n of e.transitions) t += "  transition " + P(n.from) + " -> " + P(n.to), n.action && (t += " action " + P(n.action)), t += " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.decided_by && (t += "    decided_by " + P(n.decided_by) + "\n"), n.on_proposal_of && (t += "    on_proposal_of " + P(n.on_proposal_of) + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
 	for (let n of e.triggers) {
-		if (t += "  trigger " + N(n.id) + " {\n", n.kind && (t += "    kind " + N(n.kind) + "\n"), n.action && (t += "    action " + N(n.action) + "\n"), n.windowYears > 0 || n.windowMonths > 0) {
+		if (t += "  trigger " + P(n.id) + " {\n", n.kind && (t += "    kind " + P(n.kind) + "\n"), n.action && (t += "    action " + P(n.action) + "\n"), n.windowYears > 0 || n.windowMonths > 0) {
 			let e = "    window {";
 			n.windowYears > 0 && (e += " years " + n.windowYears), n.windowMonths > 0 && (e += " months " + n.windowMonths), t += e + " }\n";
 		}
@@ -10093,7 +10114,7 @@ var kl = (e, t) => {
 		else if (e === "approved_by") n.approved_by = a(t());
 		else if (e === "clause") n.clause = a(t());
 		else if (e === "note") n.note = a(t());
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -10102,7 +10123,7 @@ var kl = (e, t) => {
 	}), (t) => (t.frameworkDocuments[e] = n, t);
 }, Al = function(e) {
 	let t = "framework_document " + e.id + " {\n";
-	return e.rank > 0 && (t += "  rank " + e.rank + "\n"), e.doc && (t += "  doc \"" + s(e.doc) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.approved_by && (t += "  approved_by " + N(e.approved_by) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n"), (e.source.doc || e.source.clause) && (t += Ol(e.source)), t += "}\n", t;
+	return e.rank > 0 && (t += "  rank " + e.rank + "\n"), e.doc && (t += "  doc \"" + s(e.doc) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.approved_by && (t += "  approved_by " + P(e.approved_by) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n"), (e.source.doc || e.source.clause) && (t += Ol(e.source)), t += "}\n", t;
 }, jl = (e, t) => {
 	let n = {
 		id: e,
@@ -10116,7 +10137,7 @@ var kl = (e, t) => {
 	return y(t, (e, t) => {
 		if (e === "clause") n.clause = a(t());
 		else if (e === "statement") n.statement = a(t());
-		else if (e === "source") n.source = I(i(t()));
+		else if (e === "source") n.source = L(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -10163,7 +10184,7 @@ var Pl = (e, t) => {
 			if (s === void 0 || !s.startsWith("{")) throw Error(`Parsing error: auto_inclusion. ID ${e}: condition ${t} is missing its block`);
 			n.conditions.push(Nl(t, i(r())));
 		} else if (t === "note") n.note = a(r());
-		else if (t === "source") n.source = I(i(r()));
+		else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -10173,7 +10194,7 @@ var Pl = (e, t) => {
 }, Fl = function(e) {
 	let t = "auto_inclusion " + e.id + " {\n";
 	e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.statement && (t += "  statement \"" + s(e.statement) + "\"\n");
-	for (let n of e.conditions) t += "  condition " + N(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+	for (let n of e.conditions) t += "  condition " + P(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
 	return e.note && (t += "  note \"" + s(e.note) + "\"\n"), (e.source.doc || e.source.clause) && (t += Ol(e.source)), t += "}\n", t;
 };
 //#endregion
@@ -10296,7 +10317,7 @@ var Vl = (e, t) => {
 			n.legacy_kinds.push(zl(t, i(r())));
 		} else if (t === "income") n.income = a(r());
 		else if (t === "no_entrance_fees_for") n.no_entrance_fees_for = Bl(r());
-		else if (t === "source") n.source = I(i(r()));
+		else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -10306,29 +10327,29 @@ var Vl = (e, t) => {
 };
 function Hl(e, t) {
 	let n = "    " + e + " {\n";
-	return t.threshold > 0 && (n += "      threshold " + t.threshold + "\n"), t.base && (n += "      base " + N(t.base) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.description && (n += "      description \"" + s(t.description) + "\"\n"), n += "    }\n", n;
+	return t.threshold > 0 && (n += "      threshold " + t.threshold + "\n"), t.base && (n += "      base " + P(t.base) + "\n"), t.clause && (n += "      clause \"" + s(t.clause) + "\"\n"), t.description && (n += "      description \"" + s(t.description) + "\"\n"), n += "    }\n", n;
 }
 function Ul(e) {
 	let t = "  voting {\n";
 	if (e.in_meeting && (t += Hl("in_meeting", e.in_meeting)), e.by_correspondence && (t += Hl("by_correspondence", e.by_correspondence)), e.other_proposals) {
 		let n = e.other_proposals;
-		t += "    other_proposals {\n", n.in_meeting > 0 && (t += "      in_meeting " + n.in_meeting + "\n"), n.by_correspondence && (t += "      by_correspondence " + N(n.by_correspondence) + "\n"), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
+		t += "    other_proposals {\n", n.in_meeting > 0 && (t += "      in_meeting " + n.in_meeting + "\n"), n.by_correspondence && (t += "      by_correspondence " + P(n.by_correspondence) + "\n"), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
 	}
-	return e.proxies_max > 0 && (t += "    proxies_max " + e.proxies_max + "\n"), e.abstentions && (t += "    abstentions " + N(e.abstentions) + "\n"), e.reason_on_against_or_abstain && (t += "    reason_on_against_or_abstain true\n"), t += "  }\n", t;
+	return e.proxies_max > 0 && (t += "    proxies_max " + e.proxies_max + "\n"), e.abstentions && (t += "    abstentions " + P(e.abstentions) + "\n"), e.reason_on_against_or_abstain && (t += "    reason_on_against_or_abstain true\n"), t += "  }\n", t;
 }
 function Wl(e, t, n) {
-	return n + e + " { " + t.map(N).join(" ") + " }\n";
+	return n + e + " { " + t.map(P).join(" ") + " }\n";
 }
 var Gl = function(e) {
 	let t = "decision_rule " + e.id + " {\n";
-	e.organ && (t += "  organ " + N(e.organ) + "\n"), e.kind && (t += "  kind " + N(e.kind) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.on_recommendation_of && (t += "  on_recommendation_of " + N(e.on_recommendation_of) + "\n"), e.independent_of && (t += "  independent_of " + N(e.independent_of) + "\n"), e.decides.length > 0 && (t += Wl("decides", e.decides, "  ")), e.voting && (t += Ul(e.voting)), e.tasks.length > 0 && (t += Wl("tasks", e.tasks, "  ")), e.scope.length > 0 && (t += Wl("scope", e.scope, "  ")), e.principle && (t += "  principle " + N(e.principle) + "\n");
-	for (let n of e.legacy_kinds) t += "  legacy_kind " + N(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
-	return e.income && (t += "  income " + N(e.income) + "\n"), e.no_entrance_fees_for.length > 0 && (t += Wl("no_entrance_fees_for", e.no_entrance_fees_for, "  ")), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	e.organ && (t += "  organ " + P(e.organ) + "\n"), e.kind && (t += "  kind " + P(e.kind) + "\n"), e.clause && (t += "  clause \"" + s(e.clause) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.on_recommendation_of && (t += "  on_recommendation_of " + P(e.on_recommendation_of) + "\n"), e.independent_of && (t += "  independent_of " + P(e.independent_of) + "\n"), e.decides.length > 0 && (t += Wl("decides", e.decides, "  ")), e.voting && (t += Ul(e.voting)), e.tasks.length > 0 && (t += Wl("tasks", e.tasks, "  ")), e.scope.length > 0 && (t += Wl("scope", e.scope, "  ")), e.principle && (t += "  principle " + P(e.principle) + "\n");
+	for (let n of e.legacy_kinds) t += "  legacy_kind " + P(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += "  }\n";
+	return e.income && (t += "  income " + P(e.income) + "\n"), e.no_entrance_fees_for.length > 0 && (t += Wl("no_entrance_fees_for", e.no_entrance_fees_for, "  ")), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/processSequence.ts
 function Kl(e) {
-	return r(e).map(P).map(a).filter((e) => e.length > 0);
+	return r(e).map(F).map(a).filter((e) => e.length > 0);
 }
 function ql(e, t) {
 	let n = {
@@ -10353,11 +10374,11 @@ function ql(e, t) {
 	}), n;
 }
 function Jl(e) {
-	return e.length === 0 ? "" : "sequence { " + e.map(N).join(" ") + " }";
+	return e.length === 0 ? "" : "sequence { " + e.map(P).join(" ") + " }";
 }
 function Yl(e, t) {
-	let n = t + "register " + N(e.id) + " {\n";
-	return e.label && (n += t + "  label \"" + s(e.label) + "\"\n"), e.clause && (n += t + "  clause \"" + s(e.clause) + "\"\n"), e.maintainer && (n += t + "  maintainer " + N(e.maintainer) + "\n"), e.published && (n += t + "  published \"" + s(e.published) + "\"\n"), e.entries && (n += t + "  entries \"" + s(e.entries) + "\"\n"), n += t + "}\n", n;
+	let n = t + "register " + P(e.id) + " {\n";
+	return e.label && (n += t + "  label \"" + s(e.label) + "\"\n"), e.clause && (n += t + "  clause \"" + s(e.clause) + "\"\n"), e.maintainer && (n += t + "  maintainer " + P(e.maintainer) + "\n"), e.published && (n += t + "  published \"" + s(e.published) + "\"\n"), e.entries && (n += t + "  entries \"" + s(e.entries) + "\"\n"), n += t + "}\n", n;
 }
 //#endregion
 //#region src/ser-des/config/documentModule.ts
@@ -10387,7 +10408,7 @@ var Xl = (e, t) => {
 			let t = a(r()), s = o();
 			if (s === void 0 || !s.startsWith("{")) throw Error(`Parsing error: document_module. ID ${e}: register ${t} is missing its block`);
 			n.registers.push(ql(t, i(r())));
-		} else if (t === "source") n.source = I(i(r()));
+		} else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -10396,7 +10417,7 @@ var Xl = (e, t) => {
 	}), (t) => (t.documentModules[e] = n, t);
 }, Zl = function(e) {
 	let t = "document_module " + e.id + " {\n";
-	e.document && (t += "  document \"" + s(e.document) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.edition && (t += "  edition \"" + s(e.edition) + "\"\n"), e.year && (t += "  year " + e.year + "\n"), e.namespace && (t += "  namespace " + N(e.namespace) + "\n");
+	e.document && (t += "  document \"" + s(e.document) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.edition && (t += "  edition \"" + s(e.edition) + "\"\n"), e.year && (t += "  year " + e.year + "\n"), e.namespace && (t += "  namespace " + P(e.namespace) + "\n");
 	let n = Jl(e.sequence);
 	n && (t += "  " + n + "\n");
 	for (let n of e.registers) t += Yl(n, "  ");
@@ -10483,8 +10504,8 @@ var tu = (e, t) => {
 	}), (t) => (t.informativeAnnexes[e] = n, t);
 }, nu = function(e) {
 	let t = "informative_annex " + e.id + " {\n";
-	t += "  document {\n", e.document.id && (t += "    id \"" + s(e.document.id) + "\"\n"), e.document.title && (t += "    title \"" + s(e.document.title) + "\"\n"), e.document.edition && (t += "    edition " + e.document.edition + "\n"), e.document.year && (t += "    year " + e.document.year + "\n"), e.document.role && (t += "    role " + N(e.document.role) + "\n"), e.document.source && (t += "    source \"" + s(e.document.source) + "\"\n"), t += "  }\n", e.appliesTo && (t += "  applies_to " + N(e.appliesTo) + "\n"), e.appliedBy && (t += "  applied_by \"" + s(e.appliedBy) + "\"\n"), e.scope && (t += "  scope \"" + s(e.scope) + "\"\n"), e.numberingCaution && (t += "  numbering_caution \"" + s(e.numberingCaution) + "\"\n");
-	for (let n of e.highlights) t += "  highlight " + N(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.title && (t += "    title \"" + s(n.title) + "\"\n"), n.statement && (t += "    statement \"" + s(n.statement) + "\"\n"), n.dischargedBy && (t += "    discharged_by \"" + s(n.dischargedBy) + "\"\n"), t += "  }\n";
+	t += "  document {\n", e.document.id && (t += "    id \"" + s(e.document.id) + "\"\n"), e.document.title && (t += "    title \"" + s(e.document.title) + "\"\n"), e.document.edition && (t += "    edition " + e.document.edition + "\n"), e.document.year && (t += "    year " + e.document.year + "\n"), e.document.role && (t += "    role " + P(e.document.role) + "\n"), e.document.source && (t += "    source \"" + s(e.document.source) + "\"\n"), t += "  }\n", e.appliesTo && (t += "  applies_to " + P(e.appliesTo) + "\n"), e.appliedBy && (t += "  applied_by \"" + s(e.appliedBy) + "\"\n"), e.scope && (t += "  scope \"" + s(e.scope) + "\"\n"), e.numberingCaution && (t += "  numbering_caution \"" + s(e.numberingCaution) + "\"\n");
+	for (let n of e.highlights) t += "  highlight " + P(n.id) + " {\n", n.clause && (t += "    clause \"" + s(n.clause) + "\"\n"), n.title && (t += "    title \"" + s(n.title) + "\"\n"), n.statement && (t += "    statement \"" + s(n.statement) + "\"\n"), n.dischargedBy && (t += "    discharged_by \"" + s(n.dischargedBy) + "\"\n"), t += "  }\n";
 	return t += "}\n", t;
 }, ru = ["normative", "informative"], iu = (e, t) => {
 	let n = {
@@ -10508,7 +10529,7 @@ var tu = (e, t) => {
 			n.obligation = t;
 		} else if (t === "summary") n.summary = a(r());
 		else if (t === "realization") n.realization = a(r());
-		else if (t === "source") n.source = I(i(r()));
+		else if (t === "source") n.source = L(i(r()));
 		else return !1;
 		return !0;
 	}, {
@@ -10517,7 +10538,7 @@ var tu = (e, t) => {
 	}), (t) => (t.partAnnexes[e] = n, t);
 }, au = function(e) {
 	let t = "part_annex " + e.id + " {\n";
-	return e.letter && (t += "  letter \"" + s(e.letter) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.obligation && (t += "  obligation " + N(e.obligation) + "\n"), e.summary && (t += "  summary \"" + s(e.summary) + "\"\n"), e.realization && (t += "  realization \"" + s(e.realization) + "\"\n"), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
+	return e.letter && (t += "  letter \"" + s(e.letter) + "\"\n"), e.title && (t += "  title \"" + s(e.title) + "\"\n"), e.obligation && (t += "  obligation " + P(e.obligation) + "\n"), e.summary && (t += "  summary \"" + s(e.summary) + "\"\n"), e.realization && (t += "  realization \"" + s(e.realization) + "\"\n"), (e.source.doc || e.source.clause) && (t += "  source {\n", e.source.doc && (t += "    doc \"" + s(e.source.doc) + "\"\n"), e.source.clause && (t += "    clause \"" + s(e.source.clause) + "\"\n"), t += "  }\n"), t += "}\n", t;
 }, ou = [
 	"asciimath",
 	"latex",