@primmel/primmel 1.6.0 → 1.7.0

package/dist-browser/index.mjs

@@ -106,7 +106,7 @@ function l() {
 //#endregion
 //#region src/ser-des/parse.ts
 function u(e, n, r = {}) {
-	let i = t(e), a = l(), o = {
+	let i = t(e), a = l(), o = [], s = {
 		root: "",
 		metadata: null,
 		packageManifest: null,
@@ -166,31 +166,43 @@ function u(e, n, r = {}) {
 		formulasUsed: {},
 		texts: {},
 		issues: []
-	}, s = 0;
-	for (; s < i.length;) {
-		let e = i[s++], t = e.value, c = n[t];
-		if (!c) {
+	}, c = 0;
+	for (; c < i.length;) {
+		let e = i[c++], t = e.value, l = n[t];
+		if (!l) {
 			if (r.strict) throw Error(`Unknown keyword "${t}" at line ${e.start.line} col ${e.start.col}. Use lenient mode (default) to skip unknown keywords.`);
 			continue;
 		}
-		let l;
-		if (c.takesID) {
-			if (s + 1 > i.length) throw Error(`Keyword "${t}" at line ${e.start.line} col ${e.start.col} expects an ID and payload, but only ${i.length - s + 1} token(s) remain.`);
-			let n = i[s++], r = i[s++];
-			if (c.field) {
-				let e = a.check(c.field, t, n.value, n.start);
-				e && o.issues.push(e);
+		let u;
+		if (l.takesID) {
+			if (c + 1 > i.length) throw Error(`Keyword "${t}" at line ${e.start.line} col ${e.start.col} expects an ID and payload, but only ${i.length - c + 1} token(s) remain.`);
+			let n = i[c++], d = i[c++];
+			if (l.field) {
+				let e = a.check(l.field, t, n.value, n.start);
+				e && s.issues.push(e);
 			}
-			l = c.parse(n.value, r.value);
+			r.withProvenance && o.push({
+				field: l.field ?? t,
+				id: n.value,
+				keyword: t,
+				start: e.start,
+				end: d.end
+			}), u = l.parse(n.value, d.value);
 		} else {
-			if (s >= i.length) throw Error(`Keyword "${t}" at line ${e.start.line} col ${e.start.col} expects a payload, but no tokens remain.`);
-			let n = i[s++];
-			l = c.parse(n.value);
+			if (c >= i.length) throw Error(`Keyword "${t}" at line ${e.start.line} col ${e.start.col} expects a payload, but no tokens remain.`);
+			let n = i[c++];
+			r.withProvenance && o.push({
+				field: l.field ?? t,
+				id: "",
+				keyword: t,
+				start: e.start,
+				end: n.end
+			}), u = l.parse(n.value);
 		}
-		let u = l(o);
-		u !== o && (u.issues = o.issues), o = u;
+		let d = u(s);
+		d !== s && (d.issues = s.issues), s = d;
 	}
-	return o;
+	return r.withProvenance && (s.constructs = o), s;
 }
 //#endregion
 //#region src/ser-des/resolve.ts
@@ -3168,10 +3180,10 @@ function Gn(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/design.ts
-function Kn(e) {
+function z(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-function qn(e) {
+function Kn(e) {
 	let t = {
 		level: null,
 		code: "",
@@ -3187,7 +3199,7 @@ function qn(e) {
 	}
 	return t;
 }
-function Jn(e) {
+function qn(e) {
 	let t = {
 		level: null,
 		code: "",
@@ -3215,7 +3227,7 @@ function Jn(e) {
 			for (; s < e.length;) {
 				let t = A(e[s++]);
 				if (s >= e.length) break;
-				let n = e[s++], r = n.startsWith("{") ? qn(i(n)) : null;
+				let n = e[s++], r = n.startsWith("{") ? Kn(i(n)) : null;
 				t === "ac" ? a.ac = r : t === "dc" ? a.dc = r : t === "vehicle_dc" && (a.vehicleDc = r);
 			}
 			t.columns = a;
@@ -3223,7 +3235,7 @@ function Jn(e) {
 	}
 	return t;
 }
-function Yn(e) {
+function Jn(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "count") {
@@ -3264,7 +3276,7 @@ function Yn(e) {
 	}
 	return t;
 }
-function Xn(e) {
+function Yn(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "severity") {
@@ -3283,10 +3295,10 @@ function Xn(e) {
 				let n = t[s++];
 				if (s >= t.length) break;
 				if (n === "criterion") e.criterion = a(t[s++]);
-				else if (n === "footnotes") e.footnotes = Kn(t[s++]);
+				else if (n === "footnotes") e.footnotes = z(t[s++]);
 				else if (n === "env") {
 					let n = a(t[s++]), r = t[s++] ?? "";
-					e.envClassValues[n] = r.startsWith("{") ? Jn(i(r)) : null;
+					e.envClassValues[n] = r.startsWith("{") ? qn(i(r)) : null;
 				} else i(t[s++]);
 			}
 		}
@@ -3294,7 +3306,7 @@ function Xn(e) {
 	}
 	return t;
 }
-function Zn(e) {
+function Xn(e) {
 	let t = {
 		duration: "",
 		cadence: "",
@@ -3328,11 +3340,11 @@ function Zn(e) {
 				}
 				t.phases.push(r);
 			}
-		} else e === "constraints" ? t.constraints = Kn(r[o++]) : i(r[o++]);
+		} else e === "constraints" ? t.constraints = z(r[o++]) : i(r[o++]);
 	}
 	return t;
 }
-function Qn(e) {
+function Zn(e) {
 	let t = {
 		count: null,
 		maxAdditional: null,
@@ -3356,11 +3368,11 @@ function Qn(e) {
 					e === "ref" ? t.selectionRef = a(r[o++]) : i(r[o++]);
 				}
 			} else t.selection = a(e);
-		} else e === "continuity" ? t.continuity = a(r[o++]) : e === "rules" ? t.rules = Kn(r[o++]) : i(r[o++]);
+		} else e === "continuity" ? t.continuity = a(r[o++]) : e === "rules" ? t.rules = z(r[o++]) : i(r[o++]);
 	}
 	return t;
 }
-function $n(e) {
+function Qn(e) {
 	let t = {
 		counts: [],
 		severities: [],
@@ -3374,8 +3386,8 @@ function $n(e) {
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		if (e === "counts") t.counts = Yn(i(r[o++]));
-		else if (e === "severities") t.severities = Xn(i(r[o++]));
+		if (e === "counts") t.counts = Jn(i(r[o++]));
+		else if (e === "severities") t.severities = Yn(i(r[o++]));
 		else if (e === "test_points") {
 			let e = n(i(r[o++])), s = 0;
 			for (; s < e.length;) {
@@ -3383,11 +3395,11 @@ function $n(e) {
 				if (s >= e.length) break;
 				n === "ref" ? t.testPointsRef = a(e[s++]) : i(e[s++]);
 			}
-		} else e === "schedule" ? t.schedule = Zn(i(r[o++])) : e === "specimens" ? t.specimens = Qn(i(r[o++])) : e === "field" ? t.field = er(i(r[o++])) : e === "simulation" ? t.simulation = tr(i(r[o++])) : e === "software" ? t.software = nr(i(r[o++])) : i(r[o++]);
+		} else e === "schedule" ? t.schedule = Xn(i(r[o++])) : e === "specimens" ? t.specimens = Zn(i(r[o++])) : e === "field" ? t.field = $n(i(r[o++])) : e === "simulation" ? t.simulation = er(i(r[o++])) : e === "software" ? t.software = tr(i(r[o++])) : i(r[o++]);
 	}
 	return t;
 }
-function er(e) {
+function $n(e) {
 	let t = {
 		siteSelection: "",
 		trafficConditions: "",
@@ -3413,7 +3425,7 @@ function er(e) {
 	}
 	return t;
 }
-function tr(e) {
+function er(e) {
 	let t = {
 		simulatorKind: "",
 		signal: "",
@@ -3427,7 +3439,7 @@ function tr(e) {
 	}
 	return t;
 }
-function nr(e) {
+function tr(e) {
 	let t = {
 		level: "",
 		items: []
@@ -3456,7 +3468,7 @@ function nr(e) {
 					for (; o < t.length;) {
 						let e = t[o++];
 						if (o >= t.length) break;
-						e === "name" ? r.name = a(t[o++]) : e === "d31" ? r.d31 = a(t[o++]) : e === "obligation" ? r.obligation = a(t[o++]) : e === "methods" ? r.methods = Kn(t[o++]) : e === "clause" ? r.clause = a(t[o++]) : i(t[o++]);
+						e === "name" ? r.name = a(t[o++]) : e === "d31" ? r.d31 = a(t[o++]) : e === "obligation" ? r.obligation = a(t[o++]) : e === "methods" ? r.methods = z(t[o++]) : e === "clause" ? r.clause = a(t[o++]) : i(t[o++]);
 					}
 				}
 				t.items.push(r);
@@ -3465,15 +3477,15 @@ function nr(e) {
 	}
 	return t;
 }
-function rr(e) {
+function nr(e) {
 	let t = "";
 	return e.level !== null && (t += "level " + e.level + " "), e.code && (t += "code \"" + s(e.code) + "\" "), e.amplitude !== null && (t += "amplitude " + e.amplitude + " "), e.unit && (t += "unit \"" + s(e.unit) + "\" "), e.note && (t += "note \"" + s(e.note) + "\" "), e.variable && (t += "variable " + e.variable + " "), t;
 }
-function ir(e) {
-	let t = rr(e);
-	return e.columns && (t += "columns { ", t += e.columns.ac ? "ac { " + rr(e.columns.ac) + "} " : "ac null ", t += e.columns.dc ? "dc { " + rr(e.columns.dc) + "} " : "dc null ", t += e.columns.vehicleDc ? "vehicle_dc { " + rr(e.columns.vehicleDc) + "} " : "vehicle_dc null ", t += "} "), t;
+function rr(e) {
+	let t = nr(e);
+	return e.columns && (t += "columns { ", t += e.columns.ac ? "ac { " + nr(e.columns.ac) + "} " : "ac null ", t += e.columns.dc ? "dc { " + nr(e.columns.dc) + "} " : "dc null ", t += e.columns.vehicleDc ? "vehicle_dc { " + nr(e.columns.vehicleDc) + "} " : "vehicle_dc null ", t += "} "), t;
 }
-function ar(e, t) {
+function ir(e, t) {
 	let n = t + "design {\n";
 	if (e.counts.length > 0) {
 		n += t + "  counts {\n";
@@ -3488,7 +3500,7 @@ function ar(e, t) {
 		for (let r of e.severities) {
 			let e = t + "    severity \"" + s(r.row) + "\" { ";
 			r.criterion && (e += "criterion " + r.criterion + " "), r.footnotes.length > 0 && (e += "footnotes { " + r.footnotes.join(" ") + " } ");
-			for (let [t, n] of Object.entries(r.envClassValues)) e += "env " + t + " " + (n ? "{ " + ir(n) + "}" : "null") + " ";
+			for (let [t, n] of Object.entries(r.envClassValues)) e += "env " + t + " " + (n ? "{ " + rr(n) + "}" : "null") + " ";
 			n += e + "}\n";
 		}
 		n += t + "  }\n";
@@ -3534,11 +3546,11 @@ function ar(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/competenceKind.ts
-function or(e) {
+function ar(e) {
 	let t = a(e);
 	return t.trim() !== "" && !isNaN(Number(t)) ? Number(t) : t;
 }
-function sr(e) {
+function or(e) {
 	let t = {
 		value: 0,
 		unit: ""
@@ -3550,7 +3562,7 @@ function sr(e) {
 	}
 	return t;
 }
-function cr(e) {
+function sr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "competence") {
@@ -3579,37 +3591,37 @@ function cr(e) {
 					for (; c < r.length;) {
 						let e = r[c++];
 						if (c >= r.length) break;
-						e === "min" ? o.min = or(r[c++]) : e === "max" ? o.max = or(r[c++]) : e === "unit" ? o.unit = a(r[c++]) : i(r[c++]);
+						e === "min" ? o.min = ar(r[c++]) : e === "max" ? o.max = ar(r[c++]) : e === "unit" ? o.unit = a(r[c++]) : i(r[c++]);
 					}
 					e.range = o;
-				} else r === "method_standard" ? e.methodStandard = a(t[s++]) : r === "resolution" ? e.resolution = sr(i(t[s++])) : r === "stability" ? e.stability = sr(i(t[s++])) : r === "description" ? e.description = a(t[s++]) : i(t[s++]);
+				} else r === "method_standard" ? e.methodStandard = a(t[s++]) : r === "resolution" ? e.resolution = or(i(t[s++])) : r === "stability" ? e.stability = or(i(t[s++])) : r === "description" ? e.description = a(t[s++]) : i(t[s++]);
 			}
 		}
 		t.push(e);
 	}
 	return t;
 }
-function lr(e, t) {
+function cr(e, t) {
 	return t ? "      " + e + " { value " + String(t.value) + " unit \"" + s(t.unit) + "\" }\n" : "";
 }
-function ur(e) {
+function lr(e) {
 	return e === null ? "" : typeof e == "number" ? String(e) : "\"" + s(e) + "\"";
 }
-function dr(e) {
+function ur(e) {
 	let t = "  required_competence {\n";
 	for (let n of e) {
 		if (t += "    competence " + n.kind + " {\n", n.range) {
 			let e = "      range {";
-			n.range.min !== null && (e += " min " + ur(n.range.min)), n.range.max !== null && (e += " max " + ur(n.range.max)), e += " unit \"" + s(n.range.unit) + "\" }\n", t += e;
+			n.range.min !== null && (e += " min " + lr(n.range.min)), n.range.max !== null && (e += " max " + lr(n.range.max)), e += " unit \"" + s(n.range.unit) + "\" }\n", t += e;
 		}
-		n.methodStandard && (t += "      method_standard \"" + s(n.methodStandard) + "\"\n"), t += lr("resolution", n.resolution), t += lr("stability", n.stability), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
+		n.methodStandard && (t += "      method_standard \"" + s(n.methodStandard) + "\"\n"), t += cr("resolution", n.resolution), t += cr("stability", n.stability), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
 	}
 	return t += "  }\n", t;
 }
-function fr(e) {
+function dr(e) {
 	return e.length >= 2 && e.charAt(0) === "\"" && e.charAt(e.length - 1) === "\"" ? o(e.substr(1, e.length - 2)) : i(e);
 }
-var pr = function(e, t) {
+var fr = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -3620,15 +3632,15 @@ var pr = function(e, t) {
 	for (; s < o.length;) {
 		let t = o[s++];
 		if (s >= o.length) throw Error(`Parsing error: competence_kind. ID ${e}: Expecting value for ${t}`);
-		if (t === "label") n.label = fr(o[s++]);
-		else if (t === "definition") n.definition = fr(o[s++]);
+		if (t === "label") n.label = dr(o[s++]);
+		else if (t === "definition") n.definition = dr(o[s++]);
 		else if (t === "source") n.source = N(i(o[s++]));
 		else if (t === "method_standard") {
 			let t = a(o[s++]);
 			if (s >= o.length) throw Error(`Parsing error: competence_kind. ID ${e}: Expecting title for method_standard ${t}`);
 			n.methodStandards.push({
 				id: t,
-				title: fr(o[s++])
+				title: dr(o[s++])
 			});
 		} else if (t === "ref") {
 			let e = b(o, s, a, i);
@@ -3636,7 +3648,7 @@ var pr = function(e, t) {
 		} else s++;
 	}
 	return (t) => (t.competenceKinds[e] = n, t);
-}, mr = function(e) {
+}, pr = function(e) {
 	let t = "competence_kind " + e.id + " {\n";
 	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");
 	for (let n of e.methodStandards) t += "  method_standard " + n.id + " \"" + s(n.title) + "\"\n";
@@ -3644,13 +3656,13 @@ var pr = function(e, t) {
 };
 //#endregion
 //#region src/ser-des/config/conformanceTest.ts
-function z(e) {
+function B(e) {
 	return n(a(e)).map(A).map(a).filter((e) => e.length > 0);
 }
-function hr(e) {
+function mr(e) {
 	return e.trim() !== "" && !isNaN(Number(e)) ? Number(e) : e;
 }
-function gr(e) {
+function hr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "variable") {
@@ -3696,7 +3708,7 @@ function gr(e) {
 	}
 	return t;
 }
-function _r(e) {
+function gr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "precondition") {
@@ -3721,7 +3733,7 @@ function _r(e) {
 	}
 	return t;
 }
-function vr(e) {
+function _r(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "observable") {
@@ -3746,7 +3758,7 @@ function vr(e) {
 	}
 	return t;
 }
-function yr(e, t) {
+function vr(e, t) {
 	let r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
@@ -3803,7 +3815,7 @@ function yr(e, t) {
 		t.acceptanceCriteria.push(c);
 	}
 }
-function br(e) {
+function yr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "value") {
@@ -3826,7 +3838,7 @@ function br(e) {
 	}
 	return t;
 }
-function xr(e) {
+function br(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = A(r[i++]);
@@ -3835,7 +3847,7 @@ function xr(e) {
 	}
 	return t;
 }
-function Sr(e) {
+function xr(e) {
 	let t = {
 		by: "",
 		values: {}
@@ -3854,7 +3866,7 @@ function Sr(e) {
 					for (; l < o.length;) {
 						let e = A(o[l++]);
 						if (l >= o.length) break;
-						o[l] === ":" && l++, l < o.length && (c[e] = hr(a(o[l++])));
+						o[l] === ":" && l++, l < o.length && (c[e] = mr(a(o[l++])));
 					}
 					t.values[r] = c;
 				}
@@ -3863,7 +3875,7 @@ function Sr(e) {
 	}
 	return t;
 }
-var Cr = function(e, t) {
+var Sr = function(e, t) {
 	let o = {
 		id: e,
 		name: "",
@@ -3935,30 +3947,30 @@ var Cr = function(e, t) {
 						action: y(() => e[n + 1]),
 						outputs: []
 					};
-					n += 2, e[n] === "inputs" && n + 1 < e.length && (r.inputs = z(e[n + 1]), n += 2), e[n] === "outputs" && n + 1 < e.length && (r.outputs = z(e[n + 1]), n += 2), o.procedure.push(r);
+					n += 2, e[n] === "inputs" && n + 1 < e.length && (r.inputs = B(e[n + 1]), n += 2), e[n] === "outputs" && n + 1 < e.length && (r.outputs = B(e[n + 1]), n += 2), o.procedure.push(r);
 				} else n++;
 			}
-		} else if (e === "procedure_steps") o.procedureSteps = z(t());
+		} else if (e === "procedure_steps") o.procedureSteps = B(t());
 		else if (e === "kind") o.kind = a(t());
 		else if (e === "obligation") o.obligation = a(t());
 		else if (e === "obligation_note") o.obligationNote = y(t);
-		else if (e === "test_subject") o.testSubject = xr(i(t()));
-		else if (e === "variables") o.variables = gr(i(t()));
-		else if (e === "observables") o.observables = vr(i(t()));
-		else if (e === "conditions_to_enforce" || e === "conditionsToEnforce") o.conditionsToEnforce = z(t());
-		else if (e === "preconditions") o.preconditions = _r(i(t()));
-		else if (e === "reference_materials") o.referenceMaterials = z(t());
-		else if (e === "required_competence") o.requiredCompetence = cr(i(t()));
-		else if (e === "acceptance_criteria") yr(i(t()), o);
-		else if (e === "design") o.design = $n(i(t()));
+		else if (e === "test_subject") o.testSubject = br(i(t()));
+		else if (e === "variables") o.variables = hr(i(t()));
+		else if (e === "observables") o.observables = _r(i(t()));
+		else if (e === "conditions_to_enforce" || e === "conditionsToEnforce") o.conditionsToEnforce = B(t());
+		else if (e === "preconditions") o.preconditions = gr(i(t()));
+		else if (e === "reference_materials") o.referenceMaterials = B(t());
+		else if (e === "required_competence") o.requiredCompetence = sr(i(t()));
+		else if (e === "acceptance_criteria") vr(i(t()), o);
+		else if (e === "design") o.design = Qn(i(t()));
 		else if (e === "acceptance") o.acceptance = Wn(i(t()));
-		else if (e === "dependencies") o.dependencies = z(t());
-		else if (e === "instances") o.instances = Sr(i(t()));
+		else if (e === "dependencies") o.dependencies = B(t());
+		else if (e === "instances") o.instances = xr(i(t()));
 		else if (e === "inherits_from") o.inheritsFrom = a(t());
-		else if (e === "result_forms") o.resultForms = z(t());
-		else if (e === "produces_artifacts") o.producesArtifacts = z(t());
-		else if (e === "report_rows") o.reportRows = z(t());
-		else if (e === "derived_values") o.derivedValues = br(i(t()));
+		else if (e === "result_forms") o.resultForms = B(t());
+		else if (e === "produces_artifacts") o.producesArtifacts = B(t());
+		else if (e === "report_rows") o.reportRows = B(t());
+		else if (e === "derived_values") o.derivedValues = yr(i(t()));
 		else if (e === "validate_measurement") {
 			let e = r(t());
 			for (let t of e) t.startsWith("\"") && o.measurements.push(i(t));
@@ -3969,7 +3981,7 @@ var Cr = function(e, t) {
 		construct: "conformance_test",
 		id: e
 	}), (t) => (t.conformanceTests[e] = o, t);
-}, wr = function(e) {
+}, Cr = 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 += T(n, "  ", s);
 	else e.sourceRef && e.sourceRef.doc ? t += T(e.sourceRef, "  ", s) : e.reference && (t += "  reference " + e.reference + "\n");
@@ -4030,7 +4042,7 @@ var Cr = function(e, t) {
 		}
 		t += "  }\n";
 	}
-	if (e.referenceMaterials.length > 0 && (t += "  reference_materials { " + e.referenceMaterials.join(" ") + " }\n"), e.requiredCompetence.length > 0 && (t += dr(e.requiredCompetence)), e.acceptanceCriteria.length > 0 || e.acceptanceCriteriaType || e.acceptancePassIf) {
+	if (e.referenceMaterials.length > 0 && (t += "  reference_materials { " + e.referenceMaterials.join(" ") + " }\n"), e.requiredCompetence.length > 0 && (t += ur(e.requiredCompetence)), e.acceptanceCriteria.length > 0 || e.acceptanceCriteriaType || e.acceptancePassIf) {
 		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 || "\"\"") + " { ";
@@ -4038,7 +4050,7 @@ var Cr = function(e, t) {
 		}
 		t += "  }\n";
 	}
-	if (e.design && (t += ar(e.design, "  ")), e.acceptance && (t += Gn(e.acceptance, "  ") + "\n"), e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.instances) {
+	if (e.design && (t += ir(e.design, "  ")), e.acceptance && (t += Gn(e.acceptance, "  ") + "\n"), e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.instances) {
 		let n = "  instances { by " + e.instances.by + " values { ";
 		for (let [t, r] of Object.entries(e.instances.values)) {
 			n += t + " { ";
@@ -4053,7 +4065,7 @@ var Cr = function(e, t) {
 		t += "  }\n";
 	}
 	return e.sourceDiscrepancy && (t += D(e.sourceDiscrepancy, "  ") + "\n"), t += "}\n", t;
-}, Tr = function(e, t) {
+}, wr = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -4082,6 +4094,7 @@ var Cr = function(e, t) {
 		else if (e === "section") n.section = y(t);
 		else if (e === "note") n.note = y(t);
 		else if (e === "source") n.source = y(t);
+		else if (e === "overlay") n.overlay = t() === "true";
 		else if (e === "scope_note") n.scopeNote = y(t);
 		else if (e === "language") n.language = y(t);
 		else if (e === "form_type") n.formType = y(t);
@@ -4096,7 +4109,7 @@ var Cr = function(e, t) {
 		construct: "term",
 		id: e
 	}), (t) => (t.terms[e] = n, t);
-}, Er = function(e) {
+}, Tr = function(e) {
 	let t = "term " + e.id + " {\n";
 	e.label && (t += "  label \"" + s(e.label) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.symbolId && (t += "  symbol " + e.symbolId + "\n"), e.vocabRef && (t += "  vocab_ref { register " + e.vocabRef.register + " clause \"" + s(e.vocabRef.clause) + "\" }\n"), e.vocabTerm && (t += "  vocab_term \"" + s(e.vocabTerm) + "\"\n"), e.section && (t += "  section \"" + s(e.section) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n"), e.source && (t += "  source \"" + s(e.source) + "\"\n"), e.scopeNote && (t += "  scope_note \"" + s(e.scopeNote) + "\"\n"), e.language && (t += "  language \"" + s(e.language) + "\"\n"), e.formType && (t += "  form_type \"" + s(e.formType) + "\"\n"), e.partOfSpeech && (t += "  part_of_speech \"" + s(e.partOfSpeech) + "\"\n");
 	let n = (e) => /\s/.test(e) ? "\"" + s(e) + "\"" : e;
@@ -4106,17 +4119,17 @@ var Cr = function(e, t) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, Dr = [
+}, Er = [
 	"none",
 	"max",
 	"mean",
 	"worst_case",
 	"max_abs_over_window"
 ];
-function Or(e) {
+function Dr(e) {
 	return n(a(e)).map(A).map(a).filter((e) => e.length > 0);
 }
-var kr = function(e, t) {
+var Or = function(e, t) {
 	let r = {
 		id: e,
 		quantityKind: "",
@@ -4138,10 +4151,10 @@ var kr = function(e, t) {
 		} else if (t === "symbol") r.symbol = y(o);
 		else if (t === "behavior") r.behavior = o();
 		else if (t === "derive" || t === "expression") r.derive = y(o);
-		else if (t === "inputs" || t === "uses") r.inputs = Or(o());
+		else if (t === "inputs" || t === "uses") r.inputs = Dr(o());
 		else if (t === "series_reduction") {
 			let t = o();
-			if (!Dr.includes(t)) throw Error(`Parsing error: verdict. ID ${e}: Unknown series_reduction ${t} (valid: ${Dr.join(", ")})`);
+			if (!Er.includes(t)) throw Error(`Parsing error: verdict. ID ${e}: Unknown series_reduction ${t} (valid: ${Er.join(", ")})`);
 			r.seriesReduction = t;
 		} else if (t === "acceptance") r.acceptance = Wn(i(o()));
 		else if (t === "source" || t === "reference") {
@@ -4156,7 +4169,7 @@ var kr = function(e, t) {
 		construct: "verdict",
 		id: e
 	}), (t) => (t.verdicts[e] = r, t);
-}, Ar = function(e) {
+}, kr = 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 && (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 += Gn(e.acceptance, "  ") + "\n");
 	let n = e.sourceRefs && e.sourceRefs.length > 0 ? e.sourceRefs : e.source && (e.source.doc || e.source.clause) ? [e.source] : [];
@@ -4165,7 +4178,7 @@ var kr = function(e, t) {
 };
 //#endregion
 //#region src/ser-des/config/referenceMaterial.ts
-function jr(e) {
+function Ar(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "field") {
@@ -4191,7 +4204,7 @@ function jr(e) {
 	}
 	return t;
 }
-function Mr(e) {
+function jr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "constraint") {
@@ -4248,7 +4261,7 @@ function Mr(e) {
 	}
 	return t;
 }
-var Nr = function(e, t) {
+var Mr = function(e, t) {
 	let n = {
 		id: e,
 		kind: "",
@@ -4268,15 +4281,15 @@ var Nr = function(e, t) {
 		} else if (e === "ref") {
 			let e = x(t, r, a, i);
 			w(n, e) || (n.refs ??= []).push(e);
-		} else if (e === "identity_fields") n.identityFields = jr(i(t()));
-		else if (e === "constraints") n.constraints = Mr(i(t()));
+		} else if (e === "identity_fields") n.identityFields = Ar(i(t()));
+		else if (e === "constraints") n.constraints = jr(i(t()));
 		else return !1;
 		return !0;
 	}, {
 		construct: "reference_material",
 		id: e
 	}), (t) => (t.referenceMaterials[e] = n, t);
-}, Pr = function(e) {
+}, Nr = function(e) {
 	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] : [];
@@ -4299,7 +4312,7 @@ var Nr = function(e, t) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, Fr = function(e, t) {
+}, Pr = function(e, t) {
 	let n = {
 		id: e,
 		kind: "",
@@ -4321,16 +4334,16 @@ var Nr = function(e, t) {
 		} else t === "description" || t === "definition" ? n.description = a(o[s++]) : t === "subject_kinds" ? n.subjectKinds = r(i(o[s++])).map(a) : t === "target_kinds" ? n.targetKinds = r(i(o[s++])).map(a) : t === "resolution" ? n.resolution = a(o[s++]) : t === "inverse" ? n.inverse = a(o[s++]) : t === "transitive" ? n.transitive = a(o[s++]) === "true" : t === "symmetric" ? n.symmetric = a(o[s++]) === "true" : s++;
 	}
 	return (t) => (t.predicates ??= {}, t.predicates[e] = n, t);
-}, Ir = function(e) {
+}, Fr = function(e) {
 	let t = "predicate " + e.id + " {\n";
 	return e.kind && (t += "  kind " + e.kind + "\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n"), e.subjectKinds.length > 0 && (t += "  subject_kinds { " + e.subjectKinds.join(" ") + " }\n"), e.targetKinds.length > 0 && (t += "  target_kinds { " + e.targetKinds.join(" ") + " }\n"), e.resolution && (t += "  resolution " + e.resolution + "\n"), e.inverse && (t += "  inverse " + e.inverse + "\n"), e.transitive && (t += "  transitive true\n"), e.symmetric && (t += "  symmetric true\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/constraint.ts
-function Lr(e) {
+function Ir(e) {
 	return e.length >= 2 && e.charAt(0) === "\"" && e.charAt(e.length - 1) === "\"" ? o(e.substr(1, e.length - 2)) : i(e);
 }
-var Rr = function(e, t) {
+var Lr = function(e, t) {
 	let n = {
 		id: e,
 		stereotype: "",
@@ -4344,9 +4357,9 @@ var Rr = function(e, t) {
 		let t = o[s++];
 		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 = Lr(o[s++]);
-		else if (t === "check") n.check = Lr(o[s++]);
-		else if (t === "violation_meaning") n.violationMeaning = Lr(o[s++]);
+		else if (t === "name") n.name = Ir(o[s++]);
+		else if (t === "check") n.check = Ir(o[s++]);
+		else if (t === "violation_meaning") n.violationMeaning = Ir(o[s++]);
 		else if (t === "on_violation") n.onViolation = a(o[s++]);
 		else if (t === "source") n.source = N(i(o[s++]));
 		else if (t === "ref") {
@@ -4355,10 +4368,10 @@ var Rr = function(e, t) {
 		} else s++;
 	}
 	return (t) => (t.constraints[e] = n, t);
-}, zr = function(e) {
+}, Rr = function(e) {
 	let t = "constraint " + e.id + " {\n";
 	return e.stereotype && (t += "  stereotype " + e.stereotype + "\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), 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 += "}\n", t;
-}, Br = ["open", "resolved"], Vr = function(e, t) {
+}, zr = ["open", "resolved"], Br = function(e, t) {
 	let i = {
 		id: e,
 		status: "",
@@ -4373,7 +4386,7 @@ var Rr = function(e, t) {
 		if (s >= o.length) throw Error(`Parsing error: discrepancy_record. ID ${e}: Expecting value for ${t}`);
 		if (t === "status") {
 			let t = a(o[s++]);
-			if (!Br.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown status ${t} (valid: ${Br.join(", ")})`);
+			if (!zr.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown status ${t} (valid: ${zr.join(", ")})`);
 			i.status = t;
 		} else if (t === "summary") i.summary = a(o[s++]);
 		else if (t === "sources") i.sources = n(a(o[s++])).map(a).filter((e) => e.length > 0);
@@ -4384,13 +4397,13 @@ var Rr = function(e, t) {
 		} else t === "governing" ? i.governing = a(o[s++]) : t === "rationale" ? i.rationale = a(o[s++]) : s++;
 	}
 	return (t) => (t.discrepancyRecords[e] = i, t);
-}, Hr = function(e) {
+}, Vr = function(e) {
 	let t = "discrepancy_record " + e.id + " {\n";
 	return e.status && (t += "  status " + e.status + "\n"), e.summary && (t += "  summary \"" + s(e.summary) + "\"\n"), t += "  sources { " + e.sources.map((e) => "\"" + s(e) + "\"").join(" ") + " }\n", e.resolution && (t += "  resolution " + e.resolution + "\n"), e.governing && (t += "  governing \"" + s(e.governing) + "\"\n"), e.rationale && (t += "  rationale \"" + s(e.rationale) + "\"\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/testPointSet.ts
-function Ur(e) {
+function Hr(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -4410,7 +4423,7 @@ function Ur(e) {
 	}
 	return t;
 }
-function Wr(e) {
+function Ur(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "point") {
@@ -4435,7 +4448,7 @@ function Wr(e) {
 	}
 	return t;
 }
-var Gr = function(e, t) {
+var Wr = function(e, t) {
 	let n = {
 		id: e,
 		description: "",
@@ -4452,16 +4465,16 @@ var Gr = function(e, t) {
 		} else if (e === "ref") {
 			let e = x(t, r, a, i);
 			w(n, e) || (n.refs ??= []).push(e);
-		} else if (e === "cardinality") n.cardinality = Ur(i(t()));
+		} else if (e === "cardinality") n.cardinality = Hr(i(t()));
 		else if (e === "repetitions_per_point") n.repetitionsPerPoint = Number(a(t()));
-		else if (e === "points") n.points = Wr(i(t()));
+		else if (e === "points") n.points = Ur(i(t()));
 		else return !1;
 		return !0;
 	}, {
 		construct: "test_point_set",
 		id: e
 	}), (t) => (t.testPointSets[e] = n, t);
-}, Kr = function(e) {
+}, Gr = function(e) {
 	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] : [];
@@ -4488,10 +4501,10 @@ var Gr = function(e, t) {
 };
 //#endregion
 //#region src/ser-des/config/requirement.ts
-function B(e) {
+function V(e) {
 	return n(a(e)).map(A).map(a).filter((e) => e.length > 0);
 }
-function qr(e) {
+function Kr(e) {
 	let t = {
 		verdict: "",
 		op: "",
@@ -4505,7 +4518,7 @@ function qr(e) {
 	}
 	return t;
 }
-function Jr(e) {
+function qr(e) {
 	let t = {
 		expression: "",
 		uses: [],
@@ -4519,11 +4532,11 @@ function Jr(e) {
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "expression" ? t.expression = a(r[o++]) : e === "uses" ? t.uses = B(r[o++]) : e === "modality" ? t.modality = a(r[o++]) : e === "relative_to" ? t.relativeTo = a(r[o++]) : e === "notes" ? t.notes = a(r[o++]) : e === "accepts" ? t.accepts = qr(i(r[o++])) : e === "acceptance" ? t.acceptance = Wn(i(r[o++])) : e === "source_discrepancy" ? t.sourceDiscrepancy = E(i(r[o++])) : o = _(r, o, e);
+		e === "expression" ? t.expression = a(r[o++]) : e === "uses" ? t.uses = V(r[o++]) : e === "modality" ? t.modality = a(r[o++]) : e === "relative_to" ? t.relativeTo = a(r[o++]) : e === "notes" ? t.notes = a(r[o++]) : e === "accepts" ? t.accepts = Kr(i(r[o++])) : e === "acceptance" ? t.acceptance = Wn(i(r[o++])) : e === "source_discrepancy" ? t.sourceDiscrepancy = E(i(r[o++])) : o = _(r, o, e);
 	}
 	return t;
 }
-function Yr(e) {
+function Jr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "subject") {
@@ -4547,7 +4560,7 @@ function Yr(e) {
 	}
 	return t;
 }
-function Xr(e) {
+function Yr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "param") {
@@ -4581,14 +4594,14 @@ function Xr(e) {
 						if (o >= r.length) break;
 						t === "min" ? (e.rangeMin = a(r[o++]), e.hasRange = !0) : t === "max" ? (e.rangeMax = a(r[o++]), e.hasRange = !0) : i(r[o++]);
 					}
-				} else r === "enum_values" ? e.enumValues = B(t[s++]) : i(t[s++]);
+				} else r === "enum_values" ? e.enumValues = V(t[s++]) : i(t[s++]);
 			}
 		}
 		t.push(e);
 	}
 	return t;
 }
-var Zr = function(e, t) {
+var Xr = function(e, t) {
 	let o = {
 		id: e,
 		name: "",
@@ -4614,10 +4627,10 @@ var Zr = function(e, t) {
 		if (e === "name") o.name = a(s[c++]);
 		else if (e === "statement") o.statement = a(s[c++]);
 		else if (e === "guidance") o.guidance = a(s[c++]);
-		else if (e === "binds_to") o.bindsTo = B(s[c++]);
-		else if (e === "subjects") o.subjects = Yr(i(s[c++]));
-		else if (e === "parameters") o.parameters = Xr(i(s[c++]));
-		else if (e === "limit") o.limit = Jr(i(s[c++]));
+		else if (e === "binds_to") o.bindsTo = V(s[c++]);
+		else if (e === "subjects") o.subjects = Jr(i(s[c++]));
+		else if (e === "parameters") o.parameters = Yr(i(s[c++]));
+		else if (e === "limit") o.limit = qr(i(s[c++]));
 		else if (e === "applicability") o.applicability = P(i(s[c++]));
 		else if (e === "channel") o.channel = a(s[c++]);
 		else if (e === "report_row") o.reportRow = a(s[c++]);
@@ -4630,7 +4643,7 @@ var Zr = function(e, t) {
 				if (t >= e.length) break;
 				n === "method" ? o.verificationMethod = a(e[t++]) : n === "description" ? o.verificationDescription = a(e[t++]) : i(e[t++]);
 			}
-		} else if (e === "dependencies") o.dependencies = B(s[c++]);
+		} else if (e === "dependencies") o.dependencies = V(s[c++]);
 		else if (e === "source_discrepancy") o.sourceDiscrepancy = E(i(s[c++]));
 		else if (e === "source" || e === "reference") {
 			let e = N(i(s[c++]));
@@ -4642,7 +4655,7 @@ var Zr = function(e, t) {
 	}
 	return (t) => (t.requirements[e] = o, t);
 };
-function Qr(e) {
+function Zr(e) {
 	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.accepts) {
 		let n = e.accepts, r = "    accepts { verdict " + n.verdict;
@@ -4650,7 +4663,7 @@ function Qr(e) {
 	}
 	return e.acceptance && (t += Gn(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += D(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
 }
-var $r = function(e) {
+var Qr = function(e) {
 	let t = "requirement " + e.id + " {\n";
 	if (e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.statement && (t += "  statement \"" + s(e.statement) + "\"\n"), e.guidance && (t += "  guidance \"" + s(e.guidance) + "\"\n"), e.bindsTo.length > 0 && (t += "  binds_to { " + e.bindsTo.join(" ") + " }\n"), e.subjects.length > 0) {
 		t += "  subjects { ";
@@ -4665,7 +4678,7 @@ var $r = function(e) {
 		}
 		t += "  }\n";
 	}
-	if (e.limit && (t += Qr(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + F(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 += Zr(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + F(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";
 	}
@@ -4673,7 +4686,7 @@ var $r = function(e) {
 	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += T(n, "  ", s);
 	for (let n of e.refs ?? []) t += "  ref " + n.predicate + " \"" + s(n.target) + "\"" + (n.note ? " { note \"" + s(n.note) + "\" }" : "") + "\n";
 	return t += "}\n", t;
-}, ei = function(e, t) {
+}, $r = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -4685,46 +4698,46 @@ var $r = function(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "name" ? n.name = a(o[s++]) : e === "title" ? n.title = a(o[s++]) : e === "description" ? n.description = a(o[s++]) : e === "subject" ? n.subject = a(o[s++]) : e === "guidance" ? n.guidance = a(o[s++]) : e === "applicability" ? n.applicability = P(i(o[s++])) : e === "dependencies" ? n.dependencies = B(o[s++]) : e === "reference" ? n.referenceIds = B(o[s++]) : s = _(o, s, e);
+		e === "name" ? n.name = a(o[s++]) : e === "title" ? n.title = a(o[s++]) : e === "description" ? n.description = a(o[s++]) : e === "subject" ? n.subject = a(o[s++]) : e === "guidance" ? n.guidance = a(o[s++]) : e === "applicability" ? n.applicability = P(i(o[s++])) : e === "dependencies" ? n.dependencies = V(o[s++]) : e === "reference" ? n.referenceIds = V(o[s++]) : s = _(o, s, e);
 	}
 	return (t) => (t.requirementClasses[e] = n, t);
-}, ti = function(e) {
+}, ei = 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    " + F(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"), t += "}\n", t;
-}, ni = {
+}, ti = {
 	keyword: "requirement",
 	field: "requirements",
 	takesID: !0,
-	parse: Zr,
-	dump: $r
-}, ri = {
+	parse: Xr,
+	dump: Qr
+}, ni = {
 	keyword: "requirement_class",
 	field: "requirementClasses",
 	takesID: !0,
-	parse: ei,
-	dump: ti
+	parse: $r,
+	dump: ei
 };
 //#endregion
 //#region src/ser-des/config/packageManifest.ts
-function V(e) {
+function H(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-var ii = [
+var ri = [
 	"core",
 	"module",
 	"rec",
 	"product_reference",
 	"certification_program"
-], ai = [
+], ii = [
 	"current",
 	"preview",
 	"superseded",
 	"withdrawn"
 ];
-function oi(e) {
-	return e.startsWith("{") ? V(e) : [a(e)];
+function ai(e) {
+	return e.startsWith("{") ? H(e) : [a(e)];
 }
-var si = function(e) {
+var oi = function(e) {
 	let t = {
 		id: "",
 		title: "",
@@ -4743,12 +4756,12 @@ var si = function(e) {
 		if (e === "id") t.id = a(r[o++]);
 		else if (e === "title") t.title = a(r[o++]);
 		else if (e === "version") t.version = a(r[o++]);
-		else if (e === "editions") t.editions = V(r[o++]);
+		else if (e === "editions") t.editions = H(r[o++]);
 		else if (e === "baseUrn" || e === "base_urn") t.baseUrn = a(r[o++]);
 		else if (e === "extends") t.extends = a(r[o++]);
 		else if (e === "uses") {
 			let e = [], n = {};
-			for (let t of V(r[o++])) {
+			for (let t of H(r[o++])) {
 				let r = t.indexOf("@");
 				if (r === -1) {
 					e.push(t);
@@ -4761,20 +4774,20 @@ var si = function(e) {
 			t.uses = e, Object.keys(n).length > 0 && (t.usePins = n);
 		} else if (e === "kind") {
 			let e = a(r[o++]);
-			if (!ii.includes(e)) throw Error(`Parsing error: package: Expected kind ${ii.join("|")}, got "${e}"`);
+			if (!ri.includes(e)) throw Error(`Parsing error: package: Expected kind ${ri.join("|")}, got "${e}"`);
 			t.kind = e;
 		} else if (e === "manufacturer") t.manufacturer = a(r[o++]);
 		else if (e === "product") t.product = a(r[o++]);
-		else if (e === "maps_to" || e === "mapsTo") t.mapsTo = V(r[o++]);
+		else if (e === "maps_to" || e === "mapsTo") t.mapsTo = H(r[o++]);
 		else if (e === "ref") {
 			let e = b(r, o, a, i);
 			w(t, e.ref) || (t.refs ??= []).push(e.ref), o = e.next;
 		} else if (e === "scheme_type" || e === "schemeType") t.schemeType = a(r[o++]);
-		else if (e === "provides") t.provides = V(r[o++]);
-		else if (e === "requires") t.requires = V(r[o++]);
-		else if (e === "waives") t.waives = V(r[o++]);
-		else if (e === "supersedes") t.supersedes = oi(r[o++]);
-		else if (e === "replaces") t.replaces = oi(r[o++]);
+		else if (e === "provides") t.provides = H(r[o++]);
+		else if (e === "requires") t.requires = H(r[o++]);
+		else if (e === "waives") t.waives = H(r[o++]);
+		else if (e === "supersedes") t.supersedes = ai(r[o++]);
+		else if (e === "replaces") t.replaces = ai(r[o++]);
 		else if (e === "validity") {
 			let e = n(i(r[o++])), s = { from: "" }, c = 0;
 			for (; c < e.length;) {
@@ -4785,10 +4798,10 @@ var si = function(e) {
 			t.validity = s;
 		} else if (e === "status") {
 			let e = a(r[o++]);
-			if (!ai.includes(e)) throw Error(`Parsing error: package: Expected status ${ai.join("|")}, got "${e}"`);
+			if (!ii.includes(e)) throw Error(`Parsing error: package: Expected status ${ii.join("|")}, got "${e}"`);
 			t.status = e;
 		} else if (e === "default_spelling" || e === "defaultSpelling") t.defaultSpelling = a(r[o++]);
-		else if (e === "spellings") t.spellings = V(r[o++]);
+		else if (e === "spellings") t.spellings = H(r[o++]);
 		else if (e === "description") t.description = a(r[o++]);
 		else if (e === "source") {
 			let e = {
@@ -4798,20 +4811,20 @@ var si = function(e) {
 			for (; c < s.length;) {
 				let t = s[c++];
 				if (c >= s.length) break;
-				t === "collection" ? e.collection = a(s[c++]) : t === "parts" ? e.parts = V(s[c++]) : i(s[c++]);
+				t === "collection" ? e.collection = a(s[c++]) : t === "parts" ? e.parts = H(s[c++]) : i(s[c++]);
 			}
 			t.source = e;
 		} else o = _(r, o, e);
 	}
 	return (e) => (e.packageManifest = t, e);
 };
-function ci(e) {
+function si(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 e.schemeType && (t += "  scheme_type " + e.schemeType + "\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.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 li = {
+var ci = {
 	keyword: "conformance_class",
 	field: "conformanceClasses",
 	takesID: !0,
@@ -4831,7 +4844,7 @@ var li = {
 		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 = P(i(s[c++])) : e === "test_subject" ? o.testSubject = xr(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 = _(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 = P(i(s[c++])) : e === "test_subject" ? o.testSubject = br(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 = _(s, c, e);
 		}
 		return (t) => (t.conformanceClasses[e] = o, t);
 	},
@@ -4844,24 +4857,24 @@ var li = {
 		}
 		return e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
-}, ui = [
+}, li = [
 	"public",
 	"registered",
 	"authority"
-], di = /* @__PURE__ */ new Set([
+], ui = /* @__PURE__ */ new Set([
 	"kind",
 	"serves",
 	"does",
 	"payload"
 ]);
-function fi(e, t) {
+function di(e, t) {
 	let r = e[t] ?? "";
 	if (r.startsWith("{")) return {
 		names: n(i(r)).flatMap((e) => e.split(",")).map((e) => a(e.trim())).filter((e) => e.length > 0),
 		next: t + 1
 	};
 	let o = [], s = t;
-	for (; s < e.length && !di.has(e[s]) && !e[s].startsWith("{");) {
+	for (; s < e.length && !ui.has(e[s]) && !e[s].startsWith("{");) {
 		for (let t of e[s].split(",")) {
 			let e = a(t.trim());
 			e && o.push(e);
@@ -4873,7 +4886,7 @@ function fi(e, t) {
 		next: s
 	};
 }
-function pi(e, t) {
+function fi(e, t) {
 	let r = {
 		name: e,
 		kind: "",
@@ -4886,10 +4899,10 @@ function pi(e, t) {
 		if (s > o.length) break;
 		if (e === "kind") r.kind = a(o[s++] ?? "");
 		else if (e === "serves") {
-			let e = fi(o, s);
+			let e = di(o, s);
 			r.serves = e.names, s = e.next;
 		} else if (e === "does") {
-			let e = fi(o, s);
+			let e = di(o, s);
 			r.does = e.names, s = e.next;
 		} else if (e === "payload") {
 			let e = n(i(o[s++] ?? "")), t = {
@@ -4907,7 +4920,7 @@ function pi(e, t) {
 	}
 	return r;
 }
-function mi(e) {
+function pi(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -4919,7 +4932,7 @@ function mi(e) {
 	}
 	return t;
 }
-function hi(e, t) {
+function mi(e, t) {
 	let r = {
 		id: e,
 		operations: [],
@@ -4931,19 +4944,19 @@ function hi(e, t) {
 		if (s > o.length) break;
 		if (e === "operation") {
 			let e = A(o[s++] ?? ""), t = s < o.length ? i(o[s++]) : "";
-			e && r.operations.push(pi(e, t));
-		} else e === "access" ? r.access = mi(i(o[s++] ?? "")) : e === "profile" ? r.profile = a(o[s++] ?? "") : i(o[s++] ?? "");
+			e && r.operations.push(fi(e, t));
+		} else e === "access" ? r.access = pi(i(o[s++] ?? "")) : e === "profile" ? r.profile = a(o[s++] ?? "") : i(o[s++] ?? "");
 	}
 	return r;
 }
-function gi(e, t) {
+function hi(e, t) {
 	let n = t + "operation " + k(e.name) + " {";
 	return e.kind && (n += " kind " + k(e.kind)), e.serves.length > 0 && (n += " serves { " + e.serves.map(k).join(" ") + " }"), e.does.length > 0 && (n += " does { " + e.does.map(k).join(" ") + " }"), e.payload && (n += " payload { quantity_kind " + k(e.payload.quantityKind) + " unit " + k(e.payload.unit) + " timestamp " + (e.payload.timestamp ? "true" : "false") + " }"), n + " }\n";
 }
-function _i(e, t) {
+function gi(e, t) {
 	let n = t + "endpoint " + k(e.id) + " {\n";
-	for (let r of e.operations) n += gi(r, t + "  ");
-	let r = ui.filter((t) => (e.access[t] ?? []).length > 0), i = Object.keys(e.access).filter((e) => !ui.includes(e));
+	for (let r of e.operations) n += hi(r, t + "  ");
+	let r = li.filter((t) => (e.access[t] ?? []).length > 0), i = Object.keys(e.access).filter((e) => !li.includes(e));
 	if (r.length + i.length > 0) {
 		n += t + "  access {";
 		for (let t of [...r, ...i]) n += " " + t + " { " + (e.access[t] ?? []).map(k).join(" ") + " }";
@@ -4951,7 +4964,7 @@ function _i(e, t) {
 	}
 	return e.profile && (n += t + "  profile " + k(e.profile) + "\n"), n + t + "}\n";
 }
-function vi(e, t) {
+function _i(e, t) {
 	let r = {
 		aspect: "",
 		via: "",
@@ -4970,11 +4983,11 @@ function vi(e, t) {
 		next: t
 	};
 }
-function yi(e, t) {
+function vi(e, t) {
 	let n = t + "serve " + k(e.aspect) + " via " + k(e.via);
 	return e.freshWithin && (n += " { fresh_within " + k(e.freshWithin) + " }"), n + "\n";
 }
-var bi = {
+var yi = {
 	keyword: "connector_profile",
 	field: "connectorProfiles",
 	takesID: !0,
@@ -4999,7 +5012,7 @@ var bi = {
 };
 //#endregion
 //#region src/ser-des/config/composition.ts
-function xi(e, t) {
+function bi(e, t) {
 	let r = {
 		id: e,
 		product: "",
@@ -5019,7 +5032,7 @@ function xi(e, t) {
 	}
 	return r;
 }
-function Si(e) {
+function xi(e) {
 	let t = [];
 	for (let n of e.split("\n")) {
 		let e = n.trim();
@@ -5042,7 +5055,7 @@ function Si(e) {
 	}
 	return t;
 }
-function Ci(e) {
+function Si(e) {
 	let t = {
 		components: [],
 		decomposition: []
@@ -5051,8 +5064,8 @@ function Ci(e) {
 		let e = n[a++];
 		if (e === "component") {
 			let e = n[a++] ?? "", r = a < n.length ? i(n[a++]) : "";
-			e && t.components.push(xi(e, r));
-		} else if (e === "decomposition") t.decomposition = Si(i(n[a++] ?? ""));
+			e && t.components.push(bi(e, r));
+		} else if (e === "decomposition") t.decomposition = xi(i(n[a++] ?? ""));
 		else if (e === "revision") {
 			let e = Number(n[a++] ?? "");
 			Number.isFinite(e) && (t.revision = e);
@@ -5060,13 +5073,13 @@ function Ci(e) {
 	}
 	return t;
 }
-function wi(e, t) {
+function Ci(e, t) {
 	let n = t + "component " + k(e.id) + " {\n";
 	return n += t + "  product " + k(e.product) + "\n", n += t + "  endpoint " + k(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 Ti(e, t) {
+function wi(e, t) {
 	let n = t + "composed_of {\n";
-	for (let r of e.components) n += wi(r, t + "  ");
+	for (let r of e.components) n += Ci(r, t + "  ");
 	if (e.decomposition.length > 0) {
 		n += t + "  decomposition {\n";
 		for (let r of e.decomposition) n += t + "    " + k(r.register) + " -> " + (r.component === "composite" ? "rule " + k(r.rule ?? "") : k(r.component) + "." + k(r.componentRegister ?? "")) + "\n";
@@ -5076,21 +5089,21 @@ function Ti(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/subject.ts
-function H(e, t, n) {
+function U(e, t, n) {
 	if (!t || !t.doc && !t.clause) return "";
 	let r = t.fragment ? ` fragment "${s(t.fragment)}"` : "";
 	return `${n}${e} { doc "${s(t.doc)}" clause "${s(t.clause)}"${r} }\n`;
 }
-function U(e) {
+function W(e) {
 	return n(a(e)).map(A).map(a).filter((e) => e.length > 0);
 }
-function W(e, t, n) {
+function G(e, t, n) {
 	return t.length === 0 ? "" : `${n}${e} { ${t.join(" ")} }\n`;
 }
-function G(e) {
+function K(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-var Ei = function(e, t) {
+var Ti = function(e, t) {
 	let o = {
 		id: e,
 		extends: "",
@@ -5113,9 +5126,9 @@ var Ei = function(e, t) {
 		if (c >= s.length) break;
 		if (e === "extends") o.extends = a(s[c++]);
 		else if (e === "measurand_kind") o.measurandKind = a(s[c++]);
-		else if (e === "measurand") o.measurand = Di(i(s[c++]));
-		else if (e === "component") o.components.push(Oi(a(s[c++]), i(s[c++])));
-		else if (e === "structure") o.structure.push(ki(a(s[c++]), i(s[c++])));
+		else if (e === "measurand") o.measurand = Ei(i(s[c++]));
+		else if (e === "component") o.components.push(Di(a(s[c++]), i(s[c++])));
+		else if (e === "structure") o.structure.push(Oi(a(s[c++]), i(s[c++])));
 		else if (e === "definition") o.definition = a(s[c++]);
 		else if (e === "note") o.note = a(s[c++]);
 		else if (e === "source") {
@@ -5132,9 +5145,9 @@ var Ei = function(e, t) {
 				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 = N(i(l[u++])) : i(l[u++]);
 			}
 			o.variants.push(r);
-		} else if (e === "dimension") o.dimensions.push(Ai(a(s[c++]), i(s[c++])));
+		} else if (e === "dimension") o.dimensions.push(ki(a(s[c++]), i(s[c++])));
 		else if (e === "per_channel") o.perChannel = a(s[c++]);
-		else if (e === "family_criteria") o.familyCriteria = G(s[c++]);
+		else if (e === "family_criteria") o.familyCriteria = K(s[c++]);
 		else if (e === "family") {
 			let e = n(i(s[c++])), t = 0;
 			for (; t < e.length;) {
@@ -5157,10 +5170,10 @@ var Ei = function(e, t) {
 			for (; t < e.length;) {
 				let n = e[t++];
 				if (t >= e.length) break;
-				n === "dimensions" ? o.familyDefaultDimensions = U(e[t++]) : n === "parameters" ? o.familyDefaultParameters = U(e[t++]) : i(e[t++]);
+				n === "dimensions" ? o.familyDefaultDimensions = W(e[t++]) : n === "parameters" ? o.familyDefaultParameters = W(e[t++]) : i(e[t++]);
 			}
-		} else if (e === "model_group") o.modelGroup = Mi(i(s[c++]));
-		else if (e === "reference") o.referenceIds = G(s[c++]);
+		} else if (e === "model_group") o.modelGroup = ji(i(s[c++]));
+		else if (e === "reference") o.referenceIds = K(s[c++]);
 		else if (e === "ref") {
 			let e = b(s, c, a, i);
 			w(o, e.ref) || (o.refs ??= []).push(e.ref), c = e.next;
@@ -5168,7 +5181,7 @@ var Ei = function(e, t) {
 	}
 	return (t) => (t.instruments[e] = o, t);
 };
-function Di(e) {
+function Ei(e) {
 	let t = {
 		kind: "",
 		description: "",
@@ -5195,7 +5208,7 @@ function Di(e) {
 	}
 	return t;
 }
-function Oi(e, t) {
+function Di(e, t) {
 	let r = {
 		id: e,
 		classId: "",
@@ -5209,7 +5222,7 @@ function Oi(e, t) {
 	}
 	return r;
 }
-function ki(e, t) {
+function Oi(e, t) {
 	let r = {
 		id: e,
 		predicate: "",
@@ -5237,7 +5250,7 @@ function ki(e, t) {
 	}
 	return r;
 }
-function Ai(e, t) {
+function ki(e, t) {
 	let r = {
 		id: e,
 		label: "",
@@ -5257,11 +5270,11 @@ function Ai(e, t) {
 			let t = a(o[s++]);
 			if (t !== "single" && t !== "set") throw Error(`Parsing error: dimension. ID ${e}: Unknown cardinality ${t} (valid: single, set)`);
 			r.cardinality = t;
-		} else t === "label_separator" ? r.labelSeparator = a(o[s++]) : t === "description" ? r.description = a(o[s++]) : t === "reference" || t === "source" ? r.source = N(i(o[s++])) : t === "values" ? r.values = ji(i(o[s++])) : s = _(o, s, t);
+		} else t === "label_separator" ? r.labelSeparator = a(o[s++]) : t === "description" ? r.description = a(o[s++]) : t === "reference" || t === "source" ? r.source = N(i(o[s++])) : t === "values" ? r.values = Ai(i(o[s++])) : s = _(o, s, t);
 	}
 	return r;
 }
-function ji(e) {
+function Ai(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -5280,7 +5293,7 @@ function ji(e) {
 				if (t >= e.length) break;
 				if (r === "label") s.label = a(e[t++]);
 				else if (r === "description") s.description = a(e[t++]);
-				else if (r === "implies") s.implies = U(e[t++]);
+				else if (r === "implies") s.implies = W(e[t++]);
 				else if (r === "term_ref") s.termRef = a(e[t++]);
 				else if (r === "payload") {
 					let r = n(i(e[t++])), o = 0;
@@ -5304,7 +5317,7 @@ function ji(e) {
 	}
 	return t;
 }
-function Mi(e) {
+function ji(e) {
 	let t = {
 		definition: "",
 		identicalCharacteristics: [],
@@ -5316,8 +5329,8 @@ function Mi(e) {
 		let e = r[o++];
 		if (o >= r.length) break;
 		if (e === "definition") t.definition = a(r[o++]);
-		else if (e === "identical_characteristics") t.identicalCharacteristics = U(r[o++]);
-		else if (e === "identical_attributes") t.identicalAttributes = U(r[o++]);
+		else if (e === "identical_characteristics") t.identicalCharacteristics = W(r[o++]);
+		else if (e === "identical_attributes") t.identicalAttributes = W(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(N(i(r[o++])));
@@ -5331,11 +5344,11 @@ function Mi(e) {
 	}
 	return t;
 }
-var Ni = function(e) {
+var Mi = function(e) {
 	let t = "instrument " + e.id + " {\n";
 	if (e.extends && (t += "  extends " + e.extends + "\n"), e.perChannel && (t += "  per_channel " + e.perChannel + "\n"), e.measurandKind && (t += "  measurand_kind " + e.measurandKind + "\n"), e.measurand) {
 		let n = e.measurand;
-		t += "  measurand {\n", n.kind && (t += "    kind " + n.kind + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.context && (t += "    context {", n.context.targetObject && (t += " target_object \"" + s(n.context.targetObject) + "\""), n.context.identificationMethod && (t += " identification_method \"" + s(n.context.identificationMethod) + "\""), t += " }\n"), t += H("source", n.source, "    "), t += "  }\n";
+		t += "  measurand {\n", n.kind && (t += "    kind " + n.kind + "\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), n.context && (t += "    context {", n.context.targetObject && (t += " target_object \"" + s(n.context.targetObject) + "\""), n.context.identificationMethod && (t += " identification_method \"" + s(n.context.identificationMethod) + "\""), t += " }\n"), t += U("source", n.source, "    "), t += "  }\n";
 	}
 	for (let n of e.components ?? []) {
 		let e = "  component " + n.id + " { ";
@@ -5347,7 +5360,7 @@ var Ni = function(e) {
 			for (let e of n.propagation) t += e.property + " " + e.direction + " ";
 			t += "}\n";
 		}
-		n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += H("source", n.source, "    "), t += "  }\n";
+		n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += U("source", n.source, "    "), t += "  }\n";
 	}
 	e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), e.note && (t += "  note \"" + s(e.note) + "\"\n");
 	for (let n of e.variants) {
@@ -5355,7 +5368,7 @@ var Ni = 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) {
-		if (t += "  dimension " + n.id + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.scope && (t += "    scope " + n.scope + "\n"), n.cardinality && (t += "    cardinality " + n.cardinality + "\n"), n.labelSeparator && (t += "    label_separator \"" + s(n.labelSeparator) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += H("reference", n.source, "    "), n.values.length > 0) {
+		if (t += "  dimension " + n.id + " {\n", n.label && (t += "    label \"" + s(n.label) + "\"\n"), n.scope && (t += "    scope " + n.scope + "\n"), n.cardinality && (t += "    cardinality " + n.cardinality + "\n"), n.labelSeparator && (t += "    label_separator \"" + s(n.labelSeparator) + "\"\n"), n.description && (t += "    description \"" + s(n.description) + "\"\n"), t += U("reference", n.source, "    "), n.values.length > 0) {
 			t += "    values {\n";
 			for (let e of n.values) {
 				let n = "      " + e.id;
@@ -5382,16 +5395,16 @@ var Ni = function(e) {
 		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 += W("dimensions", e.familyDefaultDimensions, "    "), t += W("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 += W("identical_characteristics", e.modelGroup.identicalCharacteristics, "    "), t += W("identical_attributes", e.modelGroup.identicalAttributes, "    ");
+	if ((e.familyDefaultDimensions.length > 0 || e.familyDefaultParameters.length > 0) && (t += "  family_defaults {\n", t += G("dimensions", e.familyDefaultDimensions, "    "), t += G("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 += G("identical_characteristics", e.modelGroup.identicalCharacteristics, "    "), t += G("identical_attributes", e.modelGroup.identicalAttributes, "    ");
 		for (let n of e.modelGroup.sources ?? []) t += T(n, "    ", s);
-		for (let n of e.modelGroup.sampleSelection ?? []) t += H("sample_selection", n, "    ");
+		for (let n of e.modelGroup.sampleSelection ?? []) t += U("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 += T(e, "  ", s);
-	return t += S(e.refs, "  ", s), t += W("reference", e.referenceIds, "  "), t += "}\n", t;
-}, Pi = function(e, t) {
+	return t += S(e.refs, "  ", s), t += G("reference", e.referenceIds, "  "), t += "}\n", t;
+}, Ni = function(e, t) {
 	let n = {
 		id: e,
 		symbol: "",
@@ -5427,7 +5440,7 @@ var Ni = function(e) {
 		else if (e === "category") n.category = a(o[s++]);
 		else if (e === "is_dimension") n.isDimension = a(o[s++]) === "true";
 		else if (e === "enum") n.enumRef = a(o[s++]);
-		else if (e === "enum_values") n.enumValues = U(o[s++]);
+		else if (e === "enum_values") n.enumValues = W(o[s++]);
 		else if (e === "note") n.note = a(o[s++]);
 		else if (e === "irdi") n.irdi = a(o[s++]);
 		else if (e === "derived") n.derived = a(o[s++]);
@@ -5437,13 +5450,13 @@ var Ni = function(e) {
 		} else s = _(o, s, e);
 	}
 	return (t) => (t.attributeDefinitions[e] = n, t);
-}, Fi = function(e) {
+}, Pi = function(e) {
 	let t = "attribute_definition " + e.id + " {\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 += T(e, "  ", s);
 	return t += S(e.refs, "  ", s), 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.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.irdi && (t += "  irdi \"" + s(e.irdi) + "\"\n"), e.derived && (t += "  derived \"" + s(e.derived) + "\"\n"), t += "}\n", t;
-}, Ii = function(e, t) {
+}, Fi = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -5462,22 +5475,22 @@ var Ni = function(e) {
 		if (e === "label") n.label = a(o[s++]);
 		else if (e === "description") n.description = a(o[s++]);
 		else if (e === "abstract") n.abstract = a(o[s++]) === "true";
-		else if (e === "extends") n.extends = U(o[s++]);
-		else if (e === "requires") n.requires = U(o[s++]);
-		else if (e === "has_parameters") n.hasParameters = U(o[s++]);
-		else if (e === "satisfies_requirements") n.satisfiesRequirements = G(o[s++]);
-		else if (e === "verified_by_tests" || e === "verified_by") n.verifiedByTests = G(o[s++]);
-		else if (e === "reference") n.referenceIds = G(o[s++]);
+		else if (e === "extends") n.extends = W(o[s++]);
+		else if (e === "requires") n.requires = W(o[s++]);
+		else if (e === "has_parameters") n.hasParameters = W(o[s++]);
+		else if (e === "satisfies_requirements") n.satisfiesRequirements = K(o[s++]);
+		else if (e === "verified_by_tests" || e === "verified_by") n.verifiedByTests = K(o[s++]);
+		else if (e === "reference") n.referenceIds = K(o[s++]);
 		else if (e === "ref") {
 			let e = b(o, s, a, i);
 			w(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else s = _(o, s, e);
 	}
 	return (t) => (t.capabilities[e] = n, t);
-}, Li = function(e) {
+}, Ii = 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 += W("extends", e.extends, "  "), t += W("requires", e.requires, "  "), t += W("has_parameters", e.hasParameters, "  "), t += W("satisfies_requirements", e.satisfiesRequirements, "  "), t += W("verified_by_tests", e.verifiedByTests, "  "), t += W("reference", e.referenceIds, "  "), t += S(e.refs, "  ", s), t += "}\n", t;
-}, Ri = function(e, 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 += G("extends", e.extends, "  "), t += G("requires", e.requires, "  "), t += G("has_parameters", e.hasParameters, "  "), t += G("satisfies_requirements", e.satisfiesRequirements, "  "), t += G("verified_by_tests", e.verifiedByTests, "  "), t += G("reference", e.referenceIds, "  "), t += S(e.refs, "  ", s), t += "}\n", t;
+}, Li = function(e, t) {
 	let n = {
 		id: e,
 		kind: "",
@@ -5496,20 +5509,20 @@ var Ni = function(e) {
 		else if (e === "source" || e === "reference") {
 			let e = N(i(o[s++]));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
-		} else if (e === "verified_by" || e === "verified_by_tests") n.verifiedBy = G(o[s++]);
+		} else if (e === "verified_by" || e === "verified_by_tests") n.verifiedBy = K(o[s++]);
 		else if (e === "ref") {
 			let e = b(o, s, a, i);
 			w(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
 		} else s = _(o, s, e);
 	}
 	return (t) => (t.behaviors[e] = n, t);
-}, zi = function(e) {
+}, Ri = function(e) {
 	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 += T(e, "  ", s);
-	return t += S(e.refs, "  ", s), t += W("verified_by", e.verifiedBy, "  "), t += "}\n", t;
-}, Bi = function(e, t) {
+	return t += S(e.refs, "  ", s), t += G("verified_by", e.verifiedBy, "  "), t += "}\n", t;
+}, zi = function(e, t) {
 	let n = {
 		id: e,
 		role: "",
@@ -5524,7 +5537,7 @@ var Ni = function(e) {
 		if (e === "role") n.role = a(o[s++]);
 		else if (e === "subject") n.subject = a(o[s++]);
 		else if (e === "description") n.description = a(o[s++]);
-		else if (e === "entries") n.entries = Vi(i(o[s++]));
+		else if (e === "entries") n.entries = Bi(i(o[s++]));
 		else if (e === "source") {
 			let e = N(i(o[s++]));
 			n.sources.push(e), n.source ||= e;
@@ -5534,11 +5547,11 @@ var Ni = function(e) {
 				let t = C(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 e === "reference" ? n.referenceIds = G(o[s++]) : s = _(o, s, e);
+		} else e === "reference" ? n.referenceIds = K(o[s++]) : s = _(o, s, e);
 	}
 	return (t) => (t.conditionSets[e] = n, t);
 };
-function Vi(e) {
+function Bi(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -5561,7 +5574,7 @@ function Vi(e) {
 	}
 	return t;
 }
-var Hi = function(e) {
+var Vi = function(e) {
 	let t = "condition_set " + e.id + " {\n";
 	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";
@@ -5573,9 +5586,9 @@ var Hi = function(e) {
 	}
 	let n = e.sources && e.sources.length > 0 ? e.sources : e.source ? [e.source] : [];
 	for (let e of n) t += T(e, "  ", s);
-	return t += W("reference", e.referenceIds, "  "), t += S(e.refs, "  ", s), t += "}\n", t;
+	return t += G("reference", e.referenceIds, "  "), t += S(e.refs, "  ", s), t += "}\n", t;
 };
-function Ui(e) {
+function Hi(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = A(r[i++]);
@@ -5584,7 +5597,7 @@ function Ui(e) {
 	}
 	return t;
 }
-function Wi(e) {
+function Ui(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = A(r[i++]);
@@ -5596,10 +5609,10 @@ function Wi(e) {
 	}
 	return t;
 }
-function Gi(e) {
+function Wi(e) {
 	return n(e).map(a).filter((e) => e.length > 0);
 }
-function Ki(e) {
+function Gi(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -5611,13 +5624,13 @@ function Ki(e) {
 	}
 	return t;
 }
-function qi(e) {
+function Ki(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o].startsWith("{")) {
-			t[e] = Ji(i(r[o++]));
+			t[e] = qi(i(r[o++]));
 			continue;
 		}
 		let n = "", s = "", c = !1;
@@ -5633,7 +5646,7 @@ function qi(e) {
 	}
 	return t;
 }
-function Ji(e) {
+function qi(e) {
 	let t = {
 		symbol: "",
 		derivation: ""
@@ -5649,18 +5662,18 @@ function Ji(e) {
 	}
 	return t;
 }
-var Yi = /* @__PURE__ */ new Set(["state", "behavior"]);
-function Xi(e, t, n) {
+var Ji = /* @__PURE__ */ new Set(["state", "behavior"]);
+function Yi(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 Zi(e, t, n, r, i) {
+function Xi(e, t, n, r, i) {
 	let a = A(n);
 	return e.misplacedAspects.push({
 		family: t,
 		aspect: a
-	}), i < r.length && r[i].startsWith("{") || Yi.has(a) ? i++ : i = Xi(a, r, i), i;
+	}), i < r.length && r[i].startsWith("{") || Ji.has(a) ? i++ : i = Yi(a, r, i), i;
 }
-function Qi(e, t) {
+function Zi(e, t) {
 	let r = e[t] ?? "";
 	if (r === "symbolic") return {
 		level: {
@@ -5689,7 +5702,7 @@ function Qi(e, t) {
 		next: t + 1
 	};
 }
-function $i(e) {
+function Qi(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
@@ -5720,64 +5733,64 @@ function $i(e) {
 			if (l >= c.length) break;
 			if (e === "target") s.target = a(c[l++]);
 			else if (e === "level") {
-				let e = Qi(c, l);
+				let e = Zi(c, l);
 				s.level = e.level, l = e.next;
 			} else if (e === "conditions") {
 				let e = O(c, l);
 				s.conditions = a(e.text), l = e.next;
-			} else e === "statement" ? s.statement = a(c[l++]) : e === "verified_by" ? s.verifiedBy = U(c[l++]) : e === "source" ? s.source = N(i(c[l++])) : i(c[l++]);
+			} else e === "statement" ? s.statement = a(c[l++]) : e === "verified_by" ? s.verifiedBy = W(c[l++]) : e === "source" ? s.source = N(i(c[l++])) : i(c[l++]);
 		}
 		t.push(s);
 	}
 	return t;
 }
-function ea(e) {
+function $i(e) {
 	return e.id === "" && !e.target && !e.level && !e.conditions && e.verifiedBy.length === 0 && !e.source;
 }
-function ta(e, t) {
+function ea(e, t) {
 	let r = n(e), a = 0;
 	for (; a < r.length;) {
 		let e = r[a++];
 		if (a >= r.length) break;
-		if (e === "metadata") t.is.metadata = Ui(i(r[a++]));
-		else if (e === "provenance") t.is.provenance = Ui(i(r[a++]));
-		else if (e === "structure") t.is.structure = Gi(i(r[a++]));
-		else if (e === "design_parameters") t.is.designParameters = Wi(i(r[a++]));
-		else if (e === "designed_conditions") t.is.designedConditions = Ui(i(r[a++]));
-		else if (e === "promises") t.is.promises = $i(i(r[a++]));
-		else if (e === "artifacts") t.is.artifacts = Gi(i(r[a++]));
+		if (e === "metadata") t.is.metadata = Hi(i(r[a++]));
+		else if (e === "provenance") t.is.provenance = Hi(i(r[a++]));
+		else if (e === "structure") t.is.structure = Wi(i(r[a++]));
+		else if (e === "design_parameters") t.is.designParameters = Ui(i(r[a++]));
+		else if (e === "designed_conditions") t.is.designedConditions = Hi(i(r[a++]));
+		else if (e === "promises") t.is.promises = Qi(i(r[a++]));
+		else if (e === "artifacts") t.is.artifacts = Wi(i(r[a++]));
 		else if (e === "endpoint") {
 			let e = A(r[a++] ?? ""), n = a < r.length ? i(r[a++]) : "";
-			e && t.is.endpoints.push(hi(e, n));
-		} else e === "composed_of" ? t.is.composedOf = Ci(i(r[a++] ?? "")) : a = Zi(t, "is", e, r, a);
+			e && t.is.endpoints.push(mi(e, n));
+		} else e === "composed_of" ? t.is.composedOf = Si(i(r[a++] ?? "")) : a = Xi(t, "is", e, r, a);
 	}
 }
-function na(e, t) {
+function ta(e, t) {
 	let r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		if (e === "attributes") t.has.attributes = Wi(i(r[o++]));
-		else if (e === "dimensions") t.has.dimensions = Ki(i(r[o++]));
+		if (e === "attributes") t.has.attributes = Ui(i(r[o++]));
+		else if (e === "dimensions") t.has.dimensions = Gi(i(r[o++]));
 		else if (e === "state") t.has.state = a(r[o++]);
-		else if (e === "characteristics") t.has.characteristics = qi(i(r[o++]));
-		else if (e === "environmental_context") t.has.environmentalContext = Gi(i(r[o++]));
-		else if (e === "artifact_instances") t.has.artifactInstances = Gi(i(r[o++]));
+		else if (e === "characteristics") t.has.characteristics = Ki(i(r[o++]));
+		else if (e === "environmental_context") t.has.environmentalContext = Wi(i(r[o++]));
+		else if (e === "artifact_instances") t.has.artifactInstances = Wi(i(r[o++]));
 		else if (e === "serve") {
-			let e = vi(r, o);
+			let e = _i(r, o);
 			t.has.serves.push(e.binding), o = e.next;
-		} else o = Zi(t, "has", e, r, o);
+		} else o = Xi(t, "has", e, r, o);
 	}
 }
-function ra(e, t) {
+function na(e, t) {
 	let r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = r[i++];
 		if (i >= r.length) break;
-		e === "behavior" ? t.does.behaviors.push(a(r[i++])) : i = Zi(t, "does", e, r, i);
+		e === "behavior" ? t.does.behaviors.push(a(r[i++])) : i = Xi(t, "does", e, r, i);
 	}
 }
-var ia = function(e, t) {
+var ra = function(e, t) {
 	let n = {
 		id: e,
 		extends: "",
@@ -5807,11 +5820,11 @@ var ia = function(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "extends" ? n.extends = a(o[s++]) : e === "is" ? ta(i(o[s++]), n) : e === "has" ? na(i(o[s++]), n) : e === "does" ? ra(i(o[s++]), n) : e === "reference" ? n.referenceIds = G(o[s++]) : s = _(o, s, e);
+		e === "extends" ? n.extends = a(o[s++]) : e === "is" ? ea(i(o[s++]), n) : e === "has" ? ta(i(o[s++]), n) : e === "does" ? na(i(o[s++]), n) : e === "reference" ? n.referenceIds = K(o[s++]) : s = _(o, s, e);
 	}
 	return (t) => (t.subjects[e] = n, t);
 };
-function aa(e, t) {
+function ia(e, t) {
 	return {
 		id: t.id,
 		extends: "",
@@ -5861,34 +5874,34 @@ function aa(e, t) {
 		misplacedAspects: t.misplacedAspects
 	};
 }
-function oa(e, t) {
+function aa(e, t) {
 	let n = (t, r) => {
 		let i = t.extends;
 		if (!i || r.has(i)) return t;
 		let a = e.subjects[i];
-		return a ? (r.add(i), aa(n(a, r), t)) : t;
+		return a ? (r.add(i), ia(n(a, r), t)) : t;
 	};
 	return n(t, /* @__PURE__ */ new Set([t.id]));
 }
-function sa(e, t) {
+function oa(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " " + k(t[e])).join(" ") + " }\n";
 }
-function ca(e, t) {
+function sa(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " :" + (t[e] ? " " + k(t[e]) : "")).join(" ") + " }\n";
 }
-function la(e, t) {
+function ca(e, t) {
 	return t.length === 0 ? "" : "    " + e + " { " + t.map(k).join(" ") + " }\n";
 }
-function ua(e) {
+function la(e) {
 	let t = Object.keys(e);
 	return t.length === 0 ? "" : "    dimensions { " + t.map((t) => t + " in { " + e[t].join(", ") + " }").join(" ") + " }\n";
 }
-function da(e) {
+function ua(e) {
 	return /^ocl\{[\s\S]*\}$/.test(e) ? e : k(e);
 }
-function fa(e) {
+function da(e) {
 	if (e.kind === "symbolic") return "symbolic " + k(e.symbolic ?? "");
 	if (e.kind === "range") {
 		let t = "";
@@ -5896,104 +5909,104 @@ function fa(e) {
 	}
 	return ve(e.quantity ?? { value: "" });
 }
-function pa(e) {
+function fa(e) {
 	if (e.length === 0) return "";
-	if (e.every(ea)) return "    promises { " + e.map((e) => k(e.statement)).join(" ") + " }\n";
+	if (e.every($i)) return "    promises { " + e.map((e) => k(e.statement)).join(" ") + " }\n";
 	let t = "    promises {\n";
 	for (let n of e) {
-		if (ea(n)) {
+		if ($i(n)) {
 			t += "      " + k(n.statement) + "\n";
 			continue;
 		}
-		t += "      " + k(n.id) + " {\n", n.target && (t += "        target " + k(n.target) + "\n"), n.level && (t += "        level " + fa(n.level) + "\n"), n.conditions && (t += "        conditions " + da(n.conditions) + "\n"), n.statement && (t += "        statement \"" + s(n.statement) + "\"\n"), t += W("verified_by", n.verifiedBy, "        "), t += H("source", n.source ?? null, "        "), t += "      }\n";
+		t += "      " + k(n.id) + " {\n", n.target && (t += "        target " + k(n.target) + "\n"), n.level && (t += "        level " + da(n.level) + "\n"), n.conditions && (t += "        conditions " + ua(n.conditions) + "\n"), n.statement && (t += "        statement \"" + s(n.statement) + "\"\n"), t += G("verified_by", n.verifiedBy, "        "), t += U("source", n.source ?? null, "        "), t += "      }\n";
 	}
 	return t += "    }\n", t;
 }
-function ma(e) {
+function pa(e) {
 	let t = Object.keys(e);
 	if (t.length === 0) return "";
 	let n = "    characteristics {\n";
 	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 " + da(t.derivation) + "\n"), t.behavior && (n += "        behavior " + k(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + k(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += H("source", t.source ?? null, "        "), n += "      }\n";
+			n += "      " + r + " {\n", t.symbol && (n += "        symbol \"" + s(t.symbol) + "\"\n"), t.derivation && (n += "        derivation " + ua(t.derivation) + "\n"), t.behavior && (n += "        behavior " + k(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + k(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += U("source", t.source ?? null, "        "), n += "      }\n";
 			continue;
 		}
-		n += "      " + r + (t.symbol ? " " + t.symbol : ""), t.derivation && (n += " = " + da(t.derivation)), n += "\n";
+		n += "      " + r + (t.symbol ? " " + t.symbol : ""), t.derivation && (n += " = " + ua(t.derivation)), n += "\n";
 	}
 	return n += "    }\n", n;
 }
-function ha(e) {
+function ma(e) {
 	let t = "";
-	for (let n of e) t += _i(n, "    ");
+	for (let n of e) t += gi(n, "    ");
 	return t;
 }
-function ga(e) {
+function ha(e) {
 	let t = "";
-	for (let n of e) t += yi(n, "    ");
+	for (let n of e) t += vi(n, "    ");
 	return t;
 }
-var _a = function(e) {
+var ga = function(e) {
 	let t = "subject " + e.id + " {\n";
 	e.extends && (t += "  extends " + e.extends + "\n");
-	let n = sa("metadata", e.is.metadata) + sa("provenance", e.is.provenance) + la("structure", e.is.structure) + ca("design_parameters", e.is.designParameters) + sa("designed_conditions", e.is.designedConditions) + pa(e.is.promises) + la("artifacts", e.is.artifacts) + ha(e.is.endpoints) + (e.is.composedOf ? Ti(e.is.composedOf, "    ") : "");
+	let n = oa("metadata", e.is.metadata) + oa("provenance", e.is.provenance) + ca("structure", e.is.structure) + sa("design_parameters", e.is.designParameters) + oa("designed_conditions", e.is.designedConditions) + fa(e.is.promises) + ca("artifacts", e.is.artifacts) + ma(e.is.endpoints) + (e.is.composedOf ? wi(e.is.composedOf, "    ") : "");
 	n && (t += "  is {\n" + n + "  }\n");
-	let r = ca("attributes", e.has.attributes) + ua(e.has.dimensions) + (e.has.state ? "    state " + k(e.has.state) + "\n" : "") + ma(e.has.characteristics) + la("environmental_context", e.has.environmentalContext) + la("artifact_instances", e.has.artifactInstances) + ga(e.has.serves);
+	let r = sa("attributes", e.has.attributes) + la(e.has.dimensions) + (e.has.state ? "    state " + k(e.has.state) + "\n" : "") + pa(e.has.characteristics) + ca("environmental_context", e.has.environmentalContext) + ca("artifact_instances", e.has.artifactInstances) + ha(e.has.serves);
 	r && (t += "  has {\n" + r + "  }\n");
 	let i = "";
 	for (let t of e.does.behaviors) i += "    behavior " + k(t) + "\n";
-	return i && (t += "  does {\n" + i + "  }\n"), t += W("reference", e.referenceIds, "  "), t += "}\n", t;
-}, va = {
+	return i && (t += "  does {\n" + i + "  }\n"), t += G("reference", e.referenceIds, "  "), t += "}\n", t;
+}, _a = {
 	keyword: "instrument",
 	field: "instruments",
 	takesID: !0,
-	parse: Ei,
-	dump: Ni
-}, ya = {
+	parse: Ti,
+	dump: Mi
+}, va = {
 	keyword: "attribute_definition",
 	field: "attributeDefinitions",
 	takesID: !0,
-	parse: Pi,
-	dump: Fi
-}, ba = {
+	parse: Ni,
+	dump: Pi
+}, ya = {
 	keyword: "capability",
 	field: "capabilities",
 	takesID: !0,
-	parse: Ii,
-	dump: Li
-}, xa = {
+	parse: Fi,
+	dump: Ii
+}, ba = {
 	keyword: "behavior",
 	field: "behaviors",
 	takesID: !0,
-	parse: Ri,
-	dump: zi
-}, Sa = {
+	parse: Li,
+	dump: Ri
+}, xa = {
 	keyword: "condition_set",
 	field: "conditionSets",
 	takesID: !0,
-	parse: Bi,
-	dump: Hi
-}, Ca = {
+	parse: zi,
+	dump: Vi
+}, Sa = {
 	keyword: "subject",
 	field: "subjects",
 	takesID: !0,
-	parse: ia,
-	resolve: oa,
-	dump: _a
+	parse: ra,
+	resolve: aa,
+	dump: ga
 };
 //#endregion
 //#region src/ser-des/config/instance.ts
-function wa(e) {
+function Ca(e) {
 	return !e.startsWith("\"") && e.endsWith(":") && e.length > 1;
 }
-function Ta(e) {
+function wa(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
 		if (!e) break;
 		r[o] === ":" && o++;
 		let n = [];
-		for (; o < r.length && r[o + 1] !== ":" && !wa(r[o]);) n.push(r[o++]);
+		for (; o < r.length && r[o + 1] !== ":" && !Ca(r[o]);) n.push(r[o++]);
 		if (n.length === 0) {
 			t[e] = { value: "" };
 			continue;
@@ -6011,7 +6024,7 @@ function Ta(e) {
 	}
 	return t;
 }
-function Ea(e) {
+function Ta(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = A(r[i++]);
@@ -6020,18 +6033,18 @@ function Ea(e) {
 	}
 	return t;
 }
-function Da(e) {
+function Ea(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-function Oa(e, t) {
+function Da(e, t) {
 	let r = n(e), a = 0;
 	for (; a < r.length;) {
 		let e = r[a++];
 		if (a >= r.length) break;
-		e === "attributes" ? t.has.attributes = Ta(i(r[a++])) : e === "dimensions" ? t.has.dimensions = Ea(i(r[a++])) : e === "test_context" ? t.has.testContext = Ta(i(r[a++])) : i(r[a++]);
+		e === "attributes" ? t.has.attributes = wa(i(r[a++])) : e === "dimensions" ? t.has.dimensions = Ta(i(r[a++])) : e === "test_context" ? t.has.testContext = wa(i(r[a++])) : i(r[a++]);
 	}
 }
-var ka = function(e, t) {
+var Oa = function(e, t) {
 	let n = {
 		id: e,
 		of: "",
@@ -6050,44 +6063,44 @@ var ka = function(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "of" ? n.of = a(o[s++]) : e === "level" ? n.level = a(o[s++]) : e === "model" ? n.model = a(o[s++]) : e === "group" ? n.group = a(o[s++]) : e === "family" ? n.family = a(o[s++]) : e === "definition_versions" ? n.definitionVersions = Ea(i(o[s++])) : e === "has" ? Oa(i(o[s++]), n) : e === "reference" ? n.referenceIds = Da(o[s++]) : i(o[s++]);
+		e === "of" ? n.of = a(o[s++]) : e === "level" ? n.level = a(o[s++]) : e === "model" ? n.model = a(o[s++]) : e === "group" ? n.group = a(o[s++]) : e === "family" ? n.family = a(o[s++]) : e === "definition_versions" ? n.definitionVersions = Ta(i(o[s++])) : e === "has" ? Da(i(o[s++]), n) : e === "reference" ? n.referenceIds = Ea(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.instances[e] = n, t);
 };
-function Aa(e, t) {
+function ka(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + _e(t[e])).join(" ") + " }\n";
 }
-function ja(e, t) {
+function Aa(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " : " + k(t[e])).join(" ") + " }\n";
 }
-var Ma = {
+var ja = {
 	keyword: "instance",
 	field: "instances",
 	takesID: !0,
-	parse: ka,
+	parse: Oa,
 	dump: function(e) {
 		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 + " : " + k(e.definitionVersions[t])).join(" ") + " }\n");
-		let r = Aa("attributes", e.has.attributes) + ja("dimensions", e.has.dimensions) + Aa("test_context", e.has.testContext);
+		let r = ka("attributes", e.has.attributes) + Aa("dimensions", e.has.dimensions) + ka("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;
 	}
 };
 //#endregion
 //#region src/ser-des/config/artifact.ts
-function Na(e) {
+function Ma(e) {
 	return n(a(e)).map(A).map(a).filter((e) => e.length > 0);
 }
-function Pa(e, t, n) {
+function Na(e, t, n) {
 	return t.length === 0 ? "" : `${n}${e} { ${t.join(" ")} }\n`;
 }
-function Fa(e) {
+function Pa(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-function Ia(e) {
+function Fa(e) {
 	let t = [], r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = A(r[i++]);
@@ -6107,7 +6120,7 @@ function Ia(e) {
 	}
 	return t;
 }
-function La(e) {
+function Ia(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = A(r[o++]);
@@ -6122,14 +6135,14 @@ function La(e) {
 			for (; t < e.length;) {
 				let n = e[t++];
 				if (t >= e.length) break;
-				n === "kinds" ? s.kinds = Na(e[t++]) : n === "role" ? s.role = a(e[t++]) : i(e[t++]);
+				n === "kinds" ? s.kinds = Ma(e[t++]) : n === "role" ? s.role = a(e[t++]) : i(e[t++]);
 			}
 		}
 		t.push(s);
 	}
 	return t;
 }
-function Ra(e) {
+function La(e) {
 	let t = {
 		fields: [],
 		structure: "",
@@ -6138,11 +6151,11 @@ function Ra(e) {
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "fields" ? t.fields = Ia(i(r[o++])) : e === "structure" ? t.structure = a(r[o++]) : e === "media" ? t.media = La(i(r[o++])) : o = _(r, o, e);
+		e === "fields" ? t.fields = Fa(i(r[o++])) : e === "structure" ? t.structure = a(r[o++]) : e === "media" ? t.media = Ia(i(r[o++])) : o = _(r, o, e);
 	}
 	return t;
 }
-var za = function(e, t) {
+var Ra = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -6162,7 +6175,7 @@ var za = function(e, t) {
 		if (s >= o.length) break;
 		if (e === "name") n.name = a(o[s++]);
 		else if (e === "description") n.description = a(o[s++]);
-		else if (e === "content_contract") n.contentContract = Ra(i(o[s++]));
+		else if (e === "content_contract") n.contentContract = La(i(o[s++]));
 		else if (e === "produced_when") {
 			let e = a(o[s++] ?? "");
 			n.producedWhen = e === "per_interval" ? {
@@ -6176,7 +6189,7 @@ var za = function(e, t) {
 		else if (e === "source") {
 			let e = N(i(o[s++]));
 			(n.sourceRefs ??= []).push(e), n.source ||= e;
-		} else if (e === "reference") n.referenceIds = Fa(o[s++]);
+		} else if (e === "reference") n.referenceIds = Pa(o[s++]);
 		else if (e === "ref") {
 			let e = b(o, s, a, i);
 			w(n, e.ref) || (n.refs ??= []).push(e.ref), s = e.next;
@@ -6184,10 +6197,10 @@ var za = function(e, t) {
 	}
 	return (t) => (t.artifactDefinitions[e] = n, t);
 };
-function Ba(e) {
+function za(e) {
 	return e.kind === "per_interval" ? `per_interval ${k(e.interval ?? "")}` : e.kind === "on_event" ? `on_event ${k(e.event ?? "")}` : e.kind;
 }
-var Va = function(e) {
+var Ba = function(e) {
 	let t = "artifact_definition " + e.id + " {\n";
 	e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.description && (t += "  description \"" + s(e.description) + "\"\n");
 	let n = e.contentContract;
@@ -6207,11 +6220,11 @@ var Va = function(e) {
 		}
 		t += "  }\n";
 	}
-	e.producedWhen.kind && (t += "  produced_when " + Ba(e.producedWhen) + "\n"), e.retention && (t += "  retention \"" + s(e.retention) + "\"\n");
+	e.producedWhen.kind && (t += "  produced_when " + za(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 += T(e, "  ", s);
-	return t += S(e.refs, "  ", s), t += Pa("reference", e.referenceIds, "  "), t += "}\n", t;
-}, Ha = function(e, t) {
+	return t += S(e.refs, "  ", s), t += Na("reference", e.referenceIds, "  "), t += "}\n", t;
+}, Va = function(e, t) {
 	let n = {
 		id: e,
 		of: "",
@@ -6224,34 +6237,34 @@ var Va = function(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "of" ? n.of = a(o[s++]) : e === "produced_at" ? n.producedAt = a(o[s++]) : e === "by" ? n.by = a(o[s++]) : e === "content" ? n.content = Ta(i(o[s++])) : e === "links" ? n.links = Na(o[s++]) : e === "reference" ? n.referenceIds = Fa(o[s++]) : s = _(o, s, e);
+		e === "of" ? n.of = a(o[s++]) : e === "produced_at" ? n.producedAt = a(o[s++]) : e === "by" ? n.by = a(o[s++]) : e === "content" ? n.content = wa(i(o[s++])) : e === "links" ? n.links = Ma(o[s++]) : e === "reference" ? n.referenceIds = Pa(o[s++]) : s = _(o, s, e);
 	}
 	return (t) => (t.artifactInstances[e] = n, t);
-}, Ua = function(e) {
+}, Ha = function(e) {
 	let t = "artifact_instance " + e.id + " {\n";
 	e.of && (t += "  of " + e.of + "\n"), e.producedAt && (t += "  produced_at " + k(e.producedAt) + "\n"), e.by && (t += "  by " + k(e.by) + "\n");
 	let n = Object.keys(e.content);
-	return n.length > 0 && (t += "  content { " + n.map((t) => t + " : " + _e(e.content[t])).join(" ") + " }\n"), t += Pa("links", e.links, "  "), t += Pa("reference", e.referenceIds, "  "), t += "}\n", t;
-}, Wa = {
+	return n.length > 0 && (t += "  content { " + n.map((t) => t + " : " + _e(e.content[t])).join(" ") + " }\n"), t += Na("links", e.links, "  "), t += Na("reference", e.referenceIds, "  "), t += "}\n", t;
+}, Ua = {
 	keyword: "artifact_definition",
 	field: "artifactDefinitions",
 	takesID: !0,
-	parse: za,
-	dump: Va
-}, Ga = {
+	parse: Ra,
+	dump: Ba
+}, Wa = {
 	keyword: "artifact_instance",
 	field: "artifactInstances",
 	takesID: !0,
-	parse: Ha,
-	dump: Ua
-}, Ka = M;
-function qa(e, t) {
+	parse: Va,
+	dump: Ha
+}, Ga = M;
+function Ka(e, t) {
 	let n = e[t] ?? "";
 	if (n.startsWith("{")) return {
 		selector: {
 			kind: "refs",
 			expression: "",
-			refs: Ka(n)
+			refs: Ga(n)
 		},
 		next: t + 1
 	};
@@ -6276,7 +6289,7 @@ function qa(e, t) {
 		next: t + 1
 	};
 }
-function Ja(e) {
+function qa(e) {
 	let t = [], n = j(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
@@ -6308,7 +6321,7 @@ function Ja(e) {
 	}
 	return t;
 }
-function Ya(e) {
+function Ja(e) {
 	let t = {
 		requirements: {
 			kind: "",
@@ -6324,13 +6337,13 @@ function Ya(e) {
 	for (; r < n.length;) {
 		let e = n[r++];
 		if (e === "requirements" || e === "promises") {
-			let i = qa(n, r);
+			let i = Ka(n, r);
 			t[e] = i.selector, r = i.next;
 		}
 	}
 	return t;
 }
-function Xa(e) {
+function Ya(e) {
 	let t = [], n = j(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
@@ -6344,7 +6357,7 @@ function Xa(e) {
 	}
 	return t;
 }
-function Za(e) {
+function Xa(e) {
 	let t = [], n = j(e), r = 0;
 	for (; r < n.length;) {
 		let e = n[r++];
@@ -6358,7 +6371,7 @@ function Za(e) {
 	}
 	return t;
 }
-function Qa(e) {
+function Za(e) {
 	let t = [], n = r(e), o = 0;
 	for (; o < n.length;) {
 		if (n[o++] !== "on") continue;
@@ -6366,7 +6379,7 @@ function Qa(e) {
 		if (o < n.length && n[o].startsWith("{")) {
 			t.push({
 				outcome: e,
-				actions: Za(i(n[o++]))
+				actions: Xa(i(n[o++]))
 			});
 			continue;
 		}
@@ -6388,7 +6401,7 @@ function Qa(e) {
 	}
 	return t;
 }
-var $a = function(e, t) {
+var Qa = function(e, t) {
 	let n = {
 		id: e,
 		over: [],
@@ -6410,12 +6423,12 @@ var $a = function(e, t) {
 		referenceIds: []
 	};
 	return g(t, (e, t) => {
-		if (e === "over") n.over = Ka(t());
-		else if (e === "triggers") n.triggers = Ja(i(t()));
-		else if (e === "evaluate") n.evaluate = Ya(i(t()));
-		else if (e === "emit") n.emit = Xa(i(t()));
-		else if (e === "escalate") n.escalate = Qa(i(t()));
-		else if (e === "reference") n.referenceIds = Ka(t());
+		if (e === "over") n.over = Ga(t());
+		else if (e === "triggers") n.triggers = qa(i(t()));
+		else if (e === "evaluate") n.evaluate = Ja(i(t()));
+		else if (e === "emit") n.emit = Ya(i(t()));
+		else if (e === "escalate") n.escalate = Za(i(t()));
+		else if (e === "reference") n.referenceIds = Ga(t());
 		else return !1;
 		return !0;
 	}, {
@@ -6423,35 +6436,35 @@ var $a = function(e, t) {
 		id: e
 	}), (t) => (t.monitors[e] = n, t);
 };
-function eo(e) {
+function $a(e) {
 	return e.kind === "timer" ? "every " + k(e.every) : e.kind === "signal" ? "on signal " + k(e.signal) : e.kind === "change" ? "on change " + k(e.aspect) : "on " + k(e.kind);
 }
-function to(e) {
+function eo(e) {
 	return e.kind === "applicable_to" ? "applicable_to(" + e.expression + ")" : e.kind === "refs" ? "{ " + e.refs.map(k).join(" ") + " }" : k(e.kind);
 }
-function no(e) {
+function to(e) {
 	let t = e.actions.map((e) => e.action === "notify" ? "notify " + k(e.role) : k(e.action)).join(" ");
 	return "on " + k(e.outcome) + " { " + t + " }";
 }
-var ro = {
+var no = {
 	keyword: "monitor",
 	field: "monitors",
 	takesID: !0,
-	parse: $a,
+	parse: Qa,
 	dump: function(e) {
 		let t = "monitor " + e.id + " {\n";
-		e.over.length > 0 && (t += "  over { " + e.over.map(k).join(" ") + " }\n"), e.triggers.length > 0 && (t += "  triggers { " + e.triggers.map(eo).join(" ") + " }\n");
+		e.over.length > 0 && (t += "  over { " + e.over.map(k).join(" ") + " }\n"), e.triggers.length > 0 && (t += "  triggers { " + e.triggers.map($a).join(" ") + " }\n");
 		let n = e.evaluate.requirements, r = e.evaluate.promises;
-		return (n.kind || r.kind) && (t += "  evaluate {", n.kind && (t += " requirements " + to(n)), r.kind && (t += " promises " + to(r)), t += " }\n"), e.emit.length > 0 && (t += "  emit { " + e.emit.map((e) => e.stream + " -> " + k(e.target)).join(" ") + " }\n"), e.escalate.length > 0 && (t += "  escalate { " + e.escalate.map(no).join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(k).join(" ") + " }\n"), t += "}\n", t;
+		return (n.kind || r.kind) && (t += "  evaluate {", n.kind && (t += " requirements " + eo(n)), r.kind && (t += " promises " + eo(r)), t += " }\n"), e.emit.length > 0 && (t += "  emit { " + e.emit.map((e) => e.stream + " -> " + k(e.target)).join(" ") + " }\n"), e.escalate.length > 0 && (t += "  escalate { " + e.escalate.map(to).join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(k).join(" ") + " }\n"), t += "}\n", t;
 	}
-}, io = [
+}, ro = [
 	"public",
 	"restricted",
 	"authority"
 ];
 //#endregion
 //#region src/ser-des/config/passport.ts
-function ao(e, t) {
+function io(e, t) {
 	return M(t).map((t) => {
 		let n = t.indexOf(".");
 		return n === -1 ? {
@@ -6465,7 +6478,7 @@ function ao(e, t) {
 		};
 	});
 }
-var oo = function(e, t) {
+var ao = function(e, t) {
 	let n = {
 		id: e,
 		upi: {
@@ -6504,8 +6517,8 @@ var oo = function(e, t) {
 		} else if (t === "reference") n.referenceIds = M(r());
 		else {
 			let i = r();
-			if (io.includes(t)) n.entries.push(...ao(t, i));
-			else if (i.startsWith("{")) throw Error(`Parsing error: passport. ID ${e}: unknown access class "${t}" — access classes are ${io.join(" | ")} (fail-closed: an unknown access class is never served)`);
+			if (ro.includes(t)) n.entries.push(...io(t, i));
+			else if (i.startsWith("{")) throw Error(`Parsing error: passport. ID ${e}: unknown access class "${t}" — access classes are ${ro.join(" | ")} (fail-closed: an unknown access class is never served)`);
 		}
 		return !0;
 	}, {
@@ -6513,26 +6526,26 @@ var oo = function(e, t) {
 		id: e
 	}), (t) => (t.passports[e] = n, t);
 };
-function so(e) {
+function oo(e) {
 	return k(e.ref === "" ? e.contentClass : e.contentClass + "." + e.ref);
 }
-var co = {
+var so = {
 	keyword: "passport",
 	field: "passports",
 	takesID: !0,
-	parse: oo,
+	parse: ao,
 	dump: function(e) {
 		let t = "passport " + e.id + " {\n";
 		(e.upi.pattern !== "" || e.upi.level !== "") && (t += "  upi {", e.upi.pattern !== "" && (t += " pattern " + k(e.upi.pattern)), e.upi.level !== "" && (t += " level " + k(e.upi.level)), t += " }\n");
 		for (let n of e.carriers) t += "  carrier { kind " + k(n.kind) + " payload " + k(n.payload) + " }\n";
-		let n = [...io, ...[...new Set(e.entries.map((e) => e.access))].filter((e) => !io.includes(e))];
+		let n = [...ro, ...[...new Set(e.entries.map((e) => e.access))].filter((e) => !ro.includes(e))];
 		for (let r of n) {
 			let n = e.entries.filter((e) => e.access === r);
-			n.length > 0 && (t += "  " + r + " { " + n.map(so).join(" ") + " }\n");
+			n.length > 0 && (t += "  " + r + " { " + n.map(oo).join(" ") + " }\n");
 		}
 		return e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.map(k).join(" ") + " }\n"), t += "}\n", t;
 	}
-}, lo = {
+}, co = {
 	keyword: "invariant",
 	field: "invariants",
 	takesID: !0,
@@ -6572,7 +6585,7 @@ var co = {
 };
 //#endregion
 //#region src/ser-des/config/testSequence.ts
-function uo(e, t, n) {
+function lo(e, t, n) {
 	g(e, (e, n) => {
 		if (e === "test") t.test = a(n());
 		else if (e === "phase") t.phase = a(n());
@@ -6585,7 +6598,7 @@ function uo(e, t, n) {
 		id: n
 	});
 }
-var fo = {
+var uo = {
 	keyword: "test_sequence",
 	field: "testSequences",
 	takesID: !0,
@@ -6616,7 +6629,7 @@ var fo = {
 					role: "",
 					dependsOn: null
 				}, r = o[s++];
-				r.startsWith("{") || (t.order = Number(a(r)), r = s < o.length && o[s].startsWith("{") ? o[s++] : ""), r.startsWith("{") && uo(i(r), t, e), n.steps.push(t);
+				r.startsWith("{") || (t.order = Number(a(r)), r = s < o.length && o[s].startsWith("{") ? o[s++] : ""), r.startsWith("{") && lo(i(r), t, e), n.steps.push(t);
 			} else s++;
 		}
 		return (t) => (t.testSequences[e] = n, t);
@@ -6630,7 +6643,7 @@ var fo = {
 		for (let n of e.sourceRefs) t += T(n, "  ", s);
 		return t += "}\n", t;
 	}
-}, po = {
+}, fo = {
 	keyword: "formulas_used",
 	field: "formulasUsed",
 	takesID: !0,
@@ -6664,7 +6677,7 @@ var fo = {
 		for (let n of e.sourceRefs) t += T(n, "  ", s);
 		return t += "}\n", t;
 	}
-}, mo = function(e, t) {
+}, po = function(e, t) {
 	let n = {
 		id: e,
 		entries: []
@@ -6693,14 +6706,14 @@ var fo = {
 		let r = t.texts[e];
 		return r ? r.entries.push(...n.entries) : t.texts[e] = n, t;
 	};
-}, ho = function(e) {
+}, mo = function(e) {
 	let t = "text " + e.id + " {\n";
 	for (let n of e.entries) t += "  spell " + n.spelling + (n.via ? " via " + n.via : "") + " \"" + s(n.value) + "\"\n";
 	return t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/quantityRegister.ts
-function go(e) {
+function ho(e) {
 	let t = {}, r = n(e);
 	for (let e = 0; e + 1 < r.length; e += 2) {
 		let n = A(r[e]), i = Number(r[e + 1]);
@@ -6708,11 +6721,11 @@ function go(e) {
 	}
 	return t;
 }
-function _o(e, t) {
+function go(e, t) {
 	let n = Number(a(e));
 	return Number.isNaN(n) ? t : n;
 }
-function vo(e, t) {
+function _o(e, t) {
 	let r = {
 		id: e,
 		dimensions: {},
@@ -6722,11 +6735,11 @@ function vo(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "dimensions" ? r.dimensions = go(i(o[s++])) : e === "si_unit" ? r.siUnit = a(o[s++]) : e === "description" ? r.description = a(o[s++]) : i(o[s++]);
+		e === "dimensions" ? r.dimensions = ho(i(o[s++])) : e === "si_unit" ? r.siUnit = a(o[s++]) : e === "description" ? r.description = a(o[s++]) : i(o[s++]);
 	}
 	return r;
 }
-function yo(e, t) {
+function vo(e, t) {
 	let r = {
 		id: e,
 		symbol: "",
@@ -6739,11 +6752,11 @@ function yo(e, t) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "symbol" ? r.symbol = a(o[s++]) : e === "label" ? r.label = a(o[s++]) : e === "kind" ? r.kind = a(o[s++]) : e === "factor" ? r.factorToSI = _o(o[s++], 1) : e === "offset" ? r.offsetToSI = _o(o[s++], 0) : e === "definition" ? r.definition = a(o[s++]) : i(o[s++]);
+		e === "symbol" ? r.symbol = a(o[s++]) : e === "label" ? r.label = a(o[s++]) : e === "kind" ? r.kind = a(o[s++]) : e === "factor" ? r.factorToSI = go(o[s++], 1) : e === "offset" ? r.offsetToSI = go(o[s++], 0) : e === "definition" ? r.definition = a(o[s++]) : i(o[s++]);
 	}
 	return r;
 }
-var bo = function(e, t) {
+var yo = function(e, t) {
 	let o = {
 		id: e,
 		kinds: [],
@@ -6753,23 +6766,23 @@ var bo = function(e, t) {
 	for (; c < s.length;) {
 		let e = s[c++];
 		if (c >= s.length) break;
-		e === "kind" ? o.kinds.push(vo(A(s[c++]), i(s[c++]))) : e === "unit" ? o.units.push(yo(A(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(_o(A(s[c++]), i(s[c++]))) : e === "unit" ? o.units.push(vo(A(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 xo(e) {
+function bo(e) {
 	let t = Object.keys(e);
 	return t.length === 0 ? "" : " dimensions { " + t.map((t) => t + " " + e[t]).join(" ") + " }";
 }
-var So = {
+var xo = {
 	keyword: "quantity_register",
 	field: "quantityRegisters",
 	takesID: !0,
-	parse: bo,
+	parse: yo,
 	dump: function(e) {
 		let t = "quantity_register " + e.id + " {\n";
 		for (let n of e.kinds) {
-			let e = "  kind " + n.id + " {" + xo(n.dimensions);
+			let e = "  kind " + n.id + " {" + bo(n.dimensions);
 			n.siUnit && (e += " si_unit \"" + s(n.siUnit) + "\""), n.description && (e += " description \"" + s(n.description) + "\""), t += e + " }\n";
 		}
 		for (let n of e.units) {
@@ -6778,7 +6791,7 @@ var So = {
 		}
 		return e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
-}, Co = {
+}, So = {
 	keyword: "dual",
 	field: "duals",
 	takesID: !0,
@@ -6799,7 +6812,7 @@ var So = {
 		let t = "dual " + e.id + " {\n";
 		return e.attribute && (t += "  attribute " + e.attribute + "\n"), e.designed && (t += "  designed " + ve(e.designed) + "\n"), e.exhibited && (t += "  exhibited " + ve(e.exhibited) + "\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
-}, wo = (e, t) => {
+}, Co = (e, t) => {
 	let n = {
 		id: e,
 		label: "",
@@ -6818,24 +6831,24 @@ var So = {
 		construct: "activity_archetype",
 		id: e
 	}), (t) => (t.activityArchetypes[e] = n, t);
-}, To = function(e) {
+}, wo = 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 " + k(e.parent) + "\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/index.ts
-function K(e) {
+function q(e) {
 	return e;
 }
-var Eo = [
-	K({
+var To = [
+	q({
 		keyword: "role",
 		field: "roles",
 		takesID: !0,
 		parse: xt,
 		dump: St
 	}),
-	K({
+	q({
 		keyword: "provision",
 		field: "provisions",
 		takesID: !0,
@@ -6843,7 +6856,7 @@ var Eo = [
 		resolve: _t,
 		dump: vt
 	}),
-	K({
+	q({
 		keyword: "process",
 		field: "processes",
 		takesID: !0,
@@ -6851,7 +6864,7 @@ var Eo = [
 		resolve: Me,
 		dump: ze
 	}),
-	K({
+	q({
 		keyword: "approval",
 		field: "approvals",
 		takesID: !0,
@@ -6859,7 +6872,7 @@ var Eo = [
 		resolve: He,
 		dump: Ue
 	}),
-	K({
+	q({
 		keyword: "class",
 		field: "dataclasses",
 		takesID: !0,
@@ -6867,14 +6880,14 @@ var Eo = [
 		resolve: Ye,
 		dump: Ze
 	}),
-	K({
+	q({
 		keyword: "enum",
 		field: "enums",
 		takesID: !0,
 		parse: We,
 		dump: et
 	}),
-	K({
+	q({
 		keyword: "data_registry",
 		field: "regs",
 		takesID: !0,
@@ -6882,28 +6895,28 @@ var Eo = [
 		resolve: Xe,
 		dump: tt
 	}),
-	K({
+	q({
 		keyword: "variable",
 		field: "variables",
 		takesID: !0,
 		parse: nt,
 		dump: rt
 	}),
-	K({
+	q({
 		keyword: "measurement",
 		field: "variables",
 		takesID: !0,
 		parse: nt,
 		dump: rt
 	}),
-	K({
+	q({
 		keyword: "exclusive_gateway",
 		field: "gateways",
 		takesID: !0,
 		parse: pt,
 		dump: mt
 	}),
-	K({
+	q({
 		keyword: "start",
 		aliases: ["start_event"],
 		field: "events",
@@ -6911,7 +6924,7 @@ var Eo = [
 		parse: ot,
 		dump: ct
 	}),
-	K({
+	q({
 		keyword: "end",
 		aliases: ["end_event"],
 		field: "events",
@@ -6919,7 +6932,7 @@ var Eo = [
 		parse: it,
 		dump: ct
 	}),
-	K({
+	q({
 		keyword: "signalcatch",
 		aliases: ["signal_catch_event"],
 		field: "events",
@@ -6927,7 +6940,7 @@ var Eo = [
 		parse: at,
 		dump: ct
 	}),
-	K({
+	q({
 		keyword: "timer",
 		aliases: ["timer_event"],
 		field: "events",
@@ -6935,14 +6948,14 @@ var Eo = [
 		parse: st,
 		dump: ct
 	}),
-	K({
+	q({
 		keyword: "reference",
 		field: "references",
 		takesID: !0,
 		parse: yt,
 		dump: bt
 	}),
-	K({
+	q({
 		keyword: "canvas",
 		aliases: ["subprocess"],
 		field: "pages",
@@ -6951,7 +6964,7 @@ var Eo = [
 		resolve: kt,
 		dump: jt
 	}),
-	K({
+	q({
 		keyword: "note",
 		field: "notes",
 		takesID: !0,
@@ -6959,28 +6972,28 @@ var Eo = [
 		resolve: It,
 		dump: Lt
 	}),
-	K({
+	q({
 		keyword: "table",
 		field: "tables",
 		takesID: !0,
 		parse: Gt,
 		dump: Yt
 	}),
-	K({
+	q({
 		keyword: "figure",
 		field: "figures",
 		takesID: !0,
 		parse: Xt,
 		dump: Zt
 	}),
-	K({
+	q({
 		keyword: "link",
 		field: "links",
 		takesID: !0,
 		parse: $t,
 		dump: en
 	}),
-	K({
+	q({
 		keyword: "comment",
 		field: "comments",
 		takesID: !0,
@@ -6988,14 +7001,14 @@ var Eo = [
 		resolve: nn,
 		dump: rn
 	}),
-	K({
+	q({
 		keyword: "map_profile",
 		field: "mapProfiles",
 		takesID: !0,
 		parse: un,
 		dump: dn
 	}),
-	K({
+	q({
 		keyword: "view_profile",
 		aliases: ["view"],
 		field: "viewProfiles",
@@ -7003,28 +7016,28 @@ var Eo = [
 		parse: fn,
 		dump: pn
 	}),
-	K({
+	q({
 		keyword: "term",
 		field: "terms",
 		takesID: !0,
-		parse: Tr,
-		dump: Er
+		parse: wr,
+		dump: Tr
 	}),
-	K({
+	q({
 		keyword: "form",
 		field: "forms",
 		takesID: !0,
 		parse: mn,
 		dump: xn
 	}),
-	K({
+	q({
 		keyword: "subform",
 		field: "subforms",
 		takesID: !0,
 		parse: Cn,
 		dump: Tn
 	}),
-	K({
+	q({
 		keyword: "symbol",
 		field: "symbols",
 		takesID: !0,
@@ -7032,7 +7045,7 @@ var Eo = [
 		resolve: On,
 		dump: kn
 	}),
-	K({
+	q({
 		keyword: "calculation",
 		field: "calculations",
 		takesID: !0,
@@ -7040,105 +7053,105 @@ var Eo = [
 		resolve: Pn,
 		dump: Fn
 	}),
-	K({
+	q({
 		keyword: "verdict",
 		field: "verdicts",
 		takesID: !0,
-		parse: kr,
-		dump: Ar
+		parse: Or,
+		dump: kr
 	}),
-	K({
+	q({
 		keyword: "reference_material",
 		field: "referenceMaterials",
 		takesID: !0,
-		parse: Nr,
-		dump: Pr
+		parse: Mr,
+		dump: Nr
 	}),
-	K({
+	q({
 		keyword: "test_point_set",
 		field: "testPointSets",
 		takesID: !0,
-		parse: Gr,
-		dump: Kr
+		parse: Wr,
+		dump: Gr
 	}),
-	K({
+	q({
 		keyword: "competence_kind",
 		field: "competenceKinds",
 		takesID: !0,
-		parse: pr,
-		dump: mr
+		parse: fr,
+		dump: pr
 	}),
-	K({
+	q({
 		keyword: "predicate",
 		field: "predicates",
 		takesID: !0,
-		parse: Fr,
-		dump: Ir
+		parse: Pr,
+		dump: Fr
 	}),
-	K({
+	q({
 		keyword: "constraint",
 		field: "constraints",
 		takesID: !0,
-		parse: Rr,
-		dump: zr
+		parse: Lr,
+		dump: Rr
 	}),
-	K({
+	q({
 		keyword: "discrepancy_record",
 		field: "discrepancyRecords",
 		takesID: !0,
-		parse: Vr,
-		dump: Hr
+		parse: Br,
+		dump: Vr
 	}),
-	K({
+	q({
 		keyword: "state_machine",
 		field: "stateMachines",
 		takesID: !0,
 		parse: Ln,
 		dump: Bn
 	}),
+	ti,
 	ni,
-	ri,
+	_a,
 	va,
 	ya,
 	ba,
 	xa,
-	Sa,
-	li,
-	K({
+	ci,
+	q({
 		keyword: "conformance_test",
 		field: "conformanceTests",
 		takesID: !0,
-		parse: Cr,
-		dump: wr
+		parse: Sr,
+		dump: Cr
 	}),
-	Ca,
-	Ma,
+	Sa,
+	ja,
+	Ua,
 	Wa,
-	Ga,
+	xo,
 	So,
-	Co,
-	K({
+	q({
 		keyword: "activity_archetype",
 		field: "activityArchetypes",
 		takesID: !0,
-		parse: wo,
-		dump: To
+		parse: Co,
+		dump: wo
 	}),
-	bi,
-	ro,
+	yi,
+	no,
+	so,
 	co,
-	lo,
+	uo,
 	fo,
-	po,
-	K({
+	q({
 		keyword: "text",
 		field: "texts",
 		takesID: !0,
-		parse: mo,
-		dump: ho
+		parse: po,
+		dump: mo
 	})
 ];
-function Do(e) {
+function Eo(e) {
 	let t = {};
 	for (let n of e) {
 		if (!n.field) continue;
@@ -7152,35 +7165,35 @@ function Do(e) {
 	}
 	return t;
 }
-function Oo(e) {
+function Do(e) {
 	let t = {};
 	for (let n of e) n.field && (t[n.field] = { resolve: n.resolve ?? ((e, t) => t) });
 	return t;
 }
-function ko(e) {
+function Oo(e) {
 	let t = {};
 	for (let n of e) n.field && (t[n.field] = n.dump);
 	return t;
 }
-var Ao = {
-	package: { parse: si },
+var ko = {
+	package: { parse: oi },
 	root: { parse: (e) => (t) => (t.root = e.trim(), t) },
 	metadata: { parse: m },
 	version: { parse: () => (e) => e },
-	...Do(Eo)
-}, jo = Oo(Eo), Mo = ko(Eo), q = (/* @__PURE__ */ e(((e, t) => {
+	...Eo(To)
+}, Ao = Do(To), jo = Oo(To), J = (/* @__PURE__ */ e(((e, t) => {
 	t.exports = {};
-})))(), No = /^include\s+"([^"]+)"/gm, Po = /^[ \t]*(#|\/\/)/;
-function J(e, t = /* @__PURE__ */ new Set()) {
-	let n = (0, q.resolve)(e);
+})))(), Mo = /^include\s+"([^"]+)"/gm, No = /^[ \t]*(#|\/\/)/;
+function Po(e, t = /* @__PURE__ */ new Set()) {
+	let n = (0, J.resolve)(e);
 	if (t.has(n)) throw Error(`Include cycle detected: ${n} (chain: ${[...t, n].map((e) => e.split("/").pop()).join(" → ")})`);
-	if (t.add(n), !(0, q.existsSync)(n)) throw Error(`Include file not found: ${n}`);
-	let r = (0, q.readFileSync)(n, "utf8"), i = (0, q.dirname)(n);
-	return r.replace(No, (e, n, a) => {
+	if (t.add(n), !(0, J.existsSync)(n)) throw Error(`Include file not found: ${n}`);
+	let r = (0, J.readFileSync)(n, "utf8"), i = (0, J.dirname)(n);
+	return r.replace(Mo, (e, n, a) => {
 		let o = r.lastIndexOf("\n", a) + 1, s = r.slice(o, a);
-		if (Po.test(s)) return e;
-		let c = (0, q.isAbsolute)(n) ? n : (0, q.resolve)(i, n);
-		return J(c.endsWith(".prl") || c.endsWith(".mmel") ? c : (0, q.existsSync)(`${c}.prl`) ? `${c}.prl` : `${c}.mmel`, new Set(t));
+		if (No.test(s)) return e;
+		let c = (0, J.isAbsolute)(n) ? n : (0, J.resolve)(i, n);
+		return Po(c.endsWith(".prl") || c.endsWith(".mmel") ? c : (0, J.existsSync)(`${c}.prl`) ? `${c}.prl` : `${c}.mmel`, new Set(t));
 	});
 }
 //#endregion
@@ -7287,24 +7300,24 @@ var Ho = [
 ];
 function Uo(e) {
 	let t = [];
-	if (!(0, q.existsSync)(e)) return t;
-	for (let n of (0, q.readdirSync)(e).sort()) {
-		let r = (0, q.join)(e, n);
-		(0, q.statSync)(r).isDirectory() ? t.push(...Uo(r)) : (n.endsWith(".prl") || n.endsWith(".mmel")) && t.push(r);
+	if (!(0, J.existsSync)(e)) return t;
+	for (let n of (0, J.readdirSync)(e).sort()) {
+		let r = (0, J.join)(e, n);
+		(0, J.statSync)(r).isDirectory() ? t.push(...Uo(r)) : (n.endsWith(".prl") || n.endsWith(".mmel")) && t.push(r);
 	}
 	return t;
 }
 function Wo(e) {
-	let t = (0, q.resolve)(e), n = [], r = (0, q.join)(t, "package.primmel");
-	(0, q.existsSync)(r) && n.push({
+	let t = (0, J.resolve)(e), n = [], r = (0, J.join)(t, "package.primmel");
+	(0, J.existsSync)(r) && n.push({
 		path: r,
 		role: "manifest"
 	});
 	let i = [];
-	for (let e of Ho) i.push(...Uo((0, q.join)(t, e)));
-	for (let e of (0, q.readdirSync)(t).sort()) {
-		let n = (0, q.join)(t, e);
-		(0, q.statSync)(n).isFile() && (e.endsWith(".prl") || e.endsWith(".mmel")) && e !== "package.primmel" && e !== ".primmel-allowlist.prl" && i.push(n);
+	for (let e of Ho) i.push(...Uo((0, J.join)(t, e)));
+	for (let e of (0, J.readdirSync)(t).sort()) {
+		let n = (0, J.join)(t, e);
+		(0, J.statSync)(n).isFile() && (e.endsWith(".prl") || e.endsWith(".mmel")) && e !== "package.primmel" && e !== ".primmel-allowlist.prl" && i.push(n);
 	}
 	i.sort();
 	for (let e of i) n.push({
@@ -7314,36 +7327,114 @@ function Wo(e) {
 	return n;
 }
 function Go(e, t = {}) {
-	return qo(e, t).standard;
+	return $o(e, t).standard;
+}
+function Ko(e, t) {
+	let n = /* @__PURE__ */ new Map(), r = [];
+	for (let i of t) {
+		let t = e.constructs[i.field]?.[i.id];
+		if (!t) {
+			r.push(i);
+			continue;
+		}
+		let a = n.get(t.file);
+		a ? a.push(i) : n.set(t.file, [i]);
+	}
+	return {
+		byFile: n,
+		unassigned: r
+	};
+}
+function qo(e, t = {}) {
+	let n = $o(e, t, !0);
+	if (!n.provenance) throw Error("loadPackageWithProvenance: provenance not collected");
+	return {
+		...n,
+		provenance: n.provenance
+	};
+}
+function Jo(e) {
+	let t = 0;
+	for (let n = 0; n < e.length; n++) e.charAt(n) === "\n" && t++;
+	return t;
+}
+function Yo(e) {
+	let t = [], n = 0, r = 1;
+	for (let i of e) {
+		if (i.role !== "content") continue;
+		let e = Po(i.path);
+		t.push({
+			path: i.path,
+			text: e,
+			start: n,
+			lineStart: r
+		}), n += e.length + 2, r += Jo(e) + 2;
+	}
+	return t;
+}
+function Xo(e) {
+	return e.map((e) => e.text).join("\n\n");
+}
+function Zo(e, t, n) {
+	let r = {}, i = 0;
+	for (let a of e) {
+		for (; i + 1 < t.length && a.start.offset >= t[i + 1].start;) i++;
+		let e = t[i], o = (t) => ({
+			line: t.line - e.lineStart + 1,
+			col: t.col,
+			offset: t.offset - e.start
+		}), s = {
+			file: e.path,
+			...n === void 0 ? {} : { package: n },
+			span: {
+				start: o(a.start),
+				end: o(a.end)
+			}
+		};
+		(r[a.field] ??= {})[a.id] = s;
+	}
+	return r;
 }
-function Ko(e) {
-	let t = (0, q.join)((0, q.resolve)(e), "package.primmel");
-	if (!(0, q.existsSync)(t)) throw Error(`loadPackage: no package.primmel found in ${(0, q.resolve)(e)}`);
-	let n = (0, q.readFileSync)(t, "utf8"), r = { packageManifest: null };
-	si(n)(r);
+function Qo(e) {
+	let t = (0, J.join)((0, J.resolve)(e), "package.primmel");
+	if (!(0, J.existsSync)(t)) throw Error(`loadPackage: no package.primmel found in ${(0, J.resolve)(e)}`);
+	let n = (0, J.readFileSync)(t, "utf8"), r = { packageManifest: null };
+	oi(n)(r);
 	let i = r.packageManifest;
 	if (!i || !i.id) throw Error(`loadPackage: ${t} is not a valid package manifest`);
 	return i;
 }
-function qo(e, t = {}) {
-	let n = Wo(e);
-	if (n.length === 0) throw Error(`loadPackage: no package files found in ${(0, q.resolve)(e)}`);
-	let r = null, i = [];
-	for (let t of n) t.role === "manifest" ? r = Ko(e) : i.push(J(t.path));
-	if (r && t.resolvePackage && Yo(r).length > 0) return $o(e, t, r);
-	let a = u(i.join("\n\n"), Ao, t);
-	if (r) {
-		a.packageManifest = r;
-		let e = Xo(r);
-		e && a.issues.push(e);
-	}
-	return {
-		standard: p(a, jo),
-		issues: a.issues
+function $o(e, t = {}, n = !1) {
+	let r = Wo(e);
+	if (r.length === 0) throw Error(`loadPackage: no package files found in ${(0, J.resolve)(e)}`);
+	let i = null;
+	r.some((e) => e.role === "manifest") && (i = Qo(e));
+	let a = Yo(r);
+	if (i && t.resolvePackage && ts(i).length > 0) return as(e, t, i, n);
+	let o = n ? {
+		...t,
+		withProvenance: !0
+	} : t, s = u(Xo(a), ko, o);
+	if (i) {
+		s.packageManifest = i;
+		let e = ns(i);
+		e && s.issues.push(e);
+	}
+	let c = {
+		standard: p(s, Ao),
+		issues: s.issues
 	};
+	if (n) {
+		let e = r.find((e) => e.role === "manifest")?.path;
+		c.provenance = {
+			...e === void 0 ? {} : { manifest: e },
+			constructs: Zo(s.constructs ?? [], a, i?.id)
+		};
+	}
+	return c;
 }
-function Jo(e, t = {}) {
-	return qo(e, t);
+function es(e, t = {}) {
+	return $o(e, t);
 }
 var Y = class extends Error {
 	rule;
@@ -7351,12 +7442,12 @@ var Y = class extends Error {
 		super(t), this.rule = e, this.name = "CompositionError";
 	}
 };
-function Yo(e) {
+function ts(e) {
 	let t = [];
 	for (let n of [...e.uses ?? [], ...e.extends ? [e.extends] : []]) t.includes(n) || t.push(n);
 	return t;
 }
-function Xo(e) {
+function ns(e) {
 	return e.extends ? {
 		severity: "warning",
 		code: "extends-deprecated",
@@ -7365,63 +7456,71 @@ function Xo(e) {
 		message: `package "${e.id}": 'extends ${e.extends}' is deprecated — declare 'uses { ${e.extends} }' instead (extends is treated as a single-entry uses)`
 	} : null;
 }
-var Zo = /* @__PURE__ */ "approvals.roles.processes.pages.gateways.regs.references.provisions.dataclasses.events.enums.variables.notes.tables.figures.links.mapProfiles.viewProfiles.terms.forms.subforms.symbols.calculations.verdicts.referenceMaterials.testPointSets.competenceKinds.constraints.discrepancyRecords.stateMachines.conformanceTests.conformanceClasses.requirements.requirementClasses.instruments.attributeDefinitions.capabilities.behaviors.conditionSets.subjects.instances.quantityRegisters.duals.invariants.testSequences.formulasUsed.texts".split(".");
-function Qo(e, t) {
-	let n = [];
-	for (let t of Wo(e)) t.role === "content" && n.push(J(t.path));
-	return u(n.join("\n\n"), Ao, t);
-}
-function $o(e, t, n) {
-	let r = t.resolvePackage, i = n.id, a = /* @__PURE__ */ new Map([[i, (0, q.resolve)(e)]]), o = /* @__PURE__ */ new Map([[i, n]]), s = [], c = /* @__PURE__ */ new Map(), l = [], u = (e) => {
-		c.set(e, 1), l.push(e);
-		for (let t of Yo(o.get(e))) {
-			let n = c.get(t) ?? 0;
-			if (n === 1) throw new Y("uses-cycle", `uses cycle: ${[...l.slice(l.indexOf(t)), t].join(" → ")} — package composition must be acyclic (uses-cycle)`);
+var rs = /* @__PURE__ */ "approvals.roles.processes.pages.gateways.regs.references.provisions.dataclasses.events.enums.variables.notes.tables.figures.links.mapProfiles.viewProfiles.terms.forms.subforms.symbols.calculations.verdicts.referenceMaterials.testPointSets.competenceKinds.constraints.discrepancyRecords.stateMachines.conformanceTests.conformanceClasses.requirements.requirementClasses.instruments.attributeDefinitions.capabilities.behaviors.conditionSets.subjects.instances.quantityRegisters.duals.invariants.testSequences.formulasUsed.texts".split(".");
+function is(e, t) {
+	let n = Yo(Wo(e));
+	return {
+		ctx: u(Xo(n), ko, t),
+		chunks: n
+	};
+}
+function as(e, t, n, r = !1) {
+	let i = t.resolvePackage, a = n.id, o = /* @__PURE__ */ new Map([[a, (0, J.resolve)(e)]]), s = /* @__PURE__ */ new Map([[a, n]]), c = [], l = /* @__PURE__ */ new Map(), u = [], d = (e) => {
+		l.set(e, 1), u.push(e);
+		for (let t of ts(s.get(e))) {
+			let n = l.get(t) ?? 0;
+			if (n === 1) throw new Y("uses-cycle", `uses cycle: ${[...u.slice(u.indexOf(t)), t].join(" → ")} — package composition must be acyclic (uses-cycle)`);
 			if (n !== 2) {
-				if (!a.has(t)) {
-					let n = r(t);
+				if (!o.has(t)) {
+					let n = i(t);
 					if (!n) throw new Y("uses-resolves", `package "${e}" uses "${t}", which the package locator cannot resolve (uses-resolves)`);
-					let i = Ko(n);
-					if (i.id !== t) throw new Y("uses-resolves", `package "${e}" uses "${t}", but the located package (${(0, q.resolve)(n)}) declares id "${i.id}" (uses-resolves)`);
-					if (a.set(t, n), o.set(t, i), i.kind === "product_reference") {
-						c.set(t, 2);
+					let r = Qo(n);
+					if (r.id !== t) throw new Y("uses-resolves", `package "${e}" uses "${t}", but the located package (${(0, J.resolve)(n)}) declares id "${r.id}" (uses-resolves)`);
+					if (o.set(t, n), s.set(t, r), r.kind === "product_reference") {
+						l.set(t, 2);
 						continue;
 					}
 				}
-				u(t);
+				d(t);
 			}
 		}
-		l.pop(), c.set(e, 2), s.push(e);
+		u.pop(), l.set(e, 2), c.push(e);
 	};
-	u(i);
-	let d = /* @__PURE__ */ new Map();
-	for (let e of s) d.set(e, Qo(a.get(e), t));
-	let f = /* @__PURE__ */ new Map();
-	for (let e of Zo) f.set(e, /* @__PURE__ */ new Map());
-	let m = d.get(s[0]);
-	for (let e of Zo) for (let t of Object.keys(m[e])) f.get(e).set(t, s[0]);
-	for (let e of s.slice(1)) {
-		let t = d.get(e);
-		for (let n of Zo) {
-			let r = m[n], i = f.get(n);
+	d(a);
+	let f = r ? {
+		...t,
+		withProvenance: !0
+	} : t, m = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map();
+	for (let e of c) {
+		let t = is(o.get(e), f);
+		m.set(e, t.ctx), h.set(e, t.chunks);
+	}
+	let g = /* @__PURE__ */ new Map();
+	for (let e of rs) g.set(e, /* @__PURE__ */ new Map());
+	let _ = m.get(c[0]);
+	for (let e of rs) for (let t of Object.keys(_[e])) g.get(e).set(t, c[0]);
+	for (let e of c.slice(1)) {
+		let t = m.get(e);
+		for (let n of rs) {
+			let r = _[n], i = g.get(n);
 			for (let [a, o] of Object.entries(t[n])) {
 				let t = i.get(a);
-				if (t !== void 0) throw new Y("uses-no-redefine", `package "${e}" redefines ${String(n)} id "${a}" already declared by package "${t}" — an overlay may reference upstream ids, never redefine them (uses-no-redefine)`);
+				if (t !== void 0 && !(n === "terms" && typeof o == "object" && o && o.overlay === !0)) throw new Y("uses-no-redefine", `package "${e}" redefines ${String(n)} id "${a}" already declared by package "${t}" — an overlay may reference upstream ids, never redefine them (uses-no-redefine)`);
 				r[a] = o, i.set(a, e);
 			}
 		}
-		m.issues.push(...t.issues), !m.metadata && t.metadata && (m.metadata = t.metadata);
+		_.issues.push(...t.issues), !_.metadata && t.metadata && (_.metadata = t.metadata);
 	}
-	for (let e of s) {
-		let t = o.get(e);
-		for (let n of t.requires ?? []) if (!s.some((t) => t !== e && (t === n || (o.get(t).provides ?? []).includes(n)))) throw new Y("requires-satisfied", `package "${e}" requires "${n}", which no package in the composition provides (requires-satisfied)`);
+	for (let e of c) {
+		let t = s.get(e);
+		for (let n of t.requires ?? []) if (!c.some((t) => t !== e && (t === n || (s.get(t).provides ?? []).includes(n)))) throw new Y("requires-satisfied", `package "${e}" requires "${n}", which no package in the composition provides (requires-satisfied)`);
 	}
-	let h = [];
-	s.forEach((e, t) => {
-		let n = o.get(e), r = s.slice(t + 1);
+	let v = [];
+	c.forEach((e, t) => {
+		let n = s.get(e), r = c.slice(t + 1);
 		for (let t of n.provides ?? []) {
-			let n = r.some((e) => (o.get(e).requires ?? []).includes(t)), i = r.some((n) => (o.get(n).waives ?? []).some((n) => n === t || n === `${e}:${t}`));
-			!n && !i && h.push({
+			let n = r.some((e) => (s.get(e).requires ?? []).includes(t)), i = r.some((n) => (s.get(n).waives ?? []).some((n) => n === t || n === `${e}:${t}`));
+			!n && !i && v.push({
 				severity: "warning",
 				code: "provides-unconsumed",
 				construct: "package",
@@ -7430,22 +7529,38 @@ function $o(e, t, n) {
 			});
 		}
 	});
-	for (let e of o.values()) {
-		let t = Xo(e);
-		t && h.push(t);
-	}
-	return m.packageManifest = n, {
-		standard: p(m, jo),
-		issues: [...m.issues, ...h],
+	for (let e of s.values()) {
+		let t = ns(e);
+		t && v.push(t);
+	}
+	_.packageManifest = n;
+	let y = {
+		standard: p(_, Ao),
+		issues: [..._.issues, ...v],
 		composition: {
-			root: i,
-			order: s
+			root: a,
+			order: c
 		}
 	};
+	if (r) {
+		let t = {};
+		for (let e of c) {
+			let n = Zo(m.get(e).constructs ?? [], h.get(e), e);
+			for (let [e, r] of Object.entries(n)) {
+				let n = t[e] ??= {};
+				for (let [e, t] of Object.entries(r)) n[e] = t;
+			}
+		}
+		y.provenance = {
+			manifest: (0, J.join)((0, J.resolve)(e), "package.primmel"),
+			constructs: t
+		};
+	}
+	return y;
 }
 //#endregion
 //#region src/ser-des/prm.ts
-var es = /* @__PURE__ */ new Set(["MMEL_MAP", "Primmel_MAP"]), ts = /* @__PURE__ */ new Set([
+var os = /* @__PURE__ */ new Set(["MMEL_MAP", "Primmel_MAP"]), ss = /* @__PURE__ */ new Set([
 	"full",
 	"minimal",
 	"partial",
@@ -7454,7 +7569,7 @@ var es = /* @__PURE__ */ new Set(["MMEL_MAP", "Primmel_MAP"]), ts = /* @__PURE__
 function X(e) {
 	throw Error(`.prm parse error: ${e}`);
 }
-function ns(e, t) {
+function cs(e, t) {
 	let n = {
 		description: "",
 		justification: "",
@@ -7463,9 +7578,9 @@ function ns(e, t) {
 	if (e == null) return n;
 	(typeof e != "object" || Array.isArray(e)) && X(`${t}: pair metadata must be an object`);
 	let r = e;
-	return r.description !== void 0 && (typeof r.description != "string" && X(`${t}: "description" must be a string`), n.description = r.description), r.justification !== void 0 && (typeof r.justification != "string" && X(`${t}: "justification" must be a string`), n.justification = r.justification), r.coverage !== void 0 && ((typeof r.coverage != "string" || !ts.has(r.coverage)) && X(`${t}: "coverage" must be one of full | minimal | partial | none`), n.coverage = r.coverage), n;
+	return r.description !== void 0 && (typeof r.description != "string" && X(`${t}: "description" must be a string`), n.description = r.description), r.justification !== void 0 && (typeof r.justification != "string" && X(`${t}: "justification" must be a string`), n.justification = r.justification), r.coverage !== void 0 && ((typeof r.coverage != "string" || !ss.has(r.coverage)) && X(`${t}: "coverage" must be one of full | minimal | partial | none`), n.coverage = r.coverage), n;
 }
-function rs(e) {
+function ls(e) {
 	let t;
 	try {
 		t = JSON.parse(e);
@@ -7474,7 +7589,7 @@ function rs(e) {
 	}
 	(typeof t != "object" || !t || Array.isArray(t)) && X("top level must be an object");
 	let n = t, r = typeof n["@type"] == "string" ? n["@type"] : "";
-	es.has(r) || X(`"@type" must be MMEL_MAP or Primmel_MAP (got "${r}")`);
+	os.has(r) || X(`"@type" must be MMEL_MAP or Primmel_MAP (got "${r}")`);
 	let i = {
 		context: typeof n["@context"] == "string" ? n["@context"] : "",
 		type: r,
@@ -7490,20 +7605,20 @@ function rs(e) {
 			coverage: {}
 		}, a = n.coverage ?? {};
 		(typeof a != "object" || !a || Array.isArray(a)) && X(`mapSet."${e}".coverage: must be an object`);
-		for (let [t, n] of Object.entries(a)) (typeof n != "string" || !ts.has(n)) && X(`mapSet."${e}".coverage."${t}": must be one of full | minimal | partial | none`), r.coverage[t] = n;
+		for (let [t, n] of Object.entries(a)) (typeof n != "string" || !ss.has(n)) && X(`mapSet."${e}".coverage."${t}": must be one of full | minimal | partial | none`), r.coverage[t] = n;
 		let o = n.mappings ?? {};
 		(typeof o != "object" || !o || Array.isArray(o)) && X(`mapSet."${e}".mappings: must be an object`);
 		for (let [t, n] of Object.entries(o)) {
 			(typeof n != "object" || !n || Array.isArray(n)) && X(`mapSet."${e}".mappings."${t}": must be an object`);
 			let i = {};
-			for (let [r, a] of Object.entries(n)) i[r] = ns(a, `mapSet."${e}".mappings."${t}"."${r}"`);
+			for (let [r, a] of Object.entries(n)) i[r] = cs(a, `mapSet."${e}".mappings."${t}"."${r}"`);
 			r.mappings[t] = i;
 		}
 		i.mapSet[e] = r;
 	}
 	return i;
 }
-function is(e) {
+function us(e) {
 	let t = {};
 	e.context && (t["@context"] = e.context), t["@type"] = e.type || "Primmel_MAP", t.id = e.id;
 	let n = {};
@@ -7528,7 +7643,7 @@ function is(e) {
 	}
 	return t.mapSet = n, JSON.stringify(t, null, 2) + "\n";
 }
-function as(e) {
+function ds(e) {
 	let t = [];
 	for (let [n, r] of Object.entries(e.mapSet)) {
 		let e = {};
@@ -7547,7 +7662,7 @@ function as(e) {
 	}
 	return t;
 }
-function os(e, t) {
+function fs(e, t) {
 	let n = {
 		context: "",
 		type: "Primmel_MAP",
@@ -7575,7 +7690,7 @@ function os(e, t) {
 }
 //#endregion
 //#region src/type-expr.ts
-var ss = [
+var ps = [
 	"integer",
 	"float",
 	"double",
@@ -7590,8 +7705,8 @@ var ss = [
 	"reference",
 	"object",
 	"any"
-], cs = /^[A-Za-z_][A-Za-z0-9_-]*$/;
-function ls(e) {
+], ms = /^[A-Za-z_][A-Za-z0-9_-]*$/;
+function hs(e) {
 	let t = 0;
 	for (let n = 0; n < e.length; n++) {
 		let r = e[n];
@@ -7601,33 +7716,33 @@ function ls(e) {
 	}
 	return null;
 }
-function us(e) {
+function gs(e) {
 	let t = e.trim();
 	if (t === "QuantityValue") return { kind: "quantity" };
-	if (ss.includes(t)) return {
+	if (ps.includes(t)) return {
 		kind: "primitive",
 		name: t
 	};
 	let n = /^reference\(([^)]+)\)$/.exec(t);
 	if (n) {
 		let e = n[1].trim();
-		return cs.test(e) ? {
+		return ms.test(e) ? {
 			kind: "reference",
 			target: e
 		} : null;
 	}
 	if (t.startsWith("map<") && t.endsWith(">")) {
-		let e = ls(t.slice(4, -1));
+		let e = hs(t.slice(4, -1));
 		if (!e) return null;
 		let n = e[0].trim(), r = null;
 		n === "string" ? r = {
 			kind: "primitive",
 			name: "string"
-		} : cs.test(n) && (r = {
+		} : ms.test(n) && (r = {
 			kind: "reference",
 			target: n
 		});
-		let i = us(e[1]);
+		let i = gs(e[1]);
 		return !r || !i ? null : {
 			kind: "map",
 			key: r,
@@ -7636,8 +7751,8 @@ function us(e) {
 	}
 	return null;
 }
-function ds(e) {
-	let t = us(e);
+function _s(e) {
+	let t = gs(e);
 	return t !== null && t.kind === "map";
 }
 //#endregion
@@ -7658,7 +7773,7 @@ function Z(e, t) {
 		qualified: t + "#" + e
 	};
 }
-function fs(e, t) {
+function vs(e, t) {
 	let n = [];
 	for (let [r, i] of Object.entries(e.mappings)) for (let a of i) n.push({
 		source: r,
@@ -7671,12 +7786,12 @@ function fs(e, t) {
 	});
 	return n;
 }
-function ps(e, t = {}) {
+function ys(e, t = {}) {
 	let n = t.modelId ?? e.packageManifest?.id ?? e.meta?.namespace ?? "", r = [...e.mapProfiles ?? []], i = t.prm ? Array.isArray(t.prm) ? t.prm : [t.prm] : [];
-	for (let e of i) r.push(...as(e));
-	return r.flatMap((e) => fs(e, n));
+	for (let e of i) r.push(...ds(e));
+	return r.flatMap((e) => vs(e, n));
 }
-function ms(e, t = {}) {
+function bs(e, t = {}) {
 	let n = t.idPrefix ?? "", r = (e.processes ?? []).filter((e) => !n || e.id.startsWith(n)), i = new Set(r.map((e) => e.id)), a = /* @__PURE__ */ new Map();
 	for (let e of r) a.set(e.id, {
 		id: e.id.slice(n.length),
@@ -7690,18 +7805,18 @@ function ms(e, t = {}) {
 	}
 	return o;
 }
-function hs(e, t) {
+function xs(e, t) {
 	return t.length === 0 ? "none" : t.every((e) => e === "full") ? "full" : e === "gateway" && t.some((e) => e === "full" || e === "minimal") ? "minimal" : t.some((e) => e !== "none") ? "partial" : "none";
 }
-function gs(e, t, n, r, i = {}) {
-	let a = Array.isArray(t) ? t : ms(t), o = n.filter((e) => e.targetModel === r), s = /* @__PURE__ */ new Map();
+function Ss(e, t, n, r, i = {}) {
+	let a = Array.isArray(t) ? t : bs(t), o = n.filter((e) => e.targetModel === r), s = /* @__PURE__ */ new Map();
 	for (let e of o) {
 		let t = Z(e.target, r).id;
 		(s.get(t) ?? s.set(t, []).get(t)).push(e.source);
 	}
 	let c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map(), u = (e, t) => {
 		let n = s.has(e.id), r = n ? e.id : t, i = e.children.map((e) => u(e, r)), a;
-		return r === null ? a = e.children.length === 0 ? "none" : hs(e.composition, i) : (a = "full", !n && t !== null && l.set(e.id, t)), c.set(e.id, a), a;
+		return r === null ? a = e.children.length === 0 ? "none" : xs(e.composition, i) : (a = "full", !n && t !== null && l.set(e.id, t)), c.set(e.id, a), a;
 	};
 	for (let e of a) u(e, null);
 	let d = [], f = /* @__PURE__ */ new Map(), p = (e) => {
@@ -7781,7 +7896,7 @@ function gs(e, t, n, r, i = {}) {
 		summary: m
 	};
 }
-function _s(e) {
+function Cs(e) {
 	let t = [], n = /* @__PURE__ */ new Set();
 	for (let r of e) for (let i of r.mappings) for (let r of e) if (r.modelId === i.targetModel) for (let e of r.mappings) {
 		if (i.target !== `${r.modelId}#${e.source}`) continue;
@@ -7799,7 +7914,7 @@ function _s(e) {
 	}
 	return t;
 }
-function vs(e) {
+function ws(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e) for (let e of n.mappings) {
 		let r = `${n.modelId}→${e.targetModel}`, i = t.get(r) ?? {
@@ -7811,14 +7926,14 @@ function vs(e) {
 	}
 	return [...t.values()];
 }
-function ys(e) {
+function Ts(e) {
 	if (e && typeof e == "object") {
-		for (let t of Object.values(e)) ys(t);
+		for (let t of Object.values(e)) Ts(t);
 		Object.freeze(e);
 	}
 	return e;
 }
-function bs(e, t, n = null) {
+function Es(e, t, n = null) {
 	let r = new Set(t.visibleElements ?? []), i = r.size > 0, a = i ? [...r] : (e.processes ?? []).map((e) => e.id), o = null;
 	if (n) {
 		let e = n.components.filter((e) => !i || r.has(e.id) || e.mappedBy.some((e) => r.has(e))), t = {
@@ -7836,14 +7951,14 @@ function bs(e, t, n = null) {
 			summary: t
 		};
 	}
-	return ys({
+	return Ts({
 		id: t.id,
 		against: t.against ?? "",
 		elements: a,
 		coverage: o
 	});
 }
-function xs(e) {
+function Ds(e) {
 	let t = /* @__PURE__ */ new Set(), n = (e) => {
 		for (let n of e ?? []) t.add(n.id);
 	};
@@ -7860,13 +7975,13 @@ function xs(e) {
 }
 //#endregion
 //#region src/model-diff.ts
-var Ss = [
+var Os = [
 	"foundations",
 	"primary",
 	"secondary",
 	"tertiary",
 	"cross-cutting"
-], Cs = {
+], ks = {
 	terms: "foundations",
 	references: "foundations",
 	roles: "foundations",
@@ -7929,9 +8044,9 @@ function Q(e) {
 	};
 	return n(e);
 }
-var ws = /#([^#]*)$/;
-function Ts(e, t, n = "") {
-	let r = e ?? "", i = n ?? "", a = ws.exec(r);
+var As = /#([^#]*)$/;
+function js(e, t, n = "") {
+	let r = e ?? "", i = n ?? "", a = As.exec(r);
 	a && (r = r.slice(0, a.index), i ||= a[1]);
 	let o = r.lastIndexOf(":"), s = r, c = "";
 	if (o >= 0) {
@@ -7945,11 +8060,11 @@ function Ts(e, t, n = "") {
 		fragment: i
 	};
 }
-var Es = [
+var Ms = [
 	"source",
 	"sourceRef",
 	"sourceRefs"
-], Ds = {
+], Ns = {
 	requirements: {
 		statement: [
 			"name",
@@ -7998,7 +8113,7 @@ var Es = [
 			"profile"
 		]
 	}
-}, Os = [
+}, Ps = [
 	"name",
 	"label",
 	"title",
@@ -8007,16 +8122,16 @@ var Es = [
 	"statement",
 	"purpose",
 	"text"
-], ks = [
+], Fs = [
 	"parent",
 	"bindsTo",
 	"targets",
 	"conformanceProcessId",
 	"conformanceProcessIds"
 ];
-function As(e) {
+function Is(e) {
 	let t = [], n = (e) => {
-		e && typeof e == "object" && (e.doc || e.clause) && t.push(Ts(e.doc ?? "", e.clause ?? "", e.fragment));
+		e && typeof e == "object" && (e.doc || e.clause) && t.push(js(e.doc ?? "", e.clause ?? "", e.fragment));
 	};
 	n(e.source), n(e.sourceRef);
 	for (let t of e.sourceRefs ?? []) n(t);
@@ -8027,21 +8142,21 @@ function As(e) {
 	});
 	let i = /* @__PURE__ */ new Set();
 	return t.filter((e) => {
-		let t = js(e);
+		let t = Ls(e);
 		return !i.has(t) && (i.add(t), !0);
 	});
 }
-function js(e) {
+function Ls(e) {
 	return Q({
 		basis: e.basis,
 		clause: e.clause,
 		fragment: e.fragment
 	});
 }
-function Ms(e, t) {
-	let n = String(t.id ?? t.entityName ?? ""), r = Cs[e] ?? "cross-cutting", i = As(t), a = new Set(Es);
+function Rs(e, t) {
+	let n = String(t.id ?? t.entityName ?? ""), r = ks[e] ?? "cross-cutting", i = Is(t), a = new Set(Ms);
 	typeof t.reference == "string" && t.reference.startsWith("urn:") && a.add("reference");
-	let o = {}, s = Ds[e], c = (e) => {
+	let o = {}, s = Ns[e], c = (e) => {
 		let n = {};
 		for (let r of e) t[r] !== void 0 && (n[r] = t[r], a.add(r));
 		return n;
@@ -8058,9 +8173,9 @@ function Ms(e, t) {
 			via: t.via
 		}));
 	} else {
-		let e = c(Os);
+		let e = c(Ps);
 		Object.keys(e).length > 0 && (o.statement = Q(e));
-		let t = c(ks);
+		let t = c(Fs);
 		Object.keys(t).length > 0 && (o.anchor = Q(t));
 	}
 	i.length > 0 && (o.provenance = Q(i.map((e) => ({
@@ -8079,31 +8194,31 @@ function Ms(e, t) {
 		provenance: i
 	};
 }
-function Ns(e, t) {
+function zs(e, t) {
 	let n = /* @__PURE__ */ new Map();
-	for (let r of Object.keys(Cs)) {
+	for (let r of Object.keys(ks)) {
 		let i = e[r];
 		if (Array.isArray(i)) {
 			for (let e of i) if (e && typeof e == "object" && ("id" in e || "entityName" in e)) {
-				let i = Ms(r, e);
+				let i = Rs(r, e);
 				n.has(i.key) && t?.push(i.key), n.set(i.key, i);
 			}
 		}
 	}
 	return n;
 }
-function Ps(e, t) {
+function Bs(e, t) {
 	return `${e}#${t}`;
 }
 function $(e) {
 	return e?.version ?? "";
 }
-function Fs(e) {
+function Vs(e) {
 	let t = [...new Set(e)].sort();
 	return t.filter((e) => !t.some((t) => t !== e && e.startsWith(t + ".")));
 }
-function Is(e, t, n) {
-	let r = n.mappingsA ?? ps(e), i = n.mappingsB ?? ps(t), a = (e) => `${e.sourceModel}#${e.source}⇒${e.target}`, o = new Map(r.map((e) => [a(e), e])), s = new Map(i.map((e) => [a(e), e])), c = [], l = [], u = [];
+function Hs(e, t, n) {
+	let r = n.mappingsA ?? ys(e), i = n.mappingsB ?? ys(t), a = (e) => `${e.sourceModel}#${e.source}⇒${e.target}`, o = new Map(r.map((e) => [a(e), e])), s = new Map(i.map((e) => [a(e), e])), c = [], l = [], u = [];
 	for (let [e, t] of s) o.has(e) || c.push(t);
 	for (let [e, t] of o) {
 		let n = s.get(e);
@@ -8124,7 +8239,7 @@ function Is(e, t, n) {
 		let o = (e) => {
 			let t = n.references?.[a];
 			if (t) return t;
-			let r = ms(e, { idPrefix: `${a}#` });
+			let r = bs(e, { idPrefix: `${a}#` });
 			return r.length > 0 ? r : null;
 		}, s = o(e), c = o(t);
 		if (!s && !c) {
@@ -8133,11 +8248,11 @@ function Is(e, t, n) {
 		}
 		let l = /* @__PURE__ */ new Map();
 		if (s) {
-			let t = gs(e, s, r, a);
+			let t = Ss(e, s, r, a);
 			for (let e of t.components) l.set(e.id, { from: e.coverage });
 		}
 		if (c) {
-			let e = gs(t, c, i, a);
+			let e = Ss(t, c, i, a);
 			for (let t of e.components) {
 				let e = l.get(t.id) ?? {};
 				e.to = t.coverage, l.set(t.id, e);
@@ -8161,12 +8276,12 @@ function Is(e, t, n) {
 		namespacesSkipped: p
 	};
 }
-function Ls(e, t) {
+function Us(e, t) {
 	let n = [];
 	for (let [t, r] of e) {
 		let e = /* @__PURE__ */ new Set([...t.provenance.map((e) => e.basis), ...r.provenance.map((e) => e.basis)]);
 		for (let i of [...e].sort()) {
-			let e = (e) => Fs(e.provenance.filter((e) => e.basis === i).map((e) => e.clause)).filter((e) => e.length > 0), a = e(t), o = e(r), s = a.filter((e) => !o.includes(e)), c = o.filter((e) => !a.includes(e));
+			let e = (e) => Vs(e.provenance.filter((e) => e.basis === i).map((e) => e.clause)).filter((e) => e.length > 0), a = e(t), o = e(r), s = a.filter((e) => !o.includes(e)), c = o.filter((e) => !a.includes(e));
 			if (s.length === 0 && c.length === 0) continue;
 			let l = {
 				key: t.key,
@@ -8216,7 +8331,7 @@ function Ls(e, t) {
 	}
 	let r = (e) => {
 		if (e.kind !== "renumbered" || !t.sentencesA || !t.sentencesB) return "unavailable";
-		let n = t.sentencesA.get(Ps(e.doc, e.from)), r = t.sentencesB.get(Ps(e.doc, e.to));
+		let n = t.sentencesA.get(Bs(e.doc, e.from)), r = t.sentencesB.get(Bs(e.doc, e.to));
 		return n === void 0 || r === void 0 ? "unavailable" : n.replace(/\s+/g, " ").trim() === r.replace(/\s+/g, " ").trim() ? "same" : "differed";
 	}, i = /* @__PURE__ */ new Map();
 	for (let e of n) {
@@ -8232,11 +8347,11 @@ function Ls(e, t) {
 	}
 	return [...i.values()].sort((e, t) => `${e.doc} ${e.from} ${e.to}`.localeCompare(`${t.doc} ${t.from} ${t.to}`));
 }
-function Rs(e, t, n) {
+function Ws(e, t, n) {
 	return e.kind !== "texts" || !n.startsWith("spelling:") ? n : n in e.aspects ? n in t.aspects ? `${n} (changed)` : `${n} (removed)` : `${n} (added)`;
 }
-function zs(e, t, n = {}) {
-	let r = [], i = [], a = Ns(e, r), o = Ns(t, i), s = [], c = [], l = [], u = [], d = [], f = 0, p = Object.fromEntries(Ss.map((e) => [e, {
+function Gs(e, t, n = {}) {
+	let r = [], i = [], a = zs(e, r), o = zs(t, i), s = [], c = [], l = [], u = [], d = [], f = 0, p = Object.fromEntries(Os.map((e) => [e, {
 		added: 0,
 		removed: 0,
 		changed: 0,
@@ -8274,10 +8389,10 @@ function zs(e, t, n = {}) {
 			id: t.id,
 			kind: t.kind,
 			tier: t.tier,
-			aspects: r.map((e) => Rs(t, n, e)).sort()
+			aspects: r.map((e) => Ws(t, n, e)).sort()
 		}), p[t.tier].changed++);
 	}
-	let m = Is(e, t, n), h = Ls(d, n), g = s.length === 0 && c.length === 0 && l.length === 0 && u.length === 0 && m.added.length === 0 && m.removed.length === 0 && m.changed.length === 0 && m.coverageDelta.length === 0 && h.length === 0, _ = e.packageManifest, v = t.packageManifest, y = n.aLabel ?? (_?.id ? `${_.id}@${$(_) || "?"}` : "a"), b = n.bLabel ?? (v?.id ? `${v.id}@${$(v) || "?"}` : "b"), x = !!_?.id && _.id === v?.id && $(_) !== $(v), S = (e, t) => `${e}: duplicate element ${t} — the last declaration wins (a data error the duplicate-id linter owns); this side under-reports`, C = [...r.map((e) => S(y, e)), ...i.map((e) => S(b, e))];
+	let m = Hs(e, t, n), h = Us(d, n), g = s.length === 0 && c.length === 0 && l.length === 0 && u.length === 0 && m.added.length === 0 && m.removed.length === 0 && m.changed.length === 0 && m.coverageDelta.length === 0 && h.length === 0, _ = e.packageManifest, v = t.packageManifest, y = n.aLabel ?? (_?.id ? `${_.id}@${$(_) || "?"}` : "a"), b = n.bLabel ?? (v?.id ? `${v.id}@${$(v) || "?"}` : "b"), x = !!_?.id && _.id === v?.id && $(_) !== $(v), S = (e, t) => `${e}: duplicate element ${t} — the last declaration wins (a data error the duplicate-id linter owns); this side under-reports`, C = [...r.map((e) => S(y, e)), ...i.map((e) => S(b, e))];
 	return {
 		aLabel: y,
 		bLabel: b,
@@ -8296,40 +8411,40 @@ function zs(e, t, n = {}) {
 		empty: g
 	};
 }
-function Bs(e) {
+function Ks(e) {
 	return `[${e.tier}/${e.kind}] ${e.id}`;
 }
-function Vs(e, t) {
+function qs(e, t) {
 	try {
 		let n = e ? JSON.parse(e) : {}, r = t ? JSON.parse(t) : {}, i = [.../* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(r)])].sort().filter((e) => Q(n[e]) !== Q(r[e])).map((e) => `${e}: ${Q(n[e])} → ${Q(r[e])}`);
 		if (i.length > 0) return i;
 	} catch {}
 	return [`from ${e}`, `to   ${t}`];
 }
-function Hs(e) {
+function Js(e) {
 	let t = [], n = e.editionComparison ? `edition comparison — ${e.aLabel} → ${e.bLabel}` : `model diff — ${e.aLabel} → ${e.bLabel}`;
 	t.push(`primmel diff: ${n}`), t.push(""), t.push(`elements: +${e.added.length} -${e.removed.length} ~${e.changed.length} >${e.moved.length} (${e.unchanged} unchanged)`), t.push(""), t.push("by tier:    added  removed  changed  moved  unchanged");
-	for (let n of Ss) {
+	for (let n of Os) {
 		let r = e.byTier[n];
 		t.push(`  ${n.padEnd(13)} ${String(r.added).padStart(5)} ${String(r.removed).padStart(8)} ${String(r.changed).padStart(8)} ${String(r.moved).padStart(6)} ${String(r.unchanged).padStart(9)}`);
 	}
 	if (e.added.length > 0) {
 		t.push("", "added:");
-		for (let n of e.added) t.push(`  + ${Bs(n)}`);
+		for (let n of e.added) t.push(`  + ${Ks(n)}`);
 	}
 	if (e.removed.length > 0) {
 		t.push("", "removed:");
-		for (let n of e.removed) t.push(`  - ${Bs(n)}`);
+		for (let n of e.removed) t.push(`  - ${Ks(n)}`);
 	}
 	if (e.changed.length > 0) {
 		t.push("", "changed:");
-		for (let n of e.changed) t.push(`  ~ ${Bs(n)} — ${n.aspects.join(", ")}`);
+		for (let n of e.changed) t.push(`  ~ ${Ks(n)} — ${n.aspects.join(", ")}`);
 	}
 	if (e.moved.length > 0) {
 		t.push("", "moved (re-anchored):");
 		for (let n of e.moved) {
-			t.push(`  > ${Bs(n)}`);
-			for (let e of Vs(n.from, n.to)) t.push(`      ${e}`);
+			t.push(`  > ${Ks(n)}`);
+			for (let e of qs(n.from, n.to)) t.push(`      ${e}`);
 		}
 	}
 	if (e.warnings.length > 0) {
@@ -8354,27 +8469,27 @@ function Hs(e) {
 }
 //#endregion
 //#region src/ser-des/index.ts
-function Us(e, t = {}) {
-	return p(u(e, Ao, t), jo);
+function Ys(e, t = {}) {
+	return p(u(e, ko, t), Ao);
 }
-function Ws(e, t = {}) {
-	let n = u(e, Ao, t);
+function Xs(e, t = {}) {
+	let n = u(e, ko, t);
 	return {
-		standard: p(n, jo),
+		standard: p(n, Ao),
 		issues: n.issues
 	};
 }
-function Gs(e, t = {}) {
-	return Us(J(e), t);
+function Zs(e, t = {}) {
+	return Ys(Po(e), t);
 }
-function Ks(e, t = {}) {
-	return Ws(J(e), t);
+function Qs(e, t = {}) {
+	return Xs(Po(e), t);
 }
-function qs(e) {
-	return Be(e, Mo);
+function $s(e) {
+	return Be(e, jo);
 }
-function Js(e) {
+function ec(e) {
 	return Fo(e);
 }
 //#endregion
-export { Y as CompositionError, ss as PRIMITIVE_TYPES, Cs as TIER_BY_FIELD, Ss as TIER_ORDER, bs as applyView, ms as buildProcessTree, Q as canonical, Ps as clauseTextKey, ps as collectMappings, xs as componentIds, gs as computeCoverage, zs as diffStandards, _s as discoverTransitive, qs as dump, ci as dumpPackage, is as dumpPrm, Yo as effectiveUses, Ns as elementIndex, Hs as formatDiffReport, ds as isWellFormedMapType, Us as load, Gs as loadFile, Ks as loadFileWithIssues, Go as loadPackage, Jo as loadPackageWithIssues, rs as loadPrm, Ws as loadWithIssues, os as mapProfilesToPrm, fs as mappingsFromProfile, Ts as normalizeSourceRef, Wo as packageFiles, Z as parseTargetRef, us as parseTypeExpression, as as prmToMapProfiles, Ko as readPackageManifest, vs as repoMap, Js as validate };
+export { Y as CompositionError, ps as PRIMITIVE_TYPES, ks as TIER_BY_FIELD, Os as TIER_ORDER, Es as applyView, bs as buildProcessTree, Q as canonical, Bs as clauseTextKey, ys as collectMappings, Ds as componentIds, Ss as computeCoverage, Gs as diffStandards, Cs as discoverTransitive, $s as dump, si as dumpPackage, us as dumpPrm, ts as effectiveUses, zs as elementIndex, Js as formatDiffReport, Ko as groupBySourceFile, _s as isWellFormedMapType, Ys as load, Zs as loadFile, Qs as loadFileWithIssues, Go as loadPackage, es as loadPackageWithIssues, qo as loadPackageWithProvenance, ls as loadPrm, Xs as loadWithIssues, fs as mapProfilesToPrm, vs as mappingsFromProfile, js as normalizeSourceRef, Wo as packageFiles, Z as parseTargetRef, gs as parseTypeExpression, ds as prmToMapProfiles, Qo as readPackageManifest, ws as repoMap, ec as validate };